| reloc.c (98103) | reloc.c (107071) |
|---|---|
| 1/*- 2 * Copyright 1996, 1997, 1998, 1999 John D. Polstra. 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 8 unchanged lines hidden (view full) --- 17 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * | 1/*- 2 * Copyright 1996, 1997, 1998, 1999 John D. Polstra. 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 8 unchanged lines hidden (view full) --- 17 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * |
| 25 * $FreeBSD: head/libexec/rtld-elf/amd64/reloc.c 98103 2002-06-10 21:15:50Z dillon $ | 25 * $FreeBSD: head/libexec/rtld-elf/amd64/reloc.c 107071 2002-11-18 22:08:50Z tmm $ |
| 26 */ 27 28/* 29 * Dynamic linker for ELF. 30 * 31 * John Polstra <jdp@polstra.com>. 32 */ 33 --- 220 unchanged lines hidden (view full) --- 254 const Obj_Entry *defobj; 255 256 assert(ELF_R_TYPE(rel->r_info) == R_386_JMP_SLOT); 257 where = (Elf_Addr *)(obj->relocbase + rel->r_offset); 258 def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, true, NULL); 259 if (def == NULL) 260 return -1; 261 target = (Elf_Addr)(defobj->relocbase + def->st_value); | 26 */ 27 28/* 29 * Dynamic linker for ELF. 30 * 31 * John Polstra <jdp@polstra.com>. 32 */ 33 --- 220 unchanged lines hidden (view full) --- 254 const Obj_Entry *defobj; 255 256 assert(ELF_R_TYPE(rel->r_info) == R_386_JMP_SLOT); 257 where = (Elf_Addr *)(obj->relocbase + rel->r_offset); 258 def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, true, NULL); 259 if (def == NULL) 260 return -1; 261 target = (Elf_Addr)(defobj->relocbase + def->st_value); |
| 262 reloc_jmpslot(where, target, defobj); | 262 reloc_jmpslot(where, target, defobj, obj, rel); |
| 263 } 264 obj->jmpslots_done = true; 265 return 0; 266} | 263 } 264 obj->jmpslots_done = true; 265 return 0; 266} |