summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorandreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4>2010-02-02 08:19:26 +0000
committerandreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4>2010-02-02 08:19:26 +0000
commit8fd7574d73e1accd8ee99d2f8524568cffc41c0c (patch)
treea4940819e0c8ae92163e5af2cbaab99a47b16b55 /libjava
parent14a107634ff592f486c76560cf1ffd7d81acb59f (diff)
downloadgcc-8fd7574d73e1accd8ee99d2f8524568cffc41c0c.tar.gz
2010-02-02 Jack Howarth <howarth@bromo.med.uc.edu>
PR java/41991 * include/posix.h: Redefine _Unwind_FindEnclosingFunction. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156446 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/include/posix.h5
2 files changed, 10 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3a9b46263f6..63b40fc017f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-02 Jack Howarth <howarth@bromo.med.uc.edu>
+
+ PR java/41991
+ * include/posix.h: Redefine _Unwind_FindEnclosingFunction.
+
2010-01-26 Andrew Haley <aph@redhat.com>
* java/lang/natClass.cc (registerClosure): Make sure closures is
diff --git a/libjava/include/posix.h b/libjava/include/posix.h
index 5f522a3804a..61b2a6aa3d9 100644
--- a/libjava/include/posix.h
+++ b/libjava/include/posix.h
@@ -56,6 +56,11 @@ details. */
#define _Jv_platform_solib_suffix ".so"
#endif
+#if defined(__APPLE__) && defined(__MACH__)
+#undef _Unwind_FindEnclosingFunction
+#define _Unwind_FindEnclosingFunction(PC) _darwin10_Unwind_FindEnclosingFunction(PC)
+#endif
+
// Some POSIX systems don't have O_SYNC and O_DYSNC so we define them here.
// Needed in java/io/natFileDescriptorPosix.cc.
#if !defined (O_SYNC) && defined (O_FSYNC)