Stop including other files in m88k/openbsd.h; instead specific the complete list

of files to include, in proper order, as tm_file at configure time. This
requires openbsd.h to be split, as also encountered on other platforms, and will
make further work easier.
No functional change introduced.

3 files changed, 28 insertions, 11 deletions

diff --git a/gnu/usr.bin/gcc/gcc/config.gcc b/gnu/usr.bin/gcc/gcc/config.gcc
index d4f4114232a..048215d3923 100644
--- a/gnu/usr.bin/gcc/gcc/config.gcc
+++ b/gnu/usr.bin/gcc/gcc/config.gcc
@@ -1,4 +1,4 @@
-#	$OpenBSD: config.gcc,v 1.22 2012/12/08 16:58:35 miod Exp $
+#	$OpenBSD: config.gcc,v 1.23 2012/12/30 18:09:30 miod Exp $
 # GCC build-, host- and target-specific configuration file.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
@@ -1800,6 +1800,7 @@ m88k-*-aout*)
 	;;
 m88k-*-openbsd*)
 	tmake_file="t-libc-ok t-openbsd"
+	tm_file="openbsd-libpthread.h m88k/aout-dbx.h aoutos.h m88k/openbsd1.h m88k/m88k.h openbsd.h m88k/openbsd.h"
 #	tm_file="${tm_file} exec-stack.h"
 	use_collect2=yes
 	gas=yes
diff --git a/gnu/usr.bin/gcc/gcc/config/m88k/openbsd.h b/gnu/usr.bin/gcc/gcc/config/m88k/openbsd.h
index f6511b5f148..c1c30c61f9a 100644
--- a/gnu/usr.bin/gcc/gcc/config/m88k/openbsd.h
+++ b/gnu/usr.bin/gcc/gcc/config/m88k/openbsd.h
@@ -18,10 +18,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include <m88k/aout-dbx.h>
-#include <aoutos.h>
-#include <m88k/m88k.h>
-
 /* <m88k/m88k.h> provided wrong GLOBAL_ASM_OP and SET_ASM_OP */
 #undef SET_ASM_OP
 #define SET_ASM_OP	"\tequ\t"
@@ -32,12 +28,6 @@ Boston, MA 02111-1307, USA.  */
 #undef SUPPORTS_WEAK
 #undef SUPPORTS_ONE_ONLY
 
-#define OBSD_HAS_CORRECT_ASM_OPS
-#define OBSD_OLD_GAS
-#define OBSD_NO_DYNAMIC_LIBRARIES
-
-#include <openbsd.h>
-
 /* Run-time target specifications.  */
 #define TARGET_OS_CPP_BUILTINS()			\
   do							\
diff --git a/gnu/usr.bin/gcc/gcc/config/m88k/openbsd1.h b/gnu/usr.bin/gcc/gcc/config/m88k/openbsd1.h
new file mode 100644
index 00000000000..c262931335f
--- /dev/null
+++ b/gnu/usr.bin/gcc/gcc/config/m88k/openbsd1.h
@@ -0,0 +1,26 @@
+/* Configuration file for an m88k OpenBSD ELF target.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#define OBSD_NO_DYNAMIC_LIBRARIES
+
+#ifndef OBJECT_FORMAT_ELF
+#define OBSD_HAS_CORRECT_ASM_OPS
+#define OBSD_OLD_GAS
+#endif