diff options
| author | Chris Lattner <sabre@nondot.org> | 2006-07-26 21:12:04 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2006-07-26 21:12:04 +0000 |
| commit | 9e56e5c00308f53f4dce79e5a744fdcbb4f377c7 (patch) | |
| tree | 66a2c2c7c7ad201f55db5dde1ffaaa635c60e2ad /llvm/lib/Target/PowerPC | |
| parent | 1d0ebb9eb79c3513f30c62737f05bdc97ef0f481 (diff) | |
| download | bcm5719-llvm-9e56e5c00308f53f4dce79e5a744fdcbb4f377c7.tar.gz bcm5719-llvm-9e56e5c00308f53f4dce79e5a744fdcbb4f377c7.zip | |
Rename RelocModel::PIC to PIC_, to avoid conflicts with -DPIC.
llvm-svn: 29307
Diffstat (limited to 'llvm/lib/Target/PowerPC')
| -rw-r--r-- | llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/Target/PowerPC/PPCTargetMachine.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp index cbadca8a171..6e75f3ceb7f 100644 --- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp +++ b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp @@ -173,7 +173,7 @@ namespace { } 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 @@ namespace { } 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 DarwinAsmPrinter::doFinalization(Module &M) { 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," diff --git a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp index bc764bcd689..b761aa8936e 100644 --- a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp +++ b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp @@ -619,7 +619,7 @@ static SDOperand LowerConstantPool(SDOperand Op, SelectionDAG &DAG) { 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 @@ static SDOperand LowerJumpTable(SDOperand Op, SelectionDAG &DAG) { 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 @@ static SDOperand LowerGlobalAddress(SDOperand Op, SelectionDAG &DAG) { 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); diff --git a/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp b/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp index 12c22e7dd80..deb479a4c34 100644 --- a/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp +++ b/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp @@ -94,7 +94,7 @@ PPCTargetMachine::PPCTargetMachine(const Module &M, const std::string &FS, if (Subtarget.isDarwin()) setRelocationModel(Reloc::DynamicNoPIC); else - setRelocationModel(Reloc::PIC); + setRelocationModel(Reloc::PIC_); } PPC32TargetMachine::PPC32TargetMachine(const Module &M, const std::string &FS) |
