diff options
Diffstat (limited to 'sysdeps/sparc')
| -rw-r--r-- | sysdeps/sparc/sparc32/dl-machine.h | 16 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/dl-machine.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index c2a5026f5b..da631d2f54 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -42,7 +42,7 @@ /* Use a different preload file when running in 32-bit emulation mode on a 64-bit host. */ -#define LD_SO_PRELOAD ((GL(dl_hwcap) & HWCAP_SPARC_V9) \ +#define LD_SO_PRELOAD ((GLRO(dl_hwcap) & HWCAP_SPARC_V9) \ ? "/etc/ld.so.preload32" \ : "/etc/ld.so.preload") @@ -58,9 +58,9 @@ elf_machine_matches_host (const Elf32_Ehdr *ehdr) /* XXX The following is wrong! Dave Miller rejected to implement it correctly. If this causes problems shoot *him*! */ #ifdef SHARED - return GL(dl_hwcap) & GL(dl_hwcap_mask) & HWCAP_SPARC_V9; + return GLRO(dl_hwcap) & GLRO(dl_hwcap_mask) & HWCAP_SPARC_V9; #else - return GL(dl_hwcap) & HWCAP_SPARC_V9; + return GLRO(dl_hwcap) & HWCAP_SPARC_V9; #endif } else @@ -137,7 +137,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) { rfunc = (Elf32_Addr) &_dl_runtime_profile; - if (_dl_name_match_p (GL(dl_profile), l)) + if (_dl_name_match_p (GLRO(dl_profile), l)) GL(dl_profile_map) = l; } @@ -166,7 +166,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) Elf32_Rela *relaend = (Elf32_Rela *) ((char *) rela + l->l_info[DT_PLTRELSZ]->d_un.d_val); - do_flush = GL(dl_hwcap) & HWCAP_SPARC_FLUSH; + do_flush = GLRO(dl_hwcap) & HWCAP_SPARC_FLUSH; /* prelink must ensure there are no R_SPARC_NONE relocs left in .rela.plt. */ @@ -352,7 +352,7 @@ sparc_fixup_plt (const Elf32_Rela *reloc, Elf32_Addr *reloc_addr, #ifndef RTLD_BOOTSTRAP /* Note that we don't mask the hwcap here, as the flush is essential to functionality on those cpu's that implement it. */ - int do_flush = GL(dl_hwcap) & HWCAP_SPARC_FLUSH; + int do_flush = GLRO(dl_hwcap) & HWCAP_SPARC_FLUSH; #else /* Unfortunately, this is necessary, so that we can ensure ld.so will not execute corrupt PLT entry instructions. */ @@ -460,7 +460,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, # if defined USE_TLS && !defined RTLD_BOOTSTRAP sym_map = RESOLVE_MAP (&sym, version, r_type); value = sym == NULL ? 0 : sym_map->l_addr + sym->st_value; -# else +# else value = RESOLVE (&sym, version, r_type); if (sym) value += sym->st_value; @@ -480,7 +480,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, found. */ break; if (sym->st_size > refsym->st_size - || (GL(dl_verbose) && sym->st_size < refsym->st_size)) + || (GLRO(dl_verbose) && sym->st_size < refsym->st_size)) { const char *strtab; diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index ff7ea8aa41..474aa0e6e6 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -284,7 +284,7 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, found. */ break; if (sym->st_size > refsym->st_size - || (GL(dl_verbose) && sym->st_size < refsym->st_size)) + || (GLRO(dl_verbose) && sym->st_size < refsym->st_size)) { const char *strtab; @@ -498,7 +498,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) { res0_addr = (Elf64_Addr) &_dl_runtime_profile_0; res1_addr = (Elf64_Addr) &_dl_runtime_profile_1; - if (_dl_name_match_p (GL(dl_profile), l)) + if (_dl_name_match_p (GLRO(dl_profile), l)) GL(dl_profile_map) = l; } |