* config.gcc [s390-*-linux]: Remove s390/t-linux from tmake_file.

	[s390x-*-linux*]: Likewise.
	* config/s390/t-linux: Remove.
	* config/s390/s390.h: Include fixdfdi.h when building libgcc2.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c2f7fbd..864a3b4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-22  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * config.gcc [s390-*-linux]: Remove s390/t-linux from tmake_file.
+       [s390x-*-linux*]: Likewise.
+       * config/s390/t-linux: Remove.
+       * config/s390/s390.h: Include fixdfdi.h when building libgcc2.
+
 Tue Oct 22 19:07:03 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
        * i386.c (builtin_description): Add IX86_BUILTIN_PUNPCKHQDQ128.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 683ec13..ba19f91 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2170,7 +2170,7 @@ rs6000-*-lynxos*)
        ;;
 s390-*-linux*)
        tm_file="s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
-       tmake_file="t-slibgcc-elf-ver t-linux s390/t-linux"
+       tmake_file="t-slibgcc-elf-ver t-linux"
        ;;
 s390x-*-linux*)
        tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
@@ -2178,7 +2178,7 @@ s390x-*-linux*)
        md_file=s390/s390.md
        extra_modes=s390/s390-modes.def
        out_file=s390/s390.c
-       tmake_file="t-slibgcc-elf-ver t-linux s390/t-linux s390/t-linux64"
+       tmake_file="t-slibgcc-elf-ver t-linux s390/t-linux64"
        ;;
 sh-*-elf* | sh[2346l]*-*-elf*)
        tmake_file="sh/t-sh sh/t-elf"

diff --git a/gcc/config/s390/s390.h b/gcc/config/s390/s390.h
index aae46cf..db01d27 100644 (file)
--- a/gcc/config/s390/s390.h
+++ b/gcc/config/s390/s390.h
@@ -22,6 +22,13 @@ Boston, MA 02111-1307, USA.  */
 #ifndef _S390_H
 #define _S390_H
 
+/* Override the __fixdfdi etc. routines when building libgcc2.
+   ??? This should be done in a cleaner way ...  */
+#ifdef IN_LIBGCC2
+#include <s390/fixdfdi.h>
+#endif
+
+
 extern int flag_pic; 
 
 /* Run-time compilation parameters selecting different hardware subsets.  */

diff --git a/gcc/config/s390/t-linux b/gcc/config/s390/t-linux
deleted file mode 100644 (file)
index bc8d519..0000000
--- a/gcc/config/s390/t-linux
+++ /dev/null
@@ -1,7 +0,0 @@
-# The crtbegin and crtend must not depend on a small GOT
-CRTSTUFF_T_CFLAGS = -O2 -fPIC
-CRTSTUFF_T_CFLAGS_S = -O2 -fPIC
-
-# Compile libgcc2.a with pic.
-TARGET_LIBGCC2_CFLAGS = -fPIC -include $(srcdir)/config/s390/fixdfdi.h
-