Index: config/sparc/freebsd.h
===================================================================
RCS file: /usr/download/ncvs/src/contrib/gcc/config/sparc/freebsd.h,v
retrieving revision 1.10
diff -u -r1.10 freebsd.h
--- config/sparc/freebsd.h	24 May 2004 00:51:23 -0000	1.10
+++ config/sparc/freebsd.h	16 Jul 2004 02:24:25 -0000
@@ -31,6 +31,26 @@
 #define CPP_CPU64_DEFAULT_SPEC \
   "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__sparc__ -D__arch64__"
 
+/* Target CPU builtins.  Override version from sparc.h. We don't want
+   sparc nor __sparc defined. */
+#undef  TARGET_CPU_CPP_BUILTINS
+#define TARGET_CPU_CPP_BUILTINS()		\
+  do						\
+    {						\
+	builtin_define_std ("__sparc__");	\
+	if (TARGET_64BIT)			\
+	  { 					\
+	    builtin_assert ("cpu=sparc64");	\
+	    builtin_assert ("machine=sparc64");	\
+	  }					\
+	else					\
+	  { 					\
+	    builtin_assert ("cpu=sparc");	\
+	    builtin_assert ("machine=sparc");	\
+	  }					\
+    }						\
+  while (0)
+
 #undef  FBSD_TARGET_CPU_CPP_BUILTINS
 #define FBSD_TARGET_CPU_CPP_BUILTINS()		\
   do						\