diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df9316115e6..02fa0f869ed 100644
--- 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 df73890bdd0..feb57c9feb7 100644
--- 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.