diff options
-rw-r--r-- | include/clang/Driver/Options.def | 1 | ||||
-rw-r--r-- | lib/Driver/Tools.cpp | 1 | ||||
-rw-r--r-- | test/CodeGen/always_inline.c | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/clang/Driver/Options.def b/include/clang/Driver/Options.def index c2981b934f..32b29cdf52 100644 --- a/include/clang/Driver/Options.def +++ b/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/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index abfabbb721..eca64135bf 100644 --- a/lib/Driver/Tools.cpp +++ b/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/test/CodeGen/always_inline.c b/test/CodeGen/always_inline.c index d159bd2233..cb32e3b621 100644 --- a/test/CodeGen/always_inline.c +++ b/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() { |