From 9cd598aa72d6ea43a953037ad51ed6cbab1b068a Mon Sep 17 00:00:00 2001
From: Nathanael Nerode <neroden@gcc.gnu.org>
Date: Mon, 16 Jun 2003 22:38:25 +0000
Subject: [PATCH] config.gcc: Explicitly mention elfos.h in ip2k entry.

	* config.gcc: Explicitly mention elfos.h in ip2k entry.
	* config/ip2k/ip2k.h: Don't #include it here.

From-SVN: r68045
---
 gcc/ChangeLog          | 5 +++++
 gcc/config.gcc         | 1 +
 gcc/config/ip2k/ip2k.h | 5 +----
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index debc696c52e2..9157b8ab7106 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-16  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* config.gcc: Explicitly mention elfos.h in ip2k entry.
+	* config/ip2k/ip2k.h: Don't #include it here.
+
 2003-06-16  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* bitmap.c, builtins.c, c-incpath.c, cgraph.c, config/frv/frv.c,
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 21a3a8fcfca7..e7e5313e0e3f 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1273,6 +1273,7 @@ ia64*-*-hpux*)
 	cxx_target_objs="ia64-c.o"
 	;;
 ip2k-*-elf)
+	tm_file="elfos.h ${tm_file}"
 	;;
 m32r-*-elf*)
 	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
diff --git a/gcc/config/ip2k/ip2k.h b/gcc/config/ip2k/ip2k.h
index 937cf4bba691..a03a2cbc2e24 100644
--- a/gcc/config/ip2k/ip2k.h
+++ b/gcc/config/ip2k/ip2k.h
@@ -22,10 +22,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-/* Set up System V.4 (aka ELF) defaults.  */
-
-#include "elfos.h"
-#undef ASM_SPEC			/* But we have a GAS assembler.  */
+#undef ASM_SPEC	/* We have a GAS assembler.  */
 
 #define TARGET_CPU_CPP_BUILTINS()		\
   do						\
-- 
GitLab