Force ARMv7 builds to use only 16 FP registers.
This is needed because upcoming Cortex-A9 devices implement
VFPv3-D16 instead of the assumed VFPv3-D32 and have thus half
the floating-point registers.
diff --git a/ndk/build/toolchains/arm-eabi-4.4.0/setup.mk b/ndk/build/toolchains/arm-eabi-4.4.0/setup.mk
index cbdeed5..41d85db 100644
--- a/ndk/build/toolchains/arm-eabi-4.4.0/setup.mk
+++ b/ndk/build/toolchains/arm-eabi-4.4.0/setup.mk
@@ -39,8 +39,8 @@
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
TARGET_ARCH_CFLAGS := -march=armv7-a \
- -mfloat-abi=softfp \
- -mfpu=neon
+ -mfloat-abi=softfp \
+ -mfpu=vfp
TARGET_ARCH_LDFLAGS := -Wl,--fix-cortex-a8
else
TARGET_ARCH_CFLAGS := -march=armv5te \
diff --git a/ndk/docs/CPU-ARCH-ABIS.TXT b/ndk/docs/CPU-ARCH-ABIS.TXT
index d142db4..b9b88e7 100644
--- a/ndk/docs/CPU-ARCH-ABIS.TXT
+++ b/ndk/docs/CPU-ARCH-ABIS.TXT
@@ -93,12 +93,12 @@
- The Thumb-2 instruction set extension.
- The VFP hardware FPU instructions.
- More specifically, VFPv3-D32 is being used, which corresponds to 32
+ More specifically, VFPv3-D16 is being used, which corresponds to 16
dedicated 64-bit floating point registers provided by the CPU.
- Other extensions described by the v7-a ARM like Advanced SIMD (a.k.a. NEON)
- or ThumbEE are optional to this ABI, which means that developers should
- check *at* *runtime* whether the extensions are available and provide
+ Other extensions described by the v7-a ARM like Advanced SIMD (a.k.a. NEON),
+ VFPv3-D32 or ThumbEE are optional to this ABI, which means that developers
+ should check *at* *runtime* whether the extensions are available and provide
alternative code paths if this is not the case.
(Just like one typically does on x86 systems to check/use MMX/SSE2/etc...
