diff options
| author | Jush Lu <jush.msn@gmail.com> | 2011-03-09 19:39:16 +0800 |
|---|---|---|
| committer | Jush Lu <jush.msn@gmail.com> | 2011-03-09 19:39:16 +0800 |
| commit | b5530586d68bd25831a6796b5d3199cb0769a35c (patch) | |
| tree | fac4a03b53b6a64b0c00f433e4d8b3c9f2bc67cd /lib/Target/CBackend/CBackend.cpp | |
| parent | b4e17c5bf4361bbdeced39aa071150d7fa9c3c10 (diff) | |
| parent | d01f50f42ce60207ed6d27fb1778e456d83be06c (diff) | |
| download | external_llvm-b5530586d68bd25831a6796b5d3199cb0769a35c.zip external_llvm-b5530586d68bd25831a6796b5d3199cb0769a35c.tar.gz external_llvm-b5530586d68bd25831a6796b5d3199cb0769a35c.tar.bz2 | |
Merge upstream r127116
Diffstat (limited to 'lib/Target/CBackend/CBackend.cpp')
| -rw-r--r-- | lib/Target/CBackend/CBackend.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp index 4e6d39e..6c555a3 100644 --- a/lib/Target/CBackend/CBackend.cpp +++ b/lib/Target/CBackend/CBackend.cpp @@ -47,7 +47,7 @@ #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Support/MathExtras.h" -#include "llvm/System/Host.h" +#include "llvm/Support/Host.h" #include "llvm/Config/config.h" #include <algorithm> // Some ms header decided to define setjmp as _setjmp, undo this for this file. @@ -1755,7 +1755,7 @@ bool CWriter::doInitialization(Module &M) { TAsm = Match->createAsmInfo(Triple); #endif TAsm = new CBEMCAsmInfo(); - TCtx = new MCContext(*TAsm); + TCtx = new MCContext(*TAsm, NULL); Mang = new Mangler(*TCtx, *TD); // Keep track of which functions are static ctors/dtors so they can have |