From: Iain Sandoe <iains@gcc.gnu.org>
Date: Tue, 17 Aug 2010 14:54:10 +0000 (+0000)
Subject: only use _darwin10_Unwind_FindEnclosingFunction on darwin >= 10
X-Git-Tag: releases/gcc-4.6.0~4966
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2a1fcf0add4aaa44ac743278eacf623d9f39f62;p=thirdparty%2Fgcc.git

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 ff72674c46b7..61f3c19199e2 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 a672e936d5bd..75b404e09e98 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 301f8a1a13c8..c986c4d2ff65 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 61b2a6aa3d90..b2cf3cffb0d9 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.