Update LLVM/Clang snapshot to r139231. This includes various bugfixes and improvements. Don't use a temporary file for tblgen to ensure that dependencies are created correctly.diff -r1.21 -r1.22 src/external/bsd/llvm/Makefile.inc
(joerg)
--- src/external/bsd/llvm/Attic/Makefile.inc 2011/09/01 12:24:35 1.21
+++ src/external/bsd/llvm/Attic/Makefile.inc 2011/09/12 13:32:59 1.22
@@ -1,22 +1,22 @@ | @@ -1,22 +1,22 @@ | |||
1 | # $NetBSD: Makefile.inc,v 1.21 2011/09/01 12:24:35 joerg Exp $ | 1 | # $NetBSD: Makefile.inc,v 1.22 2011/09/12 13:32:59 joerg Exp $ | |
2 | 2 | |||
3 | .if !defined(LLVM_TOPLEVEL_MK) | 3 | .if !defined(LLVM_TOPLEVEL_MK) | |
4 | LLVM_TOPLEVEL_MK= | 4 | LLVM_TOPLEVEL_MK= | |
5 | 5 | |||
6 | .include <bsd.own.mk> | 6 | .include <bsd.own.mk> | |
7 | 7 | |||
8 | LLVM_REVISION= 138875 | 8 | LLVM_REVISION= 139231 | |
9 | CLANG_REVISION= 138875 | 9 | CLANG_REVISION= 139231 | |
10 | 10 | |||
11 | LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm | 11 | LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm | |
12 | CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang | 12 | CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang | |
13 | LLVM_TOPLEVEL:= ${.PARSEDIR} | 13 | LLVM_TOPLEVEL:= ${.PARSEDIR} | |
14 | 14 | |||
15 | CPPFLAGS+= -I. -I${LLVM_SRCDIR}/include -I${CLANG_SRCDIR}/include \ | 15 | CPPFLAGS+= -I. -I${LLVM_SRCDIR}/include -I${CLANG_SRCDIR}/include \ | |
16 | -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS | 16 | -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS | |
17 | 17 | |||
18 | .if defined(HOSTLIB) || defined(HOSTPROG) | 18 | .if defined(HOSTLIB) || defined(HOSTPROG) | |
19 | LLVM_INCLUDE_CONFIG= ${LLVM_TOOLCONF_OBJDIR}/config/include | 19 | LLVM_INCLUDE_CONFIG= ${LLVM_TOOLCONF_OBJDIR}/config/include | |
20 | LLVM_INCLUDE_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm-include && ${PRINTOBJDIR} | 20 | LLVM_INCLUDE_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm-include && ${PRINTOBJDIR} | |
21 | LLVM_TOOLCONF_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm && ${PRINTOBJDIR} | 21 | LLVM_TOOLCONF_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm && ${PRINTOBJDIR} | |
22 | HOST_CPPFLAGS+= ${CPPFLAGS} | 22 | HOST_CPPFLAGS+= ${CPPFLAGS} |
--- src/external/bsd/llvm/Attic/tablegen.mk 2011/06/01 14:13:41 1.2
+++ src/external/bsd/llvm/Attic/tablegen.mk 2011/09/12 13:32:59 1.3
@@ -1,19 +1,17 @@ | @@ -1,19 +1,17 @@ | |||
1 | # $NetBSD: tablegen.mk,v 1.2 2011/06/01 14:13:41 joerg Exp $ | 1 | # $NetBSD: tablegen.mk,v 1.3 2011/09/12 13:32:59 joerg Exp $ | |
2 | 2 | |||
3 | .include <bsd.own.mk> | 3 | .include <bsd.own.mk> | |
4 | 4 | |||
5 | .for t in ${TABLEGEN_SRC} | 5 | .for t in ${TABLEGEN_SRC} | |
6 | .for f in ${TABLEGEN_OUTPUT} ${TABLEGEN_OUTPUT.${t}} | 6 | .for f in ${TABLEGEN_OUTPUT} ${TABLEGEN_OUTPUT.${t}} | |
7 | ${f:C,\|.*$,,}: ${t} ${TOOL_TBLGEN} | 7 | ${f:C,\|.*$,,}: ${t} ${TOOL_TBLGEN} | |
8 | [ -z "${f:C,\|.*$,,}" ] || mkdir -p ${f:C,\|.*$,,:H} | 8 | [ -z "${f:C,\|.*$,,}" ] || mkdir -p ${f:C,\|.*$,,:H} | |
9 | ${TOOL_TBLGEN} -I${LLVM_SRCDIR}/include ${TABLEGEN_INCLUDES} \ | 9 | ${TOOL_TBLGEN} -I${LLVM_SRCDIR}/include ${TABLEGEN_INCLUDES} \ | |
10 | ${TABLEGEN_INCLUDES.${t}} ${f:C,^.*\|,,:C,\^, ,} \ | 10 | ${TABLEGEN_INCLUDES.${t}} ${f:C,^.*\|,,:C,\^, ,} \ | |
11 | ${.ALLSRC:M*/${t}} -d ${.TARGET}.d.tmp -o ${.TARGET}.tmp \ | 11 | ${.ALLSRC:M*/${t}} -d ${.TARGET}.d -o ${.TARGET} | |
12 | && mv ${.TARGET}.tmp ${.TARGET} && \ | |||
13 | mv ${.TARGET}.d.tmp ${.TARGET}.d | |||
14 | DPSRCS+= ${f:C,\|.*$,,} | 12 | DPSRCS+= ${f:C,\|.*$,,} | |
15 | CLEANFILES+= ${f:C,\|.*$,,} ${f:C,\|.*$,,:C,$,.d,} | 13 | CLEANFILES+= ${f:C,\|.*$,,} ${f:C,\|.*$,,:C,$,.d,} | |
16 | 14 | |||
17 | .sinclude "${f:C,\|.*$,,:C,$,.d,}" | 15 | .sinclude "${f:C,\|.*$,,:C,$,.d,}" | |
18 | .endfor | 16 | .endfor | |
19 | .endfor | 17 | .endfor |
--- src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Attic/Makefile 2011/09/01 12:24:36 1.6
+++ src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Attic/Makefile 2011/09/12 13:32:59 1.7
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.6 2011/09/01 12:24:36 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.7 2011/09/12 13:32:59 joerg Exp $ | |
2 | 2 | |||
3 | LIB= clangStaticAnalyzerCheckers | 3 | LIB= clangStaticAnalyzerCheckers | |
4 | 4 | |||
5 | .include <bsd.init.mk> | 5 | .include <bsd.init.mk> | |
6 | 6 | |||
7 | .PATH: ${CLANG_SRCDIR}/lib/StaticAnalyzer/Checkers | 7 | .PATH: ${CLANG_SRCDIR}/lib/StaticAnalyzer/Checkers | |
8 | 8 | |||
9 | SRCS+= AdjustedReturnValueChecker.cpp \ | 9 | SRCS+= AdjustedReturnValueChecker.cpp \ | |
10 | AnalyzerStatsChecker.cpp \ | 10 | AnalyzerStatsChecker.cpp \ | |
11 | ArrayBoundChecker.cpp \ | 11 | ArrayBoundChecker.cpp \ | |
12 | ArrayBoundCheckerV2.cpp \ | 12 | ArrayBoundCheckerV2.cpp \ | |
13 | AttrNonNullChecker.cpp \ | 13 | AttrNonNullChecker.cpp \ | |
14 | BasicObjCFoundationChecks.cpp \ | 14 | BasicObjCFoundationChecks.cpp \ | |
@@ -35,26 +35,27 @@ SRCS+= AdjustedReturnValueChecker.cpp \ | @@ -35,26 +35,27 @@ SRCS+= AdjustedReturnValueChecker.cpp \ | |||
35 | MacOSXAPIChecker.cpp \ | 35 | MacOSXAPIChecker.cpp \ | |
36 | MallocChecker.cpp \ | 36 | MallocChecker.cpp \ | |
37 | MallocOverflowSecurityChecker.cpp \ | 37 | MallocOverflowSecurityChecker.cpp \ | |
38 | NSAutoreleasePoolChecker.cpp \ | 38 | NSAutoreleasePoolChecker.cpp \ | |
39 | NSErrorChecker.cpp \ | 39 | NSErrorChecker.cpp \ | |
40 | NoReturnFunctionChecker.cpp \ | 40 | NoReturnFunctionChecker.cpp \ | |
41 | OSAtomicChecker.cpp \ | 41 | OSAtomicChecker.cpp \ | |
42 | ObjCAtSyncChecker.cpp \ | 42 | ObjCAtSyncChecker.cpp \ | |
43 | ObjCSelfInitChecker.cpp \ | 43 | ObjCSelfInitChecker.cpp \ | |
44 | ObjCUnusedIVarsChecker.cpp \ | 44 | ObjCUnusedIVarsChecker.cpp \ | |
45 | PointerArithChecker.cpp \ | 45 | PointerArithChecker.cpp \ | |
46 | PointerSubChecker.cpp \ | 46 | PointerSubChecker.cpp \ | |
47 | PthreadLockChecker.cpp \ | 47 | PthreadLockChecker.cpp \ | |
48 | RetainCountChecker.cpp \ | |||
48 | ReturnPointerRangeChecker.cpp \ | 49 | ReturnPointerRangeChecker.cpp \ | |
49 | ReturnUndefChecker.cpp \ | 50 | ReturnUndefChecker.cpp \ | |
50 | StackAddrEscapeChecker.cpp \ | 51 | StackAddrEscapeChecker.cpp \ | |
51 | StreamChecker.cpp \ | 52 | StreamChecker.cpp \ | |
52 | UndefBranchChecker.cpp \ | 53 | UndefBranchChecker.cpp \ | |
53 | UndefCapturedBlockVarChecker.cpp \ | 54 | UndefCapturedBlockVarChecker.cpp \ | |
54 | UndefResultChecker.cpp \ | 55 | UndefResultChecker.cpp \ | |
55 | UndefinedArraySubscriptChecker.cpp \ | 56 | UndefinedArraySubscriptChecker.cpp \ | |
56 | UndefinedAssignmentChecker.cpp \ | 57 | UndefinedAssignmentChecker.cpp \ | |
57 | UnixAPIChecker.cpp \ | 58 | UnixAPIChecker.cpp \ | |
58 | UnreachableCodeChecker.cpp \ | 59 | UnreachableCodeChecker.cpp \ | |
59 | VLASizeChecker.cpp | 60 | VLASizeChecker.cpp | |
60 | 61 |
--- src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Attic/Makefile 2011/09/01 12:24:37 1.4
+++ src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Attic/Makefile 2011/09/12 13:32:59 1.5
@@ -1,29 +1,28 @@ | @@ -1,29 +1,28 @@ | |||
1 | # $NetBSD: Makefile,v 1.4 2011/09/01 12:24:37 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.5 2011/09/12 13:32:59 joerg Exp $ | |
2 | 2 | |||
3 | LIB= clangStaticAnalyzerCore | 3 | LIB= clangStaticAnalyzerCore | |
4 | 4 | |||
5 | .include <bsd.init.mk> | 5 | .include <bsd.init.mk> | |
6 | 6 | |||
7 | .PATH: ${CLANG_SRCDIR}/lib/StaticAnalyzer/Core | 7 | .PATH: ${CLANG_SRCDIR}/lib/StaticAnalyzer/Core | |
8 | 8 | |||
9 | SRCS+= AggExprVisitor.cpp \ | 9 | SRCS+= AggExprVisitor.cpp \ | |
10 | AnalysisManager.cpp \ | 10 | AnalysisManager.cpp \ | |
11 | BasicConstraintManager.cpp \ | 11 | BasicConstraintManager.cpp \ | |
12 | BasicValueFactory.cpp \ | 12 | BasicValueFactory.cpp \ | |
13 | BlockCounter.cpp \ | 13 | BlockCounter.cpp \ | |
14 | BugReporter.cpp \ | 14 | BugReporter.cpp \ | |
15 | BugReporterVisitors.cpp \ | 15 | BugReporterVisitors.cpp \ | |
16 | CFRefCount.cpp \ | |||
17 | Checker.cpp \ | 16 | Checker.cpp \ | |
18 | CheckerContext.cpp \ | 17 | CheckerContext.cpp \ | |
19 | CheckerHelpers.cpp \ | 18 | CheckerHelpers.cpp \ | |
20 | CheckerManager.cpp \ | 19 | CheckerManager.cpp \ | |
21 | CheckerRegistry.cpp \ | 20 | CheckerRegistry.cpp \ | |
22 | CoreEngine.cpp \ | 21 | CoreEngine.cpp \ | |
23 | Environment.cpp \ | 22 | Environment.cpp \ | |
24 | ExplodedGraph.cpp \ | 23 | ExplodedGraph.cpp \ | |
25 | ExprEngine.cpp \ | 24 | ExprEngine.cpp \ | |
26 | ExprEngineC.cpp \ | 25 | ExprEngineC.cpp \ | |
27 | ExprEngineCXX.cpp \ | 26 | ExprEngineCXX.cpp \ | |
28 | ExprEngineCallAndReturn.cpp \ | 27 | ExprEngineCallAndReturn.cpp \ | |
29 | ExprEngineObjC.cpp \ | 28 | ExprEngineObjC.cpp \ |