* config/i386/cygwin.h: Don't include any other files directly.

	* config/i386/mingw32.h: Don't include cygwin.h directly.
	* config.gcc (cygwin, mingw32, uwin): Instead make these files
	explicit in the tm_files variable.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2bd7864..c72462a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-27  Roger Sayle  <roger@eyesopen.com>
+
+       * config/i386/cygwin.h: Don't include any other files directly.
+       * config/i386/mingw32.h: Don't include cygwin.h directly.
+       * config.gcc (cygwin, mingw32, uwin): Instead make these files
+       explicit in the tm_files variable.
+
 2003-02-27  Alan Modra  <amodra@bigpond.net.au>
 
        * config/rs6000/rs6000.md: Add TI constant splitter.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 71ee45d..baa22d0 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1312,7 +1312,7 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
        xm_defines=POSIX
        xm_file=i386/xm-cygwin.h
        tmake_file=i386/t-cygwin
-       tm_file=i386/cygwin.h
+       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygwin.h"
        extra_objs=winnt.o
        if test x$enable_threads = xyes; then
                thread_file='win32'
@@ -1320,7 +1320,7 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
        exeext=.exe
        ;;
 i[34567]86-*-mingw32*)
-       tm_file=i386/mingw32.h
+       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygwin.h i386/mingw32.h"
        xm_defines=POSIX
        xm_file=i386/xm-mingw32.h
        tmake_file="i386/t-cygwin i386/t-mingw32"
@@ -1338,7 +1338,7 @@ i[34567]86-*-mingw32*)
        esac
        ;;
 i[34567]86-*-uwin*)
-       tm_file="i386/cygwin.h i386/uwin.h"
+       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygwin.h i386/uwin.h"
        tmake_file="i386/t-cygwin i386/t-uwin"
        extra_objs=winnt.o
        if test x$enable_threads = xyes; then

diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h
index df26929..ab3b5fb 100644 (file)
--- a/gcc/config/i386/cygwin.h
+++ b/gcc/config/i386/cygwin.h
@@ -22,17 +22,14 @@ Boston, MA 02111-1307, USA.  */
 
 #define DBX_DEBUGGING_INFO 1
 #define SDB_DEBUGGING_INFO 1
+
+#undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
 
 #define TARGET_VERSION fprintf (stderr, " (x86 Cygwin)"); 
 #define TARGET_EXECUTABLE_SUFFIX ".exe"
 
 #include <stdio.h>
-#include "i386/i386.h"
-#include "i386/unix.h"
-#include "i386/bsd.h"
-#include "i386/gas.h"
-#include "dbxcoff.h"
 
 /* Masks for subtarget switches used by other files.  */
 #define MASK_NOP_FUN_DLLIMPORT 0x08000000 /* Ignore dllimport for functions */

diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
index 4431084..ba01c8c 100644 (file)
--- a/gcc/config/i386/mingw32.h
+++ b/gcc/config/i386/mingw32.h
@@ -29,8 +29,6 @@ Boston, MA 02111-1307, USA.  */
 #define WIN32_NO_ABSOLUTE_INST_DIRS 1
 #endif
 
-#include "i386/cygwin.h"
-
 #define TARGET_EXECUTABLE_SUFFIX ".exe"
 
 /* See i386/crtdll.h for an alternative definition.  */