summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Gohman <dan433584@gmail.com>2015-12-21 23:30:41 +0000
committerDan Gohman <dan433584@gmail.com>2015-12-21 23:30:41 +0000
commitf4b4e08db0482a267a6ffe639b99019027bf610c (patch)
tree03be189ce30174f72a12d6d4df1df217181d1645
parent3f79e3259360a1b112b9e5351302e4a6e720d732 (diff)
downloadbcm5719-llvm-f4b4e08db0482a267a6ffe639b99019027bf610c.tar.gz
bcm5719-llvm-f4b4e08db0482a267a6ffe639b99019027bf610c.zip
[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. llvm-svn: 256216
-rw-r--r--clang/lib/Driver/Tools.cpp2
-rw-r--r--clang/test/Driver/wasm-toolchain.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 54570286779..efba28cfb5d 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -6516,8 +6516,6 @@ void wasm::Linker::ConstructJob(Compilation &C, const JobAction &JA,
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());
diff --git a/clang/test/Driver/wasm-toolchain.c b/clang/test/Driver/wasm-toolchain.c
new file mode 100644
index 00000000000..6e3d84ce1d2
--- /dev/null
+++ b/clang/test/Driver/wasm-toolchain.c
@@ -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"
OpenPOWER on IntegriCloud