[llvm-commits] CVS: llvm/lib/Target/ARM/ARMISelLowering.cpp ARMRegisterInfo.cpp ARMTargetMachine.cpp

[Evan Cheng]

Changes in directory llvm/lib/Target/ARM:

ARMISelLowering.cpp updated: 1.1 -> 1.2
ARMRegisterInfo.cpp updated: 1.34 -> 1.35
ARMTargetMachine.cpp updated: 1.14 -> 1.15
---
Log message:

isDarwin -> isTargetDarwin

---
Diffs of the changes:  (+8 -8)

 ARMISelLowering.cpp  |    8 ++++----
 ARMRegisterInfo.cpp  |    6 +++---
 ARMTargetMachine.cpp |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)


Index: llvm/lib/Target/ARM/ARMISelLowering.cpp
diff -u llvm/lib/Target/ARM/ARMISelLowering.cpp:1.1 llvm/lib/Target/ARM/ARMISelLowering.cpp:1.2
--- llvm/lib/Target/ARM/ARMISelLowering.cpp:1.1	Fri Jan 19 01:51:42 2007
+++ llvm/lib/Target/ARM/ARMISelLowering.cpp	Fri Jan 19 13:28:01 2007
@@ -146,7 +146,7 @@
   setOperationAction(ISD::LOCATION, MVT::Other, Expand);
   setOperationAction(ISD::DEBUG_LOC, MVT::Other, Expand);
   // FIXME - use subtarget debug flags
-  if (Subtarget->isDarwin())
+  if (Subtarget->isTargetDarwin())
     setOperationAction(ISD::DEBUG_LABEL, MVT::Other, Expand);
 
   setOperationAction(ISD::RET,           MVT::Other, Custom);
@@ -470,7 +470,7 @@
     isDirect = true;
     bool isExt = (GV->isExternal() || GV->hasWeakLinkage() ||
                   GV->hasLinkOnceLinkage());
-    bool isStub = (isExt && Subtarget->isDarwin()) &&
+    bool isStub = (isExt && Subtarget->isTargetDarwin()) &&
                    getTargetMachine().getRelocationModel() != Reloc::Static;
     isARMFunc = !Subtarget->isThumb() || isStub;
     // Wrap it since tBX takes a register source operand.
@@ -479,7 +479,7 @@
   } else if (ExternalSymbolSDNode *S = dyn_cast<ExternalSymbolSDNode>(Callee)) {
     Callee = DAG.getTargetExternalSymbol(S->getSymbol(), getPointerTy());
     isDirect = true;
-    bool isStub = Subtarget->isDarwin() &&
+    bool isStub = Subtarget->isTargetDarwin() &&
                   getTargetMachine().getRelocationModel() != Reloc::Static;
     isARMFunc = !Subtarget->isThumb() || isStub;
     // Wrap it since tBX takes a register source operand.
@@ -641,7 +641,7 @@
   MVT::ValueType PtrVT = getPointerTy();
   GlobalValue *GV = cast<GlobalAddressSDNode>(Op)->getGlobal();
   Reloc::Model RelocM = getTargetMachine().getRelocationModel();
-  bool IsIndirect = Subtarget->isDarwin() && GVIsIndirectSymbol(GV);
+  bool IsIndirect = Subtarget->isTargetDarwin() && GVIsIndirectSymbol(GV);
   SDOperand CPAddr;
   if (RelocM == Reloc::Static)
     CPAddr = DAG.getTargetConstantPool(GV, PtrVT, 2);


Index: llvm/lib/Target/ARM/ARMRegisterInfo.cpp
diff -u llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.34 llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.35
--- llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.34	Fri Jan 19 01:51:42 2007
+++ llvm/lib/Target/ARM/ARMRegisterInfo.cpp	Fri Jan 19 13:28:01 2007
@@ -256,7 +256,7 @@
     ARM::D11, ARM::D10, ARM::D9,  ARM::D8,
     0
   };
-  return STI.isDarwin() ? DarwinCalleeSavedRegs : CalleeSavedRegs;
+  return STI.isTargetDarwin() ? DarwinCalleeSavedRegs : CalleeSavedRegs;
 }
 
 const TargetRegisterClass* const *
@@ -807,7 +807,7 @@
       case ARM::R9:
       case ARM::R10:
       case ARM::R11:
-        Category = STI.isDarwin() ? 2 : 1;
+        Category = STI.isTargetDarwin() ? 2 : 1;
         break;
       case ARM::D8:
       case ARM::D9:
@@ -870,7 +870,7 @@
       case ARM::R11:
         if (Reg == FramePtr)
           FramePtrSpillFI = FI;
-        if (STI.isDarwin()) {
+        if (STI.isTargetDarwin()) {
           AFI->addGPRCalleeSavedArea2Frame(FI);
           GPRCS2Size += 4;
         } else {


Index: llvm/lib/Target/ARM/ARMTargetMachine.cpp
diff -u llvm/lib/Target/ARM/ARMTargetMachine.cpp:1.14 llvm/lib/Target/ARM/ARMTargetMachine.cpp:1.15
--- llvm/lib/Target/ARM/ARMTargetMachine.cpp:1.14	Fri Jan 19 01:51:42 2007
+++ llvm/lib/Target/ARM/ARMTargetMachine.cpp	Fri Jan 19 13:28:01 2007
@@ -35,7 +35,7 @@
 ARMTargetMachine::ARMTargetMachine(const Module &M, const std::string &FS)
   : Subtarget(M, FS), DataLayout("e-p:32:32-d:32"), InstrInfo(Subtarget),
     FrameInfo(Subtarget) {
-  if (Subtarget.isDarwin())
+  if (Subtarget.isTargetDarwin())
     NoFramePointerElim = true;
 }