| Message ID | 1436276165-17767-1-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show
Return-Path: <patchwork-forward+bncBDYNJBOFRECBBYNL56WAKGQEQ37TQRY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 208F622A03 for <linaro@patches.linaro.org>; Tue, 7 Jul 2015 13:36:34 +0000 (UTC) Received: by wifm2 with SMTP id m2sf21184392wif.1 for <linaro@patches.linaro.org>; Tue, 07 Jul 2015 06:36:33 -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: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=YMsnCAOHtEti2MnDIhC5x8ReGBwG88dUfSWHeSsLtJs=; b=RPex2hbThKxpXeW6e0P9uZkwFBoT/5NWsrKNF0dROej81g917wOwxvHRjMfI/TxyVw hZ1AmF+G1BXdfC6BSE5bWrrP8aT2D/CriJYwxDgstB8j7fWdtJid0mD4FOljjxb2ePpM CczaCNN16izSI+kRjbSkSO9dK+lXUXF5PEpFh6X88H/1Ub13TKzX+lG/KbLEikZqkwyD MfazGgr2W71JDqr0DNaWVtNKY9n/VX/pqyUpyWMB3eRKXWtQk6OOyU1U1RnQUnCLzs/O nnvo6/shNIhuGsdWTOu+0eibDk+GwYhrZrorP8pfD6rbYQffM0msos1aZbCBV94UnBbS fEcQ== X-Gm-Message-State: ALoCoQnURkGmTnGarY63aKEQbH+PZfmzkcQKfhOU7v3a8epRvQyB3ALM+/3cmjfO+CpP5e+gEqpx X-Received: by 10.180.37.198 with SMTP id a6mr17972554wik.7.1436276193436; Tue, 07 Jul 2015 06:36:33 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.133 with SMTP id y5ls811540laj.19.gmail; Tue, 07 Jul 2015 06:36:33 -0700 (PDT) X-Received: by 10.152.115.199 with SMTP id jq7mr4028054lab.113.1436276193270; Tue, 07 Jul 2015 06:36:33 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id j1si18181441lbc.15.2015.07.07.06.36.33 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jul 2015 06:36:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by laar3 with SMTP id r3so195982237laa.0 for <patchwork-forward@linaro.org>; Tue, 07 Jul 2015 06:36:33 -0700 (PDT) X-Received: by 10.112.166.106 with SMTP id zf10mr4103532lbb.36.1436276192981; Tue, 07 Jul 2015 06:36:32 -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 hn6csp2397049lbb; Tue, 7 Jul 2015 06:36:31 -0700 (PDT) X-Received: by 10.107.134.141 with SMTP id q13mr6315629ioi.91.1436276191209; Tue, 07 Jul 2015 06:36:31 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id h9si16235475igg.24.2015.07.07.06.36.30 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 07 Jul 2015 06:36:31 -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-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from <edk2-devel-bounces@lists.sourceforge.net>) id 1ZCT2p-0004lx-TE; Tue, 07 Jul 2015 13:36:19 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from <ard.biesheuvel@linaro.org>) id 1ZCT2o-0004lr-QO for edk2-devel@lists.sourceforge.net; Tue, 07 Jul 2015 13:36:18 +0000 Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.212.176 as permitted sender) client-ip=209.85.212.176; envelope-from=ard.biesheuvel@linaro.org; helo=mail-wi0-f176.google.com; Received: from mail-wi0-f176.google.com ([209.85.212.176]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1ZCT2m-0004Mt-UJ for edk2-devel@lists.sourceforge.net; Tue, 07 Jul 2015 13:36:18 +0000 Received: by wiwl6 with SMTP id l6so314950954wiw.0 for <edk2-devel@lists.sourceforge.net>; Tue, 07 Jul 2015 06:36:10 -0700 (PDT) X-Received: by 10.194.5.74 with SMTP id q10mr8396195wjq.27.1436276170833; Tue, 07 Jul 2015 06:36:10 -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.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Jul 2015 06:36:09 -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:04 +0200 Message-Id: <1436276165-17767-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 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: 1ZCT2m-0004Mt-UJ Subject: [edk2] [PATCH 1/2] ArmPlatformPkg: 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.44 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/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S index 2c4a7e5324e9..0d0e3e17c170 100644 --- a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S +++ b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S @@ -24,10 +24,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): // Do early platform specific actions
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> --- ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)