diff options
| author | Ben Colline <bcollins@debian.org> | 2005-08-19 22:44:57 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-08-19 22:44:57 +0200 |
| commit | 8d5290149ee1c6a4cea5f5146d64e2a0d48f4988 (patch) | |
| tree | 6e61cf51aae72b81e3667e093893265c86febccc /scripts/mod | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-8d5290149ee1c6a4cea5f5146d64e2a0d48f4988.tar.xz linux-8d5290149ee1c6a4cea5f5146d64e2a0d48f4988.zip | |
[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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'scripts/mod')
| -rw-r--r-- | scripts/mod/modpost.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 9b9f94c915d2..09ffca54b373 100644 --- a/scripts/mod/modpost.c +++ b/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 |