config.gcc (s390-*-linux-*, [...]): Switch to new-style tm_file specification.

* config.gcc (s390-*-linux-*, s390x-*-linux*): Switch to
new-style tm_file specification.  Specify correct tm_p_file,
md_file, and out_file for s390x.

* config/s390/linux.h, linux64.h:  Don't include other target
macro header files.  Now handled via tm_file.

* config/s390/linux.h, s390.h:  (IEEE_FLOAT, TARGET_IEEE_FLOAT,
TARGET_IBM_FLOAT): Move from linux.h to s390.h to ensure they
are defined before use.

From-SVN: r45685

gcc/ChangeLog

+2001-09-18  Ulrich Weigand  <uweigand@de.ibm.com>:
+ 
+        * config.gcc (s390-*-linux-*, s390x-*-linux*): Switch to 
+	new-style tm_file specification.  Specify correct tm_p_file, 
+	md_file, and out_file for s390x. 
+
+	* config/s390/linux.h, linux64.h:  Don't include other target
+	macro header files.  Now handled via tm_file.
+
+	* config/s390/linux.h, s390.h:  (IEEE_FLOAT, TARGET_IEEE_FLOAT, 
+	TARGET_IBM_FLOAT): Move from linux.h to s390.h to ensure they
+	are defined before use.
+	
 Tue Sep 18 09:51:11 2001  Eric Christopher  <ecechristo@redhat.com>
 
         * config/mips/mips.c (mips_asm_file_start): Conditionalize Elf

gcc/config.gcc

@@ -2799,7 +2799,7 @@ rs6000-*-lynxos*)
 	;;
 s390-*-linux*)
 	xmake_file=x-linux
-	tm_file=s390/linux.h
+	tm_file="s390/s390.h linux.h s390/linux.h"
 	tmake_file="t-slibgcc-elf-ver t-linux s390/t-linux"
 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
 	if test x$enable_threads = xyes; then
@@ -2808,7 +2808,10 @@ s390-*-linux*)
 	;;
 s390x-*-linux*)
 	xmake_file=x-linux
-	tm_file=s390/linux64.h
+	tm_file="s390/s390.h linux.h s390/linux.h s390/linux64.h"
+	tm_p_file=s390/s390-protos.h
+	md_file=s390/s390.md
+	out_file=s390/s390.c
 	tmake_file="t-slibgcc-elf-ver t-linux s390/t-linux"
 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
 	if test x$enable_threads = xyes; then

gcc/config/s390/linux.h

@@ -23,14 +23,6 @@ Boston, MA 02111-1307, USA.  */
 #ifndef _LINUX_H
 #define _LINUX_H
 
-#define IEEE_FLOAT 1
-#define TARGET_IBM_FLOAT           0
-#define TARGET_IEEE_FLOAT          1
-
-#include <s390/s390.h>              /* Base s390 target machine definitions*/
-
-#include <linux.h>
-
 #undef SIZE_TYPE                       /* use default                      */
 
 #undef TARGET_VERSION

gcc/config/s390/linux64.h

@@ -22,8 +22,6 @@ Boston, MA 02111-1307, USA.  */
 #ifndef _LINUX64_H
 #define _LINUX64_H
 
-#include <s390/linux.h>              /* Base linux target machine definitions*/
-
 #undef PTRDIFF_TYPE
 #define PTRDIFF_TYPE "long int"
 

gcc/config/s390/s390.h

@@ -65,6 +65,11 @@ extern int target_flags;
 /* Define this to change the optimizations performed by default.  */
 #define OPTIMIZATION_OPTIONS(LEVEL, SIZE) optimization_options(LEVEL, SIZE)
 
+/* Defines for REAL_ARITHMETIC.  */
+#define IEEE_FLOAT 1
+#define TARGET_IBM_FLOAT           0
+#define TARGET_IEEE_FLOAT          1 
+
 /* The current function count for create unique internal labels.  */
 
 extern int s390_function_count;