From patchwork Mon Oct 27 07:59:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 39577 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0BDCE2118A for ; Mon, 27 Oct 2014 08:02:41 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id ge10sf110419lab.5 for ; Mon, 27 Oct 2014 01:02:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:mailing-list :precedence:list-id:list-unsubscribe:list-subscribe:list-archive :list-post:list-help:sender:delivered-to:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results; bh=Zrqw6bLXh5kxubrSX26E2rNOYUz1WYSL568TPf2mej0=; b=LQ9Q2xwMrzVyyd31FyNrK3GhmFWl3LTB8PH/p1POcmZdKV7vmxcpBV74tQ4Zheb2r5 yghpqZyqGyxEXA1LtR1spqS2BFDrzKoUX6AyjqanqH2Kt34oSDgmWS36f8cm1eI3DXyV ZpQVle0mnAHmhDq6TIRsu25s6qmM8Kcac+HPicPbgE9NWdrSURImi0MxUJQG3UoguvDN ae7HPGMCuJZbVdSbPwyGbFWMAxqSVN4dVxJnrdCmBGfQcZPWX3m/LTBdZcHKqZslNFQp iHXQacX64L/El+aI1mpxeVBdznc87f1TXLQbgOBxcHd5bVI7IgHYcszpDzRokcAiD4V3 Rkpg== X-Gm-Message-State: ALoCoQn08lA+lbxY0aNrfpHpVJ38T+u+5eh+XZyaha3oFZtB8a1lR24dCq5T6A3aLlZE36PUxgW7 X-Received: by 10.112.170.167 with SMTP id an7mr5237428lbc.4.1414396960500; Mon, 27 Oct 2014 01:02:40 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.34 with SMTP id t2ls149130lal.2.gmail; Mon, 27 Oct 2014 01:02:39 -0700 (PDT) X-Received: by 10.152.228.140 with SMTP id si12mr21656619lac.66.1414396959395; Mon, 27 Oct 2014 01:02:39 -0700 (PDT) Received: from mail-la0-x231.google.com (mail-la0-x231.google.com. [2a00:1450:4010:c03::231]) by mx.google.com with ESMTPS id v5si18683488lae.56.2014.10.27.01.02.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 Oct 2014 01:02:39 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::231 as permitted sender) client-ip=2a00:1450:4010:c03::231; Received: by mail-la0-f49.google.com with SMTP id ge10so139575lab.22 for ; Mon, 27 Oct 2014 01:02:39 -0700 (PDT) X-Received: by 10.112.189.10 with SMTP id ge10mr21477476lbc.23.1414396959165; Mon, 27 Oct 2014 01:02:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp247476lbz; Mon, 27 Oct 2014 01:02:38 -0700 (PDT) X-Received: by 10.70.48.106 with SMTP id k10mr780905pdn.143.1414396957535; Mon, 27 Oct 2014 01:02:37 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id qk1si9840129pac.189.2014.10.27.01.02.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Oct 2014 01:02:37 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-53809-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 15949 invoked by alias); 27 Oct 2014 08:00:18 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list 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 15448 invoked by uid 89); 27 Oct 2014 08:00:02 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 X-HELO: mail-ie0-f178.google.com X-Received: by 10.42.114.18 with SMTP id e18mr18008035icq.42.1414396799815; Mon, 27 Oct 2014 00:59:59 -0700 (PDT) From: Andrew Pinski To: libc-alpha@sourceware.org Cc: Andrew Pinski Subject: [PATCH 18/29] [AARCH64] Reformat inline-asm in elf_machine_load_address. Date: Mon, 27 Oct 2014 00:59:42 -0700 Message-Id: <1414396793-9005-19-git-send-email-apinski@cavium.com> In-Reply-To: <1414396793-9005-1-git-send-email-apinski@cavium.com> References: <1414396793-9005-1-git-send-email-apinski@cavium.com> X-Original-Sender: apinski@cavium.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::231 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 This patch reformats the inline-asm in elf_machine_load_address so it is easier to change only part of the inline-asm. That is using string concating instead of string continueing. Also document on why this inline-asm works, it depends on the 32bit relocation being resolved at link time. * sysdeps/aarch64/dl-machine.h (elf_machine_load_address): Refactor inline-asm. Also add comment. --- sysdeps/aarch64/dl-machine.h | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h index 6e041b1..121b178 100644 --- a/sysdeps/aarch64/dl-machine.h +++ b/sysdeps/aarch64/dl-machine.h @@ -53,19 +53,22 @@ elf_machine_load_address (void) The choice of symbol is arbitrary. The static address we obtain by constructing a non GOT reference to the symbol, the dynamic address of the symbol we compute using adrp/add to compute the - symbol's address relative to the PC. */ + symbol's address relative to the PC. + This depends on 32bit relocations being resolved at link time + and that the static address fits in the 32bits. */ ElfW(Addr) static_addr; ElfW(Addr) dynamic_addr; - asm (" \n\ - adrp %1, _dl_start; \n\ - add %1, %1, #:lo12:_dl_start \n\ - ldr %w0, 1f \n\ - b 2f \n\ -1: .word _dl_start \n\ -2: \n\ - " : "=r" (static_addr), "=r" (dynamic_addr)); + asm (" \n" +" adrp %1, _dl_start; \n" +" add %1, %1, #:lo12:_dl_start \n" +" ldr %w0, 1f \n" +" b 2f \n" +"1: \n" +" .word _dl_start \n" +"2: \n" + : "=r" (static_addr), "=r" (dynamic_addr)); return dynamic_addr - static_addr; }