diff options
| author | Logan Chien <loganchien@google.com> | 2011-07-20 14:35:08 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2011-07-20 14:37:02 +0800 |
| commit | ebf5f0962932032481ae306b42c96c68c3a0be95 (patch) | |
| tree | bbb4590c963c577450081053136a90c5bd05c74e /lib/Target/XCore/XCoreInstrInfo.cpp | |
| parent | 46b77918fb8670fbc0a4a6389c5fa0795264c2cb (diff) | |
| parent | e76a33b9567d78a5744dc52fcec3a6056d6fb576 (diff) | |
| download | external_llvm-ebf5f0962932032481ae306b42c96c68c3a0be95.zip external_llvm-ebf5f0962932032481ae306b42c96c68c3a0be95.tar.gz external_llvm-ebf5f0962932032481ae306b42c96c68c3a0be95.tar.bz2 | |
Merge with LLVM upstream r135568 (Jul 20th 2011)
Conflicts:
lib/Bitcode/Reader/BitcodeReader.cpp
Change-Id: Iebed76d2f7d281e742947e31d9a0b78174daf2d6
Diffstat (limited to 'lib/Target/XCore/XCoreInstrInfo.cpp')
| -rw-r--r-- | lib/Target/XCore/XCoreInstrInfo.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/Target/XCore/XCoreInstrInfo.cpp b/lib/Target/XCore/XCoreInstrInfo.cpp index f90481f..2db70fc 100644 --- a/lib/Target/XCore/XCoreInstrInfo.cpp +++ b/lib/Target/XCore/XCoreInstrInfo.cpp @@ -17,7 +17,6 @@ #include "llvm/MC/MCContext.h" #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/CodeGen/MachineFrameInfo.h" -#include "llvm/CodeGen/MachineLocation.h" #include "llvm/Target/TargetRegistry.h" #include "llvm/ADT/STLExtras.h" #include "llvm/Support/Debug.h" |