aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorJack Howarth <howarth@bromo.med.uc.edu>2010-02-02 08:19:26 +0000
committerAndreas Tobler <andreast@gcc.gnu.org>2010-02-02 09:19:26 +0100
commit4546b861fba352876c796c09ce323090a96f9725 (patch)
treea4940819e0c8ae92163e5af2cbaab99a47b16b55 /libjava
parent1bcb71c4595c9cb2d61cdf2691edbbd3a589da71 (diff)
downloadgcc-4546b861fba352876c796c09ce323090a96f9725.zip
gcc-4546b861fba352876c796c09ce323090a96f9725.tar.gz
gcc-4546b861fba352876c796c09ce323090a96f9725.tar.bz2
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 * include/posix.h: Redefine _Unwind_FindEnclosingFunction. From-SVN: r156446
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 3a9b462..63b40fc 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 5f522a3..61b2a6a 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)