diff options
| author | Shih-wei Liao <sliao@google.com> | 2012-03-24 04:18:09 -0700 |
|---|---|---|
| committer | Shih-wei Liao <sliao@google.com> | 2012-03-24 04:18:09 -0700 |
| commit | c59a7995d22e2889706810c90a20a51ecfec278b (patch) | |
| tree | ef37472f01d4b6258755680b4561a667bc337dd6 /lib/Target/PTX/PTXTargetMachine.cpp | |
| parent | d1acd051dd8446a013b6c35b4bfe64ec68417206 (diff) | |
| parent | 98a92d199ce9993dca1b65927009013ad3e5297f (diff) | |
| download | external_llvm-c59a7995d22e2889706810c90a20a51ecfec278b.zip external_llvm-c59a7995d22e2889706810c90a20a51ecfec278b.tar.gz external_llvm-c59a7995d22e2889706810c90a20a51ecfec278b.tar.bz2 | |
Merge branch 'upstream' into sliao_d
Diffstat (limited to 'lib/Target/PTX/PTXTargetMachine.cpp')
| -rw-r--r-- | lib/Target/PTX/PTXTargetMachine.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Target/PTX/PTXTargetMachine.cpp b/lib/Target/PTX/PTXTargetMachine.cpp index 9305377..40835d0 100644 --- a/lib/Target/PTX/PTXTargetMachine.cpp +++ b/lib/Target/PTX/PTXTargetMachine.cpp @@ -11,8 +11,8 @@ // //===----------------------------------------------------------------------===// -#include "PTX.h" #include "PTXTargetMachine.h" +#include "PTX.h" #include "llvm/PassManager.h" #include "llvm/Analysis/Passes.h" #include "llvm/Analysis/Verifier.h" @@ -26,6 +26,7 @@ #include "llvm/MC/MCInstrInfo.h" #include "llvm/MC/MCStreamer.h" #include "llvm/MC/MCSubtargetInfo.h" +#include "llvm/Support/Debug.h" #include "llvm/Support/TargetRegistry.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Target/TargetData.h" @@ -37,8 +38,6 @@ #include "llvm/Target/TargetRegisterInfo.h" #include "llvm/Target/TargetSubtargetInfo.h" #include "llvm/Transforms/Scalar.h" -#include "llvm/Support/Debug.h" -#include "llvm/Support/TargetRegistry.h" using namespace llvm; |