diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-04-02 23:49:50 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-04-02 23:49:50 -0800 |
| commit | bd4efa7351f3e3f54b47cb3ceac9d6cf94dc25e1 (patch) | |
| tree | 328ecb0c4bd6b9fbadd5b1d18c4c4f27f3e87453 /scripts | |
| parent | 513230c4f87271d1296ad67ecdf789ba93231a21 (diff) | |
| parent | 8b4d8f66184974d3286b19cd17b85c7b6100ef5f (diff) | |
| download | history-bd4efa7351f3e3f54b47cb3ceac9d6cf94dc25e1.tar.gz | |
Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5
into nuts.ninka.net:/home/davem/src/BK/sparc-2.5
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/modpost.c | 6 | ||||
| -rw-r--r-- | scripts/modpost.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/scripts/modpost.c b/scripts/modpost.c index 2d19dcdafd608..1b94b2c73b28c 100644 --- a/scripts/modpost.c +++ b/scripts/modpost.c @@ -296,6 +296,12 @@ handle_modversions(struct module *mod, struct elf_info *info, /* ignore global offset table */ if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0) break; + 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) + break; + } if (memcmp(symname, MODULE_SYMBOL_PREFIX, strlen(MODULE_SYMBOL_PREFIX)) == 0) { diff --git a/scripts/modpost.h b/scripts/modpost.h index 1a5c8e829cc8e..5861081797809 100644 --- a/scripts/modpost.h +++ b/scripts/modpost.h @@ -17,6 +17,7 @@ #define Elf_Shdr Elf32_Shdr #define Elf_Sym Elf32_Sym #define ELF_ST_BIND ELF32_ST_BIND +#define ELF_ST_TYPE ELF32_ST_TYPE #else @@ -24,6 +25,7 @@ #define Elf_Shdr Elf64_Shdr #define Elf_Sym Elf64_Sym #define ELF_ST_BIND ELF64_ST_BIND +#define ELF_ST_TYPE ELF64_ST_TYPE #endif |