diff options
| author | Stephen Hines <srhines@google.com> | 2014-07-21 00:45:20 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-07-21 00:45:20 -0700 |
| commit | c6a4f5e819217e1e12c458aed8e7b122e23a3a58 (patch) | |
| tree | 81b7dd2bb4370a392f31d332a566c903b5744764 /tools/llvm-lto | |
| parent | 19c6fbb3e8aaf74093afa08013134b61fa08f245 (diff) | |
| download | external_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.zip external_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.tar.gz external_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.tar.bz2 | |
Update LLVM for rebase to r212749.
Includes a cherry-pick of:
r212948 - fixes a small issue with atomic calls
Change-Id: Ib97bd980b59f18142a69506400911a6009d9df18
Diffstat (limited to 'tools/llvm-lto')
| -rw-r--r-- | tools/llvm-lto/Android.mk | 4 | ||||
| -rw-r--r-- | tools/llvm-lto/llvm-lto.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/llvm-lto/Android.mk b/tools/llvm-lto/Android.mk index a5782d9..1a9979e 100644 --- a/tools/llvm-lto/Android.mk +++ b/tools/llvm-lto/Android.mk @@ -19,9 +19,9 @@ llvm_lto_STATIC_LIBRARIES := \ libLLVMARMDisassembler \ libLLVMAArch64CodeGen \ libLLVMAArch64Info \ - libLLVMAArch64Desc \ - libLLVMAArch64AsmPrinter \ libLLVMAArch64AsmParser \ + libLLVMAArch64AsmPrinter \ + libLLVMAArch64Desc \ libLLVMAArch64Utils \ libLLVMAArch64Disassembler \ libLLVMMipsCodeGen \ diff --git a/tools/llvm-lto/llvm-lto.cpp b/tools/llvm-lto/llvm-lto.cpp index 8c2d1cd..8b39f12 100644 --- a/tools/llvm-lto/llvm-lto.cpp +++ b/tools/llvm-lto/llvm-lto.cpp @@ -110,7 +110,7 @@ int main(int argc, char **argv) { for (unsigned i = BaseArg; i < InputFilenames.size(); ++i) { std::string error; std::unique_ptr<LTOModule> Module( - LTOModule::makeLTOModule(InputFilenames[i].c_str(), Options, error)); + LTOModule::createFromFile(InputFilenames[i].c_str(), Options, error)); if (!error.empty()) { errs() << argv[0] << ": error loading file '" << InputFilenames[i] << "': " << error << "\n"; |