2005-02-11 Ralf Corsepius <ralf.corsepius@rtems.org>

	* config/rs6000/t-rtems:
	(MULTILIB_OPTIONS): Remove mcpu=602.
	(MUTLILIB_DIRNAMES): Remove m602.
	(MULTILIB_MATCHES): Add ${MULTILIB_MATCHES_FLOAT}.
	Let mcpu=602 match mcpu=603.
	(MULTILIB_NEW_EXCEPTIONS_ONLY): Add mcpu=601, mcpu=602, mcpu=m603.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@94876 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 34513ea..a809886 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2005-02-11  Ralf Corsepius  <ralf.corsepius@rtems.org>
+
+       * config/rs6000/t-rtems:
+       (MULTILIB_OPTIONS): Remove mcpu=602.
+       (MUTLILIB_DIRNAMES): Remove m602.
+       (MULTILIB_MATCHES): Add ${MULTILIB_MATCHES_FLOAT}. 
+       Let mcpu=602 match mcpu=603.
+       (MULTILIB_NEW_EXCEPTIONS_ONLY): Add mcpu=601, mcpu=602, mcpu=m603.
+
 2005-02-10  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
        * pa/linux-unwind.h (pa32_fallback_frame_state): Handle misaligned

diff --git a/gcc/config/rs6000/t-rtems b/gcc/config/rs6000/t-rtems
index 05d9a26..11a73b6 100644 (file)
--- a/gcc/config/rs6000/t-rtems
+++ b/gcc/config/rs6000/t-rtems
@@ -1,13 +1,13 @@
 # Multilibs for powerpc RTEMS targets.
 
 MULTILIB_OPTIONS       = \
-mcpu=403/mcpu=505/mcpu=601/mcpu=602/mcpu=603/mcpu=603e/mcpu=604/mcpu=750/mcpu=821/mcpu=860 \
+mcpu=403/mcpu=505/mcpu=601/mcpu=603/mcpu=603e/mcpu=604/mcpu=750/mcpu=821/mcpu=860 \
 Dmpc509/Dmpc8260 \
 D_OLD_EXCEPTIONS \
 msoft-float
 
 MULTILIB_DIRNAMES      = \
-m403 m505 m601 m602 m603 m603e m604 m750 m821 m860 \
+m403 m505 m601 m603 m603e m604 m750 m821 m860 \
 mpc509 \
 mpc8260 \
 roe \
@@ -15,10 +15,11 @@ nof
 
 MULTILIB_EXTRA_OPTS    = mrelocatable-lib mno-eabi mstrict-align
 
-# MULTILIB_MATCHES     = ${MULTILIB_MATCHES_FLOAT}
-MULTILIB_MATCHES       = ${MULTILIB_MATCHES_ENDIAN} \
-                         ${MULTILIB_MATCHES_SYSV} \
-                         mcpu?505/Dmpc505=mcpu?505/Dmpc509
+MULTILIB_MATCHES       = ${MULTILIB_MATCHES_FLOAT}
+MULTILIB_MATCHES       += ${MULTILIB_MATCHES_ENDIAN}
+MULTILIB_MATCHES       += ${MULTILIB_MATCHES_SYSV}
+MULTILIB_MATCHES       += mcpu?505/Dmpc505=mcpu?505/Dmpc509
+MULTILIB_MATCHES       += mcpu?603=mcpu?602
 
 #
 # RTEMS old/new-exceptions handling
@@ -34,6 +35,9 @@ MULTILIB_MATCHES      = ${MULTILIB_MATCHES_ENDIAN} \
 # Cpu-variants supporting new exception processing only
 MULTILIB_NEW_EXCEPTIONS_ONLY = \
 *mcpu=505*/*D_OLD_EXCEPTIONS* \
+*mcpu=601*/*D_OLD_EXCEPTIONS* \
+*mcpu=602*/*D_OLD_EXCEPTIONS* \
+*mcpu=603/*D_OLD_EXCEPTIONS* \
 *mcpu=604*/*D_OLD_EXCEPTIONS* \
 *mcpu=750*/*D_OLD_EXCEPTIONS* \
 *mcpu=821*/*D_OLD_EXCEPTIONS* \