From 6f1c3a33770de0e5dcd71631d349668164b00aab Mon Sep 17 00:00:00 2001
From: James Van Artsdalen <jrv@gnu.org>
Date: Tue, 5 Jan 1993 08:47:27 +0000
Subject: [PATCH] Use new file names for included m68k files.

From-SVN: r3096
---
 gcc/config/m68k/m68kv4.h   | 8 ++++----
 gcc/config/m68k/mot3300.h  | 2 +-
 gcc/config/m68k/news.h     | 2 +-
 gcc/config/m68k/news3.h    | 2 +-
 gcc/config/m68k/news3gas.h | 2 +-
 gcc/config/m68k/newsgas.h  | 2 +-
 gcc/config/m68k/next.h     | 2 +-
 gcc/config/m68k/pbb.h      | 2 +-
 gcc/config/m68k/plexus.h   | 2 +-
 gcc/config/m68k/sgs.h      | 2 +-
 gcc/config/m68k/sun2.h     | 2 +-
 gcc/config/m68k/sun2o4.h   | 2 +-
 gcc/config/m68k/sun3.h     | 2 +-
 gcc/config/m68k/sun3mach.h | 2 +-
 gcc/config/m68k/sun3n.h    | 2 +-
 gcc/config/m68k/sun3n3.h   | 2 +-
 gcc/config/m68k/sun3o3.h   | 2 +-
 gcc/config/m68k/tower-as.h | 2 +-
 gcc/config/m68k/tower.h    | 2 +-
 19 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/gcc/config/m68k/m68kv4.h b/gcc/config/m68k/m68kv4.h
index d064b5c5328..81f3726100a 100644
--- a/gcc/config/m68k/m68kv4.h
+++ b/gcc/config/m68k/m68kv4.h
@@ -23,7 +23,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define SGS_SWITCH_TABLES	/* Different switch table handling */
 
-#include "m68ksgs.h"		/* The m68k/SVR4 assembler is SGS based */
+#include "m68k/sgs.h"		/* The m68k/SVR4 assembler is SGS based */
 #include "svr4.h"		/* Pick up the generic SVR4 macros */
 
 /* See m68k.h.  7 means 68020 with 68881.  */
@@ -105,10 +105,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define DBX_REGISTER_NUMBER(REGNO) (REGNO)
 
 /* The ASM_OUTPUT_SKIP macro is first defined in m68k.h, using ".skip".
-   It is then overridden by m68ksgs.h to use ".space", and again by svr4.h
+   It is then overridden by m68k/sgs.h to use ".space", and again by svr4.h
    to use ".zero".  The m68k/SVR4 assembler uses ".space", so repeat the
-   definition from m68ksgs.h here.  Note that ASM_NO_SKIP_IN_TEXT is
-   defined in m68ksgs.h, so we don't have to repeat it here. */
+   definition from m68k/sgs.h here.  Note that ASM_NO_SKIP_IN_TEXT is
+   defined in m68k/sgs.h, so we don't have to repeat it here. */
 
 #undef ASM_OUTPUT_SKIP
 #define ASM_OUTPUT_SKIP(FILE,SIZE)  \
diff --git a/gcc/config/m68k/mot3300.h b/gcc/config/m68k/mot3300.h
index 55893ef6ca2..c4e06df6723 100644
--- a/gcc/config/m68k/mot3300.h
+++ b/gcc/config/m68k/mot3300.h
@@ -30,7 +30,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define SGS_SWAP_W		/* Use swap.w rather than just plain swap */
 #define SGS_SWITCH_TABLES	/* Different switch table handling */
 
-#include "m68k.h"
+#include "m68k/m68k.h"
 
 /* See m68k.h.  7 means 68020 with 68881.  */
 
diff --git a/gcc/config/m68k/news.h b/gcc/config/m68k/news.h
index 24f6cce9fb2..623568bf082 100644
--- a/gcc/config/m68k/news.h
+++ b/gcc/config/m68k/news.h
@@ -23,7 +23,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define SGS_NO_LI		/* Suppress jump table label usage */
 #endif
 
-#include "m68k.h"
+#include "m68k/m68k.h"
 
 /* See m68k.h.  7 means 68020 with 68881.  */
 
diff --git a/gcc/config/m68k/news3.h b/gcc/config/m68k/news3.h
index f3d9eb686a7..b4a3f4100d1 100644
--- a/gcc/config/m68k/news3.h
+++ b/gcc/config/m68k/news3.h
@@ -1,4 +1,4 @@
-#include "news.h"
+#include "m68k/news.h"
 
 /* This is to be compatible with types.h.
    It was found to be necessary with Newsos 3.  */
diff --git a/gcc/config/m68k/news3gas.h b/gcc/config/m68k/news3gas.h
index 7f02d9d1e7d..7c2d2b0595f 100644
--- a/gcc/config/m68k/news3gas.h
+++ b/gcc/config/m68k/news3gas.h
@@ -1,4 +1,4 @@
-#include "newsgas.h"
+#include "m68k/newsgas.h"
 
 /* This is to be compatible with types.h.
    It was found to be necessary with Newsos 3.  */
diff --git a/gcc/config/m68k/newsgas.h b/gcc/config/m68k/newsgas.h
index 81a0c735307..5e8c3b28348 100644
--- a/gcc/config/m68k/newsgas.h
+++ b/gcc/config/m68k/newsgas.h
@@ -4,4 +4,4 @@
 
 #define USE_GAS
 
-#include "news.h"
+#include "m68k/news.h"
diff --git a/gcc/config/m68k/next.h b/gcc/config/m68k/next.h
index 9f7160e3300..9c7ebc09cfd 100644
--- a/gcc/config/m68k/next.h
+++ b/gcc/config/m68k/next.h
@@ -16,7 +16,7 @@ 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include "m68k.h"
+#include "m68k/m68k.h"
 
 /* Use new NeXT include file search path.  */
 
diff --git a/gcc/config/m68k/pbb.h b/gcc/config/m68k/pbb.h
index a88c1c2df49..065fcf8f1f2 100644
--- a/gcc/config/m68k/pbb.h
+++ b/gcc/config/m68k/pbb.h
@@ -24,7 +24,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    converts the output of gas to coff containing stab debug symbols.
    (See vasta@apollo.com or mb@soldev.tti.com) */
 
-#include "m68k.h"
+#include "m68k/m68k.h"
 
 /* See m68k.h.  5 means 68020 without 68881.  */
 
diff --git a/gcc/config/m68k/plexus.h b/gcc/config/m68k/plexus.h
index bae9b55d042..4f892d1c9dd 100644
--- a/gcc/config/m68k/plexus.h
+++ b/gcc/config/m68k/plexus.h
@@ -36,7 +36,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 
-#include "m68k.h"
+#include "m68k/m68k.h"
 
 /* Define __HAVE_68881 in preprocessor only if -m68881 is specified.
    This will control the use of inline 68881 insns in certain macros. */
diff --git a/gcc/config/m68k/sgs.h b/gcc/config/m68k/sgs.h
index 164884a88c3..9672068ea87 100644
--- a/gcc/config/m68k/sgs.h
+++ b/gcc/config/m68k/sgs.h
@@ -29,7 +29,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define SGS			/* Uses SGS assembler */
 #define SGS_CMP_ORDER		/* Takes cmp operands in reverse order */
 
-#include "m68k.h"
+#include "m68k/m68k.h"
 
 /* SGS specific assembler pseudo ops. */
 
diff --git a/gcc/config/m68k/sun2.h b/gcc/config/m68k/sun2.h
index bfe9bf7ca61..34338293fb4 100644
--- a/gcc/config/m68k/sun2.h
+++ b/gcc/config/m68k/sun2.h
@@ -18,7 +18,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 
-#include "m68k.h"
+#include "m68k/m68k.h"
 
 /* See m68k.h.  0 means 68000 with no 68881.  */
 
diff --git a/gcc/config/m68k/sun2o4.h b/gcc/config/m68k/sun2o4.h
index 0d53c33cbe8..9dbe9306d79 100644
--- a/gcc/config/m68k/sun2o4.h
+++ b/gcc/config/m68k/sun2o4.h
@@ -17,7 +17,7 @@ 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include "sun2.h"
+#include "m68k/sun2.h"
 
 
 /* Define __HAVE_SKY__ in preprocessor, according to the -m flags.
diff --git a/gcc/config/m68k/sun3.h b/gcc/config/m68k/sun3.h
index 11c4bea221b..b78a4a94b49 100644
--- a/gcc/config/m68k/sun3.h
+++ b/gcc/config/m68k/sun3.h
@@ -25,7 +25,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define SUPPORT_SUN_FPA
 
-#include "m68k.h"
+#include "m68k/m68k.h"
 
 /* See m68k.h.  7 means 68020 with 68881.  */
 
diff --git a/gcc/config/m68k/sun3mach.h b/gcc/config/m68k/sun3mach.h
index e6e9ee7efd1..9bc4fb38b31 100644
--- a/gcc/config/m68k/sun3mach.h
+++ b/gcc/config/m68k/sun3mach.h
@@ -1,4 +1,4 @@
-#include "sun3.h"
+#include "m68k/sun3.h"
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dmc68000 -Dsun -Dsun3 -Dunix -DMACH -DCMU -DMTXINU -DBIT_MSF -DBYTE_MSF"
diff --git a/gcc/config/m68k/sun3n.h b/gcc/config/m68k/sun3n.h
index bff17ae6bb8..a4d72e8193a 100644
--- a/gcc/config/m68k/sun3n.h
+++ b/gcc/config/m68k/sun3n.h
@@ -2,4 +2,4 @@
 
 #define TARGET_DEFAULT 5
 
-#include "sun3.h"
+#include "m68k/sun3.h"
diff --git a/gcc/config/m68k/sun3n3.h b/gcc/config/m68k/sun3n3.h
index 917a4e499ed..1c962bd68b8 100644
--- a/gcc/config/m68k/sun3n3.h
+++ b/gcc/config/m68k/sun3n3.h
@@ -1,4 +1,4 @@
-#include "sun3n.h"
+#include "m68k/sun3n.h"
 
 /* LINK_SPEC is needed only for Sunos 4.  */
 
diff --git a/gcc/config/m68k/sun3o3.h b/gcc/config/m68k/sun3o3.h
index e245abc5ae9..4d3e3dd2584 100644
--- a/gcc/config/m68k/sun3o3.h
+++ b/gcc/config/m68k/sun3o3.h
@@ -1,4 +1,4 @@
-#include "sun3.h"
+#include "m68k/sun3.h"
 
 /* LINK_SPEC is needed only for Sunos 4.  */
 
diff --git a/gcc/config/m68k/tower-as.h b/gcc/config/m68k/tower-as.h
index c9d15329320..2e7da48cfaa 100644
--- a/gcc/config/m68k/tower-as.h
+++ b/gcc/config/m68k/tower-as.h
@@ -29,7 +29,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 
-#include "tower.h"
+#include "m68k/tower.h"
 #undef SELECT_RTX_SECTION
 
 /* Use default settings for system V.3.  */
diff --git a/gcc/config/m68k/tower.h b/gcc/config/m68k/tower.h
index 8fff2d3d18a..c205f9f2512 100644
--- a/gcc/config/m68k/tower.h
+++ b/gcc/config/m68k/tower.h
@@ -34,7 +34,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 
-#include "m68k.h"
+#include "m68k/m68k.h"
 
 
 /* See m68k.h.  5 means 68020 with no 68881.  */
-- 
2.30.2