2020-01-04 15:38:35

by Masahiro Yamada

Subject: [PATCH] modpost: assume STT_SPARC_REGISTER is defined

Commit 8d5290149ee1 ("[SPARC]: Deal with glibc changing macro names in
modpost.c") was more than 14 years ago. STT_SPARC_REGISTER is hopefully
defined in elf.h of recent C libraries.

Signed-off-by: Masahiro Yamada <[email protected]>
---

scripts/mod/modpost.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 6e892c93d104..7edfdb2f4497 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -12,6 +12,7 @@
*/

#define _GNU_SOURCE
+#include <elf.h>
#include <stdio.h>
#include <ctype.h>
#include <string.h>
@@ -729,12 +730,6 @@ static void handle_symbol(struct module *mod, struct elf_info *info,
break;
if (ignore_undef_symbol(info, symname))
break;
-/* cope with newer glibc (2.3.4 or higher) STT_ definition in elf.h */
-#if defined(STT_REGISTER) || defined(STT_SPARC_REGISTER)
-/* add compatibility with older glibc */
-#ifndef STT_SPARC_REGISTER
-#define STT_SPARC_REGISTER STT_REGISTER
-#endif
if (info->hdr->e_machine == EM_SPARC ||
info->hdr->e_machine == EM_SPARCV9) {
/* Ignore register directives. */
@@ -747,7 +742,6 @@ static void handle_symbol(struct module *mod, struct elf_info *info,
symname = munged;
}
}
-#endif

mod->unres = alloc_symbol(symname,
ELF_ST_BIND(sym->st_info) == STB_WEAK,
--
2.17.1

2020-01-06 21:34:42

by David Miller

Subject: Re: [PATCH] modpost: assume STT_SPARC_REGISTER is defined

From: Masahiro Yamada <[email protected]>
Date: Sun, 5 Jan 2020 00:36:51 +0900

> Commit 8d5290149ee1 ("[SPARC]: Deal with glibc changing macro names in
> modpost.c") was more than 14 years ago. STT_SPARC_REGISTER is hopefully
> defined in elf.h of recent C libraries.
>
> Signed-off-by: Masahiro Yamada <[email protected]>

Acked-by: David S. Miller <[email protected]>

2020-01-11 07:27:57

by Masahiro Yamada

Subject: Re: [PATCH] modpost: assume STT_SPARC_REGISTER is defined

On Tue, Jan 7, 2020 at 6:33 AM David Miller <[email protected]> wrote:
>
> From: Masahiro Yamada <[email protected]>
> Date: Sun, 5 Jan 2020 00:36:51 +0900
>
> > Commit 8d5290149ee1 ("[SPARC]: Deal with glibc changing macro names in
> > modpost.c") was more than 14 years ago. STT_SPARC_REGISTER is hopefully
> > defined in elf.h of recent C libraries.
> >
> > Signed-off-by: Masahiro Yamada <[email protected]>
>
> Acked-by: David S. Miller <[email protected]>
>

Applied to linux-kbuild.


--
Best Regards
Masahiro Yamada