From patchwork Fri Sep 29 21:35:22 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: 820099 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-85156-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="wc/KDjpj"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y3lGj4qjYz9t0F for ; Sat, 30 Sep 2017 07:35:41 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=sGMqElQD6uCErzbWpRfCoiAAHG3Gm xdSa3s2TYedhloksGg5SFl6GE75nk5SuoiN8x5KT/Ro1KlIKjJ6OUbAxskB/A5Pe 1kh0cGbgwc1O/HnmjhJKkTCr5NdOLsQhhBnd5Tp8TQj/vQzwIR3rEVXVIvGqPEcV 2SXNYOQDBgz7lw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=AXPLecvza76fmq7of/EVTQwCZ5E=; b=wc/ KDjpjVCxr9SeOPL7T75lDeVweZoUblJzdr8mRp0n5c2+sWGjubUtRTgySV+Ftd69 X6RnyBLCs61lKSF6AvTu/VCxdL0b4fJ6o6C/FQq7Sh3ygzOuPYjBr8qN9LRfmAgP 6MTrBpXIsVmhPVYKfZ8Hd4I4qCarnLl1PW8UQ6Q4= Received: (qmail 79158 invoked by alias); 29 Sep 2017 21:35:33 -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 78901 invoked by uid 89); 29 Sep 2017 21:35:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.3 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-it0-f46.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=p32hTO522GiF1qM3kMqwaTLNBeQe9MrdWWGBUf7TATY=; b=qL6xU9YRiu0eRHO+Zyk1O250OMSpKO/LoYLJNCZ/Xe2hpaANYALQlczGJnVGi+gTs4 0uNBB26JRLKxUer7r+hFcLtv5yWg/LgJ/XnMq9nuj6AqTh3P0QqgU5YUNoRdnFJ+xlfU C8kzXbMv9xw0AKu8ln/1RkcBxljEP7X18MtaReXd5Y9WdM3OrDF4EAYwepA4kusnvlx+ FAWH5+O3sXYfBRRlsLw7U7b7tjVkMp03lJqummNSazLMM3wgL2UcIAMGT2NNmSOvFnNF RkxQWYR83WI/bArAc4J4tDl9pY2xREnXtcqQbnjJ24oc8NxuKcvQnolBDMWuqWuD3Atm 5XnQ== X-Gm-Message-State: AMCzsaWpvp8mWqSIDiOn4+X4Ix1CZa/2hhuG8Wbs9ELIDCceXliJiiPK vEa1n4fi/pExtSWGsYCUXJRMHakY X-Google-Smtp-Source: AOwi7QAn5FyRA/bLDDC4NAUd+zAJktmQKAEhRrIEGz6gjJ7hDy/LplRr76UekuyAsXJZDQNAahPJnA== X-Received: by 10.36.132.6 with SMTP id h6mr9264522itd.51.1506720930312; Fri, 29 Sep 2017 14:35:30 -0700 (PDT) Date: Fri, 29 Sep 2017 14:35:22 -0700 From: "H.J. Lu" To: GNU C Library Subject: [PATCH] m68k: Update elf_machine_load_address for static PIE Message-ID: <20170929213522.GP2482@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.0 (2017-09-02) When --enable-static-pie is used to configure glibc, we need to use _dl_relocate_static_pie to compute load address in static PIE. OK for master? * sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use _dl_relocate_static_pie instead of _dl_start to compute load address in static PIE. Return 0 if _DYNAMIC is undefined for static executable. --- sysdeps/m68k/dl-machine.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h index fd8fb00103..a9a19009e5 100644 --- a/sysdeps/m68k/dl-machine.h +++ b/sysdeps/m68k/dl-machine.h @@ -51,9 +51,18 @@ static inline Elf32_Addr elf_machine_load_address (void) { Elf32_Addr addr; +#ifdef SHARED asm (PCREL_OP ("lea", "_dl_start", "%0", "%0", "%%pc") "\n\t" "sub.l _dl_start@GOT.w(%%a5), %0" : "=a" (addr)); +#else + extern Elf32_Dyn _DYNAMIC[] __attribute__((weak, visibility ("hidden"))); + if (!_DYNAMIC) + return 0; + asm (PCREL_OP ("lea", "_dl_relocate_static_pie", "%0", "%0", "%%pc") "\n\t" + "sub.l _dl_relocate_static_pie@GOT.w(%%a5), %0" + : "=a" (addr)); +#endif return addr; }