From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 55578 invoked by alias); 2 Oct 2017 22:00:59 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 54900 invoked by uid 89); 2 Oct 2017 22:00:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-oi0-f67.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=PWnZKVDCd1CVFWwMG9yIrazVOsdVAzZbxUNzI9wXOzo=; b=D0vATg042XwqXqc1C2j7y+L1/6yU+0tPaFN3GXgbOqMiOuWYINRm4by6QiMXxjmHSP 3LeBu+vTGDv1np1n8SHoJAG5TYk5t/WyUO0lyiHa+zW13I58BlWoXf52RBRz2RtaubX9 dn/gScqVbmJUopJh8SHofERnVhoO5s4MGrk0h6Z7FrHsky+Ud7Xf02+XrGn7DHGBwGc8 cyB3OpTZ+VpF7km8cM21Op/wD+76oXJRiMq8IgYVPX/h5DRXWhVJepgT+0Kx/ORsSF5H e6cnX1iChvtLchjbsCw3cfJLT8DQEuBDbwtboDnC7cQYot0R78D8fXRBDL4mMvWdeXZ0 TceA== X-Gm-Message-State: AMCzsaW+yZovysfyyF22Fs07zWHOBSak78bWq80SRfMJTN+6OGFwHJbF Z8MywbI8uqI6pw7w9iD+rTKvk1v4bnTJeD1FaqM= X-Google-Smtp-Source: AOwi7QDVFANC8VLG0udRyB5ULzX1NlHKRwCy0NN+nBUjMFj3FcriVwkRaENLexAWt63iMDjJN494B1z/ry54CKOmvOA= X-Received: by 10.157.10.129 with SMTP id 1mr8126042otq.201.1506981655946; Mon, 02 Oct 2017 15:00:55 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20170929213843.GU2482@gmail.com> References: <20170929213843.GU2482@gmail.com> From: "H.J. Lu" Date: Mon, 02 Oct 2017 22:00:00 -0000 Message-ID: Subject: Re: [PATCH] ld.so: Replace (&bootstrap_map) with BOOTSTRAP_MAP To: GNU C Library Content-Type: text/plain; charset="UTF-8" X-SW-Source: 2017-10/txt/msg00080.txt.bz2 On 9/29/17, H.J. Lu 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.