diff options
Diffstat (limited to 'gcc/objcp')
| -rw-r--r-- | gcc/objcp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/objcp/Make-lang.in | 2 | ||||
| -rw-r--r-- | gcc/objcp/objcp-lang.c | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog index e7fe12b..c1012ec 100644 --- a/gcc/objcp/ChangeLog +++ b/gcc/objcp/ChangeLog @@ -1,3 +1,9 @@ +2010-09-28 Richard Henderson <rth@redhat.com> + + * objcp-lang.c: Include "target.h". + (objcxx_eh_personality): Use targetm.except_unwind_info. + * Make-lang.in (objcp-lang.o): Update deps. + 2010-09-21 Nicola Pero <nicola.pero@meta-innovation.com> PR objc/25965 diff --git a/gcc/objcp/Make-lang.in b/gcc/objcp/Make-lang.in index 22dc30f..0849a89 100644 --- a/gcc/objcp/Make-lang.in +++ b/gcc/objcp/Make-lang.in @@ -73,7 +73,7 @@ cc1objplus$(exeext): $(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) $(LIBDEPS) objcp/objcp-lang.o : objcp/objcp-lang.c \ $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(CXX_TREE_H) \ $(C_COMMON_H) $(LANGHOOKS_DEF_H) objc/objc-act.h cp/cp-objcp-common.h \ - gtype-objcp.h + $(TARGET_H) gtype-objcp.h objcp/objcp-decl.o : objcp/objcp-decl.c \ $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(CXX_TREE_H) \ diff --git a/gcc/objcp/objcp-lang.c b/gcc/objcp/objcp-lang.c index 70a605b..fdb2976 100644 --- a/gcc/objcp/objcp-lang.c +++ b/gcc/objcp/objcp-lang.c @@ -29,6 +29,7 @@ along with GCC; see the file COPYING3. If not see #include "objc-act.h" #include "langhooks.h" #include "langhooks-def.h" +#include "target.h" #include "cp-objcp-common.h" enum c_language_kind c_language = clk_objcxx; @@ -147,7 +148,7 @@ objcxx_eh_personality (void) { if (!objcp_eh_personality_decl) objcp_eh_personality_decl - = build_personality_function (USING_SJLJ_EXCEPTIONS + = build_personality_function (targetm.except_unwind_info () == UI_SJLJ ? "__gxx_personality_sj0" : "__gxx_personality_v0"); |