[llvm-branch-commits] [llvm-gcc-branch] r101961 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ driverdriver.c gcc/config/darwin.h

[Eric Christopher]

Author: echristo
Date: Tue Apr 20 18:22:03 2010
New Revision: 101961

URL: http://llvm.org/viewvc/llvm-project?rev=101961&view=rev
Log:
Merge r101959 from mainline.

Fixes rdar://7618268

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/driverdriver.c
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/darwin.h

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 20 18:22:03 2010
@@ -1,2 +1,2 @@
 /llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,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
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,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,101959

Modified: llvm-gcc-4.2/branches/Apple/Morbo/driverdriver.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/driverdriver.c?rev=101961&r1=101960&r2=101961&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/driverdriver.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/driverdriver.c Tue Apr 20 18:22:03 2010
@@ -1596,9 +1596,10 @@
       if (num_infiles > 1 && !compile_only_request)
 	ima_is_used = 1;
 
-      /* Linker wants to know this in case of multiple -arch.  */
-      if (!compile_only_request && !dash_dynamiclib_seen)
-	new_argv[new_argc++] = "-Wl,-arch_multiple";
+      /* The compiler and linker both want to know if we have multiple archs.
+         The compiler for debug info emission and the linker for augmenting
+         error and warning messages.  */
+	    new_argv[new_argc++] = "-arch_multiple";
 
 
       /* If only one input file is specified OR IMA is used then expected output

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/darwin.h?rev=101961&r1=101960&r2=101961&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/darwin.h Tue Apr 20 18:22:03 2010
@@ -194,6 +194,8 @@
   { "-fpascal-strings", "-mpascal-strings" },	\
   { "-fno-pascal-strings", "-mno-pascal-strings" },	\
   /* APPLE LOCAL end constant cfstrings */	\
+  /* APPLE LOCAL multiple arch */ \
+  { "-arch_multiple", "-Zarch_multiple"}, \
   SUBTARGET_OPTION_TRANSLATE_TABLE
 
 /* APPLE LOCAL begin constant cfstrings */
@@ -363,7 +365,8 @@
 %{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
 "/* APPLE LOCAL end mainline 4.3 2006-10-31 4370146 */"\
     %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm: \
-    %{g*:%{!gstabs*:%{!g0: dsymutil %{o*:%*}%{!o:a.out}}}}}}}}}}}}"
+"/* APPLE LOCAL arch_multiple */"\
+    %{g*:%{!gstabs*:%{!g0:%{!Zarch_multiple: dsymutil %{o*:%*}%{!o:a.out}}}}}}}}}}}}}"
 /* APPLE LOCAL end mainline */
 
 #ifdef TARGET_SYSTEM_ROOT
@@ -466,6 +469,8 @@
    " LINK_SYSROOT_SPEC " \
    %{twolevel_namespace} %{twolevel_namespace_hints} \
    %{Zumbrella*: -umbrella %*} \
+   "/* APPLE LOCAL arch_multiple */" \
+   %{Zarch_multiple: -arch_multiple} \
    %{undefined*} \
    %{Zunexported_symbols_list*:-unexported_symbols_list %*} \
    %{Zweak_reference_mismatches*:-weak_reference_mismatches %*} \