[llvm-branch-commits] [llvm-gcc-branch] r124568 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ gcc/ChangeLog.apple gcc/config/i386/darwin.h gcc/config/rs6000/darwin.h

[Jakob Stoklund Olesen]

Author: stoklund
Date: Sun Jan 30 16:03:07 2011
New Revision: 124568

URL: http://llvm.org/viewvc/llvm-project?rev=124568&view=rev
Log:
Rewind Morbo branch to llvmgcc42-2335.6 tag.

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/darwin.h
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/rs6000/darwin.h

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 30 16:03:07 2011
@@ -1,2 +1,2 @@
 /llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99262,99305,99412,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101614,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459,110501,110689,110727,111048,113248,114961,118368,118749
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99262,99305,99412,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101614,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459,110501,110689,110727,113248,114961,118368,118749

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple?rev=124568&r1=124567&r2=124568&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple Sun Jan 30 16:03:07 2011
@@ -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 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-06-28 Jim Grosbach <grosbach at apple.com>
 
 	Radar 7449793

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/darwin.h?rev=124568&r1=124567&r2=124568&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/darwin.h (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/darwin.h Sun Jan 30 16:03:07 2011
@@ -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

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/rs6000/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/rs6000/darwin.h?rev=124568&r1=124567&r2=124568&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/rs6000/darwin.h (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/rs6000/darwin.h Sun Jan 30 16:03:07 2011
@@ -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 */