Set the correct -mfpu option for libraries built for cortex-m4f

esden · Oct 30, 2011 · 85aad3d · 85aad3d
1 parent 3c2c828
commit 85aad3d
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/patches/patch-gcc-config-arm-t-arm-elf.diff b/patches/patch-gcc-config-arm-t-arm-elf.diff
@@ -1,6 +1,6 @@
 --- gcc/config/arm/t-arm-elf.orig	2011-10-25 21:33:18.000000000 -0700
-+++ gcc/config/arm/t-arm-elf	2011-10-26 11:12:16.000000000 -0700
++++ gcc/config/arm/t-arm-elf	2011-10-30 14:53:22.000000000 -0700
-@@ -31,78 +31,28 @@
+@@ -31,78 +31,31 @@
  	_arm_floatdidf _arm_floatdisf _arm_floatundidf _arm_floatundisf \
  	_clzsi2 _clzdi2 
 
@@ -90,11 +90,14 @@
 +# rather than just setting it itself.
 +MULTILIB_EXCEPTIONS += mcpu=cortex-m3* mcpu=cortex-m4*
 +
-+# All this just to get mfloat-abi=hard only specified for the M4
++# All this just to get mfloat-abi=hard mfpu=fpv4-sp-d16 only specified for the M4
-+MULTILIB_OPTIONS    += mfloat-abi=hard
++MULTILIB_OPTIONS    += mfloat-abi=hard mfpu=fpv4-sp-d16
-+MULTILIB_DIRNAMES   += float-abi-hard
++MULTILIB_DIRNAMES   += float-abi-hard fpuv4-sp-d16
-+MULTILIB_EXCEPTIONS += mfloat-abi=hard mthumb/mfloat-abi=hard
++MULTILIB_EXCEPTIONS += mfloat* mthumb/mfloat*
-+MULTILIB_EXCEPTIONS += *cortex-m3*mfloat-abi=hard
++MULTILIB_EXCEPTIONS += mfpu* mthumb/mfpu*
++MULTILIB_EXCEPTIONS += mthumb/mcpu=cortex-m4/mfloat-abi=hard
++MULTILIB_EXCEPTIONS += mthumb/mcpu=cortex-m4/mfpu=fpv4-sp-d16
++MULTILIB_EXCEPTIONS += *cortex-m3*mfloat-abi* *cortex-m3*mfpu*
 
  EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crti.o crtn.o