From: Iain Sandoe <iains@gcc.gnu.org>
Date: Thu, 8 Sep 2011 09:20:12 +0000 (+0000)
Subject: part of restore of powerpc-darwin Ada bootstrap
X-Git-Tag: releases/gcc-4.7.0~3860
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88b7601303a76eae0d7b831014cba0ff96360e73;p=thirdparty%2Fgcc.git

part of restore of powerpc-darwin Ada bootstrap

	* traceback.c (Darwin) USE_GCC_UNWINDER for Darwin
	versions >= 8.

From-SVN: r178682
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index da25c7249173..d1c5204e2dff 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-08  Iain Sandoe  <iains@gcc.gnu.org>
+
+	* traceback.c (Darwin) USE_GCC_UNWINDER for Darwin
+	versions >= 8.
+
 2011-09-07  Iain Sandoe  <iains@gcc.gnu.org>
 
 	* gcc-interface/Makefile.in (darwin): Provide powerpc64 system 
diff --git a/gcc/ada/tracebak.c b/gcc/ada/tracebak.c
index a8a200d44869..ea7bbfe51c3e 100644
--- a/gcc/ada/tracebak.c
+++ b/gcc/ada/tracebak.c
@@ -203,9 +203,23 @@ extern void (*Unlock_Task) (void);
 
   */
 
-/*--------------------------- PPC AIX/Darwin ----------------------------*/
+/*------------------- Darwin 8 (OSX 10.4) or newer ----------------------*/
+#if defined (__APPLE__) \
+    && defined (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) \
+    && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1040
+ 
+#define USE_GCC_UNWINDER
+
+#if defined (__i386__) || defined (__x86_64__)
+#define PC_ADJUST -2
+#elif defined (__ppc__) || defined (__ppc64__)
+#define PC_ADJUST -4
+#else
+#error Unhandled darwin architecture.
+#endif
 
-#if ((defined (_POWER) && defined (_AIX)) || \
+/*------------------------ PPC AIX/Older Darwin -------------------------*/
+#elif ((defined (_POWER) && defined (_AIX)) || \
 (defined (__ppc__) && defined (__APPLE__)))
 
 #define USE_GENERIC_UNWINDER