Changes in directory llvm/lib/Target/X86:
X86ATTAsmPrinter.cpp updated: 1.53 -> 1.54
X86ISelLowering.cpp updated: 1.239 -> 1.240
X86TargetMachine.cpp updated: 1.118 -> 1.119
---
Log message:
Rename RelocModel::PIC to PIC_, to avoid conflicts with -DPIC.
---
Diffs of the changes: (+7 -7)
X86ATTAsmPrinter.cpp | 4 ++--
X86ISelLowering.cpp | 8 ++++----
X86TargetMachine.cpp | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
Index: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.53
llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.54
--- llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.53 Wed Jul 19 06:54:50 2006
+++ llvm/lib/Target/X86/X86ATTAsmPrinter.cpp Wed Jul 26 16:12:04 2006
@@ -152,7 +152,7 @@
O << PrivateGlobalPrefix << "CPI" << getFunctionNumber() << "_"
<< MO.getConstantPoolIndex();
if (Subtarget->TargetType == X86Subtarget::isDarwin &&
- TM.getRelocationModel() == Reloc::PIC)
+ TM.getRelocationModel() == Reloc::PIC_)
O << "-\"L" << getFunctionNumber() << "$pb\"";
int Offset = MO.getOffset();
if (Offset > 0)
@@ -185,7 +185,7 @@
} else {
O << Mang->getValueName(GV);
}
- if (!isCallOp && TM.getRelocationModel() == Reloc::PIC)
+ if (!isCallOp && TM.getRelocationModel() == Reloc::PIC_)
O << "-\"L" << getFunctionNumber() << "$pb\"";
} else
O << Mang->getValueName(MO.getGlobal());
Index: llvm/lib/Target/X86/X86ISelLowering.cpp
diff -u llvm/lib/Target/X86/X86ISelLowering.cpp:1.239
llvm/lib/Target/X86/X86ISelLowering.cpp:1.240
--- llvm/lib/Target/X86/X86ISelLowering.cpp:1.239 Fri Jul 21 03:26:46 2006
+++ llvm/lib/Target/X86/X86ISelLowering.cpp Wed Jul 26 16:12:04 2006
@@ -2746,7 +2746,7 @@
CP->getAlignment()));
if (Subtarget->isTargetDarwin()) {
// With PIC, the address is actually $g + Offset.
- if (getTargetMachine().getRelocationModel() == Reloc::PIC)
+ if (getTargetMachine().getRelocationModel() == Reloc::PIC_)
Result = DAG.getNode(ISD::ADD, getPointerTy(),
DAG.getNode(X86ISD::GlobalBaseReg, getPointerTy()),
Result);
}
@@ -2762,7 +2762,7 @@
getPointerTy()));
if (Subtarget->isTargetDarwin()) {
// With PIC, the address is actually $g + Offset.
- if (getTargetMachine().getRelocationModel() == Reloc::PIC)
+ if (getTargetMachine().getRelocationModel() == Reloc::PIC_)
Result = DAG.getNode(ISD::ADD, getPointerTy(),
DAG.getNode(X86ISD::GlobalBaseReg, getPointerTy()),
Result);
@@ -2788,7 +2788,7 @@
getPointerTy()));
if (Subtarget->isTargetDarwin()) {
// With PIC, the address is actually $g + Offset.
- if (getTargetMachine().getRelocationModel() == Reloc::PIC)
+ if (getTargetMachine().getRelocationModel() == Reloc::PIC_)
Result = DAG.getNode(ISD::ADD, getPointerTy(),
DAG.getNode(X86ISD::GlobalBaseReg, getPointerTy()),
Result);
@@ -3173,7 +3173,7 @@
getPointerTy()));
if (Subtarget->isTargetDarwin()) {
// With PIC, the address is actually $g + Offset.
- if (getTargetMachine().getRelocationModel() == Reloc::PIC)
+ if (getTargetMachine().getRelocationModel() == Reloc::PIC_)
Result = DAG.getNode(ISD::ADD, getPointerTy(),
DAG.getNode(X86ISD::GlobalBaseReg, getPointerTy()),
Result);
Index: llvm/lib/Target/X86/X86TargetMachine.cpp
diff -u llvm/lib/Target/X86/X86TargetMachine.cpp:1.118
llvm/lib/Target/X86/X86TargetMachine.cpp:1.119
--- llvm/lib/Target/X86/X86TargetMachine.cpp:1.118 Tue Jul 25 15:40:54 2006
+++ llvm/lib/Target/X86/X86TargetMachine.cpp Wed Jul 26 16:12:04 2006
@@ -78,7 +78,7 @@
if (Subtarget.isTargetDarwin())
setRelocationModel(Reloc::DynamicNoPIC);
else
- setRelocationModel(Reloc::PIC);
+ setRelocationModel(Reloc::PIC_);
}
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
