[llvm-commits] [llvm-gcc-4.2] r111048 - in /llvm-gcc-4.2/trunk/gcc: ChangeLog.apple config/i386/darwin.h config/rs6000/darwin.h

[Bob Wilson]

Author: bwilson
Date: Fri Aug 13 17:08:58 2010
New Revision: 111048

URL: http://llvm.org/viewvc/llvm-project?rev=111048&view=rev
Log:
Radar 8309184: Merge fix for <rdar://problem/8307333> from gcc-4.2.

Modified:
    llvm-gcc-4.2/trunk/gcc/ChangeLog.apple
    llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h
    llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h

Modified: llvm-gcc-4.2/trunk/gcc/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ChangeLog.apple?rev=111048&r1=111047&r2=111048&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/ChangeLog.apple (original)
+++ llvm-gcc-4.2/trunk/gcc/ChangeLog.apple Fri Aug 13 17:08:58 2010
@@ -1,3 +1,10 @@
+2010-08-13  Bob Wilson  <bob.wilson at 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-08-06  Jim Grosbach <grosbach at apple.com>
 
 	* config/arm/arm.c(arm_override_options): v7m only has thumb mode.

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h?rev=111048&r1=111047&r2=111048&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h Fri Aug 13 17:08:58 2010
@@ -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

Modified: llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h?rev=111048&r1=111047&r2=111048&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h Fri Aug 13 17:08:58 2010
@@ -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 */