From: David O'Brien <obrien@FreeBSD.org>
Date: Tue, 11 Dec 2001 18:21:04 +0000 (+0000)
Subject: config.gcc (m68020-*-elf*): Expand tm_file to include all needed cpu configuration... 
X-Git-Tag: prereleases/libstdc++-3.0.95~268
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=911713157618beaeb432bc646f82a074e4c28435;p=thirdparty%2Fgcc.git

config.gcc (m68020-*-elf*): Expand tm_file to include all needed cpu configuration headers.

2001-12-11  David O'Brien  <obrien@FreeBSD.org>
	* config.gcc (m68020-*-elf*): Expand tm_file to include all needed
	cpu configuration headers.
	* config/h8300/elf.h: Include dbxelf.h.
	* config/m68k/linux.h: Likewise.
	* config/m68k/m68020-elf.h: Likewise.
	* config/m68k/m68kv4.h: Likewise.
	* config/sh/elf.h: Likewise.
	* config/m68k/m68kemb.h: Add comment about the its purpose.

Approved by:  Richard Henderson <rth@redhat.com>
              Message-ID: <20011210155120.A23862@redhat.com>

From-SVN: r47885
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b5c02519b09d..357eb2296b95 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2001-12-11  David O'Brien  <obrien@FreeBSD.org>
+
+	* config.gcc (m68020-*-elf*): Expand tm_file to include all needed
+	cpu configuration headers.
+	* config/h8300/elf.h: Include dbxelf.h.
+	* config/m68k/linux.h: Likewise.
+	* config/m68k/m68020-elf.h: Likewise.
+	* config/m68k/m68kv4.h: Likewise.
+	* config/sh/elf.h: Likewise.
+	* config/m68k/m68kemb.h: Add comment about the its purpose.
+
 2001-12-11  Richard Henderson  <rth@redhat.com>
 
 	* objc/objc-act.c (build_constructor): Cast initializer values
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 10999d7c73cf..5144c162e25d 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1895,7 +1895,7 @@ m68k-*-coff*)
 	float_format=m68k
 	;;
 m68020-*-elf* | m68k-*-elf*)
-	tm_file="m68k/m68020-elf.h"
+	tm_file="m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
 	xm_defines=POSIX
 	tmake_file=m68k/t-m68kelf
 	header_files=math-68881.h
diff --git a/gcc/config/h8300/elf.h b/gcc/config/h8300/elf.h
index dcfb5e9f8a04..3b6db3b2d381 100644
--- a/gcc/config/h8300/elf.h
+++ b/gcc/config/h8300/elf.h
@@ -20,6 +20,7 @@
 
 #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
 
+#include "dbxelf.h"
 #include "elfos.h"
 
 
diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h
index f7bb8ae78fc5..9926329813e8 100644
--- a/gcc/config/m68k/linux.h
+++ b/gcc/config/m68k/linux.h
@@ -29,6 +29,7 @@ Boston, MA 02111-1307, USA.  */
 /* Make sure CC1 is undefined.  */
 #undef CC1_SPEC
 
+#include "dbxelf.h"
 #include "elfos.h"
 #include "svr4.h"
 #include <linux.h>		/* some common stuff */
diff --git a/gcc/config/m68k/m68020-elf.h b/gcc/config/m68k/m68020-elf.h
index ccf8a30e133b..07c3f813fc9e 100644
--- a/gcc/config/m68k/m68020-elf.h
+++ b/gcc/config/m68k/m68020-elf.h
@@ -21,12 +21,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* This comment is here to see if it will keep Sun's cpp from dying.  */
 
-#include "m68k/m68k-none.h"
-#include "m68k/m68kelf.h"
-#include "elfos.h"
-/* m68k/m68kemb.h sets some macros in ways that override the svr4 abi.  */
-#include "m68k/m68kemb.h" 
-
 /* We need to override the default specs from elfos.h.  This suppresses the
    loading of crt0.o by gcc's default linker spec.  For embedded targets crt0
    now comes from the linker script.  */
diff --git a/gcc/config/m68k/m68kemb.h b/gcc/config/m68k/m68kemb.h
index 2db87dd5a3b0..623a64c521b5 100644
--- a/gcc/config/m68k/m68kemb.h
+++ b/gcc/config/m68k/m68kemb.h
@@ -2,6 +2,8 @@
    This is meant to be included after m68k.h.
    Copyright (C) 1994, 1995, 1998, 1999 Free Software Foundation, Inc.  */
 
+/* Override the SVR4 ABI for this target.  */
+
 #define PTRDIFF_TYPE "long int"
 #define SIZE_TYPE "long unsigned int"
 
diff --git a/gcc/config/m68k/m68kv4.h b/gcc/config/m68k/m68kv4.h
index 4d26e4227311..13c303ccc17d 100644
--- a/gcc/config/m68k/m68kv4.h
+++ b/gcc/config/m68k/m68kv4.h
@@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA.  */
 /* TODO: convert includes to ${tm_file} list in config.gcc.  */
 #include "m68k/sgs.h"		/* The m68k/SVR4 assembler is SGS based */
 
+#include "dbxelf.h"
 #include "elfos.h"
 #include "svr4.h"		/* Pick up the generic SVR4 macros */
 
diff --git a/gcc/config/sh/elf.h b/gcc/config/sh/elf.h
index 7d392dc31e71..8ad74903e7a2 100644
--- a/gcc/config/sh/elf.h
+++ b/gcc/config/sh/elf.h
@@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Be ELF-like.  */
 /* TODO: convert includes to ${tm_file} list in config.gcc.  */
+#include "dbxelf.h"
 #include "elfos.h"
 #include "svr4.h"