[llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp PPCISelLowering.cpp PPCTargetMachine.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/PowerPC:

PPCAsmPrinter.cpp updated: 1.187 -> 1.188
PPCISelLowering.cpp updated: 1.198 -> 1.199
PPCTargetMachine.cpp updated: 1.98 -> 1.99
---
Log message:

Rename RelocModel::PIC to PIC_, to avoid conflicts with -DPIC.


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

 PPCAsmPrinter.cpp    |    6 +++---
 PPCISelLowering.cpp  |    6 +++---
 PPCTargetMachine.cpp |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
diff -u llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp:1.187 llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp:1.188
--- llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp:1.187	Fri Jul 14 20:24:23 2006
+++ llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp	Wed Jul 26 16:12:04 2006
@@ -173,7 +173,7 @@
       } else {
         O << "ha16(";
         printOp(MI->getOperand(OpNo));
-        if (TM.getRelocationModel() == Reloc::PIC)
+        if (TM.getRelocationModel() == Reloc::PIC_)
           O << "-\"L" << getFunctionNumber() << "$pb\")";
         else
           O << ')';
@@ -185,7 +185,7 @@
       } else {
         O << "lo16(";
         printOp(MI->getOperand(OpNo));
-        if (TM.getRelocationModel() == Reloc::PIC)
+        if (TM.getRelocationModel() == Reloc::PIC_)
           O << "-\"L" << getFunctionNumber() << "$pb\")";
         else
           O << ')';
@@ -599,7 +599,7 @@
   bool isPPC64 = TD->getPointerSizeInBits() == 64;
 
   // Output stubs for dynamically-linked functions
-  if (TM.getRelocationModel() == Reloc::PIC) {
+  if (TM.getRelocationModel() == Reloc::PIC_) {
     for (std::set<std::string>::iterator i = FnStubs.begin(), e = FnStubs.end();
          i != e; ++i) {
       SwitchToTextSection(".section __TEXT,__picsymbolstub1,symbol_stubs,"


Index: llvm/lib/Target/PowerPC/PPCISelLowering.cpp
diff -u llvm/lib/Target/PowerPC/PPCISelLowering.cpp:1.198 llvm/lib/Target/PowerPC/PPCISelLowering.cpp:1.199
--- llvm/lib/Target/PowerPC/PPCISelLowering.cpp:1.198	Mon Jul 10 15:56:58 2006
+++ llvm/lib/Target/PowerPC/PPCISelLowering.cpp	Wed Jul 26 16:12:04 2006
@@ -619,7 +619,7 @@
     return DAG.getNode(ISD::ADD, PtrVT, Hi, Lo);
   }
   
-  if (TM.getRelocationModel() == Reloc::PIC) {
+  if (TM.getRelocationModel() == Reloc::PIC_) {
     // With PIC, the first instruction is actually "GR+hi(&G)".
     Hi = DAG.getNode(ISD::ADD, PtrVT,
                      DAG.getNode(PPCISD::GlobalBaseReg, PtrVT), Hi);
@@ -649,7 +649,7 @@
     return DAG.getNode(ISD::ADD, PtrVT, Hi, Lo);
   }
   
-  if (TM.getRelocationModel() == Reloc::PIC) {
+  if (TM.getRelocationModel() == Reloc::PIC_) {
     // With PIC, the first instruction is actually "GR+hi(&G)".
     Hi = DAG.getNode(ISD::ADD, PtrVT,
                      DAG.getNode(PPCISD::GlobalBaseReg, MVT::i32), Hi);
@@ -680,7 +680,7 @@
     return DAG.getNode(ISD::ADD, PtrVT, Hi, Lo);
   }
   
-  if (TM.getRelocationModel() == Reloc::PIC) {
+  if (TM.getRelocationModel() == Reloc::PIC_) {
     // With PIC, the first instruction is actually "GR+hi(&G)".
     Hi = DAG.getNode(ISD::ADD, PtrVT,
                      DAG.getNode(PPCISD::GlobalBaseReg, PtrVT), Hi);


Index: llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
diff -u llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.98 llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.99
--- llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.98	Fri Jul 14 20:24:23 2006
+++ llvm/lib/Target/PowerPC/PPCTargetMachine.cpp	Wed Jul 26 16:12:04 2006
@@ -94,7 +94,7 @@
     if (Subtarget.isDarwin())
       setRelocationModel(Reloc::DynamicNoPIC);
     else
-      setRelocationModel(Reloc::PIC);
+      setRelocationModel(Reloc::PIC_);
 }
 
 PPC32TargetMachine::PPC32TargetMachine(const Module &M, const std::string &FS)