r256216 - [WebAssembly] Remove the -target command-line flag from the ld commandline.

[Dan Gohman via cfe-commits]

Author: djg
Date: Mon Dec 21 17:30:41 2015
New Revision: 256216

URL: http://llvm.org/viewvc/llvm-project?rev=256216&view=rev
Log:
[WebAssembly] Remove the -target command-line flag from the ld commandline.

This flag isn't needed, or permitted, with the "ld" flavor of lld.

Also, add a basic ld commandline test.

Added:
    cfe/trunk/test/Driver/wasm-toolchain.c
Modified:
    cfe/trunk/lib/Driver/Tools.cpp

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=256216&r1=256215&r2=256216&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Mon Dec 21 17:30:41 2015
@@ -6516,8 +6516,6 @@ void wasm::Linker::ConstructJob(Compilat
   ArgStringList CmdArgs;
   CmdArgs.push_back("-flavor");
   CmdArgs.push_back("ld");
-  CmdArgs.push_back("-target");
-  CmdArgs.push_back(Args.MakeArgString(getToolChain().getTripleString()));
   AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs);
   CmdArgs.push_back("-o");
   CmdArgs.push_back(Output.getFilename());

Added: cfe/trunk/test/Driver/wasm-toolchain.c
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/wasm-toolchain.c?rev=256216&view=auto
==============================================================================
--- cfe/trunk/test/Driver/wasm-toolchain.c (added)
+++ cfe/trunk/test/Driver/wasm-toolchain.c Mon Dec 21 17:30:41 2015
@@ -0,0 +1,3 @@
+// RUN: %clang -### -target wasm32-unknown-unknown -x assembler %s 2>&1 | 
FileCheck -check-prefix=AS_LINK %s
+// AS_LINK: clang{{.*}}" "-cc1as" {{.*}} "-o" "[[temp:[^"]*]]"
+// AS_LINK: lld" "-flavor" "ld" "[[temp]]" "-o" "a.out"


_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits