| Message ID | 1436276165-17767-2-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show
Return-Path: <patchwork-forward+bncBDYNJBOFRECBBZNL56WAKGQEKFGGTNY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A3FA022A03 for <linaro@patches.linaro.org>; Tue, 7 Jul 2015 13:36:38 +0000 (UTC) Received: by laer2 with SMTP id r2sf57487420lae.3 for <linaro@patches.linaro.org>; Tue, 07 Jul 2015 06:36:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=VlOQHLCvvAc6XL+Ld/0fYymZ8YKWN76pge1+87EWOBk=; b=Gj4vRgccjNhkI5eHFdjGqVSSM+qnL/tUVdObUuL5Vc5t+QhtQg6yfyRU8eC5vqYGfH HauicFI7Oe4Ul/rohTMyX1XA5pJctBjLS3u2uB/5VUNortnP18OoXZ8pYmGoWhmyZnFC c9CoUySIUdvzMEjyqvs5bz47qsPlcszfvVkYeB7lSqKMeDFb+RvJcJx/rrSE4dOzTc1K LmVI7bMpm0C8FPUp/KUzbKNMyZ0b8A8Wqmc257qeu5VD4SguX3sIMm0/d4oNTPmvfm7l 2upnRLATLGofd6AenA3vNmsvfLZsXAx2D103PK5EtwnFyNtfpn1ZU9wxVMquUTgs2b8T O2lQ== X-Gm-Message-State: ALoCoQntMzrW1Er1oNVsivX6QE8+6prjYWXPD4fqvLC8J8IO1OVocfIHhJMpX0ZRQ/nSZk0WcZzS X-Received: by 10.194.175.36 with SMTP id bx4mr2155434wjc.1.1436276197268; Tue, 07 Jul 2015 06:36:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.136 with SMTP id q8ls867383laj.91.gmail; Tue, 07 Jul 2015 06:36:37 -0700 (PDT) X-Received: by 10.152.207.105 with SMTP id lv9mr4154892lac.10.1436276197095; Tue, 07 Jul 2015 06:36:37 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id nx8si18136178lbb.161.2015.07.07.06.36.37 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jul 2015 06:36:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by laar3 with SMTP id r3so195985125laa.0 for <patchwork-forward@linaro.org>; Tue, 07 Jul 2015 06:36:37 -0700 (PDT) X-Received: by 10.112.42.50 with SMTP id k18mr3776780lbl.76.1436276196940; Tue, 07 Jul 2015 06:36:36 -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.108.230 with SMTP id hn6csp2397083lbb; Tue, 7 Jul 2015 06:36:35 -0700 (PDT) X-Received: by 10.107.17.229 with SMTP id 98mr2641602ior.21.1436276195832; Tue, 07 Jul 2015 06:36:35 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id lr8si16622664igb.57.2015.07.07.06.36.35 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 07 Jul 2015 06:36:35 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from <edk2-devel-bounces@lists.sourceforge.net>) id 1ZCT2t-0005im-VJ; Tue, 07 Jul 2015 13:36:23 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from <ard.biesheuvel@linaro.org>) id 1ZCT2s-0005if-Vm for edk2-devel@lists.sourceforge.net; Tue, 07 Jul 2015 13:36:22 +0000 Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of linaro.org designates 74.125.82.50 as permitted sender) client-ip=74.125.82.50; envelope-from=ard.biesheuvel@linaro.org; helo=mail-wg0-f50.google.com; Received: from mail-wg0-f50.google.com ([74.125.82.50]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1ZCT2o-0004Mv-Ve for edk2-devel@lists.sourceforge.net; Tue, 07 Jul 2015 13:36:22 +0000 Received: by wgck11 with SMTP id k11so168367883wgc.0 for <edk2-devel@lists.sourceforge.net>; Tue, 07 Jul 2015 06:36:13 -0700 (PDT) X-Received: by 10.180.9.75 with SMTP id x11mr60906253wia.80.1436276172994; Tue, 07 Jul 2015 06:36:12 -0700 (PDT) Received: from ards-macbook-pro.arnhem.chello.nl (dhcp-077-250-063-167.chello.nl. [77.250.63.167]) by mx.google.com with ESMTPSA id n8sm33886379wiy.19.2015.07.07.06.36.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Jul 2015 06:36:12 -0700 (PDT) From: Ard Biesheuvel <ard.biesheuvel@linaro.org> To: edk2-devel@lists.sourceforge.net, olivier.martin@arm.com, lersek@redhat.com Date: Tue, 7 Jul 2015 15:36:05 +0200 Message-Id: <1436276165-17767-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436276165-17767-1-git-send-email-ard.biesheuvel@linaro.org> References: <1436276165-17767-1-git-send-email-ard.biesheuvel@linaro.org> X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1ZCT2o-0004Mv-Ve Subject: [edk2] [PATCH 2/2] ArmVirtPkg: use correct ASM decoration for non-function global symbols X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/edk2-devel>, <mailto:edk2-devel-request@lists.sourceforge.net?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 |
diff --git a/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S index 0adaf44c9ed9..f0cf865b3c93 100644 --- a/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S +++ b/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S @@ -25,10 +25,10 @@ GCC_ASM_IMPORT(ArmReadMpidr) GCC_ASM_IMPORT(ArmPlatformPeiBootAction) GCC_ASM_IMPORT(ArmPlatformStackSet) GCC_ASM_EXPORT(_ModuleEntryPoint) -GCC_ASM_EXPORT(mSystemMemoryEnd) +ASM_GLOBAL ASM_PFX(mSystemMemoryEnd) -StartupAddr: .8byte ASM_PFX(CEntryPoint) -mSystemMemoryEnd: .8byte 0 +StartupAddr: .8byte ASM_PFX(CEntryPoint) +ASM_PFX(mSystemMemoryEnd): .8byte 0 ASM_PFX(_ModuleEntryPoint): //
This fixes the declaration and definition of mSystemMemoryEnd so that it is correctly annotated as a non-function symbol. Also adds the ASM_PFX prefix, which is empty on AARCH64 but should be included for correctness. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)