Ticket #1740: powerpc-multi-lib_v1.patch

gcc/config/rs6000/rtems.h

@@ -49 +49 @@
 %{mcpu=604:  %{!Dppc*: %{!Dmpc*: -Dmpc604}  } } \
 %{mcpu=750:  %{!Dppc*: %{!Dmpc*: -Dmpc750}  } } \
 %{mcpu=821:  %{!Dppc*: %{!Dmpc*: -Dmpc821}  } } \
-%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } }" 
+%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } } \
+%{mcpu=8540: %{!Dppc*: %{!Dmpc*: -Dppc8540}  } }" 
 
 #undef  SUBSUBTARGET_EXTRA_SPECS
 #define SUBSUBTARGET_EXTRA_SPECS \
   { "cpp_os_rtems",             CPP_OS_RTEMS_SPEC }
+
+#undef WCHAR_TYPE
+
+#undef WCHAR_TYPE_SIZE

gcc/config/rs6000/t-rtems

@@ -19 +19 @@
 # <http://www.gnu.org/licenses/>.
 
 MULTILIB_OPTIONS        = \
-mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400 \
+mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400/mcpu=8540 \
 Dmpc8260 \
-msoft-float
+msoft-float/mfloat-gprs=single/mfloat-gprs=double
 
 MULTILIB_DIRNAMES       = \
-m403 m505 m601 m603e m604 m860 m7400 \
+m403 m505 m601 m603e m604 m860 m7400 m8540 \
 mpc8260 \
-nof
+nof floatgprssingle floatgprsdouble
 
 # MULTILIB_MATCHES      = ${MULTILIB_MATCHES_FLOAT}
 MULTILIB_MATCHES        =
@@ -71 +71 @@
 ${MULTILIB_SOFTFLOAT_ONLY} \
 ${MULTILIB_HARDFLOAT_ONLY}
 
+# e200 or e500 with embedded floating point unit
+MULTILIB_EXCEPTIONS += mcpu=8540
+MULTILIB_EXCEPTIONS += mfloat-gprs=single
+MULTILIB_EXCEPTIONS += mfloat-gprs=double
+MULTILIB_EXCEPTIONS += mcpu=[012345679]*/*mfloat-gprs=*
+MULTILIB_EXCEPTIONS += mcpu=8[012346789]*/*mfloat-gprs=*
+
 # Special rules
 # Take out all variants we don't want
 MULTILIB_EXCEPTIONS += *mcpu=403/Dmpc*
@@ -80 +87 @@
 MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc*
 MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc*
 MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc*
+MULTILIB_EXCEPTIONS += *mcpu=8540/Dmpc*