OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* sysdeps/alpha/dl-machine.h (elf_machine_rela): Use RESOLVE_MAP all the time.

Browse Source 
2005-02-06  Richard Henderson  <rth@redhat.com>

	* sysdeps/alpha/dl-machine.h (elf_machine_rela): Use RESOLVE_MAP
	all the time.
This commit is contained in:
Richard Henderson 2005-02-07 03:11:46 +00:00
parent 75df54b7c8
commit a6e73dea18
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-02-06 Richard Henderson <rth@redhat.com>
* sysdeps/alpha/dl-machine.h (elf_machine_rela): Use RESOLVE_MAP
all the time.
2004-11-03 Marcus Brinkmann <marcus@gnu.org> 2004-11-03 Marcus Brinkmann <marcus@gnu.org>
* configure.in (sysnames): Append sysdeps/generic for each add-on. * configure.in (sysnames): Append sysdeps/generic for each add-on.

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

@ -423,26 +423,16 @@ elf_machine_rela (struct link_map *map,
return; return;
else else
{ {
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
Elf64_Addr sym_value; Elf64_Addr sym_value;
Elf64_Addr sym_raw_value; Elf64_Addr sym_raw_value;
#if defined USE_TLS && !defined RTLD_BOOTSTRAP
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
sym_raw_value = sym_value = reloc->r_addend; sym_raw_value = sym_value = reloc->r_addend;
if (sym) if (sym_map)
{ {
sym_raw_value += sym->st_value; sym_raw_value += sym->st_value;
sym_value = sym_raw_value + sym_map->l_addr; sym_value = sym_raw_value + sym_map->l_addr;
} }
#else
Elf64_Addr loadbase = RESOLVE (&sym, version, r_type);
sym_raw_value = sym_value = reloc->r_addend;
if (sym)
{
sym_raw_value += sym->st_value;
sym_value = sym_raw_value + loadbase;
}
#endif
if (r_type == R_ALPHA_GLOB_DAT) if (r_type == R_ALPHA_GLOB_DAT)
*reloc_addr = sym_value; *reloc_addr = sym_value;