ccc: Store arch name in all toolchains.
- No functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65102 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/ccc/ccclib/ToolChain.py b/tools/ccc/ccclib/ToolChain.py
index 62a380b..2fe482e 100644
--- a/tools/ccc/ccclib/ToolChain.py
+++ b/tools/ccc/ccclib/ToolChain.py
@@ -10,10 +10,11 @@
class ToolChain(object):
"""ToolChain - Provide mappings of Actions to Tools."""
- def __init__(self, driver,
+ def __init__(self, driver, archName,
filePathPrefixes=[],
programPathPrefixes=[]):
self.driver = driver
+ self.archName = archName
self.filePathPrefixes = list(filePathPrefixes)
self.programPathPrefixes = list(programPathPrefixes)
@@ -80,13 +81,12 @@
return True
class Darwin_X86_ToolChain(ToolChain):
- def __init__(self, driver, darwinVersion, gccVersion, archName):
- super(Darwin_X86_ToolChain, self).__init__(driver)
+ def __init__(self, driver, archName, darwinVersion, gccVersion):
+ super(Darwin_X86_ToolChain, self).__init__(driver, archName)
assert isinstance(darwinVersion, tuple) and len(darwinVersion) == 3
assert isinstance(gccVersion, tuple) and len(gccVersion) == 3
self.darwinVersion = darwinVersion
self.gccVersion = gccVersion
- self.archName = archName
self.clangTool = Tools.Clang_CompileTool(self)
cc = Tools.Darwin_X86_CompileTool(self)
@@ -235,8 +235,8 @@
perform all subcommands; this relies on gcc translating the
options appropriately."""
- def __init__(self, driver):
- super(Generic_GCC_ToolChain, self).__init__(driver)
+ def __init__(self, driver, archName):
+ super(Generic_GCC_ToolChain, self).__init__(driver, archName)
cc = Tools.GCC_CompileTool(self)
self.clangTool = Tools.Clang_CompileTool(self)
self.toolMap = {