diff options
Diffstat (limited to 'elf/rtld.c')
| -rw-r--r-- | elf/rtld.c | 23 |
1 files changed, 11 insertions, 12 deletions
@@ -32,7 +32,6 @@ #include <fpu_control.h> #include <hp-timing.h> #include <libc-lock.h> -#include "dynamic-link.h" #include <dl-librecon.h> #include <unsecvars.h> #include <dl-cache.h> @@ -50,9 +49,18 @@ #include <dl-main.h> #include <gnu/lib-names.h> #include <dl-tunables.h> +#include <get-dynamic-info.h> #include <assert.h> +/* This #define produces dynamic linking inline functions for + bootstrap relocation instead of general-purpose relocation. + Since ld.so must not have any undefined symbols the result + is trivial: always the map of ld.so itself. */ +#define RTLD_BOOTSTRAP +#define RESOLVE_MAP(map, scope, sym, version, flags) map +#include "dynamic-link.h" + /* Only enables rtld profiling for architectures which provides non generic hp-timing support. The generic support requires either syscall (clock_gettime), which will incur in extra overhead on loading time. @@ -507,15 +515,6 @@ _dl_start_final (void *arg, struct dl_start_final_info *info) # define bootstrap_map info.l #endif - /* This #define produces dynamic linking inline functions for - bootstrap relocation instead of general-purpose relocation. - Since ld.so must not have any undefined symbols the result - is trivial: always the map of ld.so itself. */ -#define RTLD_BOOTSTRAP -#define RESOLVE_MAP(map, scope, sym, version, flags) map -#include "get-dynamic-info.h" -#include "dynamic-link.h" - static ElfW(Addr) __attribute_used__ _dl_start (void *arg) { @@ -548,7 +547,7 @@ _dl_start (void *arg) /* Read our own dynamic section and fill in the info array. */ bootstrap_map.l_ld = (void *) bootstrap_map.l_addr + elf_machine_dynamic (); - elf_get_dynamic_info (&bootstrap_map, true); + elf_get_dynamic_info (&bootstrap_map); #if NO_TLS_OFFSET != 0 bootstrap_map.l_tls_offset = NO_TLS_OFFSET; @@ -1616,7 +1615,7 @@ dl_main (const ElfW(Phdr) *phdr, if (! rtld_is_main) { /* Extract the contents of the dynamic section for easy access. */ - elf_get_dynamic_info (main_map, false); + elf_get_dynamic_info (main_map); /* If the main map is libc.so, update the base namespace to refer to this map. If libc.so is loaded later, this happens |