diff --git a/clang/include/clang/Driver/Options.def b/clang/include/clang/Driver/Options.def
index c2981b934fc92e34969747757e7c96b5e966c7f2..32b29cdf528122b338102d706b0c960116b638fd 100644
--- a/clang/include/clang/Driver/Options.def
+++ b/clang/include/clang/Driver/Options.def
@@ -493,6 +493,7 @@ OPTION("-mdynamic-no-pic", mdynamic_no_pic, Joined, m_Group, INVALID, "q", 0, 0,
 OPTION("-mfix-and-continue", mfix_and_continue, Flag, clang_ignored_m_Group, INVALID, "", 0, 0, 0)
 OPTION("-miphoneos-version-min=", miphoneos_version_min_EQ, Joined, m_Group, INVALID, "", 0, 0, 0)
 OPTION("-mkernel", mkernel, Flag, m_Group, INVALID, "", 0, 0, 0)
+OPTION("-mllvm", mllvm, Separate, INVALID, INVALID, "", 0, 0, 0)
 OPTION("-mmacosx-version-min=", mmacosx_version_min_EQ, Joined, m_Group, INVALID, "", 0, 0, 0)
 OPTION("-mmmx", mmmx, Flag, m_x86_Features_Group, INVALID, "", 0, 0, 0)
 OPTION("-mno-3dnowa", mno_3dnowa, Flag, m_x86_Features_Group, INVALID, "", 0, 0, 0)
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index abfabbb721a1329793b46342a5035aa638e8d713..eca64135bf6d060534f4d9e2a0f43a7450bd9717 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -562,6 +562,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   Args.AddLastArg(CmdArgs, options::OPT_dD);
 
   Args.AddAllArgValues(CmdArgs, options::OPT_Xclang);
+  Args.AddAllArgValues(CmdArgs, options::OPT_mllvm);
 
   if (Output.getType() == types::TY_Dependencies) {
     // Handled with other dependency code.
diff --git a/clang/test/CodeGen/always_inline.c b/clang/test/CodeGen/always_inline.c
index d159bd2233e42b99d9481a75c88c8c5c7a6036ab..cb32e3b62181004d78c2488e5036967db14cb367 100644
--- a/clang/test/CodeGen/always_inline.c
+++ b/clang/test/CodeGen/always_inline.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc -emit-llvm -o %t %s &&
+// RUN: clang -emit-llvm -S -o %t %s &&
 // RUN: grep '@f0' %t | count 0 &&
-// RUN: clang-cc -disable-llvm-optzns -emit-llvm -o %t %s &&
+// RUN: clang -mllvm -disable-llvm-optzns -emit-llvm -S -o %t %s &&
 // RUN: grep '@f0' %t | count 2
 
 //static int f0() {