re PR target/19796 (Bootstrap fails: Unresolved data symbol "set_fpc_csr")

	PR bootstrap/19796
	Revert:
	2005-01-26  Richard Sandiford  <rsandifo@redhat.com>
	* config/mips/iris6.h (ENDFILE_SPEC): Don't link in irix-csr.o if
	either -ffast-math or -funsafe-math-optimizations is in use.

	2005-01-24  Richard Sandiford  <rsandifo@redhat.com>
	* config/mips/irix-csr.c: New file.
	* config/mips/t-iris6 (irix-csr.o): New rule to build it.
	(EXTRA_MULTILIB_PARTS): Add irix-csr.o.
	* config/mips/iris6.h (ENDFILE_SPEC): Include it in n32 and n64
	executables.

From-SVN: r94696

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3fbce885454ac649d3d504af871fd4aa92f0476e..3c0219efb0db45c32a9675ab547813fb6c5b7f7f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,18 @@
+2005-02-07  Richard Sandiford  <rsandifo@redhat.com>
+
+       PR bootstrap/19796
+       Revert:
+       2005-01-26  Richard Sandiford  <rsandifo@redhat.com>
+       * config/mips/iris6.h (ENDFILE_SPEC): Don't link in irix-csr.o if
+       either -ffast-math or -funsafe-math-optimizations is in use.
+
+       2005-01-24  Richard Sandiford  <rsandifo@redhat.com>
+       * config/mips/irix-csr.c: New file.
+       * config/mips/t-iris6 (irix-csr.o): New rule to build it.
+       (EXTRA_MULTILIB_PARTS): Add irix-csr.o.
+       * config/mips/iris6.h (ENDFILE_SPEC): Include it in n32 and n64
+       executables.
+
 2005-02-07  Alexandre Oliva  <aoliva@redhat.com>
 
        * config/mn10300/linux.h (LIB_SPEC, STARTFILE_SPEC): Remove

diff --git a/gcc/config/mips/iris6.h b/gcc/config/mips/iris6.h
index 0468a114d781b7cfe0067d7c446830b835162596..ff051255c9c6982e9d24d7adfa84bab93b0cda4f 100644 (file)
--- a/gcc/config/mips/iris6.h
+++ b/gcc/config/mips/iris6.h
@@ -98,9 +98,7 @@ Boston, MA 02111-1307, USA.  */
 
 #undef ENDFILE_SPEC
 #define ENDFILE_SPEC \
-  "%{!shared:%{!ffast-math:%{!funsafe-math-optimizations: \
-     %{mabi=n32|mabi=64:irix-csr.o%s}}}} \
-   crtend.o%s irix-crtn.o%s \
+  "crtend.o%s irix-crtn.o%s \
    %{!shared: \
      %{mabi=32:crtn.o%s}\
      %{mabi=n32:%{mips4:/usr/lib32/mips4/crtn.o%s}\

diff --git a/gcc/config/mips/irix-csr.c b/gcc/config/mips/irix-csr.c
deleted file mode 100644 (file)
index ef37345..0000000
--- a/gcc/config/mips/irix-csr.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#if _MIPS_SIM == _ABIN32 || _MIPS_SIM == _ABI64
-#include <sys/fpu.h>
-
-/* n32 and n64 applications usually run with the MIPS IV Flush to Zero
-   bit set.  Clear it here so that gcc-generated code will handle
-   subnormals correctly by default.  */
-
-static void __attribute__((constructor))
-clear_flush_to_zero (void)
-{
-  union fpc_csr csr;
-
-  csr.fc_word = get_fpc_csr ();
-  csr.fc_struct.flush = 0;
-  set_fpc_csr (csr.fc_word);
-}
-#endif

diff --git a/gcc/config/mips/t-iris6 b/gcc/config/mips/t-iris6
index 93837887f464f78960c3eaa653d4c3c5d3a8a7b0..254480cb43f54cf330538246471fdfbfbc39a367 100644 (file)
--- a/gcc/config/mips/t-iris6
+++ b/gcc/config/mips/t-iris6
@@ -19,9 +19,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
-
-$(T)irix-csr.o: $(srcdir)/config/mips/irix-csr.c $(GCC_PASSES)
-       $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(MULTILIB_CFLAGS) $(INCLUDES) \
-         -c -o $@ $<
-
-EXTRA_MULTILIB_PARTS += irix-csr.o