re PR java/41991 (gcj segfaults on i686-apple-darwin9 and x86_64-apple-darwin9)

2010-02-02  Jack Howarth  <howarth@bromo.med.uc.edu>

	PR java/41991
	* unwind-dw2-fde-darwin.c: Re-export _Unwind_FindEnclosingFunction()
	as _darwin10_Unwind_FindEnclosingFunction().
	* libgcc-libsystem.ver: New.

From-SVN: r156444

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0755576afa69fe04ec4a2ead695c98c299064b8f..68ad754ce711d6b6446097ecacbe2e11d679e3f6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-02  Jack Howarth  <howarth@bromo.med.uc.edu>
+
+       PR java/41991
+       * unwind-dw2-fde-darwin.c: Re-export _Unwind_FindEnclosingFunction()
+       as _darwin10_Unwind_FindEnclosingFunction().
+       * libgcc-libsystem.ver: New.
+
 2010-02-01  Vladimir Makarov  <vmakarov@redhat.com>
 
        PR target/41399

diff --git a/gcc/libgcc-libsystem.ver b/gcc/libgcc-libsystem.ver
new file mode 100644 (file)
index 0000000..4763174
--- /dev/null
+++ b/gcc/libgcc-libsystem.ver
@@ -0,0 +1 @@
+_darwin10_Unwind_FindEnclosingFunction

diff --git a/gcc/unwind-dw2-fde-darwin.c b/gcc/unwind-dw2-fde-darwin.c
index cd00ea22f4cb7f9824abccda944474d2f33ef2c1..6245ed31979b534d24075e43c436850951af6def 100644 (file)
--- a/gcc/unwind-dw2-fde-darwin.c
+++ b/gcc/unwind-dw2-fde-darwin.c
@@ -273,3 +273,15 @@ _Unwind_Find_FDE (void *pc, struct dwarf_eh_bases *bases)
                                          the_obj_info);
   return ret;
 }
+
+void *
+_darwin10_Unwind_FindEnclosingFunction (void *pc)
+{
+  struct dwarf_eh_bases bases;
+  const struct dwarf_fde *fde = _Unwind_Find_FDE (pc-1, &bases);
+  if (fde)
+    return bases.func;
+  else
+    return NULL;
+}
+