alpha.h (TARGET_CPU_CPP_BUILTINS): Move language- related defines to...

* config/alpha/alpha.h (TARGET_CPU_CPP_BUILTINS): Move language-
related defines to...
(SUBTARGET_LANGUAGE_CPP_BUILTINS): ...here.
* config/alpha/netbsd.h (SUBTARGET_LANGUAGE_CPP_BUILTINS): Redefine
as a no-op.

From-SVN: r56684

gcc/ChangeLog

+2002-08-30  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config/alpha/alpha.h (TARGET_CPU_CPP_BUILTINS): Move language-
+	related defines to...
+	(SUBTARGET_LANGUAGE_CPP_BUILTINS): ...here.
+	* config/alpha/netbsd.h (SUBTARGET_LANGUAGE_CPP_BUILTINS): Redefine
+	as a no-op.
+
 2002-08-30  Krister Walfridsson  <cato@df.lth.se>
 
 	* config/arm/arm.c (arm_asm_output_labelref): New function.

gcc/config/alpha/alpha.h

@@ -69,22 +69,31 @@ Boston, MA 02111-1307, USA.  */
 	  builtin_define ("_IEEE_FP_INEXACT");		\
 							\
 	/* Macros dependent on the C dialect.  */	\
-	if (preprocessing_asm_p ())			\
-	  builtin_define_std ("LANGUAGE_ASSEMBLY");	\
-        else if (c_language == clk_c)			\
-	  builtin_define_std ("LANGUAGE_C");		\
-	else if (c_language == clk_cplusplus)		\
-	  {						\
-	    builtin_define ("__LANGUAGE_C_PLUS_PLUS");	\
-	    builtin_define ("__LANGUAGE_C_PLUS_PLUS__");\
-	  }						\
-	if (flag_objc)					\
-	  {						\
-	    builtin_define ("__LANGUAGE_OBJECTIVE_C");	\
-	    builtin_define ("__LANGUAGE_OBJECTIVE_C__");\
-	  }						\
+	SUBTARGET_LANGUAGE_CPP_BUILTINS();		\
 } while (0)
 
+#ifndef SUBTARGET_LANGUAGE_CPP_BUILTINS
+#define SUBTARGET_LANGUAGE_CPP_BUILTINS()		\
+  do							\
+    {							\
+      if (preprocessing_asm_p ())			\
+	builtin_define_std ("LANGUAGE_ASSEMBLY");	\
+      else if (c_language == clk_c)			\
+	builtin_define_std ("LANGUAGE_C");		\
+      else if (c_language == clk_cplusplus)		\
+	{						\
+	  builtin_define ("__LANGUAGE_C_PLUS_PLUS");	\
+	  builtin_define ("__LANGUAGE_C_PLUS_PLUS__");	\
+	}						\
+      if (flag_objc)					\
+	{						\
+	  builtin_define ("__LANGUAGE_OBJECTIVE_C");	\
+	  builtin_define ("__LANGUAGE_OBJECTIVE_C__");	\
+	}						\
+    }							\
+  while (0)
+#endif
+
 #define CPP_SPEC "%(cpp_subtarget)"
 
 #ifndef CPP_SUBTARGET_SPEC

gcc/config/alpha/netbsd.h

@@ -28,6 +28,12 @@ Boston, MA 02111-1307, USA.  */
 	NETBSD_OS_CPP_BUILTINS_LP64();		\
     } while (0)
 
+
+/* NetBSD doesn't use the LANGUAGE* built-ins.  */
+#undef SUBTARGET_LANGUAGE_CPP_BUILTINS
+#define SUBTARGET_LANGUAGE_CPP_BUILTINS()	/* nothing */
+
+
 /* Show that we need a GP when profiling.  */
 #undef TARGET_PROFILING_NEEDS_GP
 #define TARGET_PROFILING_NEEDS_GP 1