re PR target/54160 (gcc should not define __OBJC2__ when lang is not set to ObjC...

	PR target/54160
	* config/t-darwin (darwin-c.o): Depend on $(CPP_INTERNAL_H).
	* config/darwin-c.c (darwin_cpp_builtins): Only set __OBJC2__
	when in obj mode.
	Include libcpp/internal.h.

From-SVN: r194227

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c261541e6ee463bf33dec5801696c8ade7e7d58d..652c05f75f586b8a88f4b66bf1673675055f3ceb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-05  Aldy Hernandez  <aldyh@redhat.com>
+
+       PR target/54160
+       * config/t-darwin (darwin-c.o): Depend on $(CPP_INTERNAL_H).
+       * config/darwin-c.c (darwin_cpp_builtins): Only set __OBJC2__ when
+       in obj mode.
+       Include libcpp/internal.h.
+
 2012-12-05  Michael Eager  <eager@eagercon.com>
 
        PR rtl-optimization/54739

diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
index 8e48c30575af03117c6c41ee98ed200e893b1326..ec8aa9ccf09d5fcf85c0fc7e3e5ad4a330013366 100644 (file)
--- a/gcc/config/darwin-c.c
+++ b/gcc/config/darwin-c.c
@@ -38,6 +38,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "c-family/c-target.h"
 #include "c-family/c-target-def.h"
 #include "cgraph.h"
+#include "../../libcpp/internal.h"
 
 /* Pragmas.  */
 
@@ -632,7 +633,7 @@ darwin_cpp_builtins (cpp_reader *pfile)
       builtin_define ("__weak=");
     }
 
-  if (flag_objc_abi == 2)
+  if (CPP_OPTION (pfile, objc) && flag_objc_abi == 2)
     builtin_define ("__OBJC2__");
 }
 

diff --git a/gcc/config/t-darwin b/gcc/config/t-darwin
index e2bd74d61b0e8e651525aae7bca17fc3a2caadf5..0e8346b6a890c256891db9d570d1a934d6b98dab 100644 (file)
--- a/gcc/config/t-darwin
+++ b/gcc/config/t-darwin
@@ -29,7 +29,7 @@ darwin.o: $(srcdir)/config/darwin.c $(CONFIG_H) $(SYSTEM_H) coretypes.h     \
 
 darwin-c.o: $(srcdir)/config/darwin-c.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
   $(TM_H) $(CPPLIB_H) $(TREE_H) $(C_PRAGMA_H) $(TM_P_H) \
-  incpath.h flags.h $(C_COMMON_H) $(C_TARGET_H) $(C_TARGET_DEF_H)
+  incpath.h flags.h $(C_COMMON_H) $(C_TARGET_H) $(C_TARGET_DEF_H) $(CPP_INTERNAL_H)
        $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
                $(srcdir)/config/darwin-c.c $(PREPROCESSOR_DEFINES)