summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2018-12-20 20:16:53 +0100
committerArd Biesheuvel <ard.biesheuvel@linaro.org>2019-05-31 17:55:41 +0200
commit8594c2073cdb1065e60f01e9b099918c5e839212 (patch)
tree208edae6a01cd8496f58c1f2dce94eb19b6fea56
parent99243102b4671e4997910b950a8e7c9c15ef9d04 (diff)
downloadedk2-8594c2073cdb1065e60f01e9b099918c5e839212.tar.gz
edk2-8594c2073cdb1065e60f01e9b099918c5e839212.tar.bz2
edk2-8594c2073cdb1065e60f01e9b099918c5e839212.zip
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>
-rw-r--r--ArmPkg/Library/ArmLib/Arm/ArmV7Support.S2
1 files changed, 2 insertions, 0 deletions
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