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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ff72674c46b72d63d775a8adc0caa1c4e4423bc0..61f3c19199e20868e5da0a2a1623f3624ae376de 100644 (file)
--- 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 a672e936d5bdf0f1cef956f896a982caef9f9ff4..75b404e09e98646fa95460871cd91fe9d1fb51b1 100644 (file)
--- 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 301f8a1a13c8d016626f0946675cce66f6174345..c986c4d2ff65787e0d5a4c0cca4eccfcd2bc0a5d 100644 (file)
--- 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 61b2a6aa3d900b3c3a460e9672d1b43d4004b89f..b2cf3cffb0d95a32925d0a6fbac3fe61a79b5795 100644 (file)
--- 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.