diff options
| -rw-r--r-- | sysdeps/alpha/dl-machine.h | 9 | ||||
| -rw-r--r-- | sysdeps/ia64/dl-machine.h | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h index 2b15e33518..05d988274b 100644 --- a/sysdeps/alpha/dl-machine.h +++ b/sysdeps/alpha/dl-machine.h @@ -522,7 +522,7 @@ elf_machine_rela (struct link_map *map, if (map != &GL(dl_rtld_map)) # endif { - /* XXX Make some timings. Maybe it's preverable to test for + /* XXX Make some timings. Maybe it's preferable to test for unaligned access and only do it the complex way if necessary. */ void *reloc_addr_1 = reloc_addr; Elf64_Addr reloc_addr_val; @@ -535,12 +535,11 @@ elf_machine_rela (struct link_map *map, memcpy (reloc_addr_1, &reloc_addr_val, 8); } } -# ifndef RTLD_BOOTSTRAP - else if (__builtin_expect (r_type == R_ALPHA_NONE, 0)) - return; -# endif else #endif + if (__builtin_expect (r_type == R_ALPHA_NONE, 0)) + return; + else { Elf64_Addr loadbase, sym_value; diff --git a/sysdeps/ia64/dl-machine.h b/sysdeps/ia64/dl-machine.h index e0910891b1..16a1ff3000 100644 --- a/sysdeps/ia64/dl-machine.h +++ b/sysdeps/ia64/dl-machine.h @@ -546,12 +546,11 @@ elf_machine_rela (struct link_map *map, # endif value += map->l_addr; } -# ifndef RTLD_BOOTSTRAP - else if (r_type == R_IA64_NONE) - return; -# endif else #endif + if (__builtin_expect (r_type == R_IA64_NONE, 0)) + return; + else { struct link_map *sym_map; |