From: Jack Howarth <howarth@bromo.med.uc.edu>
Date: Tue, 2 Feb 2010 08:18:08 +0000 (+0000)
Subject: re PR java/41991 (gcj segfaults on i686-apple-darwin9 and x86_64-apple-darwin9)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fc15bd031910e85fde8856fa32e4f79efdf0478a;p=gcc.git

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 0755576afa6..68ad754ce71 100644
--- 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
index 00000000000..47631749dc2
--- /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 cd00ea22f4c..6245ed31979 100644
--- 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;
+}
+