mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-12-21 04:31:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

(elf_machine_rela): Don't handle

Browse Source 
R_ALPHA_RELATIVE if RTLD_BOOTSTRAP and HAVE_Z_COMBRELOC.  Only
check for rtld map if RTLD_BOOTSTRAP nor HAVE_Z_COMBRELOC is defined.
This commit is contained in:
Ulrich Drepper 2001-08-30 23:09:10 +00:00
parent 703aebdd7b
commit 952ec50e9e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sysdeps/alpha/dl-machine.h
View File

@ -468,7 +468,7 @@ elf_machine_rela (struct link_map *map,
{ {
unsigned long int const r_type = ELF64_R_TYPE (reloc->r_info); unsigned long int const r_type = ELF64_R_TYPE (reloc->r_info);
#ifndef RTLD_BOOTSTRAP #if !defined RTLD_BOOTSTRAP && !defined HAVE_Z_COMBRELOC
/* This is defined in rtld.c, but nowhere in the static libc.a; make the /* This is defined in rtld.c, but nowhere in the static libc.a; make the
reference weak so static programs can still link. This declaration reference weak so static programs can still link. This declaration
cannot be done when compiling rtld.c (i.e. #ifdef RTLD_BOOTSTRAP) cannot be done when compiling rtld.c (i.e. #ifdef RTLD_BOOTSTRAP)
@ -480,12 +480,13 @@ elf_machine_rela (struct link_map *map,
/* We cannot use a switch here because we cannot locate the switch /* We cannot use a switch here because we cannot locate the switch
jump table until we've self-relocated. */ jump table until we've self-relocated. */
#if !defined RTLD_BOOTSTRAP || !defined HAVE_Z_COMBRELOC
if (__builtin_expect (r_type == R_ALPHA_RELATIVE, 0)) if (__builtin_expect (r_type == R_ALPHA_RELATIVE, 0))
{ {
#ifndef RTLD_BOOTSTRAP # if !defined RTLD_BOOTSTRAP && !defined HAVE_Z_COMBRELOC
/* Already done in dynamic linker. */ /* Already done in dynamic linker. */
if (map != &_dl_rtld_map) if (map != &_dl_rtld_map)
#endif # endif
{ {
/* XXX Make some timings. Maybe it's preverable to test for /* XXX Make some timings. Maybe it's preverable to test for
unaligned access and only do it the complex way if necessary. */ unaligned access and only do it the complex way if necessary. */
@ -500,11 +501,12 @@ elf_machine_rela (struct link_map *map,
memcpy (reloc_addr_1, &reloc_addr_val, 8); memcpy (reloc_addr_1, &reloc_addr_val, 8);
} }
} }
#ifndef RTLD_BOOTSTRAP # ifndef RTLD_BOOTSTRAP
else if (__builtin_expect (r_type == R_ALPHA_NONE, 0)) else if (__builtin_expect (r_type == R_ALPHA_NONE, 0))
return; return;
#endif # endif
else else
#endif
{ {
Elf64_Addr loadbase, sym_value; Elf64_Addr loadbase, sym_value;