From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x233.google.com (mail-wm0-x233.google.com [IPv6:2a00:1450:400c:c09::233]) (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 848781A1E5E for ; Wed, 10 Aug 2016 08:18:47 -0700 (PDT) Received: by mail-wm0-x233.google.com with SMTP id o80so111016104wme.1 for ; Wed, 10 Aug 2016 08:18:47 -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=rs62Fq3bRYZ/oQeWatuq+Ll2iI/84xPKKklzuqObILs=; b=EkbvLFBNk6judkHEpErCJXLXeRicwb1Z2OFzogxBudhcQYwoNjmQsdB7iLvtotKifU x2ZAKfJ6iu6+r6OK153DH3moeLQQDhdQiXwaaNNE+/V0H2zX/892DIfxCvxz3erjG2k2 iknY+dAOb/H2mKvy/uqndKBhxpXEYSBUJnDVg= 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=rs62Fq3bRYZ/oQeWatuq+Ll2iI/84xPKKklzuqObILs=; b=KgZTZ04smdUQ0F+vcggCxEPx6j1pVCIhRACphNUZVnk25MWIDGluFQwREqM2HRK2TY Yp4eapPNSApCoUGxF0VCqWIoZ1937PT5/gswccOGwHc3RG2asHjaI6bypYbDro2tWA4E RUd1BuIxvs2D/1sUKDMDYJm0sYEgAulSS8/TmY/XMCYpfmbWi4ph5TEyOVOrrgRQlNl3 h++nS8Sv8dLA0UW9ouXheVm+1UexIaF+lngftUuGKv7vkRBMNi01zqlRnzcPRpedh/KS MfgLw5PfZB7d0KHVfVKx0qTiFGvr0W5GnFursgiNb4B99ZuyN/biAdQOe6eX0/4fiEo1 HzgA== X-Gm-Message-State: AEkoouvorV2TGvhPyyEVW99Ni3EgPzML5k1qp6lSXdDdRzcCxh9viAbaE/J4Ql8gB2p8qriv X-Received: by 10.194.185.202 with SMTP id fe10mr4354409wjc.93.1470842326142; Wed, 10 Aug 2016 08:18:46 -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.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Aug 2016 08:18:45 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, eugene@hp.com Cc: lersek@redhat.com, Ard Biesheuvel Date: Wed, 10 Aug 2016 17:17:50 +0200 Message-Id: <1470842282-8415-15-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: [PATCH 14/26] ArmPkg/ArmSmcLib: 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: , X-List-Received-Date: Wed, 10 Aug 2016 15:18:48 -0000 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/ArmSmcLib/AArch64/ArmSmc.S | 7 ++----- ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S | 8 +++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S b/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S index 46c17674c199..a8dbb911de5e 100644 --- a/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S +++ b/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S @@ -11,12 +11,9 @@ // // -.text -.align 3 +#include -GCC_ASM_EXPORT(ArmCallSmc) - -ASM_PFX(ArmCallSmc): +ASM_FUNC(ArmCallSmc) // Push x0 on the stack - The stack must always be quad-word aligned str x0, [sp, #-16]! diff --git a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S index 260fb10fe86b..afb2e9bc901c 100644 --- a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S +++ b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S @@ -11,13 +11,11 @@ // // -.text -.align 3 -.arch_extension sec +#include -GCC_ASM_EXPORT(ArmCallSmc) +.arch_extension sec -ASM_PFX(ArmCallSmc): +ASM_FUNC(ArmCallSmc) push {r4-r8} // r0 will be popped just after the SMC call push {r0} -- 2.7.4