[llvm-branch-commits] [cfe-branch] r113215 - in /cfe/branches/Apple/whitney-IB/src/tools/clang: ./ lib/Driver/Tools.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Tue Sep  7 12:12:54 2010
New Revision: 113215

URL: http://llvm.org/viewvc/llvm-project?rev=113215&view=rev
Log:
--- Merging r113212 into 'src/tools/clang':
U    src/tools/clang/lib/Driver/Tools.cpp


Modified:
    cfe/branches/Apple/whitney-IB/src/tools/clang/   (props changed)
    cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Driver/Tools.cpp

Propchange: cfe/branches/Apple/whitney-IB/src/tools/clang/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Sep  7 12:12:54 2010
@@ -0,0 +1,2 @@
+/cfe/trunk:113212
+/llvm/branches/Apple/Pertwee/tools/clang:110850,110961

Modified: cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Driver/Tools.cpp?rev=113215&r1=113214&r2=113215&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Driver/Tools.cpp (original)
+++ cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Driver/Tools.cpp Tue Sep  7 12:12:54 2010
@@ -2204,7 +2204,13 @@
   // Newer linkers support -demangle, pass it if supported and not disabled by
   // the user.
   if (Version[0] >= 100 && !Args.hasArg(options::OPT_Z_Xlinker__no_demangle)) {
-    CmdArgs.push_back("-demangle");
+    // Don't pass -demangle to ld_classic.
+    //
+    // FIXME: This is a temporary workaround, ld should be handling this.
+    bool UsesLdClassic = (getToolChain().getArch() == llvm::Triple::x86 &&
+                          Args.hasArg(options::OPT_static));
+    if (!UsesLdClassic)
+      CmdArgs.push_back("-demangle");
   }
 
   // Derived from the "link" spec.