[RTEMS] Change multilibs for ARM

Account for Cortex-M3 Errata 602117.  The -mfix-cortex-m3-ldrd option is
enabled by default, if -mcpu=cortex-m3 is used.

gcc/

	* config/arm/t-rtems: Replace ARMv7-M multilibs with Cortex-M
	multilibs.

From-SVN: r271452

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 803d3a7f222d1c6a32ce123eb6aba26a0a1dd800..e04e0b3244789a433c00c4597124d2f3d2e85db2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-05-21  Sebastian Huber  <sebastian.huber@embedded-brains.de>
+
+       Backported from mainline
+       2019-05-16  Sebastian Huber  <sebastian.huber@embedded-brains.de>
+
+       * config/arm/t-rtems: Replace ARMv7-M multilibs with Cortex-M
+       multilibs.
+
 2019-05-20  Jeff Law  <law@redhat.com>
 
        Backported from mainline

diff --git a/gcc/config/arm/t-rtems b/gcc/config/arm/t-rtems
index c07378657c8289014fc875a426e48b48b7c1f690..94a2eb7dd0be057ad63dea8b7a95b845f69a910f 100644 (file)
--- a/gcc/config/arm/t-rtems
+++ b/gcc/config/arm/t-rtems
@@ -17,8 +17,8 @@ MULTILIB_DIRNAMES     += eb
 MULTILIB_OPTIONS       += mthumb
 MULTILIB_DIRNAMES      += thumb
 
-MULTILIB_OPTIONS       += march=armv5te+fp/march=armv6-m/march=armv7-a/march=armv7-a+simd/march=armv7-r/march=armv7-r+fp/march=armv7-m/march=armv7e-m+fp/march=armv7e-m+fp.dp
-MULTILIB_DIRNAMES      += armv5te+fp       armv6-m       armv7-a       armv7-a+simd       armv7-r       armv7-r+fp       armv7-m       armv7e-m+fp        armv7e-m+fp.dp
+MULTILIB_OPTIONS       += march=armv5te+fp/march=armv6-m/march=armv7-a/march=armv7-a+simd/march=armv7-r/march=armv7-r+fp/mcpu=cortex-m3/mcpu=cortex-m4/mcpu=cortex-m4+nofp/mcpu=cortex-m7
+MULTILIB_DIRNAMES      += armv5te+fp       armv6-m       armv7-a       armv7-a+simd       armv7-r       armv7-r+fp       cortex-m3      cortex-m4      cortex-m4+nofp      cortex-m7
 
 MULTILIB_OPTIONS       += mfloat-abi=hard
 MULTILIB_DIRNAMES      += hard
@@ -31,7 +31,8 @@ MULTILIB_REQUIRED     += mthumb/march=armv7-a+simd/mfloat-abi=hard
 MULTILIB_REQUIRED      += mthumb/march=armv7-a
 MULTILIB_REQUIRED      += mthumb/march=armv7-r+fp/mfloat-abi=hard
 MULTILIB_REQUIRED      += mthumb/march=armv7-r
-MULTILIB_REQUIRED      += mthumb/march=armv7e-m+fp/mfloat-abi=hard
-MULTILIB_REQUIRED      += mthumb/march=armv7e-m+fp.dp/mfloat-abi=hard
-MULTILIB_REQUIRED      += mthumb/march=armv7-m
+MULTILIB_REQUIRED      += mthumb/mcpu=cortex-m3
+MULTILIB_REQUIRED      += mthumb/mcpu=cortex-m4/mfloat-abi=hard
+MULTILIB_REQUIRED      += mthumb/mcpu=cortex-m4+nofp
+MULTILIB_REQUIRED      += mthumb/mcpu=cortex-m7/mfloat-abi=hard
 MULTILIB_REQUIRED      += mthumb