svn commit: r199515 - in projects/clangbsd/usr.bin/clang: . bin/clang bin/tblgen include/clang/Driver lib/libclangdriver

[Roman Divacky]

Author: rdivacky
Date: Thu Nov 19 11:13:36 2009
New Revision: 199515
URL: http://svn.freebsd.org/changeset/base/199515

Log:
  update LLVM/clang build

Added:
  projects/clangbsd/usr.bin/clang/include/clang/Driver/
  projects/clangbsd/usr.bin/clang/include/clang/Driver/CC1Options.inc
  projects/clangbsd/usr.bin/clang/include/clang/Driver/Options.inc
Modified:
  projects/clangbsd/usr.bin/clang/bin/clang/Makefile
  projects/clangbsd/usr.bin/clang/bin/tblgen/Makefile
  projects/clangbsd/usr.bin/clang/clang.build.mk
  projects/clangbsd/usr.bin/clang/lib/libclangdriver/Makefile

Modified: projects/clangbsd/usr.bin/clang/bin/clang/Makefile
==============================================================================
--- projects/clangbsd/usr.bin/clang/bin/clang/Makefile	Thu Nov 19 11:12:59 2009	(r199514)
+++ projects/clangbsd/usr.bin/clang/bin/clang/Makefile	Thu Nov 19 11:13:36 2009	(r199515)
@@ -5,7 +5,7 @@
 PROG_CXX=clang
 
 SRCDIR=	tools/clang/tools/driver
-SRCS=	driver.cpp
+SRCS=	cc1_main.cpp driver.cpp
 MAN=
 
 .if ${MK_CLANG_IS_CC} != "no"
@@ -15,7 +15,7 @@ LINKS=	${BINDIR}/clang ${BINDIR}/cc \
 	${BINDIR}/clang ${BINDIR}/clang++
 .endif
 
-TGHDRS=	DiagnosticCommonKinds
+TGHDRS=	DiagnosticCommonKinds DiagnosticDriverKinds CC1Options
 LIBDEPS=clangdriver clangfrontend clanglex clangbasic \
 	llvmbitreader llvmbitwriter llvmsupport llvmsystem
 

Modified: projects/clangbsd/usr.bin/clang/bin/tblgen/Makefile
==============================================================================
--- projects/clangbsd/usr.bin/clang/bin/tblgen/Makefile	Thu Nov 19 11:12:59 2009	(r199514)
+++ projects/clangbsd/usr.bin/clang/bin/tblgen/Makefile	Thu Nov 19 11:13:36 2009	(r199515)
@@ -8,7 +8,7 @@ SRCS=	AsmMatcherEmitter.cpp AsmWriterEmi
 	CodeGenDAGPatterns.cpp CodeGenInstruction.cpp \
 	CodeGenTarget.cpp DAGISelEmitter.cpp FastISelEmitter.cpp \
 	InstrEnumEmitter.cpp InstrInfoEmitter.cpp IntrinsicEmitter.cpp \
-	LLVMCConfigurationEmitter.cpp Record.cpp \
+	LLVMCConfigurationEmitter.cpp OptParserEmitter.cpp Record.cpp \
 	RegisterInfoEmitter.cpp SubtargetEmitter.cpp TGLexer.cpp \
 	TGParser.cpp TGValueTypes.cpp TableGen.cpp TableGenBackend.cpp
 

Modified: projects/clangbsd/usr.bin/clang/clang.build.mk
==============================================================================
--- projects/clangbsd/usr.bin/clang/clang.build.mk	Thu Nov 19 11:12:59 2009	(r199514)
+++ projects/clangbsd/usr.bin/clang/clang.build.mk	Thu Nov 19 11:13:36 2009	(r199515)
@@ -50,6 +50,15 @@ Diagnostic${hdr}Kinds.inc.h: ${CLANG_SRC
 		-gen-clang-diags-defs -clang-component=${hdr} \
 		${CLANG_SRCS}/include/clang/Basic/Diagnostic.td > ${.TARGET}
 .endfor
+Options.inc.h: ${CLANG_SRCS}/include/clang/Driver/Options.td
+	${TBLGEN} -I${CLANG_SRCS}/include/clang/Driver \
+	   -gen-opt-parser-defs \
+	   ${CLANG_SRCS}/include/clang/Driver/Options.td > ${.TARGET}
+
+CC1Options.inc.h: ${CLANG_SRCS}/include/clang/Driver/CC1Options.td
+	${TBLGEN} -I${CLANG_SRCS}/include/clang/Driver \
+	   -gen-opt-parser-defs \
+	   ${CLANG_SRCS}/include/clang/Driver/CC1Options.td > ${.TARGET}
 
 SRCS+=		${TGHDRS:C/$/.inc.h/}
 DPADD+=		${TGHDRS:C/$/.inc.h/}

Added: projects/clangbsd/usr.bin/clang/include/clang/Driver/CC1Options.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clangbsd/usr.bin/clang/include/clang/Driver/CC1Options.inc	Thu Nov 19 11:13:36 2009	(r199515)
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "CC1Options.inc.h"

Added: projects/clangbsd/usr.bin/clang/include/clang/Driver/Options.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clangbsd/usr.bin/clang/include/clang/Driver/Options.inc	Thu Nov 19 11:13:36 2009	(r199515)
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "Options.inc.h"

Modified: projects/clangbsd/usr.bin/clang/lib/libclangdriver/Makefile
==============================================================================
--- projects/clangbsd/usr.bin/clang/lib/libclangdriver/Makefile	Thu Nov 19 11:12:59 2009	(r199514)
+++ projects/clangbsd/usr.bin/clang/lib/libclangdriver/Makefile	Thu Nov 19 11:13:36 2009	(r199515)
@@ -3,10 +3,11 @@
 LIB=	clangdriver
 
 SRCDIR=	tools/clang/lib/Driver
-SRCS=	Action.cpp Arg.cpp ArgList.cpp Compilation.cpp Driver.cpp \
-	HostInfo.cpp Job.cpp OptTable.cpp Option.cpp Phases.cpp \
+SRCS=	Action.cpp Arg.cpp ArgList.cpp CC1Options.cpp Compilation.cpp \
+	Driver.cpp DriverOptions.cpp HostInfo.cpp Job.cpp OptTable.cpp \
+	Option.cpp Phases.cpp \
 	Tool.cpp ToolChain.cpp ToolChains.cpp Tools.cpp Types.cpp
 
-TGHDRS=	DiagnosticCommonKinds DiagnosticDriverKinds
+TGHDRS=	DiagnosticCommonKinds DiagnosticDriverKinds Options CC1Options
 
 .include "../../clang.lib.mk"