Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d529014 authored by Ben Colline's avatar Ben Colline Committed by David S. Miller
Browse files

[SPARC]: Deal with glibc changing macro names in modpost.c 



GLIBC 2.3.4 and later changed the STT_REGISTER macro to
STT_SPARC_REGISTER, so we need to cope with that somehow.

Original patch from fabbione, reposted by Ben Collins.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 91aa9fb5

scripts/mod/modpost.c

+7 −2
Original line number Diff line number Diff line
@@ -359,11 +359,16 @@ handle_modversions(struct module *mod, struct elf_info *info, 
		/* ignore __this_module, it will be resolved shortly */

		if (strcmp(symname, MODULE_SYMBOL_PREFIX "__this_module") == 0)

			break;

#ifdef STT_REGISTER

/* 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. */

			if (ELF_ST_TYPE(sym->st_info) == STT_REGISTER)

			if (ELF_ST_TYPE(sym->st_info) == STT_SPARC_REGISTER)

				break;

		}

#endif