diff options
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 6 | ||||
| -rw-r--r-- | clang/test/Driver/embed-bitcode.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 1f2c64eaf73..be2971de598 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -504,9 +504,11 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) { .Default(SaveTempsCwd); } + setLTOMode(Args); + // Ignore -fembed-bitcode options with LTO // since the output will be bitcode anyway. - if (!Args.hasFlag(options::OPT_flto, options::OPT_fno_lto, false)) { + if (getLTOMode() == LTOK_None) { if (Arg *A = Args.getLastArg(options::OPT_fembed_bitcode_EQ)) { StringRef Name = A->getValue(); unsigned Model = llvm::StringSwitch<unsigned>(Name) @@ -526,8 +528,6 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) { Args.ClaimAllArgs(options::OPT_fembed_bitcode_EQ); } - setLTOMode(Args); - std::unique_ptr<llvm::opt::InputArgList> UArgs = llvm::make_unique<InputArgList>(std::move(Args)); diff --git a/clang/test/Driver/embed-bitcode.c b/clang/test/Driver/embed-bitcode.c index 4c014fcb2a1..da60da3fff7 100644 --- a/clang/test/Driver/embed-bitcode.c +++ b/clang/test/Driver/embed-bitcode.c @@ -27,6 +27,8 @@ // CHECK-SAVE-TEMP: -cc1as // RUN: %clang -c %s -flto -fembed-bitcode 2>&1 -### | FileCheck %s -check-prefix=CHECK-LTO +// RUN: %clang -c %s -flto=full -fembed-bitcode 2>&1 -### | FileCheck %s -check-prefix=CHECK-LTO +// RUN: %clang -c %s -flto=thin -fembed-bitcode 2>&1 -### | FileCheck %s -check-prefix=CHECK-LTO // CHECK-LTO: -cc1 // CHECK-LTO: -emit-llvm-bc // CHECK-LTO-NOT: warning: argument unused during compilation: '-fembed-bitcode' |
