diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-runtime.c | 8 | ||||
| -rw-r--r-- | elf/elf.h | 8 | ||||
| -rw-r--r-- | elf/ldsodefs.h | 3 |
3 files changed, 13 insertions, 6 deletions
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c index 53601b809f..10daa98c06 100644 --- a/elf/dl-runtime.c +++ b/elf/dl-runtime.c @@ -128,13 +128,13 @@ fixup ( { value = _dl_lookup_versioned_symbol(strtab + sym->st_name, &sym, scope, l->l_name, - version, ELF_MACHINE_JMP_SLOT); + version, DL_LOOKUP_NOPLT); break; } } case 0: value = _dl_lookup_symbol (strtab + sym->st_name, &sym, scope, - l->l_name, ELF_MACHINE_JMP_SLOT); + l->l_name, DL_LOOKUP_NOPLT); } /* Currently value contains the base load address of the object @@ -205,13 +205,13 @@ profile_fixup ( value = _dl_lookup_versioned_symbol(strtab + sym->st_name, &sym, scope, l->l_name, version, - ELF_MACHINE_JMP_SLOT); + DL_LOOKUP_NOPLT); break; } } case 0: value = _dl_lookup_symbol (strtab + sym->st_name, &sym, scope, - l->l_name, ELF_MACHINE_JMP_SLOT); + l->l_name, DL_LOOKUP_NOPLT); } /* Currently value contains the base load address of the object diff --git a/elf/elf.h b/elf/elf.h index 037ababf70..fcc8a5384a 100644 --- a/elf/elf.h +++ b/elf/elf.h @@ -162,11 +162,14 @@ typedef struct #define EM_S370 9 /* Amdahl */ #define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */ -#define EM_SPARC64 11 /* SPARC v9 (not official) 64-bit */ - #define EM_PARISC 15 /* HPPA */ + +#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ + #define EM_PPC 20 /* PowerPC */ +#define EM_SPARCV9 43 /* SPARC v9 64-bit */ + /* If it is necessary to assign new unofficial EM_* values, please pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the chances of collision with official or non-GNU unofficial values. */ @@ -808,6 +811,7 @@ typedef struct #define HWCAP_SPARC_STBAR 2 #define HWCAP_SPARC_SWAP 4 #define HWCAP_SPARC_MULDIV 8 +#define HWCAP_SPARC_V9 16 /* The cpu is v9, so v8plus is ok. */ /* MIPS R3000 specific definitions. */ diff --git a/elf/ldsodefs.h b/elf/ldsodefs.h index 39f28332c6..19d931fd4e 100644 --- a/elf/ldsodefs.h +++ b/elf/ldsodefs.h @@ -140,6 +140,9 @@ extern int _dl_debug_files; /* Expect cache ID. */ extern int _dl_correct_cache_id; +/* Mask for hardware capabilities that are available. */ +extern unsigned long int _dl_hwcap; + /* Mask for important hardware capabilities we honour. */ extern unsigned long int _dl_hwcap_mask; |