diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-20 05:59:49 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-20 05:59:49 +0400 |
| commit | b8d9598c41e999fb094d3811019248197c54274a (patch) | |
| tree | f934dada0798c769331886481dd0e7538c2842fd /scripts | |
| parent | 01c314a0c0f6367960a7cb1ffb5796560ccaa1c1 (diff) | |
| parent | 83c4e43722a2c8a8438b8d165047720fd36aaea4 (diff) | |
| download | linux-b8d9598c41e999fb094d3811019248197c54274a.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'scripts')
| -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 |