OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR target/54160 (gcc should not define __OBJC2__ when lang is not set to ObjC (gcc 4.6 and later)) 

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
This commit is contained in:
Aldy Hernandez 2012-12-05 21:10:18 +00:00 committed by Aldy Hernandez
parent b08c12cb46
commit 833fe7dadc
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -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

3
gcc/config/darwin-c.c
View File

@ -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__");
}

2
gcc/config/t-darwin
View File

@ -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)