aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/i386
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-08-15 01:23:29 +0000
committerUlrich Drepper <drepper@redhat.com>1996-08-15 01:23:29 +0000
commit706074a5bb120f78f4fd8bc40c6814f14e17e530 (patch)
treec5da6add27af818bf38e5d9e4f9b3c2dedc718ff /sysdeps/i386
parent046e3001f9370904c1efd764cfe49c472818ddfb (diff)
downloadglibc-706074a5bb120f78f4fd8bc40c6814f14e17e530.zip
glibc-706074a5bb120f78f4fd8bc40c6814f14e17e530.tar.gz
glibc-706074a5bb120f78f4fd8bc40c6814f14e17e530.tar.bz2
update from main archive 960814cvs/libc-960815
Diffstat (limited to 'sysdeps/i386')
-rw-r--r--sysdeps/i386/dl-machine.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 111122e..d616bf4 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -193,15 +193,15 @@ elf_machine_rel (struct link_map *map,
switch (ELF32_R_TYPE (reloc->r_info))
{
case R_386_COPY:
- loadbase = RESOLVE (&sym, (Elf32_Addr) reloc_addr, 0);
+ loadbase = RESOLVE (&sym, DL_LOOKUP_NOEXEC);
memcpy (reloc_addr, (void *) (loadbase + sym->st_value), sym->st_size);
break;
case R_386_GLOB_DAT:
- loadbase = RESOLVE (&sym, (Elf32_Addr) reloc_addr, 0);
+ loadbase = RESOLVE (&sym, 0);
*reloc_addr = sym ? (loadbase + sym->st_value) : 0;
break;
case R_386_JMP_SLOT:
- loadbase = RESOLVE (&sym, (Elf32_Addr) reloc_addr, 1);
+ loadbase = RESOLVE (&sym, DL_LOOKUP_NOPLT);
*reloc_addr = sym ? (loadbase + sym->st_value) : 0;
break;
case R_386_32:
@@ -222,7 +222,7 @@ elf_machine_rel (struct link_map *map,
built-in definitions used while loading those libraries. */
undo = map->l_addr + sym->st_value;
#endif
- loadbase = RESOLVE (&sym, (Elf32_Addr) reloc_addr, 0);
+ loadbase = RESOLVE (&sym, 0);
*reloc_addr += (sym ? (loadbase + sym->st_value) : 0) - undo;
break;
}
@@ -233,7 +233,7 @@ elf_machine_rel (struct link_map *map,
*reloc_addr += map->l_addr;
break;
case R_386_PC32:
- loadbase = RESOLVE (&sym, (Elf32_Addr) reloc_addr, 0);
+ loadbase = RESOLVE (&sym, 0);
*reloc_addr += ((sym ? (loadbase + sym->st_value) : 0) -
(Elf32_Addr) reloc_addr);
break;