- Added option -relocation-model to set relocation model. Valid values include static, pic,

dynamic-no-pic, and default.
PPC and x86 default is dynamic-no-pic for Darwin, pic for others.
- Removed options -enable-pic and -ppc-static.

llvm-svn: 26315

1 files changed, 1 insertions, 7 deletions

diff --git a/llvm/lib/Target/PowerPC/PPCSubtarget.cpp b/llvm/lib/Target/PowerPC/PPCSubtarget.cpp
index c7a3428..606dfc0 100644
--- a/llvm/lib/Target/PowerPC/PPCSubtarget.cpp
+++ b/llvm/lib/Target/PowerPC/PPCSubtarget.cpp
@@ -19,7 +19,6 @@
 
 using namespace llvm;
 PPCTargetEnum llvm::PPCTarget = TargetDefault;
-bool llvm::PPCGenerateStaticCode = false;
 
 namespace llvm {
   cl::opt<PPCTargetEnum, true>
@@ -29,12 +28,7 @@ namespace llvm {
                           clEnumValN(TargetDarwin,"darwin",
                                      "  Enable Darwin codegen"),
                           clEnumValEnd),
-               cl::location(PPCTarget), cl::init(TargetDefault));
-  
-  cl::opt<bool, true>
-  PPCStaticCode("ppc-static",
-                cl::desc("PowerPC: generate completely non-pic code"),
-                cl::location(PPCGenerateStaticCode));
+               cl::location(PPCTarget), cl::init(TargetDefault));  
 } 
  
 #if defined(__APPLE__)