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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index debc696..9157b8a 100644 (file)
--- 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 21a3a8f..e7e5313 100644 (file)
--- 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 937cf4b..a03a2cb 100644 (file)
--- 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.  */
 
 \f
-/* 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                                           \