* config/mips/t-linux64: Remove code that messed with $(SPECS).

(MULTILIB_OPTIONS, MULTILIB_DIRNAMES, MULTILIB_OSDIRNAMES): Move
n32 to the front.
(MULTILIB_EXTRA_OPTS, CRTSTUFF_T_CFLAGS, CRTSTUFF_T_CFLAGS_S):
Removed.
* config/mips/linux64.h (DRIVER_SELF_SPECS): Don't handle
-mabi-fake-default.
(SUBTARGET_TARGET_SWITCHES): Likewise.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 52682ea..4c0b10e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2004-12-22  Alexandre Oliva  <aoliva@redhat.com>
+
+       * config/mips/t-linux64: Remove code that messed with $(SPECS).
+       (MULTILIB_OPTIONS, MULTILIB_DIRNAMES, MULTILIB_OSDIRNAMES): Move
+       n32 to the front.
+       (MULTILIB_EXTRA_OPTS, CRTSTUFF_T_CFLAGS, CRTSTUFF_T_CFLAGS_S):
+       Removed.
+       * config/mips/linux64.h (DRIVER_SELF_SPECS): Don't handle
+       -mabi-fake-default.
+       (SUBTARGET_TARGET_SWITCHES): Likewise.
+
 2004-12-21  Andrew Pinski  <pinskia@physics.uc.edu>
 
        PR c++/18984

diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
index 64ff68e..6835f71 100644 (file)
--- a/gcc/config/mips/linux64.h
+++ b/gcc/config/mips/linux64.h
@@ -30,14 +30,9 @@ Boston, MA 02111-1307, USA.  */
   { "driver_default_abi_self_spec", DRIVER_DEFAULT_ABI_SELF_SPEC },
 #define DRIVER_SELF_SPECS \
 "%{!EB:%{!EL:%(endian_spec)}}", \
-"%{mabi-fake-default:%{!mabi=*:-mabi=32}}", \
 "%(driver_default_abi_self_spec)", \
 "%{!mips*:%{!march=*:%{mabi=32:-mips1}%{mabi=n32|mabi=64:-mips3}}}"
 
-#undef SUBTARGET_TARGET_SWITCHES
-#define SUBTARGET_TARGET_SWITCHES \
-  { "abi-fake-default", 0, N_("Same as -mabi=32, just trickier") },
-
 #undef SUBTARGET_ASM_SPEC
 #define SUBTARGET_ASM_SPEC "\
 %{!fno-PIC:%{!fno-pic:-KPIC}} \

diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
index 402838b..39531e5 100644 (file)
--- a/gcc/config/mips/t-linux64
+++ b/gcc/config/mips/t-linux64
@@ -1,6 +1,6 @@
-MULTILIB_OPTIONS = mabi=32/mabi=n32/mabi=64
-MULTILIB_DIRNAMES = o32 32 64
-MULTILIB_OSDIRNAMES = ../lib ../lib32 ../lib64
+MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
+MULTILIB_DIRNAMES = 32 o32 64
+MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
 
 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
 
@@ -17,27 +17,3 @@ tp-bit.c: $(srcdir)/config/fp-bit.c
        echo '# define TFLOAT' >> tp-bit.c
        cat $(srcdir)/config/fp-bit.c >> tp-bit.c
        echo '#endif' >> tp-bit.c
-
-# This arranges for us to extract the built-in specs of the compiler
-# into specs.install.  It's this file that we're going to install as
-# specs.  Howver, at toolchain build time, we must use specs that
-# enforce the defaults that the compiler expects, namely, the o32 ABI,
-# instead of n32, that we want to use as the default post install.
-SPECS = specs.install
-specs: specs.install
-       # Changing the build-time default ABI from n32 to o32
-       # The post-install default ABI will remain n32
-       @if test "x`grep '!mabi=\*:-mabi=n32' specs.install`" = \
-               "x%{!mabi=*:-mabi=n32}"; then \
-         sed 's,\(!mabi=\*:-mabi\)=n32,\1=32,' < specs.install > $@ ; \
-       else \
-         echo failed, gcc/config/mips/t-linux64 needs updating >&2; \
-         false; \
-       fi
-
-# This arranges for anyone who uses gcc -print-multi-lib post
-# installation to get lists of options for each multilib to get
-# options that actually work.
-MULTILIB_EXTRA_OPTS = mabi-fake-default
-CRTSTUFF_T_CFLAGS = -mabi-fake-default
-CRTSTUFF_T_CFLAGS_S = -mabi-fake-default