modpost: assume STT_SPARC_REGISTER is defined
diff mbox series

Message ID 20200104153651.2258-1-masahiroy@kernel.org
State New
Headers show
Series
  • modpost: assume STT_SPARC_REGISTER is defined
Related show

Commit Message

Masahiro Yamada Jan. 4, 2020, 3:36 p.m. UTC
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 <masahiroy@kernel.org>
---

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

Comments

David Miller Jan. 6, 2020, 9:33 p.m. UTC | #1
From: Masahiro Yamada <masahiroy@kernel.org>
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 <masahiroy@kernel.org>

Acked-by: David S. Miller <davem@davemloft.net>
Masahiro Yamada Jan. 11, 2020, 7:26 a.m. UTC | #2
On Tue, Jan 7, 2020 at 6:33 AM David Miller <davem@redhat.com> wrote:
>
> From: Masahiro Yamada <masahiroy@kernel.org>
> 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 <masahiroy@kernel.org>
>
> Acked-by: David S. Miller <davem@davemloft.net>
>

Applied to linux-kbuild.

Patch
diff mbox series

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,