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

[Daniel Dunbar]

Author: ddunbar
Date: Tue Sep  7 12:53:44 2010
New Revision: 113229

URL: http://llvm.org/viewvc/llvm-project?rev=113229&view=rev
Log:
--- Merging r113226 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 (original)
+++ svn:mergeinfo Tue Sep  7 12:53:44 2010
@@ -1,2 +1,2 @@
-/cfe/trunk:113079,113212
+/cfe/trunk:113079,113212,113226
 /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=113229&r1=113228&r2=113229&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:53:44 2010
@@ -2209,6 +2209,16 @@
     // FIXME: This is a temporary workaround, ld should be handling this.
     bool UsesLdClassic = (getToolChain().getArch() == llvm::Triple::x86 &&
                           Args.hasArg(options::OPT_static));
+    if (getToolChain().getArch() == llvm::Triple::x86) {
+      for (arg_iterator it = Args.filtered_begin(options::OPT_Xlinker,
+                                                 options::OPT_Wl_COMMA),
+             ie = Args.filtered_end(); it != ie; ++it) {
+        const Arg *A = *it;
+        for (unsigned i = 0, e = A->getNumValues(); i != e; ++i)
+          if (llvm::StringRef(A->getValue(Args, i)) == "-kext")
+            UsesLdClassic = true;
+      }
+    }
     if (!UsesLdClassic)
       CmdArgs.push_back("-demangle");
   }