[llvm-commits] [llvm] r51455 - /llvm/trunk/lib/Target/X86/X86TargetMachine.cpp

[Evan Cheng]

Author: evancheng
Date: Thu May 22 18:55:24 2008
New Revision: 51455

URL: http://llvm.org/viewvc/llvm-project?rev=51455&view=rev
Log:
X86CodeEmitter should not set PIC style to None at initialization time. This will break codegen if relocation model is changed to PIC_ later.

Modified:
    llvm/trunk/lib/Target/X86/X86TargetMachine.cpp

Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.cpp?rev=51455&r1=51454&r2=51455&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Thu May 22 18:55:24 2008
@@ -180,10 +180,8 @@
 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())