From 29741d6ae5740e31ff7551bf97826b7b8e3c040a Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Tue, 4 Sep 2007 15:03:54 +0000 Subject: [PATCH] decl.c (java_init_decl_processing): Call "__cxa_end_cleanup" when using the ARM EABI. 2007-09-04 Andrew Haley * decl.c (java_init_decl_processing): Call "__cxa_end_cleanup" when using the ARM EABI. From-SVN: r128086 --- gcc/java/ChangeLog | 5 +++++ gcc/java/decl.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 0adcbdb2b60..6e27bb32369 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2007-09-04 Andrew Haley + + * decl.c (java_init_decl_processing): Call "__cxa_end_cleanup" + when using the ARM EABI. + 2007-09-03 Daniel Jacobowitz * Make-lang.in (jvspec.o): Remove SHLIB_MULTILIB. diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 8a6b0149ce5..5340617e1c3 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -1075,7 +1075,10 @@ java_init_decl_processing (void) eh_personality_libfunc = init_one_libfunc (USING_SJLJ_EXCEPTIONS ? "__gcj_personality_sj0" : "__gcj_personality_v0"); - default_init_unwind_resume_libfunc (); + if (targetm.arm_eabi_unwinder) + unwind_resume_libfunc = init_one_libfunc ("__cxa_end_cleanup"); + else + default_init_unwind_resume_libfunc (); lang_eh_runtime_type = do_nothing; -- 2.30.2