diff options
| author | Stephen Hines <srhines@google.com> | 2014-02-11 20:01:10 -0800 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-02-11 20:01:10 -0800 |
| commit | ce9904c6ea8fd669978a8eefb854b330eb9828ff (patch) | |
| tree | 2418ee2e96ea220977c8fb74959192036ab5b133 /tools/llvm-link | |
| parent | c27b10b198c1d9e9b51f2303994313ec2778edd7 (diff) | |
| parent | dbb832b83351cec97b025b61c26536ef50c3181c (diff) | |
| download | external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.zip external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.tar.gz external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.tar.bz2 | |
Merge remote-tracking branch 'upstream/release_34' into merge-20140211
Conflicts:
lib/Linker/LinkModules.cpp
lib/Support/Unix/Signals.inc
Change-Id: Ia54f291fa5dc828052d2412736e8495c1282aa64
Diffstat (limited to 'tools/llvm-link')
| -rw-r--r-- | tools/llvm-link/llvm-link.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp index 652c414..99cca23 100644 --- a/tools/llvm-link/llvm-link.cpp +++ b/tools/llvm-link/llvm-link.cpp @@ -70,7 +70,7 @@ int main(int argc, char **argv) { // Print a stack trace if we signal out. sys::PrintStackTraceOnErrorSignal(); PrettyStackTraceProgram X(argc, argv); - + LLVMContext &Context = getGlobalContext(); llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. cl::ParseCommandLineOptions(argc, argv, "llvm linker\n"); |