Commit 5370d4ac authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

modpost: assume STT_SPARC_REGISTER is defined 



Commit 8d529014 ("[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: default avatarMasahiro Yamada <masahiroy@kernel.org>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7168965e

scripts/mod/modpost.c

+1 −7
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE