commit 2b91d502a553468ee699c906ea8c0f6e4fe705f7
author Daniel Dunbar <daniel@zuster.org> Fri Feb 20 20:52:47 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Fri Feb 20 20:52:47 2009 +0000
tree d7bdc3ba883cbc489555613bdf90e97af2e9e46d
parent a8ff9f455d94d9609766cfd5186b6e21dc2102f1

Unbreak Darwin PIC handling; my refactoring yesterday was bogus.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65154 91177308-0d34-0410-b5e6-96231b3b80d8

tools/ccc/ccclib/Tools.py

diff --git a/tools/ccc/ccclib/Tools.py b/tools/ccc/ccclib/Tools.py
index a9db01a..9d3bd8e 100644
--- a/tools/ccc/ccclib/Tools.py
+++ b/tools/ccc/ccclib/Tools.py
@@ -255,7 +255,16 @@
                           arglist.getLastArg(arglist.parser.f_pieOption))
             picDisabled = (arglist.getLastArg(arglist.parser.m_kernelOption) or
                            arglist.getLastArg(arglist.parser.staticOption))
-            model = self.toolChain.getRelocationModel(picEnabled, picDisabled)
+            model = self.toolChain.getForcedPicModel()
+            if not model:
+                if arglist.getLastArg(arglist.parser.m_dynamicNoPicOption):
+                    model = 'dynamic-no-pic'
+                elif picDisabled:
+                    model = 'static'
+                elif picEnabled:
+                    model = 'pic'
+                else:
+                    model = self.toolChain.getDefaultRelocationModel()
             cmd_args.append('--relocation-model=%s' % model)
 
             if arglist.getLastArg(arglist.parser.f_timeReportOption):