From 4546b861fba352876c796c09ce323090a96f9725 Mon Sep 17 00:00:00 2001 From: Jack Howarth Date: Tue, 2 Feb 2010 08:19:26 +0000 Subject: re PR java/41991 (gcj segfaults on i686-apple-darwin9 and x86_64-apple-darwin9) 2010-02-02 Jack Howarth PR java/41991 * include/posix.h: Redefine _Unwind_FindEnclosingFunction. From-SVN: r156446 --- libjava/ChangeLog | 5 +++++ libjava/include/posix.h | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'libjava') 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 + + PR java/41991 + * include/posix.h: Redefine _Unwind_FindEnclosingFunction. + 2010-01-26 Andrew Haley * 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) -- cgit v1.1