| rtld.c (105753) | rtld.c (107071) |
|---|---|
| 1/*- 2 * Copyright 1996, 1997, 1998, 1999, 2000 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, 2000 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/rtld.c 105753 2002-10-23 01:43:29Z kan $ | 25 * $FreeBSD: head/libexec/rtld-elf/rtld.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 --- 406 unchanged lines hidden (view full) --- 440 441 /* 442 * Write the new contents for the jmpslot. Note that depending on 443 * architecture, the value which we need to return back to the 444 * lazy binding trampoline may or may not be the target 445 * address. The value returned from reloc_jmpslot() is the value 446 * that the trampoline needs. 447 */ | 26 */ 27 28/* 29 * Dynamic linker for ELF. 30 * 31 * John Polstra <jdp@polstra.com>. 32 */ 33 --- 406 unchanged lines hidden (view full) --- 440 441 /* 442 * Write the new contents for the jmpslot. Note that depending on 443 * architecture, the value which we need to return back to the 444 * lazy binding trampoline may or may not be the target 445 * address. The value returned from reloc_jmpslot() is the value 446 * that the trampoline needs. 447 */ |
| 448 target = reloc_jmpslot(where, target, defobj); | 448 target = reloc_jmpslot(where, target, defobj, obj, rel); |
| 449 rlock_release(); 450 return target; 451} 452 453/* 454 * Error reporting function. Use it like printf. If formats the message 455 * into a buffer, and sets things up so that the next call to dlerror() 456 * will return the message. --- 1729 unchanged lines hidden --- | 449 rlock_release(); 450 return target; 451} 452 453/* 454 * Error reporting function. Use it like printf. If formats the message 455 * into a buffer, and sets things up so that the next call to dlerror() 456 * will return the message. --- 1729 unchanged lines hidden --- |