Skip to content

GitLab

Commit a738e155 authored by Antonio Niño Díaz's avatar Antonio Niño Díaz Committed by TrustedFirmware Code Review
Browse files

Merge "aarch32: Allow compiling with soft-float toolchain" into integration

parents dbf65238 fbd8f6c8
Show whitespace changes
Inline Side-by-side
include/arch/aarch32/el3_common_macros.S
View file @ a738e155
...@@ -92,9 +92,14 @@ ...@@ -92,9 +92,14 @@
* *
* FPEXC.EN: Enable access to Advanced SIMD and floating point features * FPEXC.EN: Enable access to Advanced SIMD and floating point features
* from all exception levels. * from all exception levels.
*
* __SOFTFP__: Predefined macro exposed by soft-float toolchain.
* ARMv7 and Cortex-A32(ARMv8/aarch32) has both soft-float and
* hard-float variants of toolchain, avoid compiling below code with
* soft-float toolchain as "vmsr" instruction will not be recognized.
* --------------------------------------------------------------------- * ---------------------------------------------------------------------
*/ */
#if (ARM_ARCH_MAJOR > 7) || defined(ARMV7_SUPPORTS_VFP) #if ((ARM_ARCH_MAJOR > 7) || defined(ARMV7_SUPPORTS_VFP)) && !(__SOFTFP__)
ldr r0, =(FPEXC_RESET_VAL | FPEXC_EN_BIT) ldr r0, =(FPEXC_RESET_VAL | FPEXC_EN_BIT)
vmsr FPEXC, r0 vmsr FPEXC, r0
isb isb
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment