Prune includes in ARM target.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204548 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/ARM/A15SDOptimizer.cpp b/lib/Target/ARM/A15SDOptimizer.cpp
index 37bf9033a058438667b219fd3c6af8887424eddd..28ea879b010c82789e1c66e51464e7dba37ecab5 100644 (file)
--- a/lib/Target/ARM/A15SDOptimizer.cpp
+++ b/lib/Target/ARM/A15SDOptimizer.cpp
@@ -27,18 +27,13 @@
 #define DEBUG_TYPE "a15-sd-optimizer"
 #include "ARM.h"
 #include "ARMBaseInstrInfo.h"
 #define DEBUG_TYPE "a15-sd-optimizer"
 #include "ARM.h"
 #include "ARMBaseInstrInfo.h"

-#include "ARMISelLowering.h"
-#include "ARMSubtarget.h"
-#include "ARMTargetMachine.h"
-#include "llvm/ADT/SmallPtrSet.h"
+#include "ARMBaseRegisterInfo.h"

 #include "llvm/ADT/Statistic.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"

-#include "llvm/Support/CommandLine.h"

 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Debug.h"

-#include "llvm/Support/raw_ostream.h"

 #include "llvm/Target/TargetRegisterInfo.h"
 #include <set>
 
 #include "llvm/Target/TargetRegisterInfo.h"
 #include <set>
 

diff --git a/lib/Target/ARM/ARM.h b/lib/Target/ARM/ARM.h
index 80e5f37eb086c9c091083282c7463a5f2234ca81..4c811ce0ba30730d8194e61398d8f839462652f8 100644 (file)
--- a/lib/Target/ARM/ARM.h
+++ b/lib/Target/ARM/ARM.h
@@ -15,19 +15,18 @@
 #ifndef TARGET_ARM_H
 #define TARGET_ARM_H
 
 #ifndef TARGET_ARM_H
 #define TARGET_ARM_H
 

-#include "MCTargetDesc/ARMBaseInfo.h"
-#include "MCTargetDesc/ARMMCTargetDesc.h"
-#include "llvm/Support/DataTypes.h"
-#include "llvm/Target/TargetMachine.h"
+#include "llvm/Support/CodeGen.h"

 
 namespace llvm {
 
 class ARMAsmPrinter;
 class ARMBaseTargetMachine;
 class FunctionPass;
 
 namespace llvm {
 
 class ARMAsmPrinter;
 class ARMBaseTargetMachine;
 class FunctionPass;

+class ImmutablePass;

 class JITCodeEmitter;
 class MachineInstr;
 class MCInst;
 class JITCodeEmitter;
 class MachineInstr;
 class MCInst;

+class TargetLowering;

 
 FunctionPass *createARMISelDag(ARMBaseTargetMachine &TM,
                                CodeGenOpt::Level OptLevel);
 
 FunctionPass *createARMISelDag(ARMBaseTargetMachine &TM,
                                CodeGenOpt::Level OptLevel);

diff --git a/lib/Target/ARM/ARMAsmPrinter.h b/lib/Target/ARM/ARMAsmPrinter.h
index cf85a5b3b990326d2494b6b9d5c8239ec30aeffc..46c2626f89fe3bd314b22545a2aac5b83d756167 100644 (file)
--- a/lib/Target/ARM/ARMAsmPrinter.h
+++ b/lib/Target/ARM/ARMAsmPrinter.h
@@ -10,14 +10,16 @@
 #ifndef ARMASMPRINTER_H
 #define ARMASMPRINTER_H
 
 #ifndef ARMASMPRINTER_H
 #define ARMASMPRINTER_H
 

-#include "ARM.h"
-#include "ARMTargetMachine.h"
+#include "ARMSubtarget.h"

 #include "llvm/CodeGen/AsmPrinter.h"
 #include "llvm/CodeGen/AsmPrinter.h"

-#include "llvm/Support/Compiler.h"
+#include "llvm/Target/TargetMachine.h"

 
 namespace llvm {
 
 
 namespace llvm {
 

+class ARMFunctionInfo;

 class MCOperand;
 class MCOperand;

+class MachineConstantPool;
+class MachineOperand;

 
 namespace ARM {
   enum DW_ISA {
 
 namespace ARM {
   enum DW_ISA {

diff --git a/lib/Target/ARM/ARMBaseInstrInfo.h b/lib/Target/ARM/ARMBaseInstrInfo.h
index c1113f6cb6ea7bfbea88a46fab37a599a064ecac..3ddddcb63790c91f549505e04b676e4c685da8e5 100644 (file)
--- a/lib/Target/ARM/ARMBaseInstrInfo.h
+++ b/lib/Target/ARM/ARMBaseInstrInfo.h
@@ -14,7 +14,7 @@
 #ifndef ARMBASEINSTRUCTIONINFO_H
 #define ARMBASEINSTRUCTIONINFO_H
 
 #ifndef ARMBASEINSTRUCTIONINFO_H
 #define ARMBASEINSTRUCTIONINFO_H
 

-#include "ARM.h"
+#include "MCTargetDesc/ARMBaseInfo.h"

 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"

diff --git a/lib/Target/ARM/ARMBaseRegisterInfo.h b/lib/Target/ARM/ARMBaseRegisterInfo.h
index 109a8cf618daefb8be5d42e3c4407196fea14c65..4ffcec1efb731039932c92eb7c168f788c86776c 100644 (file)
--- a/lib/Target/ARM/ARMBaseRegisterInfo.h
+++ b/lib/Target/ARM/ARMBaseRegisterInfo.h
@@ -14,7 +14,7 @@
 #ifndef ARMBASEREGISTERINFO_H
 #define ARMBASEREGISTERINFO_H
 
 #ifndef ARMBASEREGISTERINFO_H
 #define ARMBASEREGISTERINFO_H
 

-#include "ARM.h"
+#include "MCTargetDesc/ARMBaseInfo.h"

 #include "llvm/Target/TargetRegisterInfo.h"
 
 #define GET_REGINFO_HEADER
 #include "llvm/Target/TargetRegisterInfo.h"
 
 #define GET_REGINFO_HEADER

diff --git a/lib/Target/ARM/ARMFastISel.cpp b/lib/Target/ARM/ARMFastISel.cpp
index a81917638bb7b1a7f079cea93a5c6daaa87feced..d2d5b9fe2a93ee7ec5e552a69c0931b84ad62736 100644 (file)
--- a/lib/Target/ARM/ARMFastISel.cpp
+++ b/lib/Target/ARM/ARMFastISel.cpp
@@ -14,11 +14,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "ARM.h"
 //===----------------------------------------------------------------------===//
 
 #include "ARM.h"

-#include "ARMBaseInstrInfo.h"
+#include "ARMBaseRegisterInfo.h"

 #include "ARMCallingConv.h"
 #include "ARMConstantPoolValue.h"
 #include "ARMCallingConv.h"
 #include "ARMConstantPoolValue.h"

+#include "ARMISelLowering.h"
+#include "ARMMachineFunctionInfo.h"

 #include "ARMSubtarget.h"
 #include "ARMSubtarget.h"

-#include "ARMTargetMachine.h"

 #include "MCTargetDesc/ARMAddressingModes.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/CodeGen/Analysis.h"
 #include "MCTargetDesc/ARMAddressingModes.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/CodeGen/Analysis.h"

diff --git a/lib/Target/ARM/ARMFeatures.h b/lib/Target/ARM/ARMFeatures.h
index e2a228c18ab2f63298ef466c10ea2bb72d2b2e85..a30f4cdb37f38a0445f668c482e2b91d3b468ad2 100644 (file)
--- a/lib/Target/ARM/ARMFeatures.h
+++ b/lib/Target/ARM/ARMFeatures.h
@@ -14,7 +14,7 @@
 #ifndef TARGET_ARM_FEATURES_H
 #define TARGET_ARM_FEATURES_H
 
 #ifndef TARGET_ARM_FEATURES_H
 #define TARGET_ARM_FEATURES_H
 

-#include "ARM.h"
+#include "MCTargetDesc/ARMMCTargetDesc.h"

 
 template<typename InstrType> // could be MachineInstr or MCInst
 bool IsCPSRDead(InstrType *Instr);
 
 template<typename InstrType> // could be MachineInstr or MCInst
 bool IsCPSRDead(InstrType *Instr);

diff --git a/lib/Target/ARM/ARMFrameLowering.h b/lib/Target/ARM/ARMFrameLowering.h
index 8836b9b9ec2872ed95818248a5defad996348d48..463428fd19ed891985fa189d6d84c582c6e57922 100644 (file)
--- a/lib/Target/ARM/ARMFrameLowering.h
+++ b/lib/Target/ARM/ARMFrameLowering.h
@@ -14,7 +14,6 @@
 #ifndef ARM_FRAMEINFO_H
 #define ARM_FRAMEINFO_H
 
 #ifndef ARM_FRAMEINFO_H
 #define ARM_FRAMEINFO_H
 

-#include "ARM.h"

 #include "ARMSubtarget.h"
 #include "llvm/Target/TargetFrameLowering.h"
 
 #include "ARMSubtarget.h"
 #include "llvm/Target/TargetFrameLowering.h"
 

diff --git a/lib/Target/ARM/ARMISelDAGToDAG.cpp b/lib/Target/ARM/ARMISelDAGToDAG.cpp
index 72008ecc33cc9667aa7a8ed1dda537cc92016d11..56bc7123ce532b6e88bb8a05cb003db3174dc7bb 100644 (file)
--- a/lib/Target/ARM/ARMISelDAGToDAG.cpp
+++ b/lib/Target/ARM/ARMISelDAGToDAG.cpp
@@ -32,7 +32,6 @@
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"

-#include "llvm/Support/raw_ostream.h"

 #include "llvm/Target/TargetLowering.h"
 #include "llvm/Target/TargetOptions.h"
 
 #include "llvm/Target/TargetLowering.h"
 #include "llvm/Target/TargetOptions.h"
 

diff --git a/lib/Target/ARM/ARMISelLowering.cpp b/lib/Target/ARM/ARMISelLowering.cpp
index 3d026be51311bf78f7dddf7f179b26a0fea50472..e14edfece641067f4c041c6cbf684e6c5d4a3178 100644 (file)
--- a/lib/Target/ARM/ARMISelLowering.cpp
+++ b/lib/Target/ARM/ARMISelLowering.cpp
@@ -14,7 +14,6 @@
 
 #define DEBUG_TYPE "arm-isel"
 #include "ARMISelLowering.h"
 
 #define DEBUG_TYPE "arm-isel"
 #include "ARMISelLowering.h"

-#include "ARM.h"

 #include "ARMCallingConv.h"
 #include "ARMConstantPoolValue.h"
 #include "ARMMachineFunctionInfo.h"
 #include "ARMCallingConv.h"
 #include "ARMConstantPoolValue.h"
 #include "ARMMachineFunctionInfo.h"


@@ -46,7 +45,6 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/MathExtras.h"

-#include "llvm/Support/raw_ostream.h"

 #include "llvm/Target/TargetOptions.h"
 #include <utility>
 using namespace llvm;
 #include "llvm/Target/TargetOptions.h"
 #include <utility>
 using namespace llvm;

diff --git a/lib/Target/ARM/ARMISelLowering.h b/lib/Target/ARM/ARMISelLowering.h
index aa47880e83c19799ec0d27734ff9b307707c7dea..022945f625afd6292e10f3cb519b16b7adbb3131 100644 (file)
--- a/lib/Target/ARM/ARMISelLowering.h
+++ b/lib/Target/ARM/ARMISelLowering.h
@@ -15,17 +15,15 @@
 #ifndef ARMISELLOWERING_H
 #define ARMISELLOWERING_H
 
 #ifndef ARMISELLOWERING_H
 #define ARMISELLOWERING_H
 

-#include "ARM.h"
-#include "ARMSubtarget.h"
+#include "MCTargetDesc/ARMBaseInfo.h"

 #include "llvm/CodeGen/CallingConvLower.h"
 #include "llvm/CodeGen/CallingConvLower.h"

-#include "llvm/CodeGen/FastISel.h"

 #include "llvm/CodeGen/SelectionDAG.h"
 #include "llvm/Target/TargetLowering.h"
 #include "llvm/CodeGen/SelectionDAG.h"
 #include "llvm/Target/TargetLowering.h"

-#include "llvm/Target/TargetRegisterInfo.h"

 #include <vector>
 
 namespace llvm {
   class ARMConstantPoolValue;
 #include <vector>
 
 namespace llvm {
   class ARMConstantPoolValue;

+  class ARMSubtarget;

 
   namespace ARMISD {
     // ARM Specific DAG Nodes
 
   namespace ARMISD {
     // ARM Specific DAG Nodes

diff --git a/lib/Target/ARM/ARMInstrInfo.h b/lib/Target/ARM/ARMInstrInfo.h
index aacf63dff5d10e85636f13e371afb00f8e332488..b09958aaa950bdaa5f4e4ccce8a303949c44a8f7 100644 (file)
--- a/lib/Target/ARM/ARMInstrInfo.h
+++ b/lib/Target/ARM/ARMInstrInfo.h
@@ -14,10 +14,8 @@
 #ifndef ARMINSTRUCTIONINFO_H
 #define ARMINSTRUCTIONINFO_H
 
 #ifndef ARMINSTRUCTIONINFO_H
 #define ARMINSTRUCTIONINFO_H
 

-#include "ARM.h"

 #include "ARMBaseInstrInfo.h"
 #include "ARMRegisterInfo.h"
 #include "ARMBaseInstrInfo.h"
 #include "ARMRegisterInfo.h"

-#include "ARMSubtarget.h"

 
 namespace llvm {
   class ARMSubtarget;
 
 namespace llvm {
   class ARMSubtarget;

diff --git a/lib/Target/ARM/ARMJITInfo.cpp b/lib/Target/ARM/ARMJITInfo.cpp
index 351a290e2aa040b8e2a407e8bca111f9e3206821..73c6eb72f001083b18f161696b967993ebad7bfb 100644 (file)
--- a/lib/Target/ARM/ARMJITInfo.cpp
+++ b/lib/Target/ARM/ARMJITInfo.cpp
@@ -13,10 +13,9 @@
 
 #define DEBUG_TYPE "jit"
 #include "ARMJITInfo.h"
 
 #define DEBUG_TYPE "jit"
 #include "ARMJITInfo.h"

-#include "ARM.h"

 #include "ARMConstantPoolValue.h"
 #include "ARMRelocations.h"
 #include "ARMConstantPoolValue.h"
 #include "ARMRelocations.h"

-#include "ARMSubtarget.h"
+#include "MCTargetDesc/ARMBaseInfo.h"

 #include "llvm/CodeGen/JITCodeEmitter.h"
 #include "llvm/IR/Function.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/CodeGen/JITCodeEmitter.h"
 #include "llvm/IR/Function.h"
 #include "llvm/Support/Debug.h"

diff --git a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
index 098faaab2423702cd250c786ee91b298a82cdc9e..48e0bd751187d089b7480f434b1768cd591c6f37 100644 (file)
--- a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
+++ b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
@@ -17,6 +17,7 @@
 #include "ARMBaseInstrInfo.h"
 #include "ARMBaseRegisterInfo.h"
 #include "ARMMachineFunctionInfo.h"
 #include "ARMBaseInstrInfo.h"
 #include "ARMBaseRegisterInfo.h"
 #include "ARMMachineFunctionInfo.h"

+#include "ARMSubtarget.h"

 #include "MCTargetDesc/ARMAddressingModes.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/STLExtras.h"
 #include "MCTargetDesc/ARMAddressingModes.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/STLExtras.h"


@@ -36,7 +37,6 @@
 #include "llvm/IR/Function.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/IR/Function.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"

-#include "llvm/Support/raw_ostream.h"

 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetRegisterInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetRegisterInfo.h"

diff --git a/lib/Target/ARM/ARMMCInstLower.cpp b/lib/Target/ARM/ARMMCInstLower.cpp
index d63ece3c63293bdff7c124e1f0d37af029279b9e..48141b14e137c0470e9bf2f02582d4b446f79ab6 100644 (file)
--- a/lib/Target/ARM/ARMMCInstLower.cpp
+++ b/lib/Target/ARM/ARMMCInstLower.cpp
@@ -14,6 +14,7 @@
 
 #include "ARM.h"
 #include "ARMAsmPrinter.h"
 
 #include "ARM.h"
 #include "ARMAsmPrinter.h"

+#include "MCTargetDesc/ARMBaseInfo.h"

 #include "MCTargetDesc/ARMMCExpr.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/IR/Constants.h"
 #include "MCTargetDesc/ARMMCExpr.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/IR/Constants.h"

diff --git a/lib/Target/ARM/ARMRegisterInfo.cpp b/lib/Target/ARM/ARMRegisterInfo.cpp
index a7880364d89a427a841c0d838537a03152d155c7..80b4b4822ce82ce9123e34030a99e3ea040ded74 100644 (file)
--- a/lib/Target/ARM/ARMRegisterInfo.cpp
+++ b/lib/Target/ARM/ARMRegisterInfo.cpp
@@ -12,8 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "ARMRegisterInfo.h"
 //===----------------------------------------------------------------------===//
 
 #include "ARMRegisterInfo.h"

-#include "ARM.h"
-#include "ARMBaseInstrInfo.h"

 using namespace llvm;
 
 void ARMRegisterInfo::anchor() { }
 using namespace llvm;
 
 void ARMRegisterInfo::anchor() { }

diff --git a/lib/Target/ARM/ARMRegisterInfo.h b/lib/Target/ARM/ARMRegisterInfo.h
index fb1537cf9425e45b62f803a0d55b32f9024d2cff..3e6af3f046989a102d195b9c6274f772c0013d4e 100644 (file)
--- a/lib/Target/ARM/ARMRegisterInfo.h
+++ b/lib/Target/ARM/ARMRegisterInfo.h
@@ -14,9 +14,7 @@
 #ifndef ARMREGISTERINFO_H
 #define ARMREGISTERINFO_H
 
 #ifndef ARMREGISTERINFO_H
 #define ARMREGISTERINFO_H
 

-#include "ARM.h"

 #include "ARMBaseRegisterInfo.h"
 #include "ARMBaseRegisterInfo.h"

-#include "llvm/Target/TargetRegisterInfo.h"

 
 namespace llvm {
 
 
 namespace llvm {
 

diff --git a/lib/Target/ARM/ARMTargetMachine.cpp b/lib/Target/ARM/ARMTargetMachine.cpp
index 787b9b1301567111be8537f04842dafc3bc7678e..64e00f46a1bc6dab0d5f2d7d15b0e7a44afc08e6 100644 (file)
--- a/lib/Target/ARM/ARMTargetMachine.cpp
+++ b/lib/Target/ARM/ARMTargetMachine.cpp
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
 //
 //===----------------------------------------------------------------------===//
 

-#include "ARMTargetMachine.h"

 #include "ARM.h"
 #include "ARM.h"

+#include "ARMTargetMachine.h"

 #include "ARMFrameLowering.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "ARMFrameLowering.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/MC/MCAsmInfo.h"

diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 1a153522796307b1913b99f04d2838cf05ef6225..d9d12672a10825d580e72b850bce086feb93c58b 100644 (file)
--- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -13,8 +13,6 @@
 #include "MCTargetDesc/ARMArchName.h"
 #include "MCTargetDesc/ARMBaseInfo.h"
 #include "MCTargetDesc/ARMMCExpr.h"
 #include "MCTargetDesc/ARMArchName.h"
 #include "MCTargetDesc/ARMBaseInfo.h"
 #include "MCTargetDesc/ARMMCExpr.h"

-#include "llvm/ADT/BitVector.h"
-#include "llvm/ADT/MapVector.h"

 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"

diff --git a/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp b/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
index 041a0fdf51524332d107e2a80126d4ab9e037a4e..5a01d261d4773b9d5d942da4d112c059ee4fd519 100644 (file)
--- a/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
+++ b/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
@@ -17,7 +17,6 @@
 #include "ARMFPUName.h"
 #include "ARMRegisterInfo.h"
 #include "ARMUnwindOpAsm.h"
 #include "ARMFPUName.h"
 #include "ARMRegisterInfo.h"
 #include "ARMUnwindOpAsm.h"

-#include "llvm/ADT/SmallPtrSet.h"

 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/MC/MCAsmBackend.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/MC/MCAsmBackend.h"

diff --git a/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.h b/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.h
index e2c440081444638d1bf500f1c3294b1fcc5b1445..cd5875924300c713382dd28a09a0ba7f188d2b11 100644 (file)
--- a/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.h
+++ b/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.h
@@ -16,7 +16,6 @@
 #define ARM_UNWIND_OP_ASM_H
 
 #include "llvm/ADT/SmallVector.h"
 #define ARM_UNWIND_OP_ASM_H
 
 #include "llvm/ADT/SmallVector.h"

-#include "llvm/ADT/StringRef.h"

 #include "llvm/Support/ARMEHABI.h"
 #include "llvm/Support/DataTypes.h"
 
 #include "llvm/Support/ARMEHABI.h"
 #include "llvm/Support/DataTypes.h"
 

diff --git a/lib/Target/ARM/TargetInfo/ARMTargetInfo.cpp b/lib/Target/ARM/TargetInfo/ARMTargetInfo.cpp
index fa5681fb12bf740b43d6103deeb1d2336320adbd..f1d294c733f0332e85dba1033d0370a6f62f4d81 100644 (file)
--- a/lib/Target/ARM/TargetInfo/ARMTargetInfo.cpp
+++ b/lib/Target/ARM/TargetInfo/ARMTargetInfo.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
 //
 //===----------------------------------------------------------------------===//
 

-#include "ARM.h"
+#include "MCTargetDesc/ARMMCTargetDesc.h"

 #include "llvm/IR/Module.h"
 #include "llvm/Support/TargetRegistry.h"
 using namespace llvm;
 #include "llvm/IR/Module.h"
 #include "llvm/Support/TargetRegistry.h"
 using namespace llvm;

diff --git a/lib/Target/ARM/Thumb1FrameLowering.h b/lib/Target/ARM/Thumb1FrameLowering.h
index ff7c6591a603965f2ef806ce0b57a64aaa06a0da..f61874b1cb0a6b3194e8206c243abf4135d790f5 100644 (file)
--- a/lib/Target/ARM/Thumb1FrameLowering.h
+++ b/lib/Target/ARM/Thumb1FrameLowering.h
@@ -14,7 +14,6 @@
 #ifndef __THUMB_FRAMEINFO_H_
 #define __THUMB_FRAMEINFO_H_
 
 #ifndef __THUMB_FRAMEINFO_H_
 #define __THUMB_FRAMEINFO_H_
 

-#include "ARM.h"

 #include "ARMFrameLowering.h"
 #include "ARMSubtarget.h"
 #include "Thumb1InstrInfo.h"
 #include "ARMFrameLowering.h"
 #include "ARMSubtarget.h"
 #include "Thumb1InstrInfo.h"


@@ -22,7 +21,6 @@
 #include "llvm/Target/TargetFrameLowering.h"
 
 namespace llvm {
 #include "llvm/Target/TargetFrameLowering.h"
 
 namespace llvm {

-  class ARMSubtarget;

 
 class Thumb1FrameLowering : public ARMFrameLowering {
 public:
 
 class Thumb1FrameLowering : public ARMFrameLowering {
 public:

diff --git a/lib/Target/ARM/Thumb1InstrInfo.cpp b/lib/Target/ARM/Thumb1InstrInfo.cpp
index 22a925e0ffbc2753a8f98733e4c28ec965b2b9ac..68cbb5c580dff54b744e069618e65a8e4c180868 100644 (file)
--- a/lib/Target/ARM/Thumb1InstrInfo.cpp
+++ b/lib/Target/ARM/Thumb1InstrInfo.cpp
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Thumb1InstrInfo.h"
 //===----------------------------------------------------------------------===//
 
 #include "Thumb1InstrInfo.h"

-#include "ARM.h"

 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineMemOperand.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineMemOperand.h"

diff --git a/lib/Target/ARM/Thumb1InstrInfo.h b/lib/Target/ARM/Thumb1InstrInfo.h
index 2a23175902a9bbfd96fcd38694a95eed549dad9b..c5845b75e5872d55ee32c5ef2860d45b690ae99e 100644 (file)
--- a/lib/Target/ARM/Thumb1InstrInfo.h
+++ b/lib/Target/ARM/Thumb1InstrInfo.h
@@ -14,7 +14,6 @@
 #ifndef THUMB1INSTRUCTIONINFO_H
 #define THUMB1INSTRUCTIONINFO_H
 
 #ifndef THUMB1INSTRUCTIONINFO_H
 #define THUMB1INSTRUCTIONINFO_H
 

-#include "ARM.h"

 #include "ARMBaseInstrInfo.h"
 #include "Thumb1RegisterInfo.h"
 
 #include "ARMBaseInstrInfo.h"
 #include "Thumb1RegisterInfo.h"
 

diff --git a/lib/Target/ARM/Thumb1RegisterInfo.cpp b/lib/Target/ARM/Thumb1RegisterInfo.cpp
index 42ac177147ac6175237edee943ccd51c8ce07068..ef1a4285f5f6371b2bc9f3af2f394a7b72311ac1 100644 (file)
--- a/lib/Target/ARM/Thumb1RegisterInfo.cpp
+++ b/lib/Target/ARM/Thumb1RegisterInfo.cpp
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Thumb1RegisterInfo.h"
 //===----------------------------------------------------------------------===//
 
 #include "Thumb1RegisterInfo.h"

-#include "ARM.h"

 #include "ARMBaseInstrInfo.h"
 #include "ARMMachineFunctionInfo.h"
 #include "ARMSubtarget.h"
 #include "ARMBaseInstrInfo.h"
 #include "ARMMachineFunctionInfo.h"
 #include "ARMSubtarget.h"


@@ -30,7 +29,6 @@
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ErrorHandling.h"

-#include "llvm/Support/raw_ostream.h"

 #include "llvm/Target/TargetFrameLowering.h"
 #include "llvm/Target/TargetMachine.h"
 
 #include "llvm/Target/TargetFrameLowering.h"
 #include "llvm/Target/TargetMachine.h"
 

diff --git a/lib/Target/ARM/Thumb1RegisterInfo.h b/lib/Target/ARM/Thumb1RegisterInfo.h
index d958887fd1e4d5e6c413576d6f19dd9f71251417..68e08c0c7539e4a2b029de0185861c7a8d921c43 100644 (file)
--- a/lib/Target/ARM/Thumb1RegisterInfo.h
+++ b/lib/Target/ARM/Thumb1RegisterInfo.h
@@ -15,7 +15,6 @@
 #ifndef THUMB1REGISTERINFO_H
 #define THUMB1REGISTERINFO_H
 
 #ifndef THUMB1REGISTERINFO_H
 #define THUMB1REGISTERINFO_H
 

-#include "ARM.h"

 #include "ARMBaseRegisterInfo.h"
 #include "llvm/Target/TargetRegisterInfo.h"
 
 #include "ARMBaseRegisterInfo.h"
 #include "llvm/Target/TargetRegisterInfo.h"
 

diff --git a/lib/Target/ARM/Thumb2InstrInfo.cpp b/lib/Target/ARM/Thumb2InstrInfo.cpp
index 91788ac4f8934064b9ca78bf837a87316a53e1e2..a9df006fb8c104634c3d8524b5c0291ea1518fd9 100644 (file)
--- a/lib/Target/ARM/Thumb2InstrInfo.cpp
+++ b/lib/Target/ARM/Thumb2InstrInfo.cpp
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Thumb2InstrInfo.h"
 //===----------------------------------------------------------------------===//
 
 #include "Thumb2InstrInfo.h"

-#include "ARM.h"

 #include "ARMConstantPoolValue.h"
 #include "ARMMachineFunctionInfo.h"
 #include "MCTargetDesc/ARMAddressingModes.h"
 #include "ARMConstantPoolValue.h"
 #include "ARMMachineFunctionInfo.h"
 #include "MCTargetDesc/ARMAddressingModes.h"

diff --git a/lib/Target/ARM/Thumb2InstrInfo.h b/lib/Target/ARM/Thumb2InstrInfo.h
index 3af7ab15b49ebaab55c7ef19fdb11ae8f266d9cd..34d45d307ff4392064e6d76d3a7e0c14e7cc46fb 100644 (file)
--- a/lib/Target/ARM/Thumb2InstrInfo.h
+++ b/lib/Target/ARM/Thumb2InstrInfo.h
@@ -14,7 +14,6 @@
 #ifndef THUMB2INSTRUCTIONINFO_H
 #define THUMB2INSTRUCTIONINFO_H
 
 #ifndef THUMB2INSTRUCTIONINFO_H
 #define THUMB2INSTRUCTIONINFO_H
 

-#include "ARM.h"

 #include "ARMBaseInstrInfo.h"
 #include "Thumb2RegisterInfo.h"
 
 #include "ARMBaseInstrInfo.h"
 #include "Thumb2RegisterInfo.h"
 

diff --git a/lib/Target/ARM/Thumb2RegisterInfo.cpp b/lib/Target/ARM/Thumb2RegisterInfo.cpp
index 4cb827f308efcd00f894dec1fca6f28ea59e935f..782d81fd424d056b9f0141de77f65756ff0eacdc 100644 (file)
--- a/lib/Target/ARM/Thumb2RegisterInfo.cpp
+++ b/lib/Target/ARM/Thumb2RegisterInfo.cpp
@@ -14,7 +14,6 @@
 
 #include "Thumb2RegisterInfo.h"
 #include "ARM.h"
 
 #include "Thumb2RegisterInfo.h"
 #include "ARM.h"

-#include "ARMBaseInstrInfo.h"

 #include "ARMSubtarget.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "ARMSubtarget.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
 #include "llvm/CodeGen/MachineFunction.h"


@@ -22,6 +21,8 @@
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"

+#include "llvm/Target/TargetInstrInfo.h"
+#include "llvm/Target/TargetMachine.h"

 using namespace llvm;
 
 Thumb2RegisterInfo::Thumb2RegisterInfo(const ARMSubtarget &sti)
 using namespace llvm;
 
 Thumb2RegisterInfo::Thumb2RegisterInfo(const ARMSubtarget &sti)

diff --git a/lib/Target/ARM/Thumb2RegisterInfo.h b/lib/Target/ARM/Thumb2RegisterInfo.h
index 41e4ff3d2d576bc5d15a604bc83f9ed6f08caf0c..8a33e6cea9192cd6ff22ec3230976c6c9e7543d0 100644 (file)
--- a/lib/Target/ARM/Thumb2RegisterInfo.h
+++ b/lib/Target/ARM/Thumb2RegisterInfo.h
@@ -15,9 +15,7 @@
 #ifndef THUMB2REGISTERINFO_H
 #define THUMB2REGISTERINFO_H
 
 #ifndef THUMB2REGISTERINFO_H
 #define THUMB2REGISTERINFO_H
 

-#include "ARM.h"

 #include "ARMBaseRegisterInfo.h"
 #include "ARMBaseRegisterInfo.h"

-#include "llvm/Target/TargetRegisterInfo.h"

 
 namespace llvm {
 
 
 namespace llvm {
 

diff --git a/lib/Target/ARM/Thumb2SizeReduction.cpp b/lib/Target/ARM/Thumb2SizeReduction.cpp
index 8e42db893d6c6bcfc935835e8dbeb84d2d508ee1..04b83fbaf5236e421d492d6126f9bafc25afc440 100644 (file)
--- a/lib/Target/ARM/Thumb2SizeReduction.cpp
+++ b/lib/Target/ARM/Thumb2SizeReduction.cpp
@@ -10,7 +10,6 @@
 #define DEBUG_TYPE "t2-reduce-size"
 #include "ARM.h"
 #include "ARMBaseInstrInfo.h"
 #define DEBUG_TYPE "t2-reduce-size"
 #include "ARM.h"
 #include "ARMBaseInstrInfo.h"

-#include "ARMBaseRegisterInfo.h"

 #include "ARMSubtarget.h"
 #include "MCTargetDesc/ARMAddressingModes.h"
 #include "Thumb2InstrInfo.h"
 #include "ARMSubtarget.h"
 #include "MCTargetDesc/ARMAddressingModes.h"
 #include "Thumb2InstrInfo.h"


@@ -23,7 +22,7 @@
 #include "llvm/IR/Function.h"        // To access Function attributes
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/IR/Function.h"        // To access Function attributes
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"

-#include "llvm/Support/raw_ostream.h"
+#include "llvm/Target/TargetMachine.h"

 using namespace llvm;
 
 STATISTIC(NumNarrows,  "Number of 32-bit instrs reduced to 16-bit ones");
 using namespace llvm;
 
 STATISTIC(NumNarrows,  "Number of 32-bit instrs reduced to 16-bit ones");