2011-02-07 Iain Sandoe <iains@gcc.gnu.org>

	PR target/47558
	* config/darwin10.h (LINK_GCC_C_SEQUENCE_SPEC): Put -lSystem first
	on 10.6 and later to ensure that we always use the unwinder from
	the system.  Only add -no_compact_unwind when tarteting darwin
	10.6 or later.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169905 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fd78ff5..205c781 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-07  Iain Sandoe  <iains@gcc.gnu.org>
+
+       PR target/47558
+       * config/darwin10.h (LINK_GCC_C_SEQUENCE_SPEC): Put -lSystem first
+       on 10.6 and later to ensure that we always use the unwinder from
+       the system.  Only add -no_compact_unwind when tarteting darwin
+       10.6 or later.
+
 2011-02-07  Steve Ellcey  <sje@cup.hp.com>
 
        PR target/46997

diff --git a/gcc/config/darwin10.h b/gcc/config/darwin10.h
index 50f8e1b..5c20594 100644 (file)
--- a/gcc/config/darwin10.h
+++ b/gcc/config/darwin10.h
@@ -1,5 +1,5 @@
 /* Target definitions for Darwin (Mac OS X) systems.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
    Contributed by Jack Howarth <howarth@bromo.med.uc.edu>.
 
 This file is part of GCC.
@@ -18,8 +18,15 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
+#undef LIB_SPEC
+#define LIB_SPEC "%{!static: -lSystem }"
+
 /* Fix PR41260 by passing -no_compact_unwind on darwin10 and later until
-unwinder in libSystem is fixed to digest new epilog unwinding notes. */
+   unwinder in libSystem is fixed to digest new epilog unwinding notes.
 
-#undef LIB_SPEC
-#define LIB_SPEC "%{!static:-no_compact_unwind -lSystem}"
+   Fix PR47558 by linking against libSystem ahead of libgcc_ext. */
+#undef  LINK_GCC_C_SEQUENCE_SPEC
+#define LINK_GCC_C_SEQUENCE_SPEC \
+"%:version-compare(>= 10.6 mmacosx-version-min= -no_compact_unwind) \
+   %{!static:%{!static-libgcc: \
+      %:version-compare(>= 10.6 mmacosx-version-min= -lSystem) } } %G %L"