r188346 - Driver: Forward -Wl, and -Xlink arguments when using windows linker

[Hans Wennborg]

Author: hans
Date: Tue Aug 13 20:24:35 2013
New Revision: 188346

URL: http://llvm.org/viewvc/llvm-project?rev=188346&view=rev
Log:
Driver: Forward -Wl, and -Xlink arguments when using windows linker

Differential Revision: http://llvm-reviews.chandlerc.com/D1394

Modified:
    cfe/trunk/lib/Driver/Tools.cpp
    cfe/trunk/test/Driver/Xlinker-args.c

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=188346&r1=188345&r2=188346&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Tue Aug 13 20:24:35 2013
@@ -6597,7 +6597,8 @@ void visualstudio::Link::ConstructJob(Co
        it = Inputs.begin(), ie = Inputs.end(); it != ie; ++it) {
     if (it->isFilename())
       CmdArgs.push_back(it->getFilename());
-    // FIXME: Forward -Wl, etc.
+    else
+      it->getInputArg().renderAsInput(Args, CmdArgs);
   }
 
   const char *Exec =

Modified: cfe/trunk/test/Driver/Xlinker-args.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Xlinker-args.c?rev=188346&r1=188345&r2=188346&view=diff
==============================================================================
--- cfe/trunk/test/Driver/Xlinker-args.c (original)
+++ cfe/trunk/test/Driver/Xlinker-args.c Tue Aug 13 20:24:35 2013
@@ -14,3 +14,11 @@
 // DARWIN-NOT: --no-demangle
 // DARWIN: "one" "two" "three" "four"
 // LINUX: "--no-demangle" "one" "two" "three" "four"
+
+// Check that we forward '-Xlinker' and '-Wl,' on Windows.
+// RUN: %clang -target i686-pc-win32 -### \
+// RUN:   -Xlinker one -Wl,two %s 2>&1 | \
+// RUN:   FileCheck -check-prefix=WIN %s
+// WIN: link.exe
+// WIN: "one"
+// WIN: "two"