summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2011-02-20 21:43:07 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2011-02-20 21:43:07 +0000
commit261f36d7f4d969d8f9cc5089d68256f6949dbcf6 (patch)
tree2a148bbbc09ec56d73674af8537cd19ea926df2f /contrib
parentAdd missing brace. (diff)
downloadrtems-261f36d7f4d969d8f9cc5089d68256f6949dbcf6.tar.bz2
Add -mcpu=8540/-mfloat-gprs=double multilib.
Remove -mcpu=601 multilib.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/crossrpms/patches/gcc-core-4.5.2-rtems4.11-20110220.diff65
1 files changed, 46 insertions, 19 deletions
diff --git a/contrib/crossrpms/patches/gcc-core-4.5.2-rtems4.11-20110220.diff b/contrib/crossrpms/patches/gcc-core-4.5.2-rtems4.11-20110220.diff
index fd8d445bc6..f8904fdc6b 100644
--- a/contrib/crossrpms/patches/gcc-core-4.5.2-rtems4.11-20110220.diff
+++ b/contrib/crossrpms/patches/gcc-core-4.5.2-rtems4.11-20110220.diff
@@ -48,12 +48,17 @@ diff -Naur gcc-4.5.2.orig/configure.ac gcc-4.5.2/configure.ac
# Canadian crosses, in case the installed compiler is not fully
diff -Naur gcc-4.5.2.orig/gcc/ChangeLog.rtems gcc-4.5.2/gcc/ChangeLog.rtems
--- gcc-4.5.2.orig/gcc/ChangeLog.rtems 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.5.2/gcc/ChangeLog.rtems 2011-02-20 05:52:09.431783560 +0100
-@@ -0,0 +1,53 @@
++++ gcc-4.5.2/gcc/ChangeLog.rtems 2011-02-20 16:15:45.516774454 +0100
+@@ -0,0 +1,58 @@
+2011-02-20 Ralf Corsépius <ralf.corsepius@rtems.org>
+
++ * config/rs6000/t-rtems: Add -mcpu=8540/-mfloat-gprs=double multilib.
++
++2011-02-20 Ralf Corsépius <ralf.corsepius@rtems.org>
++
++ * config/rs6000/t-rtems: Remove -mcpu=601 multilib.
+ * config/rs6000/t-rtems: Remove -Dmpc8260 multilib.
-+ * config/rs6000/rtems.h: Allow --float-gprs= targets to override grps on
++ * config/rs6000/rtems.h: Allow --float-gprs=... to override grps on
+ E500 targets.
+
+2010-05-19 Joel Sherrill <joel.sherrill@oarcorp.com>
@@ -238,34 +243,64 @@ diff -Naur gcc-4.5.2.orig/gcc/config/rs6000/rtems.h gcc-4.5.2/gcc/config/rs6000/
+#undef WCHAR_TYPE_SIZE
diff -Naur gcc-4.5.2.orig/gcc/config/rs6000/t-rtems gcc-4.5.2/gcc/config/rs6000/t-rtems
--- gcc-4.5.2.orig/gcc/config/rs6000/t-rtems 2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.5.2/gcc/config/rs6000/t-rtems 2011-02-20 05:28:32.121739439 +0100
-@@ -19,13 +19,11 @@
++++ gcc-4.5.2/gcc/config/rs6000/t-rtems 2011-02-20 16:12:42.687931906 +0100
+@@ -19,14 +19,12 @@
# <http://www.gnu.org/licenses/>.
MULTILIB_OPTIONS = \
-mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400 \
-Dmpc8260 \
-+mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400/mcpu=8540 \
- msoft-float
+-msoft-float
++mcpu=403/mcpu=505/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400/mcpu=8540 \
++msoft-float/mfloat-gprs=double
MULTILIB_DIRNAMES = \
-m403 m505 m601 m603e m604 m860 m7400 \
-mpc8260 \
-+m403 m505 m601 m603e m604 m860 m7400 m8540 \
- nof
+-nof
++m403 m505 m603e m604 m860 m7400 m8540 \
++nof gprsdouble
# MULTILIB_MATCHES = ${MULTILIB_MATCHES_FLOAT}
-@@ -47,6 +45,9 @@
+ MULTILIB_MATCHES =
+@@ -47,6 +45,13 @@
# Map 750 to .
MULTILIB_MATCHES += mcpu?750=
+# Map 8548 to 8540
+MULTILIB_MATCHES += mcpu?8540=mcpu?8548
+
++# Map -mcpu=8540 -mfloat-gprs=single to -mcpu=8540
++# (mfloat-gprs=single is implicit default)
++MULTILIB_MATCHES += mcpu?8540=mcpu?8540/mfloat-gprs?single
++
# Soft-float only, default implies msoft-float
# NOTE: Must match with MULTILIB_MATCHES_FLOAT and MULTILIB_MATCHES
MULTILIB_SOFTFLOAT_ONLY = \
-@@ -73,10 +74,11 @@
+@@ -62,6 +67,16 @@
+ MULTILIB_HARDFLOAT_ONLY = \
+ *mcpu=505/*msoft-float*
+
++# Targets which do not support gprs
++MULTILIB_NOGPRS = \
++mfloat-gprs=* \
++*mcpu=403/*mfloat-gprs=* \
++*mcpu=505/*mfloat-gprs=* \
++*mcpu=603e/*mfloat-gprs=* \
++*mcpu=604/*mfloat-gprs=* \
++*mcpu=860/*mfloat-gprs=* \
++*mcpu=7400/*mfloat-gprs=*
++
+ MULTILIB_EXCEPTIONS =
+
+ # Disallow -Dppc and -Dmpc without other options
+@@ -69,14 +84,8 @@
+
+ MULTILIB_EXCEPTIONS += \
+ ${MULTILIB_SOFTFLOAT_ONLY} \
+-${MULTILIB_HARDFLOAT_ONLY}
++${MULTILIB_HARDFLOAT_ONLY} \
++${MULTILIB_NOGPRS}
# Special rules
# Take out all variants we don't want
@@ -276,14 +311,6 @@ diff -Naur gcc-4.5.2.orig/gcc/config/rs6000/t-rtems gcc-4.5.2/gcc/config/rs6000/
-MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc*
-MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc*
-MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc*
-+# MULTILIB_EXCEPTIONS += *mcpu=403/Dmpc*
-+# MULTILIB_EXCEPTIONS += *mcpu=505/Dmpc*
-+# MULTILIB_EXCEPTIONS += *mcpu=601/Dmpc*
-+# MULTILIB_EXCEPTIONS += *mcpu=604/Dmpc*
-+# MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc*
-+# MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc*
-+# MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc*
-+# MULTILIB_EXCEPTIONS += *mcpu=8540/Dmpc*
diff -Naur gcc-4.5.2.orig/gcc/config/sh/rtemself.h gcc-4.5.2/gcc/config/sh/rtemself.h
--- gcc-4.5.2.orig/gcc/config/sh/rtemself.h 2007-08-02 12:49:31.000000000 +0200
+++ gcc-4.5.2/gcc/config/sh/rtemself.h 2011-02-20 05:21:33.551939285 +0100