If cross compiling, do not invoke mips-tfile by default.

From-SVN: r2651

diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index 48ea1c091a92755e251214b7aee44fc9e34fcbe3..29391e33b3de6538a98332ee29d67c02bb1ef784 100644 (file)
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -395,9 +395,12 @@ while (0)
 /* Specify to run a post-processor, mips-tfile after the assembler
    has run to stuff the mips debug information into the object file.
    This is needed because the $#!%^ MIPS assembler provides no way
-   of specifying such information in the assembly file.  */
+   of specifying such information in the assembly file.  If we are
+   cross compiling, disable mips-tfile unless the user specifies
+   -mmips-tfile.  */
 
 #ifndef ASM_FINAL_SPEC
+#ifndef CROSS_COMPILE
 #define ASM_FINAL_SPEC "\
 %{!mgas: %{!mno-mips-tfile: \
        \n mips-tfile %{v*: -v} \
@@ -405,7 +408,18 @@ while (0)
                %{!K: %{save-temps: -I %b.o~}} \
                %{c:%W{o*}%{!o*:-o %b.o}}%{!c:-o %U.o} \
                %{.s:%i} %{!.s:%g.s}}}"
-#endif
+
+#else                          /* CROSS_COMPILE */
+#define ASM_FINAL_SPEC "\
+%{!mgas: %{mmips-tfile: \
+       \n mips-tfile %{v*: -v} \
+               %{K: -I %b.o~} \
+               %{!K: %{save-temps: -I %b.o~}} \
+               %{c:%W{o*}%{!o*:-o %b.o}}%{!c:-o %U.o} \
+               %{.s:%i} %{!.s:%g.s}}}"
+
+#endif /* CROSS_COMPILE */
+#endif /* ASM_FINAL_SPEC */
 
 /* Redefinition of libraries used.  Mips doesn't support normal
    UNIX style profiling via calling _mcount.  It does offer

diff --git a/gcc/config/mips/osfrose.h b/gcc/config/mips/osfrose.h
index 1923d928b9edbd79b7816dca05e4211c1b4c1358..78629e72108ad8f7a2f4096421debe78721b9dac 100644 (file)
--- a/gcc/config/mips/osfrose.h
+++ b/gcc/config/mips/osfrose.h
@@ -47,6 +47,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
        %{v*: -v} \
        %{G*}"
 
+#ifndef CROSS_COMPILE
 #define ASM_FINAL_SPEC "\
 %{mmips-as: %{!mno-mips-tfile: \
        \n mips-tfile %{v*: -v} %{d*} \
@@ -55,6 +56,16 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
                        %{c:%W{o*}%{!o*:-o %b.o}}%{!c:-o %U.o} \
                        %{.s:%i} %{!.s:%g.s}}}"
 
+#else                          /* CROSS_COMPILE */
+#define ASM_FINAL_SPEC "\
+%{mmips-as: %{mmips-tfile: \
+       \n mips-tfile %{v*: -v} %{d*} \
+                       %{K: -I %b.o~} \
+                       %{!K: %{save-temps: -I %b.o~}} \
+                       %{c:%W{o*}%{!o*:-o %b.o}}%{!c:-o %U.o} \
+                       %{.s:%i} %{!.s:%g.s}}}"
+#endif
+
 #define CPP_SPEC "\
 %{.S:  -D__LANGUAGE_ASSEMBLY__ -D__LANGUAGE_ASSEMBLY %{!ansi:-DLANGUAGE_ASSEMBLY} \
        -ULANGUAGE_C -U__LANGUAGE_C__} \