From patchwork Fri Feb 6 18:51:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 437440 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 DBBE9140168 for ; Sat, 7 Feb 2015 05:52:15 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=SVwct+3A56h1QSJBt6VjcU3AdrnpkhbwZQ4PZKgMsV95ap lurJJ6jsiRQkmB5vEzeZXqMHYyMAwe5FoqJiDSyJ9xrRJzgcJ8dDKQyNcIvw0oVF dG7g3Hbx4oxP8UkFYPGn7O7DHoJsA0ODW+XE69hW0B25Rr0quy9HDhia9vi18= 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:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=r4VaITh5sX+YD/x1nNqk0gB5lWc=; b=tbwn9plhkhp1WVL0yLA0 P5HjTudTbZUBOXFR7SpZqXz3m1Sfi2YRyG8ryA0NLtxtIdmrE9q4PrH3dK/tARng RFN5yEP1Fto+01AZYZzWrQUHw4g6aiVB099b4trbwhobxyH0JuDuauvlRvBgvEpt +f4rJxFROrKvreiwv1fbcN8= Received: (qmail 27389 invoked by alias); 6 Feb 2015 18:51:51 -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 27379 invoked by uid 89); 6 Feb 2015 18:51:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [PATCH roland/arm] ARM: Add missing sfi_breg in LDR_GLOBAL macro. Message-Id: <20150206185148.806C02C3A92@topped-with-meat.com> Date: Fri, 6 Feb 2015 10:51:48 -0800 (PST) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=eNG25RFHZNpbQ8E524gA:9 a=CjuIK1q_8ugA:10 The main motivation for my refactoring of LDR_GLOBAL and making more things use it was to consolidate the sfi_* uses there. But then I forgot to add the necessary ones to the rewritten macros! I think it's trivially obvious that this does not affect arm*-linux* configurations. OK? Thanks, Roland * sysdeps/arm/sysdep.h [!PROF] [ARCH_HAS_T2 && !PIC] (LDR_GLOBAL): Use sfi_breg on ldr. [!PROF] [ARCH_HAS_T2 && PIC && ARM_PCREL_MOVW_OK] (LDR_GLOBAL): Likewise. --- a/sysdeps/arm/sysdep.h +++ b/sysdeps/arm/sysdep.h @@ -198,7 +198,7 @@ # define LDR_GLOBAL(R, T, SYMBOL, CONSTANT) \ movw T, #:lower16:SYMBOL; \ movt T, #:upper16:SYMBOL; \ - ldr R, [T, $CONSTANT] + sfi_breg T, ldr R, [\B, $CONSTANT] # elif defined (ARCH_HAS_T2) && defined (PIC) && ARM_PCREL_MOVW_OK # define LDR_GLOBAL(R, T, SYMBOL, CONSTANT) \ movw R, #:lower16:_GLOBAL_OFFSET_TABLE_ - 97f - PC_OFS; \ @@ -212,7 +212,7 @@ 97: add R, R, pc; \ 98: LDST_PC_INDEXED (ldr, T, T, T); \ LDST_INDEXED (ldr, R, T, R, T); \ - ldr R, [R, $CONSTANT] + sfi_breg R, ldr R, [\B, $CONSTANT] # else # define LDR_GLOBAL(R, T, SYMBOL, CONSTANT) \ ldr T, 99f; \