Re: [PATCH] ld.so: Replace (&bootstrap_map) with BOOTSTRAP_MAP

["H.J. Lu" <hjl.tools@gmail.com>]

On 9/29/17, H.J. Lu <hjl.tools@gmail.com> wrote:
> (&_dl_main_map) is used instead of (&bootstrap_map) to bootstrap static
> PIE.  Define BOOTSTRAP_MAP with (&_dl_main_map) to avoid hardcode to
> (&bootstrap_map).
>
> Tested on x86-64.  OK for master?
>
>
> H.J.
> ---
> 	* elf/rtld.c (BOOTSTRAP_MAP): New.
> 	(RESOLVE_MAP): Replace (&bootstrap_map) with BOOTSTRAP_MAP.
> 	* sysdeps/hppa/dl-machine.h (ELF_MACHINE_BEFORE_RTLD_RELOC):
> 	Likewise.
> 	* sysdeps/ia64/dl-machine.h (ELF_MACHINE_BEFORE_RTLD_RELOC):
> 	Likewise.
> 	* sysdeps/mips/dl-machine.h (ELF_MACHINE_BEFORE_RTLD_RELOC):
> 	Likewise.
> ---
>  elf/rtld.c                | 3 ++-
>  sysdeps/hppa/dl-machine.h | 2 +-
>  sysdeps/ia64/dl-machine.h | 2 +-
>  sysdeps/mips/dl-machine.h | 2 +-
>  4 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/elf/rtld.c b/elf/rtld.c
> index d8e75c02e6..90505aee7d 100644
> --- a/elf/rtld.c
> +++ b/elf/rtld.c
> @@ -454,7 +454,8 @@ _dl_start (void *arg)
>       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(sym, version, flags) (&bootstrap_map)
> +#define BOOTSTRAP_MAP (&bootstrap_map)
> +#define RESOLVE_MAP(sym, version, flags) BOOTSTRAP_MAP
>  #include "dynamic-link.h"
>
>    if (HP_TIMING_INLINE && HP_SMALL_TIMING_AVAIL)
> diff --git a/sysdeps/hppa/dl-machine.h b/sysdeps/hppa/dl-machine.h
> index e24bd25c63..acfb9fc31f 100644
> --- a/sysdeps/hppa/dl-machine.h
> +++ b/sysdeps/hppa/dl-machine.h
> @@ -62,7 +62,7 @@ __hppa_init_bootstrap_fdesc_table (struct link_map *map)
>  }
>
>  #define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info)		\
> -	__hppa_init_bootstrap_fdesc_table (&bootstrap_map);	\
> +	__hppa_init_bootstrap_fdesc_table (BOOTSTRAP_MAP);	\
>  	_dl_fptr_init();
>
>  /* Return nonzero iff ELF header is compatible with the running host.  */
> diff --git a/sysdeps/ia64/dl-machine.h b/sysdeps/ia64/dl-machine.h
> index 8d0d3c97dd..b56f1c8194 100644
> --- a/sysdeps/ia64/dl-machine.h
> +++ b/sysdeps/ia64/dl-machine.h
> @@ -45,7 +45,7 @@ __ia64_init_bootstrap_fdesc_table (struct link_map *map)
>  }
>
>  #define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info)		\
> -	__ia64_init_bootstrap_fdesc_table (&bootstrap_map);
> +	__ia64_init_bootstrap_fdesc_table (BOOTSTRAP_MAP);
>
>  /* Return nonzero iff ELF header is compatible with the running host.  */
>  static inline int __attribute__ ((unused))
> diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
> index 74ead7f524..da9d6332ea 100644
> --- a/sysdeps/mips/dl-machine.h
> +++ b/sysdeps/mips/dl-machine.h
> @@ -190,7 +190,7 @@ elf_machine_load_address (void)
>     fiddles with global data.  */
>  #define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info)			\
>  do {									\
> -  struct link_map *map = &bootstrap_map;				\
> +  struct link_map *map = BOOTSTRAP_MAP;					\
>    ElfW(Sym) *sym;							\
>    ElfW(Addr) *got;							\
>    int i, n;								\
> --
> 2.13.6
>
>

Tested with build-many-glibcs.py.  Will check it in shortly.

-- 
H.J.