From patchwork Fri Sep 29 21:32:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 23245 Received: (qmail 38378 invoked by alias); 29 Sep 2017 21:33:03 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 38112 invoked by uid 89); 29 Sep 2017 21:33:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.8 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1627 X-HELO: mail-it0-f50.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=3ymeaWkTfyzrhWF42CYOzxXK4PUXkwqtj+kXB2m6H5M=; b=X/9FvPWYFmLEcwZCZwtoWAIPl3xemBQr1rw3Ord3/Y7XdqlWuUev55mAld5J9AgFV4 zWS0i6rzueOaNlzNqYdzTuP3H+nkiQU/BKeqfLdTjwL8v2Bzfwpu7oPQveNBCfYMhfs/ CCRXqZCMD8OFn8Y85FamfKGsfXCGSHgjOLcKvPdcYdlAmVOtMAUbjEck7Y7VK0Hf2+zD h8BtdJvWjsVUViUo9OZ7pxZ4K7/e23ZPgU/bMdv9TSHFfh8d5sa9TabMWrcdV5fcQhgW vMSh0t7FhauH6w7o7DVjWEet/eN7JTh1Zko0FKAyZiGbXDR3g8bCT5NSSJn1ERvv5seT z3Ww== X-Gm-Message-State: AMCzsaVmHWv15maQE1bzDjSGjFW9gbmI5uaSb4SBquqeJH04mMrNJ6+P y63PI0JHXS+5+km+lpNPaNZE611j X-Google-Smtp-Source: AOwi7QCy3JsQTi70StYh+LkAu7x95e/jP+rE7vJvchNUu4PbDVyb7hk1G2OBed0wN0SyEVm5p2kN/Q== X-Received: by 10.36.12.14 with SMTP id 14mr8868941itn.94.1506720780213; Fri, 29 Sep 2017 14:33:00 -0700 (PDT) Date: Fri, 29 Sep 2017 14:32:54 -0700 From: "H.J. Lu" To: GNU C Library Subject: [PATCH] sparc: Update elf_machine_load_address for static PIE Message-ID: <20170929213254.GI2482@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.0 (2017-09-02) sparc uses a local label to compute load address, which works with static PIE. We just need to return 0 if _DYNAMIC is undefined for static executable. OK for master? * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_dynamic): Return 0 if _DYNAMIC is undefined for static executable. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_dynamic): Likewise. --- sysdeps/sparc/sparc32/dl-machine.h | 5 +++++ sysdeps/sparc/sparc64/dl-machine.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index 436e4e6cc3..30ae1b56ee 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -77,6 +77,11 @@ elf_machine_dynamic (void) static inline Elf32_Addr elf_machine_load_address (void) { +#ifndef SHARED + extern Elf32_Dyn _DYNAMIC[] __attribute__((weak, visibility ("hidden"))); + if (!_DYNAMIC) + return 0; +#endif register Elf32_Addr *pc __asm ("%o7"), *got __asm ("%l7"); __asm ("sethi %%hi(_GLOBAL_OFFSET_TABLE_-4), %1\n\t" diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index c2871dca3a..22e6dcced3 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -66,6 +66,11 @@ elf_machine_dynamic (void) static inline Elf64_Addr elf_machine_load_address (void) { +#ifndef SHARED + extern Elf64_Dyn _DYNAMIC[] __attribute__((weak, visibility ("hidden"))); + if (!_DYNAMIC) + return 0; +#endif register Elf32_Addr *pc __asm ("%o7"); register Elf64_Addr *got __asm ("%l7");