From 97b020e61e77c96ab5ffc61891f94987860495c7 Mon Sep 17 00:00:00 2001
From: Evan Cheng <evan.cheng@apple.com>
Date: Thu, 22 May 2008 23:55:24 +0000
Subject: [PATCH] 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
---
 llvm/lib/Target/X86/X86TargetMachine.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp
index a60ce09ab9c7..19ceef8de153 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())