From 20b78b1cd46740ea58783ba06a68d12c335c065d Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@cygnus.com>
Date: Fri, 26 Mar 1999 16:09:24 +0000
Subject: [PATCH] Define SUBTARGET_CPU_DEFAULT before including arm/coff.h

From-SVN: r26002
---
 gcc/ChangeLog          |  2 ++
 gcc/config/arm/vxarm.h | 71 ++++++++++++++++++++++++++++++++----------
 2 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 97aa2176d61..1900e9439e3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -2,6 +2,8 @@ Fri Mar 26 16:02:37 1999  Nick Clifton  <nickc@cygnus.com>
 
 	* configure.in (arm-*-vxworks*): Just include arm/vxarm.h
 	* configure: Regenerate.
+	* config/arm/vxarm.h: Define SUBTARGET_CPU_DEFAULT before
+	including arm/coff.h
 
 1999-02-16  Scott Bambrough <scottb@corelcomputer.com>
 
diff --git a/gcc/config/arm/vxarm.h b/gcc/config/arm/vxarm.h
index 0707345e399..b42bbbec00c 100644
--- a/gcc/config/arm/vxarm.h
+++ b/gcc/config/arm/vxarm.h
@@ -1,36 +1,73 @@
-#undef SUBTARGET_CPP_SPEC
-#define SUBTARGET_CPP_SPEC      "%{march=arm710:-DCPU=ARM710A} \
-%{march=arm7tdmi:-DCPU=ARM7TDMI} \
-%{march=arm810:-DCPU=ARM810} \
-%{march=strongarm110:-DCPU=ARMSA110} \
-%{!march=*: \
- %{mcpu=arm710:-DCPU=ARM710A} \
- %{mcpu=arm7tdmi:-DCPU=ARM7TDMI} \
- %{mcpu=arm810:-DCPU=ARM810} \
- %{mcpu=strongarm110:-DCPU=ARMSA110}} \
-%{!mcpu*:%{!march=*:-DCPU=ARM710A}} \
-"
+/* Definitions of target machine for GNU compiler,
+   for ARM with targetting the VXWorks run time environment. 
+   Copyright (C) 1999 Free Software Foundation, Inc.
+
+   Contributed by: Mike Stump <mrs@wrs.com>
+   
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+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, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm710
 
-#undef CPP_PREDEFINES
+#include "arm/coff.h"
+
+#undef  SUBTARGET_CPP_SPEC
+#define SUBTARGET_CPP_SPEC      \
+"%{march=arm710:-DCPU=ARM710A} \
+ %{march=arm7tdmi:-DCPU=ARM7TDMI} \
+ %{march=arm810:-DCPU=ARM810} \
+ %{march=strongarm110:-DCPU=ARMSA110} \
+ %{!march=*: \
+  %{mcpu=arm710:-DCPU=ARM710A} \
+  %{mcpu=arm7tdmi:-DCPU=ARM7TDMI} \
+  %{mcpu=arm810:-DCPU=ARM810} \
+  %{mcpu=strongarm110:-DCPU=ARMSA110}} \
+  %{!mcpu*:%{!march=*:-DCPU=ARM710A}} \
+"
+#undef  CPP_PREDEFINES
 #define CPP_PREDEFINES  "-D__vxworks -D__arm__ -Acpu(arm) -Amachine(arm)"
 
 /* VxWorks does all the library stuff itself.  */
 
-#undef LIB_SPEC
+#undef  LIB_SPEC
 #define LIB_SPEC ""
 
 /* VxWorks uses object files, not loadable images.  make linker just
    combine objects. */
 
-#undef LINK_SPEC
+#undef  LINK_SPEC
 #define LINK_SPEC "-r"
 
 /* VxWorks provides the functionality of crt0.o and friends itself.  */
 
-#undef STARTFILE_SPEC
+#undef  STARTFILE_SPEC
 #define STARTFILE_SPEC ""
 
-#undef ENDFILE_SPEC
+#undef  ENDFILE_SPEC
 #define ENDFILE_SPEC ""
+
+#undef  TARGET_VERSION
+#define TARGET_VERSION fputs (" (ARM/VxWorks)", stderr);
+
+#undef  ASM_FILE_START
+#define ASM_FILE_START(STREAM) 					\
+do 								\
+{								\
+  extern char * version_string;					\
+  fprintf (STREAM, "%s Generated by gcc %s for ARM/VxWorks\n",	\
+	   ASM_COMMENT_START, version_string);			\
+} while (0)
-- 
2.30.2