From patchwork Wed Aug 10 15:17:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 73659 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp455849qga; Wed, 10 Aug 2016 08:18:43 -0700 (PDT) X-Received: by 10.66.216.69 with SMTP id oo5mr8007347pac.155.1470842323721; Wed, 10 Aug 2016 08:18:43 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id ts2si46051422pac.42.2016.08.10.08.18.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Aug 2016 08:18:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6EF131A1E56; Wed, 10 Aug 2016 08:18:39 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x231.google.com (mail-wm0-x231.google.com [IPv6:2a00:1450:400c:c09::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C31CA1A1E49 for ; Wed, 10 Aug 2016 08:18:37 -0700 (PDT) Received: by mail-wm0-x231.google.com with SMTP id q128so100374317wma.1 for ; Wed, 10 Aug 2016 08:18:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/hSDnRQTB7PltNdwt8Zj9YVAuNDy3Iq4iVMJEtAY4hA=; b=VcZrj9sdA5UG1ykGTyb8LjJzqFS4pbFQYqpiqB5ikCQf42wRa0F04Gisb5xkZNzxId ne3yVUCJJh6ytAE/sQt/glm5fSrHQKI3MpTYNF4CamJf8yu1oDhYcNIhwLvI/i+Yiilc +NK68sTlvSzyE0v4VYGuJW+TbbyB/YDM2h+r4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/hSDnRQTB7PltNdwt8Zj9YVAuNDy3Iq4iVMJEtAY4hA=; b=b3aoR6UZbIxIgDJnwM8i53PJHutUv7t1o+HBkAMz1mII9vse+ofdvh2dEx/SLMj0hu aI8T5uxl8N3BzTyl2gBdwr1yDbOVmzGWyb3D8Hha7zl24Bm7QDtV1NeQFX2Jq0yUl4l3 +hPaUeVwvYhHdRqWhh5OXP4blog3dKjPRO2/TtF/t7VWxQOgUfGUec2p9VYFbQjZ9qYd kZEtXfrBdQ6vMD/WRfwniGVunAI1Gwm4bb3CZCixs/s+47lV4XhelbSIgApLr4XE5f8v tmcOwTCHliYopRtupObLDeL1hF4YKFpvuJLwKO9/bHopds2ZoYKNMefN7I4Wc4j4VpG7 b47Q== X-Gm-Message-State: AEkoouvaD9OgMUdUWdBL4TcnVlCkZ9dugPTBthtiRgcWlylPYO8+VmRKMj4HcZ5qi+tZYV4v X-Received: by 10.194.142.198 with SMTP id ry6mr4499310wjb.62.1470842316346; Wed, 10 Aug 2016 08:18:36 -0700 (PDT) Received: from localhost.localdomain (46.red-81-37-107.dynamicip.rima-tde.net. [81.37.107.46]) by smtp.gmail.com with ESMTPSA id c16sm8908374wme.4.2016.08.10.08.18.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Aug 2016 08:18:35 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, eugene@hp.com Date: Wed, 10 Aug 2016 17:17:47 +0200 Message-Id: <1470842282-8415-12-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470842282-8415-1-git-send-email-ard.biesheuvel@linaro.org> References: <1470842282-8415-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 11/26] ArmPkg/ArmHvcLib: switch to ASM_FUNC() asm macro X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lersek@redhat.com, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Annotate functions with ASM_FUNC() so that they are emitted into separate sections. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S | 9 +++------ ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S | 10 ++++------ 2 files changed, 7 insertions(+), 12 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S b/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S index 99a1d21ce7f1..e9140a0a9bba 100644 --- a/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S +++ b/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S @@ -1,6 +1,6 @@ // // Copyright (c) 2012-2014, ARM Limited. All rights reserved. -// Copyright (c) 2014, Linaro Limited. All rights reserved. +// Copyright (c) 2014-2016, Linaro Limited. All rights reserved. // // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -12,12 +12,9 @@ // // -.text -.align 3 +#include -GCC_ASM_EXPORT(ArmCallHvc) - -ASM_PFX(ArmCallHvc): +ASM_FUNC(ArmCallHvc) // Push x0 on the stack - The stack must always be quad-word aligned str x0, [sp, #-16]! diff --git a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S b/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S index 25ceb6a7d8db..be4693796f32 100644 --- a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S +++ b/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S @@ -1,6 +1,6 @@ // // Copyright (c) 2012-2014, ARM Limited. All rights reserved. -// Copyright (c) 2014, Linaro Limited. All rights reserved. +// Copyright (c) 2014-2016, Linaro Limited. All rights reserved. // // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -12,13 +12,11 @@ // // -.text -.align 3 -.arch_extension virt +#include -GCC_ASM_EXPORT(ArmCallHvc) +.arch_extension virt -ASM_PFX(ArmCallHvc): +ASM_FUNC(ArmCallHvc) push {r4-r8} // r0 will be popped just after the HVC call push {r0}