diff options
author | Evan Cheng <evan.cheng@apple.com> | 2008-05-22 23:55:24 +0000 |
---|---|---|
committer | Evan Cheng <evan.cheng@apple.com> | 2008-05-22 23:55:24 +0000 |
commit | 97b020e61e77c96ab5ffc61891f94987860495c7 (patch) | |
tree | 4c6effd92a5c0734dfe2781270b4bb2607f3bd57 /llvm/lib/Target/X86/X86TargetMachine.cpp | |
parent | db622628e803988f327f1207e7012add6b97f81f (diff) | |
download | bcm5719-llvm-97b020e61e77c96ab5ffc61891f94987860495c7.tar.gz bcm5719-llvm-97b020e61e77c96ab5ffc61891f94987860495c7.zip |
X86CodeEmitter should not set PIC style to None at initialization time. This will break codegen if relocation model is changed to PIC_ later.
llvm-svn: 51455
Diffstat (limited to 'llvm/lib/Target/X86/X86TargetMachine.cpp')
-rw-r--r-- | llvm/lib/Target/X86/X86TargetMachine.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp index a60ce09ab9c..19ceef8de15 100644 --- a/llvm/lib/Target/X86/X86TargetMachine.cpp +++ b/llvm/lib/Target/X86/X86TargetMachine.cpp @@ -180,10 +180,8 @@ bool X86TargetMachine::addAssemblyEmitter(PassManagerBase &PM, bool Fast, bool X86TargetMachine::addCodeEmitter(PassManagerBase &PM, bool Fast, bool DumpAsm, MachineCodeEmitter &MCE) { // FIXME: Move this to TargetJITInfo! - if (DefRelocModel == Reloc::Default) { + if (DefRelocModel == Reloc::Default) setRelocationModel(Reloc::Static); - Subtarget.setPICStyle(PICStyle::None); - } // JIT cannot ensure globals are placed in the lower 4G of address. if (Subtarget.is64Bit()) |