Rewind Morbo branch to llvmgcc42-2335.6 tag.
llvm-svn: 124568
diff --git a/llvm-gcc-4.2/gcc/ChangeLog.apple b/llvm-gcc-4.2/gcc/ChangeLog.apple
index a2b1b81..9adcb9d 100644
--- a/llvm-gcc-4.2/gcc/ChangeLog.apple
+++ b/llvm-gcc-4.2/gcc/ChangeLog.apple
@@ -5,13 +5,6 @@
* 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 d0b1db1..2202dcf 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 8307333 */
-#define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc"
+/* APPLE LOCAL ARM 5681645 */
+#define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc_s.10.5 -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 ddf7a0f..8992c2a 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 8307333 */
-#define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc"
+/* APPLE LOCAL ARM 5681645 */
+#define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc_s.10.5 -lgcc"
/* APPLE LOCAL begin 5342595 */
/* LLVM LOCAL begin */
