OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

only use _darwin10_Unwind_FindEnclosingFunction on darwin >= 10

Browse Source 
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
This commit is contained in:
Iain Sandoe 2010-08-17 14:54:10 +00:00
parent 2642f659a6
commit e2a1fcf0ad
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -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.

7
gcc/unwind-dw2-fde-darwin.c
View File

@ -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;
}

6
libjava/ChangeLog
View File

@ -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

6
libjava/include/posix.h
View File

@ -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.