diff options
| author | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-08-17 14:54:10 +0000 |
|---|---|---|
| committer | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-08-17 14:54:10 +0000 |
| commit | d6668429c36038c9b649350b124f10a54302ba86 (patch) | |
| tree | 6a46c3798cdc661bf0271c9a57d55f4961210cbb /gcc/unwind-dw2-fde-darwin.c | |
| parent | 8127ab5d0f776e36ccac421e711bf66a73a73641 (diff) | |
| download | gcc-d6668429c36038c9b649350b124f10a54302ba86.tar.gz | |
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).
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163309 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/unwind-dw2-fde-darwin.c')
| -rw-r--r-- | gcc/unwind-dw2-fde-darwin.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/unwind-dw2-fde-darwin.c b/gcc/unwind-dw2-fde-darwin.c index a672e936d5b..75b404e09e9 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; } |