aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog6
-rw-r--r--gcc/java/Make-lang.in3
-rw-r--r--gcc/java/lang.c3
3 files changed, 10 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 664cd32..97192a2 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-28 Richard Henderson <rth@redhat.com>
+
+ * lang.c: Include "target.h".
+ (java_eh_personality): Use targetm.except_unwind_info.
+ * Make-lang.in (lang.o): Update deps.
+
2010-09-27 Andrew Haley <aph@redhat.com>
PR java/45773
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 7d2a6a3..0c91c37 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -302,7 +302,8 @@ java/jvgenmain.o: java/jvgenmain.c $(CONFIG_H) $(JAVA_TREE_H) $(SYSTEM_H) \
coretypes.h $(TM_H) intl.h
java/lang.o: java/lang.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h input.h \
toplev.h $(SYSTEM_H) coretypes.h $(TM_H) $(DIAGNOSTIC_H) \
- langhooks.h $(LANGHOOKS_DEF_H) gt-java-lang.h opts.h options.h
+ langhooks.h $(LANGHOOKS_DEF_H) gt-java-lang.h opts.h options.h \
+ $(TARGET_H)
java/mangle.o: java/mangle.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) $(SYSTEM_H) \
coretypes.h $(TM_H) toplev.h $(GGC_H) gt-java-mangle.h $(LANGHOOKS_DEF_H)
java/mangle_name.o: java/mangle_name.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) \
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 1633c02..78f9715 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -43,6 +43,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "tree-dump.h"
#include "opts.h"
#include "options.h"
+#include "target.h"
static bool java_init (void);
static void java_finish (void);
@@ -902,7 +903,7 @@ java_eh_personality (void)
{
if (!java_eh_personality_decl)
java_eh_personality_decl
- = build_personality_function (USING_SJLJ_EXCEPTIONS
+ = build_personality_function (targetm.except_unwind_info () == UI_SJLJ
? "__gcj_personality_sj0"
: "__gcj_personality_v0");