Skip to contentSkip to conversation

modpost: assume STT_SPARC_REGISTER is defined

PATCH In review Masahiro Yamada 2 participants 3 messages Jan 4, 2020 – Jan 11, 2020 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

 scripts/mod/modpost.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
scripts/mod/modpost.c +1 -7
index 6e892c93d104..7edfdb2f4497 100644
@@ -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,
Signature · 1 line
2.17.1
#2 lore raw
Quoted 4 lines · David Miller

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

Quoted 8 lines
Quoted 5 lines

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.

Applied to linux-kbuild.

Signature · 2 lines
Best Regards
Masahiro Yamada