From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Thu, 20 Dec 2018 19:16:53 +0000 (+0100)
Subject: ArmPkg/ArmLib ARM: set .fpu to let Clang 7 assemble ArmV7Support.S
X-Git-Tag: edk2-stable201905~28
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=8594c2073cdb1065e60f01e9b099918c5e839212

ArmPkg/ArmLib ARM: set .fpu to let Clang 7 assemble ArmV7Support.S

Clang 7 complains about the vmsr instruction in ArmV7Support.S,
which is only available on cores that implement some flavour of
VFP. So set the .fpu to NEON like we do in some other places.

Acked-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---

diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S b/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S
index 16c56f72e9..4925f6628e 100644
--- a/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S
+++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S
@@ -262,6 +262,8 @@ ASM_FUNC(ArmEnableVFP)
 #ifndef __clang__
   mcr     p10,#0x7,r0,c8,c0,#0
 #else
+  # Set the FPU model so Clang does not choke on the next instruction
+  .fpu    neon
   vmsr    fpexc, r0
 #endif
   bx      lr