diff options
| author | Iain Sandoe <iains@gcc.gnu.org> | 2010-08-17 14:54:10 +0000 |
|---|---|---|
| committer | Iain Sandoe <iains@gcc.gnu.org> | 2010-08-17 14:54:10 +0000 |
| commit | e2a1fcf0add4aaa44ac743278eacf623d9f39f62 (patch) | |
| tree | 6a46c3798cdc661bf0271c9a57d55f4961210cbb | |
| parent | 2642f659a685886012ce45f1e04b82232878fc5a (diff) | |
| download | gcc-e2a1fcf0add4aaa44ac743278eacf623d9f39f62.zip gcc-e2a1fcf0add4aaa44ac743278eacf623d9f39f62.tar.gz gcc-e2a1fcf0add4aaa44ac743278eacf623d9f39f62.tar.bz2 | |
only use _darwin10_Unwind_FindEnclosingFunction on darwin >= 10
gcc:
* unwind-dw2-fde-darwin.c (_darwin10_Unwind_FindEnclosingFunction):
Dunmmy function with NULL return unless the target is
OSX >= 10.6 (Darwin10).
libjava:
* include/posix.h: Make substitution of
_darwin10_Unwind_FindEnclosingFunction conditional on
OSX >= 10.6 (Darwin10).
From-SVN: r163309
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/unwind-dw2-fde-darwin.c | 7 | ||||
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/include/posix.h | 6 |
4 files changed, 19 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ff72674..61f3c19 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-08-17 Iain Sandoe <iains@gcc.gnu.org> + + * unwind-dw2-fde-darwin.c (_darwin10_Unwind_FindEnclosingFunction): + Dunmmy function with NULL return unless the target is + OSX >= 10.6 (Darwin10). + 2010-08-17 Jack Howarth <howarth@bromo.med.uc.edu> * gcc.c (spec_function): Add remove-outfile. diff --git a/gcc/unwind-dw2-fde-darwin.c b/gcc/unwind-dw2-fde-darwin.c index a672e93..75b404e 100644 --- a/gcc/unwind-dw2-fde-darwin.c +++ b/gcc/unwind-dw2-fde-darwin.c @@ -276,13 +276,14 @@ _Unwind_Find_FDE (void *pc, struct dwarf_eh_bases *bases) } void * -_darwin10_Unwind_FindEnclosingFunction (void *pc) +_darwin10_Unwind_FindEnclosingFunction (void *pc ATTRIBUTE_UNUSED) { +#if __MACH__ && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060) struct dwarf_eh_bases bases; const struct dwarf_fde *fde = _Unwind_Find_FDE (pc-1, &bases); if (fde) return bases.func; - else - return NULL; +#endif + return NULL; } diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 301f8a1..c986c4d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2010-08-17 Iain Sandoe <iains@gcc.gnu.org> + + * include/posix.h: Make substitution of + _darwin10_Unwind_FindEnclosingFunction conditional on + OSX >= 10.6 (Darwin10). + 2010-08-12 Tom Tromey <tromey@redhat.com> * gnu/java/security/jce/prng/natVMSecureRandomWin32.cc diff --git a/libjava/include/posix.h b/libjava/include/posix.h index 61b2a6a..b2cf3cf 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -56,9 +56,9 @@ details. */ #define _Jv_platform_solib_suffix ".so" #endif -#if defined(__APPLE__) && defined(__MACH__) -#undef _Unwind_FindEnclosingFunction -#define _Unwind_FindEnclosingFunction(PC) _darwin10_Unwind_FindEnclosingFunction(PC) +#if __MACH__ && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060) +# 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. |