Author: mrs
Date: Tue Jan 20 16:58:07 2009
New Revision: 62631
URL: http://llvm.org/viewvc/llvm-project?rev=62631&view=rev
Log:
A couple of extra patches.
Added:
cfe/tags/Apple/clang/clang-1.patch
cfe/tags/Apple/clang/clang-2.patch
Added: cfe/tags/Apple/clang/clang-1.patch
URL:
http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/clang-1.patch?rev=62631&view=auto
==============================================================================
--- cfe/tags/Apple/clang/clang-1.patch (added)
+++ cfe/tags/Apple/clang/clang-1.patch Tue Jan 20 16:58:07 2009
@@ -0,0 +1,31 @@
+Index: tools/Makefile
+===================================================================
+--- tools/Makefile (revision 62619)
++++ tools/Makefile (working copy)
+@@ -8,11 +8,13 @@
+
##===----------------------------------------------------------------------===##
+
+ LEVEL := ..
++CLANG_DIR := $(shell test -e clang && echo clang)
++
+ # NOTE: The tools are organized into five groups of four consisting of one
+ # large and three small executables. This is done to minimize memory load
+ # in parallel builds. Please retain this ordering.
+ PARALLEL_DIRS := llvm-config \
+- opt llvm-as llvm-dis \
++ opt $(CLANG_DIR) llvm-as llvm-dis \
+ llc llvm-ranlib llvm-ar llvm-nm \
+ llvm-ld llvm-prof llvm-link \
+ lli gccas gccld llvm-extract llvm-db \
+Index: Makefile.rules
+===================================================================
+--- Makefile.rules (revision 62619)
++++ Makefile.rules (working copy)
+@@ -568,7 +568,6 @@
+ # To create other directories, as needed, and timestamp their creation
+ %/.dir:
+ $(Verb) $(MKDIR) $* > /dev/null
+- $(Verb) $(DATE) > $@
+
+ .PRECIOUS: $(ObjDir)/.dir $(LibDir)/.dir $(ToolDir)/.dir $(ExmplDir)/.dir
+ .PRECIOUS: $(LLVMLibDir)/.dir $(LLVMToolDir)/.dir $(LLVMExmplDir)/.dir
Added: cfe/tags/Apple/clang/clang-2.patch
URL:
http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/clang-2.patch?rev=62631&view=auto
==============================================================================
--- cfe/tags/Apple/clang/clang-2.patch (added)
+++ cfe/tags/Apple/clang/clang-2.patch Tue Jan 20 16:58:07 2009
@@ -0,0 +1,49 @@
+Doing diffs in tools/clang/.:
+--- tools/clang/./tools/ccc/ccclib/ToolChain.py.~1~ 2009-01-20
14:53:16.000000000 -0800
++++ tools/clang/./tools/ccc/ccclib/ToolChain.py 2009-01-20
14:53:57.000000000 -0800
+@@ -59,15 +59,16 @@ class Darwin_X86_ToolChain(ToolChain):
+ Phases.LinkPhase : Tools.Darwin_X86_LinkTool(self),
+ Phases.LipoPhase : Tools.LipoTool(),
+ }
+- self.clangTool = Tools.Clang_CompileTool()
++ self.clangTool = Tools.Clang_CompileTool(self)
+
+ def getToolChainDir(self):
+ return 'i686-apple-darwin%d/%s' % (self.darwinVersion[0],
+ '.'.join(map(str,self.gccVersion)))
+
+ def getProgramPath(self, name):
+- # FIXME: Implement proper search.
+- return '/usr/libexec/gcc/%s/%s' % (self.getToolChainDir(), name)
++ return '%s/../libexec/gcc/%s/%s' % (self.driver.driverDir,
++ self.getToolChainDir(),
++ name)
+
+ def getMacosxVersionMin(self):
+ major,minor,minorminor = self.darwinVersion
+--- tools/clang/./tools/ccc/ccclib/Tools.py.~1~ 2009-01-20
14:53:16.000000000 -0800
++++ tools/clang/./tools/ccc/ccclib/Tools.py 2009-01-20 14:53:57.000000000
-0800
+@@ -163,11 +163,12 @@ class Darwin_AssembleTool(Tool):
+ cmd_args))
+
+ class Clang_CompileTool(Tool):
+- def __init__(self):
++ def __init__(self, toolChain):
+ super(Clang_CompileTool, self).__init__('clang',
+ (Tool.eFlagsPipedInput |
+ Tool.eFlagsPipedOutput |
+ Tool.eFlagsIntegratedCPP))
++ self.toolChain = toolChain
+
+ def constructJob(self, phase, arch, jobs, inputs,
+ output, outputType, arglist, linkingOutput):
+@@ -263,7 +264,7 @@ class Clang_CompileTool(Tool):
+ else:
+ cmd_args.extend(arglist.renderAsInput(input.source))
+
+- jobs.addJob(Jobs.Command('clang', cmd_args))
++ jobs.addJob(Jobs.Command('%s/clang' %
self.toolChain.driver.driverDir, cmd_args))
+
+ class Darwin_X86_CC1Tool(Tool):
+ def getCC1Name(self, type):
+--------------
_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
