diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a1cf4098025..7ed9a4452d0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-10  Ziemowit Laski  <zlaski@apple.com>
+
+	* config/alpha/alpha.h (TARGET_CPU_CPP_BUILTINS): Replace
+	reference to clk_objective_c with flag_objc.
+	* config/i386/i386-interix.h (TARGET_OS_CPP_BUILTINS):
+	Likewise.
+	* config/mips/mips.h (TARGET_CPU_CPP_BUILTINS): Likewise.
+
 2002-08-10  Neil Booth  <neil@daikokuya.co.uk>
 
 	* c-opts.c (set_std_cxx98, set_std_c89): New.
diff --git a/gcc/config/alpha/alpha.h b/gcc/config/alpha/alpha.h
index cdba117fabc..fa3294ae593 100644
--- a/gcc/config/alpha/alpha.h
+++ b/gcc/config/alpha/alpha.h
@@ -78,7 +78,7 @@ Boston, MA 02111-1307, USA.  */
 	    builtin_define ("__LANGUAGE_C_PLUS_PLUS");	\
 	    builtin_define ("__LANGUAGE_C_PLUS_PLUS__");\
 	  }						\
-	else if (c_language == clk_objective_c)		\
+	if (flag_objc)					\
 	  {						\
 	    builtin_define ("__LANGUAGE_OBJECTIVE_C");	\
 	    builtin_define ("__LANGUAGE_OBJECTIVE_C__");\
diff --git a/gcc/config/i386/i386-interix.h b/gcc/config/i386/i386-interix.h
index d80538f86b9..02842238bb6 100644
--- a/gcc/config/i386/i386-interix.h
+++ b/gcc/config/i386/i386-interix.h
@@ -72,7 +72,7 @@ Boston, MA 02111-1307, USA.  */
 	     builtin_define_std ("LANGUAGE_C");				\
 	     if (c_language == clk_cplusplus)				\
 	       builtin_define_std ("LANGUAGE_C_PLUS_PLUS");		\
-	     else if (c_language == clk_objective_c)			\
+	     if (flag_objc)						\
 	       builtin_define_std ("LANGUAGE_OBJECTIVE_C");		\
 	  } 								\
     }									\
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index eaf68528911..01a42f4acb5 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -488,7 +488,7 @@ extern void		sbss_section PARAMS ((void));
           builtin_define ("__LANGUAGE_C_PLUS_PLUS");		\
           builtin_define ("__LANGUAGE_C_PLUS_PLUS__");		\
         }							\
-      else if (c_language == clk_objective_c)			\
+      if (flag_objc)						\
         {							\
 	  builtin_define ("_LANGUAGE_OBJECTIVE_C");		\
           builtin_define ("__LANGUAGE_OBJECTIVE_C");		\