Module Name: src
Committed By: joerg
Date: Tue Oct 11 13:54:01 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: mi
src/external/bsd/llvm: Makefile.inc tablegen.mk
src/external/bsd/llvm/bin: Makefile
src/external/bsd/llvm/bin/llc: Makefile
src/external/bsd/llvm/bin/lli: Makefile
src/external/bsd/llvm/bin/llvm-link: Makefile
src/external/bsd/llvm/bin/llvm-mc: Makefile
src/external/bsd/llvm/bin/tblgen: Makefile
src/external/bsd/llvm/include: Makefile
src/external/bsd/llvm/lib: Makefile
src/external/bsd/llvm/lib/libLLVMARMCodeGen: Makefile
src/external/bsd/llvm/lib/libLLVMCodeGen: Makefile
src/external/bsd/llvm/lib/libLLVMCore: Makefile
src/external/bsd/llvm/lib/libLLVMMC: Makefile
src/external/bsd/llvm/lib/libLLVMMipsMCTargetDesc: Makefile
src/external/bsd/llvm/lib/libLLVMObject: Makefile
src/external/bsd/llvm/lib/libLLVMSupport: Makefile
src/external/bsd/llvm/lib/libLLVMX86CodeGen: Makefile
src/external/bsd/llvm/lib/libclangAST: Makefile
src/external/bsd/llvm/lib/libclangAnalysis: Makefile
src/external/bsd/llvm/lib/libclangBasic: Makefile
src/external/bsd/llvm/lib/libclangCodeGen: Makefile
src/external/bsd/llvm/lib/libclangFrontend: Makefile
src/external/bsd/llvm/lib/libclangSema: Makefile
src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers: Makefile
src/share/mk: bsd.own.mk
src/sys/arch/i386/stand: Makefile.inc
src/tools: Makefile
src/tools/llvm-tblgen: Makefile
Added Files:
src/external/bsd/llvm/bin/clang-tblgen: Makefile
src/external/bsd/llvm/bin/llvm-cov: Makefile
src/external/bsd/llvm/bin/llvm-dwarfdump: Makefile
src/external/bsd/llvm/bin/llvm-size: Makefile
src/external/bsd/llvm/lib/libLLVMDebugInfo: Makefile
src/external/bsd/llvm/lib/libLLVMTableGen: Makefile
src/tools/llvm-clang-tblgen: Makefile
src/tools/llvm-lib/libLLVMTableGen: Makefile
Removed Files:
src/external/bsd/llvm/bin/llvmc: Makefile
src/external/bsd/llvm/lib/libLLVMCompilerDriver: Makefile
Log Message:
Update LLVM/Clang snapshot to r141658. This primarily fixes a regression
preventing Qt4 from building.
To generate a diff of this commit:
cvs rdiff -u -r1.1690 -r1.1691 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/tablegen.mk
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/bin/clang-tblgen/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/llvm/bin/llc/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/bin/lli/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/bin/llvm-cov/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/bin/llvm-dwarfdump/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/bin/llvm-link/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/llvm/bin/llvm-mc/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/bin/llvm-size/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/llvm/bin/llvmc/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/bin/tblgen/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/include/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/llvm/lib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/bsd/llvm/lib/libLLVMCompilerDriver/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/lib/libLLVMCore/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libLLVMDebugInfo/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/llvm/lib/libLLVMMC/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/llvm/lib/libLLVMMipsMCTargetDesc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/lib/libLLVMObject/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/lib/libLLVMSupport/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libLLVMTableGen/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/lib/libclangAST/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/lib/libclangAnalysis/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/lib/libclangBasic/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/lib/libclangCodeGen/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/lib/libclangFrontend/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/llvm/lib/libclangSema/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile
cvs rdiff -u -r1.683 -r1.684 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/stand/Makefile.inc
cvs rdiff -u -r1.148 -r1.149 src/tools/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/llvm-clang-tblgen/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libLLVMTableGen/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tools/llvm-tblgen/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1690 src/distrib/sets/lists/comp/mi:1.1691
--- src/distrib/sets/lists/comp/mi:1.1690 Sun Oct 9 17:41:06 2011
+++ src/distrib/sets/lists/comp/mi Tue Oct 11 13:53:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1690 2011/10/09 17:41:06 christos Exp $
+# $NetBSD: mi,v 1.1691 2011/10/11 13:53:56 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -16,6 +16,7 @@
./usr/bin/clang comp-c-bin llvm
./usr/bin/clang++ comp-c-bin llvm
./usr/bin/clang-cpp comp-c-bin llvm
+./usr/bin/clang-tblgen comp-c-bin llvm
./usr/bin/config comp-util-bin
./usr/bin/crunchgen comp-c-bin
./usr/bin/crunchide comp-c-bin
Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.22 src/external/bsd/llvm/Makefile.inc:1.23
--- src/external/bsd/llvm/Makefile.inc:1.22 Mon Sep 12 13:32:59 2011
+++ src/external/bsd/llvm/Makefile.inc Tue Oct 11 13:53:57 2011
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.22 2011/09/12 13:32:59 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.23 2011/10/11 13:53:57 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
.include <bsd.own.mk>
-LLVM_REVISION= 139231
-CLANG_REVISION= 139231
+LLVM_REVISION= 141658
+CLANG_REVISION= 141658
LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
Index: src/external/bsd/llvm/tablegen.mk
diff -u src/external/bsd/llvm/tablegen.mk:1.3 src/external/bsd/llvm/tablegen.mk:1.4
--- src/external/bsd/llvm/tablegen.mk:1.3 Mon Sep 12 13:32:59 2011
+++ src/external/bsd/llvm/tablegen.mk Tue Oct 11 13:53:57 2011
@@ -1,12 +1,12 @@
-# $NetBSD: tablegen.mk,v 1.3 2011/09/12 13:32:59 joerg Exp $
+# $NetBSD: tablegen.mk,v 1.4 2011/10/11 13:53:57 joerg Exp $
.include <bsd.own.mk>
.for t in ${TABLEGEN_SRC}
.for f in ${TABLEGEN_OUTPUT} ${TABLEGEN_OUTPUT.${t}}
-${f:C,\|.*$,,}: ${t} ${TOOL_TBLGEN}
+${f:C,\|.*$,,}: ${t} ${TOOL_LLVM_TBLGEN}
[ -z "${f:C,\|.*$,,}" ] || mkdir -p ${f:C,\|.*$,,:H}
- ${TOOL_TBLGEN} -I${LLVM_SRCDIR}/include ${TABLEGEN_INCLUDES} \
+ ${TOOL_LLVM_TBLGEN} -I${LLVM_SRCDIR}/include ${TABLEGEN_INCLUDES} \
${TABLEGEN_INCLUDES.${t}} ${f:C,^.*\|,,:C,\^, ,} \
${.ALLSRC:M*/${t}} -d ${.TARGET}.d -o ${.TARGET}
DPSRCS+= ${f:C,\|.*$,,}
@@ -15,3 +15,18 @@ CLEANFILES+= ${f:C,\|.*$,,} ${f:C,\|.*$,
.sinclude "${f:C,\|.*$,,:C,$,.d,}"
.endfor
.endfor
+
+.for t in ${CLANG_TABLEGEN_SRC}
+.for f in ${CLANG_TABLEGEN_OUTPUT} ${CLANG_TABLEGEN_OUTPUT.${t}}
+${f:C,\|.*$,,}: ${t} ${TOOL_CLANG_TBLGEN}
+ [ -z "${f:C,\|.*$,,}" ] || mkdir -p ${f:C,\|.*$,,:H}
+ ${TOOL_CLANG_TBLGEN} -I${LLVM_SRCDIR}/include \
+ ${CLANG_TABLEGEN_INCLUDES} ${CLANG_TABLEGEN_INCLUDES.${t}} \
+ ${f:C,^.*\|,,:C,\^, ,} \
+ ${.ALLSRC:M*/${t}} -d ${.TARGET}.d -o ${.TARGET}
+DPSRCS+= ${f:C,\|.*$,,}
+CLEANFILES+= ${f:C,\|.*$,,} ${f:C,\|.*$,,:C,$,.d,}
+
+.sinclude "${f:C,\|.*$,,:C,$,.d,}"
+.endfor
+.endfor
Index: src/external/bsd/llvm/bin/Makefile
diff -u src/external/bsd/llvm/bin/Makefile:1.2 src/external/bsd/llvm/bin/Makefile:1.3
--- src/external/bsd/llvm/bin/Makefile:1.2 Mon Mar 28 11:41:48 2011
+++ src/external/bsd/llvm/bin/Makefile Tue Oct 11 13:53:57 2011
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2011/03/28 11:41:48 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2011/10/11 13:53:57 joerg Exp $
.include <bsd.own.mk>
SUBDIR= clang \
+ clang-tblgen \
tblgen
.if defined(LLVM_DEVELOPER)
@@ -13,8 +14,10 @@ SUBDIR+= \
llvm-ar \
llvm-as \
llvm-bcanalyzer \
+ llvm-cov \
llvm-diff \
llvm-dis \
+ llvm-dwarfdump \
llvm-extract \
llvm-ld \
llvm-link \
@@ -22,8 +25,8 @@ SUBDIR+= \
llvm-nm \
llvm-prof \
llvm-ranlib \
+ llvm-size \
llvm-stub \
- llvmc \
macho-dumpx \
opt
.endif
Index: src/external/bsd/llvm/bin/llc/Makefile
diff -u src/external/bsd/llvm/bin/llc/Makefile:1.9 src/external/bsd/llvm/bin/llc/Makefile:1.10
--- src/external/bsd/llvm/bin/llc/Makefile:1.9 Sun Jul 17 20:07:57 2011
+++ src/external/bsd/llvm/bin/llc/Makefile Tue Oct 11 13:53:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/07/17 20:07:57 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2011/10/11 13:53:57 joerg Exp $
PROG_CXX= llc
NOMAN= yes
@@ -37,10 +37,10 @@ LLVM_LIBS+= \
X86Utils \
SelectionDAG \
CodeGen \
- Target \
ScalarOpts \
TransformsUtils \
Analysis \
+ Target \
MCParser \
MC \
Core \
Index: src/external/bsd/llvm/bin/lli/Makefile
diff -u src/external/bsd/llvm/bin/lli/Makefile:1.5 src/external/bsd/llvm/bin/lli/Makefile:1.6
--- src/external/bsd/llvm/bin/lli/Makefile:1.5 Sun Jul 17 20:07:57 2011
+++ src/external/bsd/llvm/bin/lli/Makefile Tue Oct 11 13:53:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/07/17 20:07:57 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2011/10/11 13:53:57 joerg Exp $
PROG_CXX= lli
NOMAN= yes
@@ -27,10 +27,10 @@ LLVM_LIBS+= \
Object \
SelectionDAG \
CodeGen \
- Target \
ScalarOpts \
TransformsUtils \
Analysis \
+ Target \
MC \
Core \
Support
Index: src/external/bsd/llvm/bin/llvm-link/Makefile
diff -u src/external/bsd/llvm/bin/llvm-link/Makefile:1.1 src/external/bsd/llvm/bin/llvm-link/Makefile:1.2
--- src/external/bsd/llvm/bin/llvm-link/Makefile:1.1 Sun Feb 6 01:13:46 2011
+++ src/external/bsd/llvm/bin/llvm-link/Makefile Tue Oct 11 13:53:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/02/06 01:13:46 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2011/10/11 13:53:58 joerg Exp $
PROG_CXX= llvm-link
NOMAN= yes
@@ -15,6 +15,8 @@ LLVM_LIBS+= \
BitWriter \
Linker \
TransformsUtils \
+ Analysis \
+ Target \
Core \
Support
Index: src/external/bsd/llvm/bin/llvm-mc/Makefile
diff -u src/external/bsd/llvm/bin/llvm-mc/Makefile:1.9 src/external/bsd/llvm/bin/llvm-mc/Makefile:1.10
--- src/external/bsd/llvm/bin/llvm-mc/Makefile:1.9 Sun Jul 17 20:07:57 2011
+++ src/external/bsd/llvm/bin/llvm-mc/Makefile Tue Oct 11 13:53:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/07/17 20:07:57 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2011/10/11 13:53:58 joerg Exp $
PROG_CXX= llvm-mc
NOMAN= yes
@@ -14,8 +14,8 @@ LLVM_LIBS+= \
MCDisassembler \
ARMCodeGen \
ARMTargetInfo \
- ARMMCTargetDesc \
ARMAsmParser \
+ ARMMCTargetDesc \
ARMAsmPrinter \
ARMDisassembler \
MipsCodeGen \
Index: src/external/bsd/llvm/bin/tblgen/Makefile
diff -u src/external/bsd/llvm/bin/tblgen/Makefile:1.6 src/external/bsd/llvm/bin/tblgen/Makefile:1.7
--- src/external/bsd/llvm/bin/tblgen/Makefile:1.6 Wed Jul 13 23:48:29 2011
+++ src/external/bsd/llvm/bin/tblgen/Makefile Tue Oct 11 13:53:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/07/13 23:48:29 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2011/10/11 13:53:58 joerg Exp $
PROG_CXX= llvm-tblgen
NOMAN= yes
@@ -12,10 +12,6 @@ SRCS= ARMDecoderEmitter.cpp \
AsmWriterEmitter.cpp \
AsmWriterInst.cpp \
CallingConvEmitter.cpp \
- ClangASTNodesEmitter.cpp \
- ClangAttrEmitter.cpp \
- ClangDiagnosticsEmitter.cpp \
- ClangSACheckersEmitter.cpp \
CodeEmitterGen.cpp \
CodeGenDAGPatterns.cpp \
CodeGenInstruction.cpp \
@@ -28,31 +24,25 @@ SRCS= ARMDecoderEmitter.cpp \
DAGISelMatcherOpt.cpp \
DisassemblerEmitter.cpp \
EDEmitter.cpp \
- Error.cpp \
FastISelEmitter.cpp \
FixedLenDecoderEmitter.cpp \
FixedLenDecoderEmitter.h \
InstrEnumEmitter.cpp \
InstrInfoEmitter.cpp \
IntrinsicEmitter.cpp \
- LLVMCConfigurationEmitter.cpp \
- NeonEmitter.cpp \
- OptParserEmitter.cpp \
PseudoLoweringEmitter.cpp \
- Record.cpp \
RegisterInfoEmitter.cpp \
SetTheory.cpp \
StringMatcher.cpp \
SubtargetEmitter.cpp \
- TGLexer.cpp \
- TGParser.cpp \
TGValueTypes.cpp \
TableGen.cpp \
- TableGenBackend.cpp \
X86DisassemblerTables.cpp \
X86RecognizableInstr.cpp
-LLVM_LIBS+= Support
+LLVM_LIBS+= \
+ TableGen \
+ Support
.include "${.PARSEDIR}/../../link.mk"
Index: src/external/bsd/llvm/include/Makefile
diff -u src/external/bsd/llvm/include/Makefile:1.3 src/external/bsd/llvm/include/Makefile:1.4
--- src/external/bsd/llvm/include/Makefile:1.3 Thu May 12 14:56:23 2011
+++ src/external/bsd/llvm/include/Makefile Tue Oct 11 13:53:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/05/12 14:56:23 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2011/10/11 13:53:58 joerg Exp $
.include <bsd.init.mk>
@@ -34,29 +34,32 @@ HEADER= \
${CLANG_SRCDIR}/include/clang/Basic \
${CLANG_SRCDIR}/include/clang/Driver
-TABLEGEN_SRC= Intrinsics.td Attr.td StmtNodes.td DeclNodes.td \
- Diagnostic.td arm_neon.td Options.td CC1AsOptions.td CC1Options.td
+TABLEGEN_SRC= Intrinsics.td
TABLEGEN_OUTPUT.Intrinsics.td= \
llvm/Intrinsics.gen|-gen-intrinsic
-TABLEGEN_INCLUDES.Attr.td= -I${CLANG_SRCDIR}/include
-TABLEGEN_OUTPUT.Attr.td= \
+CLANG_TABLEGEN_SRC= Attr.td StmtNodes.td DeclNodes.td \
+ Diagnostic.td arm_neon.td Options.td CC1AsOptions.td CC1Options.td
+
+CLANG_TABLEGEN_INCLUDES.Attr.td= -I${CLANG_SRCDIR}/include
+CLANG_TABLEGEN_OUTPUT.Attr.td= \
clang/AST/Attrs.inc|-gen-clang-attr-classes \
clang/AST/AttrImpl.inc|-gen-clang-attr-impl \
clang/Basic/AttrList.inc|-gen-clang-attr-list \
clang/Lex/AttrSpellings.inc|-gen-clang-attr-spelling-list \
+ clang/Parse/AttrLateParsed.inc|-gen-clang-attr-late-parsed-list \
clang/Serialization/AttrPCHRead.inc|-gen-clang-attr-pch-read \
clang/Serialization/AttrPCHWrite.inc|-gen-clang-attr-pch-write
-TABLEGEN_OUTPUT.StmtNodes.td= \
+CLANG_TABLEGEN_OUTPUT.StmtNodes.td= \
clang/AST/StmtNodes.inc|-gen-clang-stmt-nodes
-TABLEGEN_OUTPUT.DeclNodes.td= \
+CLANG_TABLEGEN_OUTPUT.DeclNodes.td= \
clang/AST/DeclNodes.inc|-gen-clang-decl-nodes
-TABLEGEN_INCLUDES.Diagnostic.td= -I${CLANG_SRCDIR}/include/clang/Basic
-TABLEGEN_OUTPUT.Diagnostic.td= \
+CLANG_TABLEGEN_INCLUDES.Diagnostic.td= -I${CLANG_SRCDIR}/include/clang/Basic
+CLANG_TABLEGEN_OUTPUT.Diagnostic.td= \
clang/Basic/DiagnosticAnalysisKinds.inc|-gen-clang-diags-defs^-clang-component=Analysis \
clang/Basic/DiagnosticASTKinds.inc|-gen-clang-diags-defs^-clang-component=AST \
clang/Basic/DiagnosticCommonKinds.inc|-gen-clang-diags-defs^-clang-component=Common \
@@ -68,20 +71,20 @@ TABLEGEN_OUTPUT.Diagnostic.td= \
clang/Basic/DiagnosticGroups.inc|-gen-clang-diag-groups \
clang/Basic/DiagnosticIndexName.inc|-gen-clang-diags-index-name
-TABLEGEN_OUTPUT.arm_neon.td= \
+CLANG_TABLEGEN_OUTPUT.arm_neon.td= \
clang/Basic/arm_neon.inc|-gen-arm-neon-sema \
arm_neon.h.inc|-gen-arm-neon
-TABLEGEN_INCLUDES.Options.td= -I${CLANG_SRCDIR}/include/clang/Driver
-TABLEGEN_OUTPUT.Options.td= \
+CLANG_TABLEGEN_INCLUDES.Options.td= -I${CLANG_SRCDIR}/include/clang/Driver
+CLANG_TABLEGEN_OUTPUT.Options.td= \
clang/Driver/Options.inc|-gen-opt-parser-defs
-TABLEGEN_INCLUDES.CC1Options.td= -I${CLANG_SRCDIR}/include/clang/Driver
-TABLEGEN_OUTPUT.CC1Options.td= \
+CLANG_TABLEGEN_INCLUDES.CC1Options.td= -I${CLANG_SRCDIR}/include/clang/Driver
+CLANG_TABLEGEN_OUTPUT.CC1Options.td= \
clang/Driver/CC1Options.inc|-gen-opt-parser-defs
-TABLEGEN_INCLUDES.CC1AsOptions.td= -I${CLANG_SRCDIR}/include/clang/Driver
-TABLEGEN_OUTPUT.CC1AsOptions.td= \
+CLANG_TABLEGEN_INCLUDES.CC1AsOptions.td= -I${CLANG_SRCDIR}/include/clang/Driver
+CLANG_TABLEGEN_OUTPUT.CC1AsOptions.td= \
clang/Driver/CC1AsOptions.inc|-gen-opt-parser-defs
.include "${.PARSEDIR}/../tablegen.mk"
Index: src/external/bsd/llvm/lib/Makefile
diff -u src/external/bsd/llvm/lib/Makefile:1.15 src/external/bsd/llvm/lib/Makefile:1.16
--- src/external/bsd/llvm/lib/Makefile:1.15 Sun Jul 17 20:07:57 2011
+++ src/external/bsd/llvm/lib/Makefile Tue Oct 11 13:53:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/07/17 20:07:57 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2011/10/11 13:53:58 joerg Exp $
.include <bsd.own.mk>
@@ -22,6 +22,7 @@ SUBDIR= \
libLLVMScalarOpts \
libLLVMSelectionDAG \
libLLVMSupport \
+ libLLVMTableGen \
libLLVMTarget \
libLLVMTransformsUtils \
libLLVMARMCodeGen \
@@ -64,9 +65,9 @@ SUBDIR+= \
.if ${NO_LLVM_DEVELOPER:Uno} == "no" && ${LLVM_DEVELOPER:U} == "yes"
SUBDIR+= \
libLLVMArchive \
+ libLLVMDebugInfo \
libLLVMCBackend \
libLLVMCBackendInfo \
- libLLVMCompilerDriver \
libLLVMCppBackend \
libLLVMCppBackendInfo \
libLLVMExecutionEngine \
Index: src/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile:1.5 src/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile:1.6
--- src/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile:1.5 Thu Sep 1 12:24:35 2011
+++ src/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile Tue Oct 11 13:53:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/09/01 12:24:35 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2011/10/11 13:53:58 joerg Exp $
LIB= LLVMARMCodeGen
@@ -30,7 +30,6 @@ SRCS+= ARMAsmPrinter.cpp \
ARMTargetMachine.cpp \
ARMTargetObjectFile.cpp \
MLxExpansionPass.cpp \
- NEONMoveFix.cpp \
Thumb1InstrInfo.cpp \
Thumb1FrameLowering.cpp \
Thumb1RegisterInfo.cpp \
Index: src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.7 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.8
--- src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.7 Thu Sep 1 12:24:35 2011
+++ src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile Tue Oct 11 13:53:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/09/01 12:24:35 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2011/10/11 13:53:58 joerg Exp $
LIB= LLVMCodeGen
@@ -20,7 +20,9 @@ SRCS+= AggressiveAntiDepBreaker.cpp \
EdgeBundles.cpp \
ELFCodeEmitter.cpp \
ELFWriter.cpp \
+ ExecutionDepsFix.cpp \
ExpandISelPseudos.cpp \
+ ExpandPostRAPseudos.cpp \
GCMetadata.cpp \
GCMetadataPrinter.cpp \
GCStrategy.cpp \
@@ -35,11 +37,11 @@ SRCS+= AggressiveAntiDepBreaker.cpp \
LiveInterval.cpp \
LiveIntervalAnalysis.cpp \
LiveIntervalUnion.cpp \
+ LiveRangeCalc.cpp \
LiveStackAnalysis.cpp \
LiveVariables.cpp \
LiveRangeEdit.cpp \
LocalStackSlotAllocation.cpp \
- LowerSubregs.cpp \
MachineBasicBlock.cpp \
MachineBranchProbabilityInfo.cpp \
MachineBlockFrequencyInfo.cpp \
Index: src/external/bsd/llvm/lib/libLLVMCore/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMCore/Makefile:1.5 src/external/bsd/llvm/lib/libLLVMCore/Makefile:1.6
--- src/external/bsd/llvm/lib/libLLVMCore/Makefile:1.5 Wed Jul 13 23:48:30 2011
+++ src/external/bsd/llvm/lib/libLLVMCore/Makefile Tue Oct 11 13:53:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/07/13 23:48:30 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2011/10/11 13:53:59 joerg Exp $
LIB= LLVMCore
@@ -17,6 +17,7 @@ SRCS+= AsmWriter.cpp \
DebugLoc.cpp \
Dominators.cpp \
Function.cpp \
+ GCOV.cpp \
GVMaterializer.cpp \
Globals.cpp \
IRBuilder.cpp \
Index: src/external/bsd/llvm/lib/libLLVMMC/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMMC/Makefile:1.7 src/external/bsd/llvm/lib/libLLVMMC/Makefile:1.8
--- src/external/bsd/llvm/lib/libLLVMMC/Makefile:1.7 Thu Sep 1 12:24:36 2011
+++ src/external/bsd/llvm/lib/libLLVMMC/Makefile Tue Oct 11 13:53:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/09/01 12:24:36 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2011/10/11 13:53:59 joerg Exp $
LIB= LLVMMC
@@ -13,6 +13,7 @@ SRCS+= ELFObjectWriter.cpp \
MCAsmInfoDarwin.cpp \
MCAsmStreamer.cpp \
MCAssembler.cpp \
+ MCAtom.cpp \
MCCodeGenInfo.cpp \
MCCodeEmitter.cpp \
MCContext.cpp \
@@ -27,6 +28,7 @@ SRCS+= ELFObjectWriter.cpp \
MCInstPrinter.cpp \
MCLabel.cpp \
MCLoggingStreamer.cpp \
+ MCModule.cpp \
MCMachOStreamer.cpp \
MCMachObjectTargetWriter.cpp \
MCNullStreamer.cpp \
Index: src/external/bsd/llvm/lib/libLLVMMipsMCTargetDesc/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMMipsMCTargetDesc/Makefile:1.1 src/external/bsd/llvm/lib/libLLVMMipsMCTargetDesc/Makefile:1.2
--- src/external/bsd/llvm/lib/libLLVMMipsMCTargetDesc/Makefile:1.1 Sun Jul 17 20:07:58 2011
+++ src/external/bsd/llvm/lib/libLLVMMipsMCTargetDesc/Makefile Tue Oct 11 13:53:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/07/17 20:07:58 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2011/10/11 13:53:59 joerg Exp $
LIB= LLVMMipsMCTargetDesc
@@ -9,7 +9,9 @@ CPPFLAGS+= -I${MIPS_OBJDIR} -I${LLVM_SRC
.PATH: ${LLVM_SRCDIR}/lib/Target/Mips/MCTargetDesc
-SRCS+= MipsMCAsmInfo.cpp \
+SRCS+= MipsAsmBackend.cpp \
+ MipsMCAsmInfo.cpp \
+ MipsMCCodeEmitter.cpp \
MipsMCTargetDesc.cpp
.if defined(HOSTLIB)
Index: src/external/bsd/llvm/lib/libLLVMObject/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMObject/Makefile:1.3 src/external/bsd/llvm/lib/libLLVMObject/Makefile:1.4
--- src/external/bsd/llvm/lib/libLLVMObject/Makefile:1.3 Mon Jul 4 16:10:39 2011
+++ src/external/bsd/llvm/lib/libLLVMObject/Makefile Tue Oct 11 13:53:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/07/04 16:10:39 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2011/10/11 13:53:59 joerg Exp $
LIB= LLVMObject
NOGCCERROR= yes
@@ -7,7 +7,8 @@ NOGCCERROR= yes
.PATH: ${LLVM_SRCDIR}/lib/Object
-SRCS+= Binary.cpp \
+SRCS+= Archive.cpp \
+ Binary.cpp \
COFFObjectFile.cpp \
ELFObjectFile.cpp \
Error.cpp \
Index: src/external/bsd/llvm/lib/libLLVMSupport/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.5 src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.6
--- src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.5 Thu Sep 1 12:24:36 2011
+++ src/external/bsd/llvm/lib/libLLVMSupport/Makefile Tue Oct 11 13:53:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/09/01 12:24:36 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2011/10/11 13:53:59 joerg Exp $
LIB= LLVMSupport
@@ -18,6 +18,7 @@ SRCS+= APFloat.cpp \
CommandLine.cpp \
ConstantRange.cpp \
CrashRecoveryContext.cpp \
+ DataExtractor.cpp \
Debug.cpp \
DeltaAlgorithm.cpp \
DAGDeltaAlgorithm.cpp \
Index: src/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile:1.5 src/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile:1.6
--- src/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile:1.5 Thu Sep 1 12:24:36 2011
+++ src/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile Tue Oct 11 13:53:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/09/01 12:24:36 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2011/10/11 13:53:59 joerg Exp $
LIB= LLVMX86CodeGen
@@ -6,8 +6,7 @@ LIB= LLVMX86CodeGen
.PATH: ${LLVM_SRCDIR}/lib/Target/X86
-SRCS+= SSEDomainFix.cpp \
- X86AsmPrinter.cpp \
+SRCS+= X86AsmPrinter.cpp \
X86COFFMachineModuleInfo.cpp \
X86CodeEmitter.cpp \
X86ELFWriterInfo.cpp \
Index: src/external/bsd/llvm/lib/libclangAST/Makefile
diff -u src/external/bsd/llvm/lib/libclangAST/Makefile:1.2 src/external/bsd/llvm/lib/libclangAST/Makefile:1.3
--- src/external/bsd/llvm/lib/libclangAST/Makefile:1.2 Fri Mar 18 23:32:03 2011
+++ src/external/bsd/llvm/lib/libclangAST/Makefile Tue Oct 11 13:54:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/03/18 23:32:03 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2011/10/11 13:54:00 joerg Exp $
LIB= clangAST
@@ -38,6 +38,7 @@ SRCS+= APValue.cpp \
ParentMap.cpp \
RecordLayout.cpp \
RecordLayoutBuilder.cpp \
+ SelectorLocationsKind.cpp \
Stmt.cpp \
StmtDumper.cpp \
StmtIterator.cpp \
@@ -48,7 +49,9 @@ SRCS+= APValue.cpp \
TemplateName.cpp \
Type.cpp \
TypeLoc.cpp \
- TypePrinter.cpp
+ TypePrinter.cpp \
+ VTTBuilder.cpp \
+ VTableBuilder.cpp
.if defined(HOSTLIB)
.include <bsd.hostlib.mk>
Index: src/external/bsd/llvm/lib/libclangAnalysis/Makefile
diff -u src/external/bsd/llvm/lib/libclangAnalysis/Makefile:1.3 src/external/bsd/llvm/lib/libclangAnalysis/Makefile:1.4
--- src/external/bsd/llvm/lib/libclangAnalysis/Makefile:1.3 Thu Sep 1 12:24:36 2011
+++ src/external/bsd/llvm/lib/libclangAnalysis/Makefile Tue Oct 11 13:54:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/09/01 12:24:36 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2011/10/11 13:54:00 joerg Exp $
LIB= clangAnalysis
@@ -18,6 +18,7 @@ SRCS+= AnalysisContext.cpp \
PseudoConstantAnalysis.cpp \
ReachableCode.cpp \
ScanfFormatString.cpp \
+ ThreadSafety.cpp \
UninitializedValues.cpp
.if defined(HOSTLIB)
Index: src/external/bsd/llvm/lib/libclangBasic/Makefile
diff -u src/external/bsd/llvm/lib/libclangBasic/Makefile:1.2 src/external/bsd/llvm/lib/libclangBasic/Makefile:1.3
--- src/external/bsd/llvm/lib/libclangBasic/Makefile:1.2 Thu May 12 14:56:24 2011
+++ src/external/bsd/llvm/lib/libclangBasic/Makefile Tue Oct 11 13:54:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/12 14:56:24 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2011/10/11 13:54:00 joerg Exp $
LIB= clangBasic
@@ -13,6 +13,7 @@ SRCS+= Builtins.cpp \
FileManager.cpp \
FileSystemStatCache.cpp \
IdentifierTable.cpp \
+ LangOptions.cpp \
SourceLocation.cpp \
SourceManager.cpp \
TargetInfo.cpp \
Index: src/external/bsd/llvm/lib/libclangCodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libclangCodeGen/Makefile:1.2 src/external/bsd/llvm/lib/libclangCodeGen/Makefile:1.3
--- src/external/bsd/llvm/lib/libclangCodeGen/Makefile:1.2 Thu May 12 14:56:24 2011
+++ src/external/bsd/llvm/lib/libclangCodeGen/Makefile Tue Oct 11 13:54:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/12 14:56:24 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2011/10/11 13:54:00 joerg Exp $
LIB= clangCodeGen
@@ -9,6 +9,8 @@ LIB= clangCodeGen
SRCS+= BackendUtil.cpp \
CGBlocks.cpp \
CGBuiltin.cpp \
+ CGCUDANV.cpp \
+ CGCUDARuntime.cpp \
CGCall.cpp \
CGClass.cpp \
CGCleanup.cpp \
@@ -28,6 +30,7 @@ SRCS+= BackendUtil.cpp \
CGObjCGNU.cpp \
CGObjCMac.cpp \
CGObjCRuntime.cpp \
+ CGOpenCLRuntime.cpp \
CGRecordLayoutBuilder.cpp \
CGRTTI.cpp \
CGStmt.cpp \
Index: src/external/bsd/llvm/lib/libclangFrontend/Makefile
diff -u src/external/bsd/llvm/lib/libclangFrontend/Makefile:1.5 src/external/bsd/llvm/lib/libclangFrontend/Makefile:1.6
--- src/external/bsd/llvm/lib/libclangFrontend/Makefile:1.5 Wed Jul 13 23:48:30 2011
+++ src/external/bsd/llvm/lib/libclangFrontend/Makefile Tue Oct 11 13:54:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/07/13 23:48:30 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2011/10/11 13:54:00 joerg Exp $
LIB= clangFrontend
@@ -26,7 +26,7 @@ SRCS+= ASTConsumers.cpp \
PrintPreprocessedOutput.cpp \
TextDiagnosticBuffer.cpp \
TextDiagnosticPrinter.cpp \
- VerifyDiagnosticsClient.cpp \
+ VerifyDiagnosticConsumer.cpp \
Warnings.cpp
.if defined(HOSTLIB)
Index: src/external/bsd/llvm/lib/libclangSema/Makefile
diff -u src/external/bsd/llvm/lib/libclangSema/Makefile:1.4 src/external/bsd/llvm/lib/libclangSema/Makefile:1.5
--- src/external/bsd/llvm/lib/libclangSema/Makefile:1.4 Tue Aug 2 17:12:39 2011
+++ src/external/bsd/llvm/lib/libclangSema/Makefile Tue Oct 11 13:54:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/08/02 17:12:39 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2011/10/11 13:54:00 joerg Exp $
LIB= clangSema
@@ -13,6 +13,7 @@ SRCS+= AnalysisBasedWarnings.cpp \
DelayedDiagnostic.cpp \
IdentifierResolver.cpp \
JumpDiagnostics.cpp \
+ MultiInitializer.cpp \
Scope.cpp \
Sema.cpp \
SemaAccess.cpp \
Index: src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile
diff -u src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile:1.7 src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile:1.8
--- src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile:1.7 Mon Sep 12 13:32:59 2011
+++ src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile Tue Oct 11 13:54:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/09/12 13:32:59 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2011/10/11 13:54:00 joerg Exp $
LIB= clangStaticAnalyzerCheckers
@@ -59,9 +59,9 @@ SRCS+= AdjustedReturnValueChecker.cpp \
UnreachableCodeChecker.cpp \
VLASizeChecker.cpp
-TABLEGEN_SRC= Checkers.td
-TABLEGEN_INCLUDES= -I${CLANG_SRCDIR}/include
-TABLEGEN_OUTPUT= Checkers.inc|-gen-clang-sa-checkers
+CLANG_TABLEGEN_SRC= Checkers.td
+CLANG_TABLEGEN_INCLUDES= -I${CLANG_SRCDIR}/include
+CLANG_TABLEGEN_OUTPUT= Checkers.inc|-gen-clang-sa-checkers
.include "${.PARSEDIR}/../../tablegen.mk"
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.683 src/share/mk/bsd.own.mk:1.684
--- src/share/mk/bsd.own.mk:1.683 Sat Oct 8 21:55:16 2011
+++ src/share/mk/bsd.own.mk Tue Oct 11 13:54:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.683 2011/10/08 21:55:16 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.684 2011/10/11 13:54:00 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -274,6 +274,7 @@ TOOL_AWK= ${TOOLDIR}/bin/${_TOOL_PREFIX
TOOL_CAP_MKDB= ${TOOLDIR}/bin/${_TOOL_PREFIX}cap_mkdb
TOOL_CAT= ${TOOLDIR}/bin/${_TOOL_PREFIX}cat
TOOL_CKSUM= ${TOOLDIR}/bin/${_TOOL_PREFIX}cksum
+TOOL_CLANG_TBLGEN= ${TOOLDIR}/bin/${_TOOL_PREFIX}clang-tblgen
TOOL_COMPILE_ET= ${TOOLDIR}/bin/${_TOOL_PREFIX}compile_et
TOOL_CONFIG= ${TOOLDIR}/bin/${_TOOL_PREFIX}config
TOOL_CRUNCHGEN= MAKE=${.MAKE:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}crunchgen
@@ -297,6 +298,7 @@ TOOL_INDXBIB= ${TOOLDIR}/bin/${_TOOL_PR
TOOL_INSTALLBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}installboot
TOOL_INSTALL_INFO= ${TOOLDIR}/bin/${_TOOL_PREFIX}install-info
TOOL_JOIN= ${TOOLDIR}/bin/${_TOOL_PREFIX}join
+TOOL_LLVM_TBLGEN= ${TOOLDIR}/bin/${_TOOL_PREFIX}llvm-tblgen
TOOL_M4= ${TOOLDIR}/bin/${_TOOL_PREFIX}m4
TOOL_MACPPCFIXCOFF= ${TOOLDIR}/bin/${_TOOL_PREFIX}macppc-fixcoff
TOOL_MAKEFS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makefs
@@ -339,7 +341,6 @@ TOOL_STAT= ${TOOLDIR}/bin/${_TOOL_PREFI
TOOL_STRFILE= ${TOOLDIR}/bin/${_TOOL_PREFIX}strfile
TOOL_SUNLABEL= ${TOOLDIR}/bin/${_TOOL_PREFIX}sunlabel
TOOL_TBL= ${TOOLDIR}/bin/${_TOOL_PREFIX}tbl
-TOOL_TBLGEN= ${TOOLDIR}/bin/${_TOOL_PREFIX}tblgen
TOOL_TIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}tic
TOOL_UUDECODE= ${TOOLDIR}/bin/${_TOOL_PREFIX}uudecode
TOOL_VGRIND= ${TOOLDIR}/bin/${_TOOL_PREFIX}vgrind -f
@@ -372,6 +373,7 @@ TOOL_AWK= awk
TOOL_CAP_MKDB= cap_mkdb
TOOL_CAT= cat
TOOL_CKSUM= cksum
+TOOL_CLANG_TBLGEN= clang-tblgen
TOOL_COMPILE_ET= compile_et
TOOL_CONFIG= config
TOOL_CRUNCHGEN= crunchgen
@@ -395,6 +397,7 @@ TOOL_INDXBIB= indxbib
TOOL_INSTALLBOOT= installboot
TOOL_INSTALL_INFO= install-info
TOOL_JOIN= join
+TOOL_LLVM_TBLGEN= llvm-tblgen
TOOL_M4= m4
TOOL_MACPPCFIXCOFF= macppc-fixcoff
TOOL_MAKEFS= makefs
@@ -436,7 +439,6 @@ TOOL_STAT= stat
TOOL_STRFILE= strfile
TOOL_SUNLABEL= sunlabel
TOOL_TBL= tbl
-TOOL_TBLGEN= llvm-tblgen
TOOL_TIC= tic
TOOL_UUDECODE= uudecode
TOOL_VGRIND= vgrind -f
Index: src/sys/arch/i386/stand/Makefile.inc
diff -u src/sys/arch/i386/stand/Makefile.inc:1.7 src/sys/arch/i386/stand/Makefile.inc:1.8
--- src/sys/arch/i386/stand/Makefile.inc:1.7 Thu Jun 16 16:39:53 2011
+++ src/sys/arch/i386/stand/Makefile.inc Tue Oct 11 13:54:00 2011
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.7 2011/06/16 16:39:53 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.8 2011/10/11 13:54:00 joerg Exp $
.include <bsd.own.mk>
BINDIR= /usr/mdec
OPT_SIZE.gcc= -Os -ffreestanding -fomit-frame-pointer
-OPT_SIZE.clang= -Oz -ffreestanding -fomit-frame-pointer \
+OPT_SIZE.clang= -Oz -ffreestanding -fomit-frame-pointer -DNDEBUG \
-fno-stack-protector -mno-sse \
+ -mllvm -enable-iv-rewrite=true \
-mllvm -stack-alignment=4 -mllvm -realign-stack=false \
-mllvm -inline-threshold=3 -mllvm -enable-load-pre=false
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.148 src/tools/Makefile:1.149
--- src/tools/Makefile:1.148 Sat Jul 16 15:52:01 2011
+++ src/tools/Makefile Tue Oct 11 13:54:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.148 2011/07/16 15:52:01 tsutsui Exp $
+# $NetBSD: Makefile,v 1.149 2011/10/11 13:54:01 joerg Exp $
.include <bsd.own.mk>
@@ -69,8 +69,9 @@ SUBDIR= host-mkdep .WAIT compat .WAIT \
.if ${MKLLVM} != "no"
SUBDIR+= \
llvm .WAIT \
- llvm-lib/libLLVMSupport .WAIT \
+ llvm-lib/libLLVMSupport llvm-lib/libLLVMTableGen .WAIT \
llvm-tblgen .WAIT \
+ llvm-clang-tblgen .WAIT \
llvm-include .WAIT \
llvm-lib .WAIT \
llvm-clang
Index: src/tools/llvm-tblgen/Makefile
diff -u src/tools/llvm-tblgen/Makefile:1.1 src/tools/llvm-tblgen/Makefile:1.2
--- src/tools/llvm-tblgen/Makefile:1.1 Sun Feb 6 01:14:24 2011
+++ src/tools/llvm-tblgen/Makefile Tue Oct 11 13:54:01 2011
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2011/02/06 01:14:24 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2011/10/11 13:54:01 joerg Exp $
-HOSTPROGNAME= ${_TOOL_PREFIX}tblgen
-HOSTPROG_CXX= ${_TOOL_PREFIX}tblgen
+HOSTPROGNAME= ${_TOOL_PREFIX}llvm-tblgen
+HOSTPROG_CXX= ${_TOOL_PREFIX}llvm-tblgen
HOST_SRCDIR= external/bsd/llvm/bin/tblgen
.include "${.CURDIR}/../Makefile.host"
Added files:
Index: src/external/bsd/llvm/bin/clang-tblgen/Makefile
diff -u /dev/null src/external/bsd/llvm/bin/clang-tblgen/Makefile:1.1
--- /dev/null Tue Oct 11 13:54:02 2011
+++ src/external/bsd/llvm/bin/clang-tblgen/Makefile Tue Oct 11 13:53:57 2011
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2011/10/11 13:53:57 joerg Exp $
+
+PROG_CXX= clang-tblgen
+NOMAN= yes
+
+.include <bsd.init.mk>
+
+.PATH: ${CLANG_SRCDIR}/utils/TableGen
+
+SRCS= ClangASTNodesEmitter.cpp \
+ ClangAttrEmitter.cpp \
+ ClangDiagnosticsEmitter.cpp \
+ ClangSACheckersEmitter.cpp \
+ NeonEmitter.cpp \
+ OptParserEmitter.cpp \
+ TableGen.cpp
+
+LLVM_LIBS+= \
+ TableGen \
+ Support
+
+.include "${.PARSEDIR}/../../link.mk"
+
+.include <bsd.prog.mk>
Index: src/external/bsd/llvm/bin/llvm-cov/Makefile
diff -u /dev/null src/external/bsd/llvm/bin/llvm-cov/Makefile:1.1
--- /dev/null Tue Oct 11 13:54:02 2011
+++ src/external/bsd/llvm/bin/llvm-cov/Makefile Tue Oct 11 13:53:57 2011
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2011/10/11 13:53:57 joerg Exp $
+
+PROG_CXX= llvm-cov
+NOMAN= yes
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/tools/llvm-cov
+
+SRCS= llvm-cov.cpp
+
+LLVM_LIBS+= \
+ Core \
+ Support
+
+.include "${.PARSEDIR}/../../link.mk"
+
+.include <bsd.prog.mk>
Index: src/external/bsd/llvm/bin/llvm-dwarfdump/Makefile
diff -u /dev/null src/external/bsd/llvm/bin/llvm-dwarfdump/Makefile:1.1
--- /dev/null Tue Oct 11 13:54:02 2011
+++ src/external/bsd/llvm/bin/llvm-dwarfdump/Makefile Tue Oct 11 13:53:57 2011
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2011/10/11 13:53:57 joerg Exp $
+
+PROG_CXX= llvm-dwarfdump
+NOMAN= yes
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/tools/llvm-dwarfdump
+
+SRCS= llvm-dwarfdump.cpp
+
+LLVM_LIBS+= \
+ DebugInfo \
+ Object \
+ Support
+
+.include "${.PARSEDIR}/../../link.mk"
+
+.include <bsd.prog.mk>
Index: src/external/bsd/llvm/bin/llvm-size/Makefile
diff -u /dev/null src/external/bsd/llvm/bin/llvm-size/Makefile:1.1
--- /dev/null Tue Oct 11 13:54:02 2011
+++ src/external/bsd/llvm/bin/llvm-size/Makefile Tue Oct 11 13:53:58 2011
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2011/10/11 13:53:58 joerg Exp $
+
+PROG_CXX= llvm-size
+NOMAN= yes
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/tools/llvm-size
+
+SRCS= llvm-size.cpp
+
+LLVM_LIBS+= \
+ Object \
+ Support
+
+.include "${.PARSEDIR}/../../link.mk"
+
+.include <bsd.prog.mk>
Index: src/external/bsd/llvm/lib/libLLVMDebugInfo/Makefile
diff -u /dev/null src/external/bsd/llvm/lib/libLLVMDebugInfo/Makefile:1.1
--- /dev/null Tue Oct 11 13:54:02 2011
+++ src/external/bsd/llvm/lib/libLLVMDebugInfo/Makefile Tue Oct 11 13:53:59 2011
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2011/10/11 13:53:59 joerg Exp $
+
+LIB= LLVMDebugInfo
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/DebugInfo
+
+SRCS+= DIContext.cpp \
+ DWARFAbbreviationDeclaration.cpp \
+ DWARFCompileUnit.cpp \
+ DWARFContext.cpp \
+ DWARFDebugAbbrev.cpp \
+ DWARFDebugArangeSet.cpp \
+ DWARFDebugAranges.cpp \
+ DWARFDebugInfoEntry.cpp \
+ DWARFDebugLine.cpp \
+ DWARFFormValue.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif
Index: src/external/bsd/llvm/lib/libLLVMTableGen/Makefile
diff -u /dev/null src/external/bsd/llvm/lib/libLLVMTableGen/Makefile:1.1
--- /dev/null Tue Oct 11 13:54:02 2011
+++ src/external/bsd/llvm/lib/libLLVMTableGen/Makefile Tue Oct 11 13:53:59 2011
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2011/10/11 13:53:59 joerg Exp $
+
+LIB= LLVMTableGen
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/TableGen
+
+SRCS+= Error.cpp \
+ Main.cpp \
+ Record.cpp \
+ TableGenBackend.cpp \
+ TGLexer.cpp \
+ TGParser.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif
Index: src/tools/llvm-clang-tblgen/Makefile
diff -u /dev/null src/tools/llvm-clang-tblgen/Makefile:1.1
--- /dev/null Tue Oct 11 13:54:02 2011
+++ src/tools/llvm-clang-tblgen/Makefile Tue Oct 11 13:54:01 2011
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2011/10/11 13:54:01 joerg Exp $
+
+HOSTPROGNAME= ${_TOOL_PREFIX}clang-tblgen
+HOSTPROG_CXX= ${_TOOL_PREFIX}clang-tblgen
+HOST_SRCDIR= external/bsd/llvm/bin/clang-tblgen
+
+.include "${.CURDIR}/../Makefile.host"
Index: src/tools/llvm-lib/libLLVMTableGen/Makefile
diff -u /dev/null src/tools/llvm-lib/libLLVMTableGen/Makefile:1.1
--- /dev/null Tue Oct 11 13:54:02 2011
+++ src/tools/llvm-lib/libLLVMTableGen/Makefile Tue Oct 11 13:54:01 2011
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile,v 1.1 2011/10/11 13:54:01 joerg Exp $
+
+.include <bsd.init.mk>
