From cf17d5e65232e57718b2e8569dc5fecb3cca4d05 Mon Sep 17 00:00:00 2001 From: Fabio Massimo Di Nitto Date: Wed, 13 Jul 2005 08:25:49 +0200 Subject: [PATCH] --- yaml --- r: 7217 b: refs/heads/master c: b95d4fec89c1f503ebad4c704ac08c3c6761329b h: refs/heads/master i: 7215: 4604446b25d3b71246f55a809fac3e2c986d4062 v: v3 --- [refs] | 2 +- trunk/scripts/mod/modpost.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 41bf97f3e0cd..2ddc9cd71e39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d983feab80948cdd0e3920c40d453a6436eeb23 +refs/heads/master: b95d4fec89c1f503ebad4c704ac08c3c6761329b diff --git a/trunk/scripts/mod/modpost.c b/trunk/scripts/mod/modpost.c index 9b9f94c915d2..09ffca54b373 100644 --- a/trunk/scripts/mod/modpost.c +++ b/trunk/scripts/mod/modpost.c @@ -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