Do not allow big-endian/little-endian multilibs to override arm/thumb multilibs.

Do not allow big-endian/little-endian multilibs to override arm/thumb
multilibs.
Do not build hardware floating point multilibs, nor apcs-26 multilibs for
the Thumb.

From-SVN: r53294

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2df36563dcdb9f4c850effe599ac03d38c17b229..617d19d51111d530142f7f4ad18221a29be8e5b5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-08  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * config/arm/t-arm-elf (MULTILIB): Do not allow big-endian/
+       little-endian multilibs to override arm/thumb multilibs.
+        Do not build hardware floating point multilibs, nor apcs-26
+       multilibs for the Thumb.
+
 2002-05-08  Mark Mitchell  <mark@codesourcery.com>
 
        PR c/6569.

diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
index d94b5d2ccbc087878fc07616420993bbc5adc930..0011b2a8d025f4af21a6b8e873efe13297c27ba3 100644 (file)
--- a/gcc/config/arm/t-arm-elf
+++ b/gcc/config/arm/t-arm-elf
@@ -25,16 +25,18 @@ MULTILIB_OPTIONS     = marm/mthumb
 MULTILIB_DIRNAMES    = arm thumb
 MULTILIB_EXCEPTIONS  = 
        
-# MULTILIB_OPTIONS     = mlittle-endian/mbig-endian
-# MULTILIB_DIRNAMES    = le be
+# MULTILIB_OPTIONS     += mlittle-endian/mbig-endian
+# MULTILIB_DIRNAMES    += le be
 # MULTILIB_EXCEPTIONS  = 
 # MULTILIB_MATCHES     = mbig-endian=mbe mlittle-endian=mle
 # 
 # MULTILIB_OPTIONS    += mhard-float/msoft-float
 # MULTILIB_DIRNAMES   += fpu soft
+# MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*
 # 
 # MULTILIB_OPTIONS    += mapcs-32/mapcs-26
 # MULTILIB_DIRNAMES   += 32bit 26bit
+# MULTILIB_EXCEPTIONS += *mthumb/*mapcs-26*
 # 
 # MULTILIB_OPTIONS    += mno-thumb-interwork/mthumb-interwork
 # MULTILIB_DIRNAMES   += normal interwork