summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/config/v850/v850.h11
-rw-r--r--gcc/config/v850/xm-v850.h2
3 files changed, 15 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fbed64afa57..238bdde5d4f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+Mon Oct 20 15:30:26 1997 Nick Clifton <nickc@cygnus.com>
+
+ * v850.h: Move define of __v850__ from CPP_PREDEFINES
+ to CPP_SPEC.
+
+ * xm-v850.h: Use __v850 rather than __v850__ to
+ identify v850 port.
+
Mon Oct 20 14:15:02 1997 Jim Wilson <wilson@cygnus.com>
* mips/mips.c (compute_frame_size): Not a leaf function if
diff --git a/gcc/config/v850/v850.h b/gcc/config/v850/v850.h
index 00e6fd1da51..063cf698e69 100644
--- a/gcc/config/v850/v850.h
+++ b/gcc/config/v850/v850.h
@@ -20,11 +20,15 @@ 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. */
-#include "svr4.h"
+#include "svr4.h" /* Automatically does #undef CPP_PREDEFINES */
#undef ASM_SPEC
#define ASM_SPEC "%{mv*:-mv%*}"
+#ifndef CPP_SPEC
+#define CPP_SPEC "-D__v850__"
+#endif
+
#undef ASM_FINAL_SPEC
#undef LIB_SPEC
#undef ENDFILE_SPEC
@@ -32,10 +36,7 @@ Boston, MA 02111-1307, USA. */
#undef STARTFILE_SPEC
/* Names to predefine in the preprocessor for this target machine. */
-
-#ifndef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__v850__ -D__v851__ -D__v850"
-#endif
+#define CPP_PREDEFINES "-D__v851__ -D__v850"
/* Print subsidiary information on the compiler version in use. */
diff --git a/gcc/config/v850/xm-v850.h b/gcc/config/v850/xm-v850.h
index a9f25b5faea..1e43d033f6f 100644
--- a/gcc/config/v850/xm-v850.h
+++ b/gcc/config/v850/xm-v850.h
@@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA. */
#define SUCCESS_EXIT_CODE 0
#define FATAL_EXIT_CODE 33
-#ifdef __v850__
+#ifdef __v850
#ifndef __STDC__
extern char *malloc (), *realloc (), *calloc ();
#else