[src/trunk]: src/external/bsd/llvm Update LLVM/Clang to r132395. This brings ...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6740b1f7ef47
branches:  trunk
changeset: 765654:6740b1f7ef47
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Jun 01 14:13:41 2011 +0000

description:
Update LLVM/Clang to r132395. This brings the usual set of improvements
and support for dependency tracking in tblgen. Use this to make updates
more robust.

diffstat:

 external/bsd/llvm/Makefile.inc                   |   6 +++---
 external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile |   5 +++--
 external/bsd/llvm/lib/libLLVMCore/Makefile       |   3 +--
 external/bsd/llvm/lib/libLLVMJIT/Makefile        |   5 ++---
 external/bsd/llvm/lib/libLLVMMC/Makefile         |   3 ++-
 external/bsd/llvm/lib/libLLVMMCJIT/Makefile      |   5 ++---
 external/bsd/llvm/lib/libclangTooling/Makefile   |   5 +++--
 external/bsd/llvm/tablegen.mk                    |  12 ++++++++----
 8 files changed, 24 insertions(+), 20 deletions(-)

diffs (154 lines):

diff -r 81e2dc1e9673 -r 6740b1f7ef47 external/bsd/llvm/Makefile.inc
--- a/external/bsd/llvm/Makefile.inc    Wed Jun 01 13:58:51 2011 +0000
+++ b/external/bsd/llvm/Makefile.inc    Wed Jun 01 14:13:41 2011 +0000
@@ -1,12 +1,12 @@
-#      $NetBSD: Makefile.inc,v 1.9 2011/05/20 13:40:04 joerg Exp $
+#      $NetBSD: Makefile.inc,v 1.10 2011/06/01 14:13:41 joerg Exp $
 
 .if !defined(LLVM_TOPLEVEL_MK)
 LLVM_TOPLEVEL_MK=
 
 .include <bsd.own.mk>
 
-LLVM_REVISION= 131689
-CLANG_REVISION=        131689
+LLVM_REVISION= 132395
+CLANG_REVISION=        132395
 
 LLVM_SRCDIR:=  ${.PARSEDIR}/dist/llvm
 CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
diff -r 81e2dc1e9673 -r 6740b1f7ef47 external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile
--- a/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile  Wed Jun 01 13:58:51 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile  Wed Jun 01 14:13:41 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2011/05/16 19:27:48 joerg Exp $
+#      $NetBSD: Makefile,v 1.5 2011/06/01 14:13:42 joerg Exp $
 
 LIB=   LLVMAsmPrinter
 
@@ -15,7 +15,8 @@
        DwarfCompileUnit.cpp \
        DwarfDebug.cpp \
        DwarfException.cpp \
-       OcamlGCPrinter.cpp
+       OcamlGCPrinter.cpp \
+       Win64Exception.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>
diff -r 81e2dc1e9673 -r 6740b1f7ef47 external/bsd/llvm/lib/libLLVMCore/Makefile
--- a/external/bsd/llvm/lib/libLLVMCore/Makefile        Wed Jun 01 13:58:51 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMCore/Makefile        Wed Jun 01 14:13:41 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2011/05/19 21:06:02 joerg Exp $
+#      $NetBSD: Makefile,v 1.4 2011/06/01 14:13:42 joerg Exp $
 
 LIB=   LLVMCore
 
@@ -33,7 +33,6 @@
        PassManager.cpp \
        PassRegistry.cpp \
        PrintModulePass.cpp \
-       StandardPasses.cpp \
        Type.cpp \
        TypeSymbolTable.cpp \
        Use.cpp \
diff -r 81e2dc1e9673 -r 6740b1f7ef47 external/bsd/llvm/lib/libLLVMJIT/Makefile
--- a/external/bsd/llvm/lib/libLLVMJIT/Makefile Wed Jun 01 13:58:51 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMJIT/Makefile Wed Jun 01 14:13:41 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2011/02/06 01:13:58 joerg Exp $
+#      $NetBSD: Makefile,v 1.2 2011/06/01 14:13:42 joerg Exp $
 
 LIB=   LLVMJIT
 
@@ -14,7 +14,6 @@
        JITDwarfEmitter.cpp \
        JITEmitter.cpp \
        JITMemoryManager.cpp \
-       OProfileJITEventListener.cpp \
-       TargetSelect.cpp
+       OProfileJITEventListener.cpp
 
 .include <bsd.lib.mk>
diff -r 81e2dc1e9673 -r 6740b1f7ef47 external/bsd/llvm/lib/libLLVMMC/Makefile
--- a/external/bsd/llvm/lib/libLLVMMC/Makefile  Wed Jun 01 13:58:51 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMMC/Makefile  Wed Jun 01 14:13:41 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2011/03/18 23:32:03 joerg Exp $
+#      $NetBSD: Makefile,v 1.3 2011/06/01 14:13:42 joerg Exp $
 
 LIB=   LLVMMC
 
@@ -37,6 +37,7 @@
        MCStreamer.cpp \
        MCSymbol.cpp \
        MCValue.cpp \
+       MCWin64EH.cpp \
        MachObjectWriter.cpp \
        WinCOFFStreamer.cpp \
        WinCOFFObjectWriter.cpp \
diff -r 81e2dc1e9673 -r 6740b1f7ef47 external/bsd/llvm/lib/libLLVMMCJIT/Makefile
--- a/external/bsd/llvm/lib/libLLVMMCJIT/Makefile       Wed Jun 01 13:58:51 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMMCJIT/Makefile       Wed Jun 01 14:13:41 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2011/05/12 14:56:23 joerg Exp $
+#      $NetBSD: Makefile,v 1.3 2011/06/01 14:13:42 joerg Exp $
 
 LIB=   LLVMMCJIT
 
@@ -7,7 +7,6 @@
 .PATH: ${LLVM_SRCDIR}/lib/ExecutionEngine/MCJIT
 
 SRCS+= Intercept.cpp \
-       MCJIT.cpp \
-       TargetSelect.cpp
+       MCJIT.cpp
 
 .include <bsd.lib.mk>
diff -r 81e2dc1e9673 -r 6740b1f7ef47 external/bsd/llvm/lib/libclangTooling/Makefile
--- a/external/bsd/llvm/lib/libclangTooling/Makefile    Wed Jun 01 13:58:51 2011 +0000
+++ b/external/bsd/llvm/lib/libclangTooling/Makefile    Wed Jun 01 14:13:41 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2011/05/12 14:56:24 joerg Exp $
+#      $NetBSD: Makefile,v 1.2 2011/06/01 14:13:42 joerg Exp $
 
 LIB=   clangTooling
 
@@ -6,7 +6,8 @@
 
 .PATH: ${CLANG_SRCDIR}/lib/Tooling
 
-SRCS+= JsonCompileCommandLineDatabase.cpp \
+SRCS+= ASTMatcher.cpp \
+       JsonCompileCommandLineDatabase.cpp \
        Tooling.cpp
 
 .if defined(HOSTLIB)
diff -r 81e2dc1e9673 -r 6740b1f7ef47 external/bsd/llvm/tablegen.mk
--- a/external/bsd/llvm/tablegen.mk     Wed Jun 01 13:58:51 2011 +0000
+++ b/external/bsd/llvm/tablegen.mk     Wed Jun 01 14:13:41 2011 +0000
@@ -1,15 +1,19 @@
-#      $NetBSD: tablegen.mk,v 1.1 2011/02/06 01:13:43 joerg Exp $
+#      $NetBSD: tablegen.mk,v 1.2 2011/06/01 14:13:41 joerg Exp $
 
 .include <bsd.own.mk>
 
 .for t in ${TABLEGEN_SRC}
 .for f in ${TABLEGEN_OUTPUT} ${TABLEGEN_OUTPUT.${t}}
-${f:C,\|.*$,,}: ${t}
+${f:C,\|.*$,,}: ${t} ${TOOL_TBLGEN}
        [ -z "${f:C,\|.*$,,}" ] || mkdir -p ${f:C,\|.*$,,:H}
        ${TOOL_TBLGEN} -I${LLVM_SRCDIR}/include ${TABLEGEN_INCLUDES} \
            ${TABLEGEN_INCLUDES.${t}} ${f:C,^.*\|,,:C,\^, ,} \
-           ${.ALLSRC:M*/${t}} > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
+           ${.ALLSRC:M*/${t}} -d ${.TARGET}.d.tmp -o ${.TARGET}.tmp \
+           && mv ${.TARGET}.tmp ${.TARGET} && \
+           mv ${.TARGET}.d.tmp ${.TARGET}.d
 DPSRCS+=       ${f:C,\|.*$,,}
-CLEANFILES+=   ${f:C,\|.*$,,}
+CLEANFILES+=   ${f:C,\|.*$,,} ${f:C,\|.*$,,:C,$,.d,}
+
+.sinclude "${f:C,\|.*$,,:C,$,.d,}"
 .endfor
 .endfor