diff options
| author | Roland McGrath <roland@gnu.org> | 1996-07-14 11:39:25 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-07-14 11:39:25 +0000 |
| commit | f51d1dfd35f793488ee32c8226cb8955ed75acbe (patch) | |
| tree | 0a157b3355be9569bd6217a20218e2fedd6f42d7 /elf/rtld.c | |
| parent | c928de790200bc7a81224377d35a91a6103387de (diff) | |
| download | glibc-f51d1dfd35f793488ee32c8226cb8955ed75acbe.tar.gz glibc-f51d1dfd35f793488ee32c8226cb8955ed75acbe.tar.xz glibc-f51d1dfd35f793488ee32c8226cb8955ed75acbe.zip | |
* elf/dl-reloc.c: Include "dynamic-link.h" at file scope.
* elf/rtld.c: Include <string.h>. * elf/dynamic-link.h (ELF_DYNAMIC_DO_REL, ELF_DYNAMIC_DO_RELA, ELF_DYNAMIC_RELOCATE): No longer take RESOLVE argument. Conditionalize defns on [RESOLVE]. * elf/do-rel.h (elf_dynamic_do_rel): Likewise. * sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise. Instead use RESOLVE macro with same args. (elf_machine_rel): Conditionalize defn on [RESOLVE]. * elf/dl-reloc.c (RESOLVE): New macro, define before including "dynamic-link.h". It replaces `resolve' local function. * elf/dl-runtime.c: Likewise. * elf/rtld.c: Likewise.
Diffstat (limited to 'elf/rtld.c')
| -rw-r--r-- | elf/rtld.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index 2e23d9cb38..1058d87150 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -20,6 +20,7 @@ Cambridge, MA 02139, USA. */ #include <link.h> #include <stddef.h> #include <stdlib.h> +#include <string.h> #include <unistd.h> #include <sys/mman.h> /* Check if MAP_ANON is defined. */ #include "../stdio-common/_itoa.h" @@ -28,6 +29,7 @@ Cambridge, MA 02139, USA. */ /* This #define produces dynamic linking inline functions for bootstrap relocation instead of general-purpose relocation. */ #define RTLD_BOOTSTRAP +#define RESOLVE(sym, reloc_addr, noplt) 0 #include "dynamic-link.h" @@ -79,7 +81,7 @@ _dl_start (void *arg) /* Relocate ourselves so we can do normal function calls and data access using the global offset table. */ - ELF_DYNAMIC_RELOCATE (&bootstrap_map, 0, NULL); + ELF_DYNAMIC_RELOCATE (&bootstrap_map, 0); /* Now life is sane; we can call functions and access global data. |