Forward Clang -mllvm options to remote compiler invocations

Author: bd1976bris

clang/lib/Driver/ToolChains/Gnu.cpp

@@ -549,6 +549,12 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
     for (auto A : Args.getAllArgValues(options::OPT_Xthinlto_distributor_EQ))
       CmdArgs.push_back(
           Args.MakeArgString("-mllvm=-thinlto-distributor-arg=" + A));
+
+    for (const Arg *A : Args.filtered(options::OPT_mllvm)) {
+      CmdArgs.push_back(Args.MakeArgString(
+          Twine("-mllvm=-thinlto-remote-compiler-arg=-mllvm=") +
+          A->getValue(0)));
+    }
   }
 
   if (Args.hasArg(options::OPT_Z_Xlinker__no_demangle))

clang/test/Driver/DTLTO/dtlto.c

@@ -5,6 +5,8 @@
 // RUN: echo "--target=x86_64-linux-gnu \
 // RUN:   -Xthinlto-distributor=distarg1 \
 // RUN:   -Xthinlto-distributor=distarg2,distarg3 \
+// RUN:   -mllvm llvm1 \
+// RUN:   -mllvm=llvm2 \
 // RUN:   -fuse-ld=lld" > %t.rsp
 
 
@@ -18,6 +20,8 @@
 // CHECK-SAME: "-mllvm=-thinlto-distributor-arg=distarg1"
 // CHECK-SAME: "-mllvm=-thinlto-distributor-arg=distarg2"
 // CHECK-SAME: "-mllvm=-thinlto-distributor-arg=distarg3"
+// CHECK-SAME: "-mllvm=-thinlto-remote-compiler-arg=-mllvm=llvm1"
+// CHECK-SAME: "-mllvm=-thinlto-remote-compiler-arg=-mllvm=llvm2"
 
 
 /// Check that options are not added without --thinlto-distributor= and

cross-project-tests/dtlto/mllvm.c

@@ -0,0 +1,33 @@
+/// Test that -mllvm options are forwarded to the remote compiler for DTLTO.
+
+// RUN: rm -rf %t && mkdir %t && cd %t
+
+// RUN: %clang --target=x86_64-linux-gnu %s -shared -flto=thin \
+// RUN:   -fthinlto-distributor=%python \
+// RUN:   -Xthinlto-distributor=%llvm_src_root/utils/dtlto/local.py \
+// RUN:   -fuse-ld=lld \
+// RUN:   -nostdlib \
+// RUN:   -Werror \
+/// Specify -v for both the inital and remote clang invocations.
+// RUN:   -v \
+// RUN:   -Wl,-mllvm=-thinlto-remote-compiler-arg=-v \
+/// -thinlto-remote-compiler-arg is a safe -mllvm option to use for this test as
+/// it is part of the DTLTO implemenation.
+// RUN:   -mllvm -thinlto-remote-compiler-arg=llvm1 \
+// RUN:   -mllvm=-thinlto-remote-compiler-arg=llvm2 \
+// RUN:   2>&1 | FileCheck %s
+
+// -mllvm arguments are forwarded to `clang -cc1`.
+// CHECK:       -mllvm -thinlto-remote-compiler-arg=llvm1
+// CHECK-SAME:  -mllvm -thinlto-remote-compiler-arg=llvm2
+
+// -mllvm arguments are forwarded to the remote compiler via lld.
+// CHECK:       -mllvm=-thinlto-remote-compiler-arg=-mllvm=-thinlto-remote-compiler-arg=llvm1
+// CHECK-SAME:  -mllvm=-thinlto-remote-compiler-arg=-mllvm=-thinlto-remote-compiler-arg=llvm2
+
+// -mllvm arguments are forwarded to `clang -cc1` in the remote execution.
+// CHECK:      -mllvm -thinlto-remote-compiler-arg=llvm1
+// CHECK-SAME: -mllvm -thinlto-remote-compiler-arg=llvm2
+
+
+int _start() { return 0; }