rationalize libgcc stub & static lib linkage on Darwin 9 & 10.

	* config/darwin.h (REAL_LIBGCC_SPEC): Remove libgcc_s.10.5 stub for
	Darwin10.  Do not link libgcc.a for Darwin >= 9.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df93161..02fa0f8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-15  Iain Sandoe  <iains@gcc.gnu.org>
+
+       * config/darwin.h (REAL_LIBGCC_SPEC): Remove libgcc_s.10.5 stub for 
+       Darwin10.  Do not link libgcc.a for Darwin >= 9.
+
 2010-08-15  Gerald Pfeifer  <gerald@pfeifer.com>
 
        * doc/invoke.texi (Warning Options): Fix terminology and markup

diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index df73890..feb57c9 100644 (file)
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -406,15 +406,15 @@ extern GTY(()) int darwin_ms_struct;
    "%{static-libgcc|static: -lgcc_eh -lgcc;                               \
       shared-libgcc|fexceptions|fgnu-runtime:                             \
        %:version-compare(!> 10.5 mmacosx-version-min= -lgcc_s.10.4)       \
-       %:version-compare(>= 10.5 mmacosx-version-min= -lgcc_s.10.5)       \
+       %:version-compare(>< 10.5 10.6 mmacosx-version-min= -lgcc_s.10.5)   \
        %:version-compare(!> 10.5 mmacosx-version-min= -lgcc_ext.10.4)     \
        %:version-compare(>= 10.5 mmacosx-version-min= -lgcc_ext.10.5)     \
-       -lgcc;                                                             \
+       %:version-compare(< 10.5 mmacosx-version-min= -lgcc) ;             \
       :%:version-compare(>< 10.3.9 10.5 mmacosx-version-min= -lgcc_s.10.4) \
-       %:version-compare(>= 10.5 mmacosx-version-min= -lgcc_s.10.5)       \
+       %:version-compare(>< 10.5 10.6 mmacosx-version-min= -lgcc_s.10.5)   \
        %:version-compare(!> 10.5 mmacosx-version-min= -lgcc_ext.10.4)     \
        %:version-compare(>= 10.5 mmacosx-version-min= -lgcc_ext.10.5)     \
-       -lgcc}"
+       %:version-compare(< 10.5 mmacosx-version-min= -lgcc) }"
 
 /* We specify crt0.o as -lcrt0.o so that ld will search the library path.