Replace the r122910 that was removed for Barolo, but still desired for Marble. Radar 8821989.
llvm-svn: 124690
diff --git a/llvm-gcc-4.2/gcc/ChangeLog.apple b/llvm-gcc-4.2/gcc/ChangeLog.apple
index 9adcb9d..a2b1b81 100644
--- a/llvm-gcc-4.2/gcc/ChangeLog.apple
+++ b/llvm-gcc-4.2/gcc/ChangeLog.apple
@@ -5,6 +5,13 @@
* doc/invoke.texi (Directory Options): Update --sysroot description to
refer Apple users to -isysroot.
+2010-08-13 Bob Wilson <bob.wilson@apple.com>
+
+ Radar 8307333
+ * config/i386/darwin.h (DARWIN_IPHONEOS_LIBGCC_SPEC): Do not link
+ against libgcc_s.10.5.dylib.
+ * config/rs6000/darwin.h (DARWIN_IPHONEOS_LIBGCC_SPEC): Likewise.
+
2010-06-28 Jim Grosbach <grosbach@apple.com>
Radar 7449793
diff --git a/llvm-gcc-4.2/gcc/config/i386/darwin.h b/llvm-gcc-4.2/gcc/config/i386/darwin.h
index 2202dcf..d0b1db1 100644
--- a/llvm-gcc-4.2/gcc/config/i386/darwin.h
+++ b/llvm-gcc-4.2/gcc/config/i386/darwin.h
@@ -138,8 +138,8 @@
#define DARWIN_DEFAULT_VERSION_TYPE DARWIN_VERSION_MACOSX
/* APPLE LOCAL end ARM 5683689 */
-/* APPLE LOCAL ARM 5681645 */
-#define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc_s.10.5 -lgcc"
+/* APPLE LOCAL ARM 5681645 8307333 */
+#define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc"
/* APPLE LOCAL begin link optimizations 6499452 */
#undef DARWIN_CRT1_SPEC
diff --git a/llvm-gcc-4.2/gcc/config/rs6000/darwin.h b/llvm-gcc-4.2/gcc/config/rs6000/darwin.h
index 8992c2a..ddf7a0f 100644
--- a/llvm-gcc-4.2/gcc/config/rs6000/darwin.h
+++ b/llvm-gcc-4.2/gcc/config/rs6000/darwin.h
@@ -168,8 +168,8 @@
#define DARWIN_DEFAULT_VERSION_TYPE DARWIN_VERSION_MACOSX
/* APPLE LOCAL end ARM 5683689 */
-/* APPLE LOCAL ARM 5681645 */
-#define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc_s.10.5 -lgcc"
+/* APPLE LOCAL ARM 5681645 8307333 */
+#define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc"
/* APPLE LOCAL begin 5342595 */
/* LLVM LOCAL begin */
