From 3828da842fac5c000ed715f75c2f68624308226d Mon Sep 17 00:00:00 2001
From: nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 26 Jul 2000 21:39:42 +0000
Subject: [PATCH] Remove definition of __arm__ from CPP_PREDEFINES

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35270 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog          |  3 +++
 gcc/config/arm/vxarm.h | 53 +++++++++++++++++++++++++-------------------------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b82d67dc48a..6e49eaaf871 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2000-07-26  Nick Clifton  <nickc@cygnus.com>
 
+	* config/arm/vxarm.h (CPP_PREDEFINES): Remove definition of
+	__arm__.  Allow it to be defined by CPP_ISA_SPEC in arm.h
+
 	* dwarf2out.c (dwarf2out_frame_debug_expr): Accept SEQUENCE as
 	well as PARALLEL blocks in FRAME_RELATED_EXPR notes.
 
diff --git a/gcc/config/arm/vxarm.h b/gcc/config/arm/vxarm.h
index 53381b937c0..1a5aad97482 100644
--- a/gcc/config/arm/vxarm.h
+++ b/gcc/config/arm/vxarm.h
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler,
    for ARM with targetting the VXWorks run time environment. 
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
    Contributed by: Mike Stump <mrs@wrs.com>
    
@@ -26,47 +26,46 @@ Boston, MA 02111-1307, USA.  */
 #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}} \
+#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)"
+#define CPP_PREDEFINES  "-D__vxworks -Acpu(arm) -Amachine(arm)"
 
 /* VxWorks does all the library stuff itself.  */
-
 #undef  LIB_SPEC
-#define LIB_SPEC ""
+#define LIB_SPEC 	""
 
 /* VxWorks uses object files, not loadable images.  make linker just
    combine objects. */
-
 #undef  LINK_SPEC
-#define LINK_SPEC "-r"
+#define LINK_SPEC 	"-r"
 
 /* VxWorks provides the functionality of crt0.o and friends itself.  */
-
 #undef  STARTFILE_SPEC
-#define STARTFILE_SPEC ""
+#define STARTFILE_SPEC 	""
 
 #undef  ENDFILE_SPEC
-#define ENDFILE_SPEC ""
+#define ENDFILE_SPEC 	""
 
 #undef  TARGET_VERSION
-#define TARGET_VERSION fputs (" (ARM/VxWorks)", stderr);
+#define TARGET_VERSION	fputs (" (ARM/VxWorks)", stderr);
 
 #undef  ASM_FILE_START
-#define ASM_FILE_START(STREAM) 					\
-do 								\
-{								\
-  fprintf (STREAM, "%s Generated by gcc %s for ARM/VxWorks\n",	\
-	   ASM_COMMENT_START, version_string);			\
-} while (0)
+#define ASM_FILE_START(STREAM) 						\
+  do 									\
+    {									\
+      fprintf (STREAM, "%s Generated by gcc %s for ARM/VxWorks\n",	\
+	       ASM_COMMENT_START, version_string);			\
+    }									\
+  while (0)
-- 
2.11.4.GIT