Module Name:    src
Committed By:   joerg
Date:           Sun Sep 23 17:22:26 UTC 2012

Modified Files:
        src/external/bsd/bind/bin/named: Makefile
        src/external/bsd/bind/lib/libdns: Makefile
        src/external/bsd/llvm: Makefile.inc
        src/external/bsd/llvm/bin/clang: Makefile
        src/external/bsd/llvm/bin/clang-tblgen: Makefile
        src/external/bsd/llvm/bin/lli: Makefile
        src/external/bsd/llvm/bin/llvm-extract: Makefile
        src/external/bsd/llvm/bin/llvm-mc: Makefile
        src/external/bsd/llvm/config/llvm/Config: AsmParsers.def
            AsmPrinters.def Disassemblers.def config.h.in llvm-config.h.in
        src/external/bsd/llvm/config/llvm/Support: DataTypes.h
        src/external/bsd/llvm/include: Makefile
        src/external/bsd/llvm/lib: Makefile
        src/external/bsd/llvm/lib/libLLVMAnalysis: Makefile
        src/external/bsd/llvm/lib/libLLVMCodeGen: Makefile
        src/external/bsd/llvm/lib/libLLVMDebugInfo: Makefile
        src/external/bsd/llvm/lib/libLLVMInstrumentation: Makefile
        src/external/bsd/llvm/lib/libLLVMMipsCodeGen: Makefile
        src/external/bsd/llvm/lib/libLLVMScalarOpts: Makefile
        src/external/bsd/llvm/lib/libLLVMTransformsUtils: Makefile
        src/external/bsd/llvm/lib/libclangAST: Makefile
        src/external/bsd/llvm/lib/libclangAnalysis: Makefile
        src/external/bsd/llvm/lib/libclangSema: Makefile
        src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers: Makefile
        src/external/bsd/llvm/lib/libclangStaticAnalyzerCore: Makefile
        src/external/bsd/llvm/lib/libclangTooling: Makefile
        src/external/gpl2/xcvs: Makefile.inc
        src/share/mk: bsd.sys.mk
        src/tests/lib/libc/ssp: Makefile
Added Files:
        src/external/bsd/llvm/lib/libclangRewriteCore: Makefile
        src/external/bsd/llvm/lib/libclangRewriteFrontend: Makefile
        src/tools/llvm-lib/libLLVMMipsDisassembler: Makefile
        src/tools/llvm-lib/libclangRewriteCore: Makefile
        src/tools/llvm-lib/libclangRewriteFrontend: Makefile
Removed Files:
        src/external/bsd/llvm/lib/libclangRewrite: Makefile
        src/tools/llvm-lib/libclangRewrite: Makefile

Log Message:
Update LLVM/Clang snapshot to r164464. This adopts the GCC options for
the SSP parameters and a not-yet-default rewrite of SROA.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/bin/named/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/lib/libdns/Makefile
cvs rdiff -u -r1.40 -r1.41 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/llvm/bin/clang/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/bin/clang-tblgen/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/bin/lli/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/bin/llvm-extract/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/llvm/bin/llvm-mc/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/llvm/config/llvm/Config/AsmParsers.def
cvs rdiff -u -r1.5 -r1.6 \
    src/external/bsd/llvm/config/llvm/Config/AsmPrinters.def
cvs rdiff -u -r1.4 -r1.5 \
    src/external/bsd/llvm/config/llvm/Config/Disassemblers.def
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/config/llvm/Config/config.h.in \
    src/external/bsd/llvm/config/llvm/Config/llvm-config.h.in
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/llvm/config/llvm/Support/DataTypes.h
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/llvm/include/Makefile
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/llvm/lib/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/lib/libLLVMDebugInfo/Makefile
cvs rdiff -u -r1.6 -r1.7 \
    src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile
cvs rdiff -u -r1.11 -r1.12 \
    src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile
cvs rdiff -u -r1.8 -r1.9 \
    src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/lib/libclangAST/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/llvm/lib/libclangAnalysis/Makefile
cvs rdiff -u -r1.3 -r0 src/external/bsd/llvm/lib/libclangRewrite/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libclangRewriteCore/Makefile
cvs rdiff -u -r0 -r1.1 \
    src/external/bsd/llvm/lib/libclangRewriteFrontend/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/llvm/lib/libclangSema/Makefile
cvs rdiff -u -r1.15 -r1.16 \
    src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile
cvs rdiff -u -r1.11 -r1.12 \
    src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/lib/libclangTooling/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/Makefile.inc
cvs rdiff -u -r1.218 -r1.219 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/ssp/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libLLVMMipsDisassembler/Makefile
cvs rdiff -u -r1.1 -r0 src/tools/llvm-lib/libclangRewrite/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libclangRewriteCore/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libclangRewriteFrontend/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/bin/named/Makefile
diff -u src/external/bsd/bind/bin/named/Makefile:1.5 src/external/bsd/bind/bin/named/Makefile:1.6
--- src/external/bsd/bind/bin/named/Makefile:1.5	Fri Aug 10 16:10:29 2012
+++ src/external/bsd/bind/bin/named/Makefile	Sun Sep 23 17:22:22 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2012/08/10 16:10:29 joerg Exp $
+#	$NetBSD: Makefile,v 1.6 2012/09/23 17:22:22 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -19,6 +19,8 @@ COPTS.${f}.c+=  -fno-strict-aliasing
 .endfor
 .endif
 
+CWARNFLAGS.clang+=	-Wno-tautological-constant-out-of-range-compare
+
 .PATH: ${DIST}/unix ${DIST}
 
 SRCS_UNIX=	os.c dlz_dlopen_driver.c

Index: src/external/bsd/bind/lib/libdns/Makefile
diff -u src/external/bsd/bind/lib/libdns/Makefile:1.7 src/external/bsd/bind/lib/libdns/Makefile:1.8
--- src/external/bsd/bind/lib/libdns/Makefile:1.7	Fri Aug 10 16:33:41 2012
+++ src/external/bsd/bind/lib/libdns/Makefile	Sun Sep 23 17:22:22 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2012/08/10 16:33:41 joerg Exp $
+#	$NetBSD: Makefile,v 1.8 2012/09/23 17:22:22 joerg Exp $
 
 LIB=dns
 
@@ -12,6 +12,8 @@ DIST=	${IDIST}/lib/dns
 .PATH.c:	${DIST}/unix ${DIST}/sec/dst ${DIST}
 CPPFLAGS+=	-I${BIND_SRCDIR}/include/dns -I${DIST}
 
+CWARNFLAGS.clang+=	-Wno-tautological-constant-out-of-range-compare
+
 .for f in lookup byaddr request sdb validator
 COPTS.${f}.c+=  -Wno-pointer-sign -fno-strict-aliasing
 .endfor

Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.40 src/external/bsd/llvm/Makefile.inc:1.41
--- src/external/bsd/llvm/Makefile.inc:1.40	Thu Aug  9 14:37:06 2012
+++ src/external/bsd/llvm/Makefile.inc	Sun Sep 23 17:22:22 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.40 2012/08/09 14:37:06 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.41 2012/09/23 17:22:22 joerg Exp $
 
 .if !defined(LLVM_TOPLEVEL_MK)
 LLVM_TOPLEVEL_MK=
@@ -7,7 +7,7 @@ LLVM_TOPLEVEL_MK=
 
 SVN_ROOT=		http://llvm.org/svn/llvm-project
 
-COMMON_REVISION=	161532
+COMMON_REVISION=	164464
 LLVM_REVISION=		${COMMON_REVISION}
 CLANG_REVISION=		${COMMON_REVISION}
 COMPILER_RT_REVISION=	${COMMON_REVISION}

Index: src/external/bsd/llvm/bin/clang/Makefile
diff -u src/external/bsd/llvm/bin/clang/Makefile:1.20 src/external/bsd/llvm/bin/clang/Makefile:1.21
--- src/external/bsd/llvm/bin/clang/Makefile:1.20	Sun Apr 29 19:19:04 2012
+++ src/external/bsd/llvm/bin/clang/Makefile	Sun Sep 23 17:22:22 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2012/04/29 19:19:04 joerg Exp $
+#	$NetBSD: Makefile,v 1.21 2012/09/23 17:22:22 joerg Exp $
 
 PROG_CXX=	clang
 NOMAN=		yes
@@ -30,7 +30,8 @@ CLANG_LIBS+= \
 	clangParse \
 	clangSema \
 	clangAnalysis \
-	clangRewrite \
+	clangRewriteFrontend \
+	clangRewriteCore \
 	clangAST \
 	clangLex \
 	clangBasic

Index: src/external/bsd/llvm/bin/clang-tblgen/Makefile
diff -u src/external/bsd/llvm/bin/clang-tblgen/Makefile:1.1 src/external/bsd/llvm/bin/clang-tblgen/Makefile:1.2
--- src/external/bsd/llvm/bin/clang-tblgen/Makefile:1.1	Tue Oct 11 13:53:57 2011
+++ src/external/bsd/llvm/bin/clang-tblgen/Makefile	Sun Sep 23 17:22:22 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/10/11 13:53:57 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2012/09/23 17:22:22 joerg Exp $
 
 PROG_CXX=	clang-tblgen
 NOMAN=		yes
@@ -9,6 +9,8 @@ NOMAN=		yes
 
 SRCS=	ClangASTNodesEmitter.cpp \
 	ClangAttrEmitter.cpp \
+	ClangCommentCommandInfoEmitter.cpp \
+	ClangCommentHTMLTagsEmitter.cpp \
 	ClangDiagnosticsEmitter.cpp \
 	ClangSACheckersEmitter.cpp \
 	NeonEmitter.cpp \

Index: src/external/bsd/llvm/bin/lli/Makefile
diff -u src/external/bsd/llvm/bin/lli/Makefile:1.6 src/external/bsd/llvm/bin/lli/Makefile:1.7
--- src/external/bsd/llvm/bin/lli/Makefile:1.6	Tue Oct 11 13:53:57 2011
+++ src/external/bsd/llvm/bin/lli/Makefile	Sun Sep 23 17:22:22 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2011/10/11 13:53:57 joerg Exp $
+#	$NetBSD: Makefile,v 1.7 2012/09/23 17:22:22 joerg Exp $
 
 PROG_CXX=	lli
 NOMAN=		yes
@@ -7,7 +7,9 @@ NOMAN=		yes
 
 .PATH: ${LLVM_SRCDIR}/tools/lli
 
-SRCS=	lli.cpp
+SRCS=	lli.cpp \
+	RecordingMemoryManager.cpp \
+	RemoteTarget.cpp
 
 LLVM_LIBS+= \
 	X86CodeGen \

Index: src/external/bsd/llvm/bin/llvm-extract/Makefile
diff -u src/external/bsd/llvm/bin/llvm-extract/Makefile:1.1 src/external/bsd/llvm/bin/llvm-extract/Makefile:1.2
--- src/external/bsd/llvm/bin/llvm-extract/Makefile:1.1	Sun Feb  6 01:13:46 2011
+++ src/external/bsd/llvm/bin/llvm-extract/Makefile	Sun Sep 23 17:22:22 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:13:46 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2012/09/23 17:22:22 joerg Exp $
 
 PROG_CXX=	llvm-extract
 NOMAN=		yes
@@ -13,10 +13,10 @@ LLVM_LIBS+= \
 	AsmParser \
 	BitReader \
 	BitWriter \
-	Target \
 	ipo \
 	TransformsUtils \
 	Analysis \
+	Target \
 	ipa \
 	Core \
 	Support

Index: src/external/bsd/llvm/bin/llvm-mc/Makefile
diff -u src/external/bsd/llvm/bin/llvm-mc/Makefile:1.11 src/external/bsd/llvm/bin/llvm-mc/Makefile:1.12
--- src/external/bsd/llvm/bin/llvm-mc/Makefile:1.11	Wed Apr  4 10:42:01 2012
+++ src/external/bsd/llvm/bin/llvm-mc/Makefile	Sun Sep 23 17:22:22 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2012/04/04 10:42:01 joerg Exp $
+#	$NetBSD: Makefile,v 1.12 2012/09/23 17:22:22 joerg Exp $
 
 PROG_CXX=	llvm-mc
 NOMAN=		yes
@@ -21,6 +21,7 @@ LLVM_LIBS+= \
 	MipsCodeGen \
 	MipsTargetInfo \
 	MipsAsmParser \
+	MipsDisassembler \
 	MipsMCTargetDesc \
 	MipsAsmPrinter \
 	PowerPCCodeGen \

Index: src/external/bsd/llvm/config/llvm/Config/AsmParsers.def
diff -u src/external/bsd/llvm/config/llvm/Config/AsmParsers.def:1.3 src/external/bsd/llvm/config/llvm/Config/AsmParsers.def:1.4
--- src/external/bsd/llvm/config/llvm/Config/AsmParsers.def:1.3	Tue Feb 28 17:09:30 2012
+++ src/external/bsd/llvm/config/llvm/Config/AsmParsers.def	Sun Sep 23 17:22:23 2012
@@ -1,24 +1,24 @@
-//===- llvm/Config/AsmParsers.def - LLVM Assembly Parsers -------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file enumerates all of the assembly-language parsers
-// supported by this build of LLVM. Clients of this file should define
-// the LLVM_ASM_PARSER macro to be a function-like macro with a
-// single parameter (the name of the target whose assembly can be
-// generated); including this file will then enumerate all of the
-// targets with assembly parsers.
-//
-// The set of targets supported by LLVM is generated at configuration
-// time, at which point this header is generated. Do not modify this
-// header directly.
-//
-//===----------------------------------------------------------------------===//
+/*===- llvm/Config/AsmParsers.def - LLVM Assembly Parsers -------*- C++ -*-===*\
+|*                                                                            *|
+|*                     The LLVM Compiler Infrastructure                       *|
+|*                                                                            *|
+|* This file is distributed under the University of Illinois Open Source      *|
+|* License. See LICENSE.TXT for details.                                      *|
+|*                                                                            *|
+|*===----------------------------------------------------------------------===*|
+|*                                                                            *|
+|* This file enumerates all of the assembly-language parsers                  *|
+|* supported by this build of LLVM. Clients of this file should define        *|
+|* the LLVM_ASM_PARSER macro to be a function-like macro with a               *|
+|* single parameter (the name of the target whose assembly can be             *|
+|* generated); including this file will then enumerate all of the             *|
+|* targets with assembly parsers.                                             *|
+|*                                                                            *|
+|* The set of targets supported by LLVM is generated at configuration         *|
+|* time, at which point this header is generated. Do not modify this          *|
+|* header directly.                                                           *|
+|*                                                                            *|
+\*===----------------------------------------------------------------------===*/
 
 #ifndef LLVM_ASM_PARSER
 #  error Please define the macro LLVM_ASM_PARSER(TargetName)

Index: src/external/bsd/llvm/config/llvm/Config/AsmPrinters.def
diff -u src/external/bsd/llvm/config/llvm/Config/AsmPrinters.def:1.5 src/external/bsd/llvm/config/llvm/Config/AsmPrinters.def:1.6
--- src/external/bsd/llvm/config/llvm/Config/AsmPrinters.def:1.5	Tue Jul  5 19:37:11 2011
+++ src/external/bsd/llvm/config/llvm/Config/AsmPrinters.def	Sun Sep 23 17:22:23 2012
@@ -1,24 +1,24 @@
-//===- llvm/Config/AsmPrinters.def - LLVM Assembly Printers -----*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file enumerates all of the assembly-language printers
-// supported by this build of LLVM. Clients of this file should define
-// the LLVM_ASM_PRINTER macro to be a function-like macro with a
-// single parameter (the name of the target whose assembly can be
-// generated); including this file will then enumerate all of the
-// targets with assembly printers.
-//
-// The set of targets supported by LLVM is generated at configuration
-// time, at which point this header is generated. Do not modify this
-// header directly.
-//
-//===----------------------------------------------------------------------===//
+/*===- llvm/Config/AsmPrinters.def - LLVM Assembly Printers -----*- C++ -*-===*\
+|*                                                                            *|
+|*                     The LLVM Compiler Infrastructure                       *|
+|*                                                                            *|
+|* This file is distributed under the University of Illinois Open Source      *|
+|* License. See LICENSE.TXT for details.                                      *|
+|*                                                                            *|
+|*===----------------------------------------------------------------------===*|
+|*                                                                            *|
+|* This file enumerates all of the assembly-language printers                 *|
+|* supported by this build of LLVM. Clients of this file should define        *|
+|* the LLVM_ASM_PRINTER macro to be a function-like macro with a              *|
+|* single parameter (the name of the target whose assembly can be             *|
+|* generated); including this file will then enumerate all of the             *|
+|* targets with assembly printers.                                            *|
+|*                                                                            *|
+|* The set of targets supported by LLVM is generated at configuration         *|
+|* time, at which point this header is generated. Do not modify this          *|
+|* header directly.                                                           *|
+|*                                                                            *|
+\*===----------------------------------------------------------------------===*/
 
 #ifndef LLVM_ASM_PRINTER
 #  error Please define the macro LLVM_ASM_PRINTER(TargetName)

Index: src/external/bsd/llvm/config/llvm/Config/Disassemblers.def
diff -u src/external/bsd/llvm/config/llvm/Config/Disassemblers.def:1.4 src/external/bsd/llvm/config/llvm/Config/Disassemblers.def:1.5
--- src/external/bsd/llvm/config/llvm/Config/Disassemblers.def:1.4	Sun Jun 17 07:40:26 2012
+++ src/external/bsd/llvm/config/llvm/Config/Disassemblers.def	Sun Sep 23 17:22:23 2012
@@ -1,24 +1,24 @@
-//===- llvm/Config/Disassemblers.def - LLVM Assembly Parsers ----*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file enumerates all of the assembly-language parsers
-// supported by this build of LLVM. Clients of this file should define
-// the LLVM_DISASSEMBLER macro to be a function-like macro with a
-// single parameter (the name of the target whose assembly can be
-// generated); including this file will then enumerate all of the
-// targets with assembly parsers.
-//
-// The set of targets supported by LLVM is generated at configuration
-// time, at which point this header is generated. Do not modify this
-// header directly.
-//
-//===----------------------------------------------------------------------===//
+/*===- llvm/Config/Disassemblers.def - LLVM Assembly Parsers ----*- C++ -*-===*\
+|*                                                                            *|
+|*                     The LLVM Compiler Infrastructure                       *|
+|*                                                                            *|
+|* This file is distributed under the University of Illinois Open Source      *|
+|* License. See LICENSE.TXT for details.                                      *|
+|*                                                                            *|
+|*===----------------------------------------------------------------------===*|
+|*                                                                            *|
+|* This file enumerates all of the assembly-language parsers                  *|
+|* supported by this build of LLVM. Clients of this file should define        *|
+|* the LLVM_DISASSEMBLER macro to be a function-like macro with a             *|
+|* single parameter (the name of the target whose assembly can be             *|
+|* generated); including this file will then enumerate all of the             *|
+|* targets with assembly parsers.                                             *|
+|*                                                                            *|
+|* The set of targets supported by LLVM is generated at configuration         *|
+|* time, at which point this header is generated. Do not modify this          *|
+|* header directly.                                                           *|
+|*                                                                            *|
+\*===----------------------------------------------------------------------===*/
 
 #ifndef LLVM_DISASSEMBLER
 #  error Please define the macro LLVM_DISASSEMBLER(TargetName)

Index: src/external/bsd/llvm/config/llvm/Config/config.h.in
diff -u src/external/bsd/llvm/config/llvm/Config/config.h.in:1.1 src/external/bsd/llvm/config/llvm/Config/config.h.in:1.2
--- src/external/bsd/llvm/config/llvm/Config/config.h.in:1.1	Sun Jun 17 07:40:26 2012
+++ src/external/bsd/llvm/config/llvm/Config/config.h.in	Sun Sep 23 17:22:23 2012
@@ -7,6 +7,9 @@
 /* Bug report URL. */
 #define BUG_REPORT_URL "http://llvm.org/bugs/";
 
+/* Define if we have libxml2 */
+/* #undef CLANG_HAVE_LIBXML */
+
 /* Relative directory for resource files */
 #define CLANG_RESOURCE_DIR ""
 
@@ -19,7 +22,7 @@
 /* Define if position independent code is enabled */
 #define ENABLE_PIC 1
 
-/* Define if timestamp information (e.g., __DATE___) is allowed */
+/* Define if timestamp information (e.g., __DATE__) is allowed */
 #define ENABLE_TIMESTAMPS 0
 
 /* Directory where gcc is installed. */
@@ -553,6 +556,9 @@
 /* Has gcc/MSVC atomic intrinsics */
 #define LLVM_HAS_ATOMICS 1
 
+/* Host triple LLVM will be executed on */
+#define LLVM_HOSTTRIPLE "x86_64--netbsd"
+
 /* Installation directory for include files */
 #define LLVM_INCLUDEDIR "/usr/include"
 
Index: src/external/bsd/llvm/config/llvm/Config/llvm-config.h.in
diff -u src/external/bsd/llvm/config/llvm/Config/llvm-config.h.in:1.1 src/external/bsd/llvm/config/llvm/Config/llvm-config.h.in:1.2
--- src/external/bsd/llvm/config/llvm/Config/llvm-config.h.in:1.1	Sun Jun 17 07:40:26 2012
+++ src/external/bsd/llvm/config/llvm/Config/llvm-config.h.in	Sun Sep 23 17:22:23 2012
@@ -41,6 +41,9 @@
 /* Has gcc/MSVC atomic intrinsics */
 #define LLVM_HAS_ATOMICS 1
 
+/* Host triple LLVM will be executed on */
+#define LLVM_HOSTTRIPLE "x86_64--netbsd"
+
 /* Installation directory for include files */
 #define LLVM_INCLUDEDIR "/usr/include"
 

Index: src/external/bsd/llvm/config/llvm/Support/DataTypes.h
diff -u src/external/bsd/llvm/config/llvm/Support/DataTypes.h:1.2 src/external/bsd/llvm/config/llvm/Support/DataTypes.h:1.3
--- src/external/bsd/llvm/config/llvm/Support/DataTypes.h:1.2	Tue Feb 28 17:09:30 2012
+++ src/external/bsd/llvm/config/llvm/Support/DataTypes.h	Sun Sep 23 17:22:23 2012
@@ -80,18 +80,6 @@ typedef u_int64_t uint64_t;
 #endif
 #endif
 
-#ifdef _OpenBSD_
-#define INT8_MAX 127
-#define INT8_MIN -128
-#define UINT8_MAX 255
-#define INT16_MAX 32767
-#define INT16_MIN -32768
-#define UINT16_MAX 65535
-#define INT32_MAX 2147483647
-#define INT32_MIN -2147483648
-#define UINT32_MAX 4294967295U
-#endif
-
 #else /* _MSC_VER */
 /* Visual C++ doesn't provide standard integer headers, but it does provide
    built-in data types. */

Index: src/external/bsd/llvm/include/Makefile
diff -u src/external/bsd/llvm/include/Makefile:1.12 src/external/bsd/llvm/include/Makefile:1.13
--- src/external/bsd/llvm/include/Makefile:1.12	Thu Aug  9 14:37:06 2012
+++ src/external/bsd/llvm/include/Makefile	Sun Sep 23 17:22:23 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2012/08/09 14:37:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.13 2012/09/23 17:22:23 joerg Exp $
 
 .include <bsd.init.mk>
 
@@ -43,6 +43,7 @@ HEADER=	\
   tgmath.h
 
 .PATH:	${LLVM_SRCDIR}/include/llvm \
+	${CLANG_SRCDIR}/include/clang/AST \
 	${CLANG_SRCDIR}/include/clang/Basic \
 	${CLANG_SRCDIR}/include/clang/Driver
 
@@ -51,8 +52,10 @@ TABLEGEN_SRC=	Intrinsics.td
 TABLEGEN_OUTPUT.Intrinsics.td= \
 	llvm/Intrinsics.gen|-gen-intrinsic
 
-CLANG_TABLEGEN_SRC=	Attr.td StmtNodes.td DeclNodes.td CommentNodes.td \
-	Diagnostic.td arm_neon.td Options.td CC1AsOptions.td CC1Options.td
+CLANG_TABLEGEN_SRC=	Attr.td CommentCommands.td CommentHTMLTags.td \
+	CommentNodes.td DeclNodes.td StmtNodes.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= \
@@ -76,6 +79,13 @@ CLANG_TABLEGEN_OUTPUT.DeclNodes.td= \
 CLANG_TABLEGEN_OUTPUT.CommentNodes.td= \
 	clang/AST/CommentNodes.inc|-gen-clang-comment-nodes
 
+CLANG_TABLEGEN_OUTPUT.CommentCommands.td= \
+	clang/AST/CommentCommandInfo.inc|-gen-clang-comment-command-info
+
+CLANG_TABLEGEN_OUTPUT.CommentHTMLTags.td= \
+	clang/AST/CommentHTMLTags.inc|-gen-clang-comment-html-tags \
+	clang/AST/CommentHTMLTagsProperties.inc|-gen-clang-comment-html-tags-properties
+
 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 \

Index: src/external/bsd/llvm/lib/Makefile
diff -u src/external/bsd/llvm/lib/Makefile:1.24 src/external/bsd/llvm/lib/Makefile:1.25
--- src/external/bsd/llvm/lib/Makefile:1.24	Thu Aug  9 14:39:01 2012
+++ src/external/bsd/llvm/lib/Makefile	Sun Sep 23 17:22:23 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2012/08/09 14:39:01 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2012/09/23 17:22:23 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -43,6 +43,7 @@ SUBDIR+= \
 SUBDIR+= \
 	libLLVMMipsAsmParser \
 	libLLVMMipsAsmPrinter \
+	libLLVMMipsDisassembler \
 	libLLVMMipsMCTargetDesc \
 	libLLVMMipsTargetInfo
 
@@ -90,7 +91,8 @@ SUBDIR+= \
 	libclangFrontendTool \
 	libclangLex \
 	libclangParse \
-	libclangRewrite \
+	libclangRewriteFrontend \
+	libclangRewriteCore \
 	libclangSema \
 	libclangSerialization \
 	libclangStaticAnalyzerCheckers \

Index: src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.7 src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.8
--- src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.7	Thu Aug  9 14:37:06 2012
+++ src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile	Sun Sep 23 17:22:23 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2012/08/09 14:37:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.8 2012/09/23 17:22:23 joerg Exp $
 
 LIB=	LLVMAnalysis
 
@@ -46,6 +46,8 @@ SRCS+=	AliasAnalysis.cpp \
 	PathProfileVerifier.cpp \
 	PHITransAddr.cpp \
 	PostDominators.cpp \
+	ProfileDataLoaderPass.cpp \
+	ProfileDataLoader.cpp \
 	ProfileEstimatorPass.cpp \
 	ProfileInfo.cpp \
 	ProfileInfoLoader.cpp \

Index: src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.19 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.20
--- src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.19	Thu Aug  9 14:37:06 2012
+++ src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile	Sun Sep 23 17:22:23 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2012/08/09 14:37:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.20 2012/09/23 17:22:23 joerg Exp $
 
 LIB=	LLVMCodeGen
 
@@ -64,6 +64,7 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	MachineModuleInfo.cpp \
 	MachineModuleInfoImpls.cpp \
 	MachinePassRegistry.cpp \
+	MachinePostDominators.cpp \
 	MachineRegisterInfo.cpp \
 	MachineSSAUpdater.cpp \
 	MachineScheduler.cpp \
@@ -100,6 +101,7 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	Spiller.cpp \
 	SpillPlacement.cpp \
 	SplitKit.cpp \
+	StackColoring.cpp \
 	StackProtector.cpp \
 	StackSlotColoring.cpp \
 	StrongPHIElimination.cpp \
@@ -108,6 +110,7 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	TargetInstrInfoImpl.cpp \
 	TargetLoweringObjectFileImpl.cpp \
 	TargetOptionsImpl.cpp \
+	TargetSchedule.cpp \
 	TwoAddressInstructionPass.cpp \
 	UnreachableBlockElim.cpp \
 	VirtRegMap.cpp

Index: src/external/bsd/llvm/lib/libLLVMDebugInfo/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMDebugInfo/Makefile:1.1 src/external/bsd/llvm/lib/libLLVMDebugInfo/Makefile:1.2
--- src/external/bsd/llvm/lib/libLLVMDebugInfo/Makefile:1.1	Tue Oct 11 13:53:59 2011
+++ src/external/bsd/llvm/lib/libLLVMDebugInfo/Makefile	Sun Sep 23 17:22:23 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/10/11 13:53:59 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2012/09/23 17:22:23 joerg Exp $
 
 LIB=	LLVMDebugInfo
 
@@ -15,6 +15,7 @@ SRCS+=	DIContext.cpp \
 	DWARFDebugAranges.cpp \
 	DWARFDebugInfoEntry.cpp \
 	DWARFDebugLine.cpp \
+	DWARFDebugRangeList.cpp \
 	DWARFFormValue.cpp
 
 .if defined(HOSTLIB)

Index: src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile:1.6 src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile:1.7
--- src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile:1.6	Thu Aug  9 14:37:06 2012
+++ src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile	Sun Sep 23 17:22:23 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2012/08/09 14:37:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.7 2012/09/23 17:22:23 joerg Exp $
 
 LIB=	LLVMInstrumentation
 
@@ -7,9 +7,9 @@ LIB=	LLVMInstrumentation
 .PATH: ${LLVM_SRCDIR}/lib/Transforms/Instrumentation
 
 SRCS+=	AddressSanitizer.cpp \
+	BlackList.cpp \
 	BoundsChecking.cpp \
 	EdgeProfiling.cpp \
-	FunctionBlackList.cpp \
 	GCOVProfiling.cpp \
 	Instrumentation.cpp \
 	OptimalEdgeProfiling.cpp \

Index: src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile:1.11 src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile:1.12
--- src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile:1.11	Thu Aug  9 14:37:07 2012
+++ src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile	Sun Sep 23 17:22:23 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2012/08/09 14:37:07 joerg Exp $
+#	$NetBSD: Makefile,v 1.12 2012/09/23 17:22:23 joerg Exp $
 
 LIB=	LLVMMipsCodeGen
 
@@ -13,6 +13,8 @@ SRCS+=	Mips16InstrInfo.cpp \
 	MipsAsmPrinter.cpp \
 	MipsCodeEmitter.cpp \
 	MipsDelaySlotFiller.cpp \
+	MipsDirectObjLower.cpp \
+	MipsELFWriterInfo.cpp \
 	MipsFrameLowering.cpp \
 	MipsInstrInfo.cpp \
 	MipsISelDAGToDAG.cpp \
@@ -35,6 +37,7 @@ TABLEGEN_INCLUDES=	-I${LLVM_SRCDIR}/lib/
 TABLEGEN_OUTPUT= \
 	MipsGenRegisterInfo.inc|-gen-register-info \
 	MipsGenInstrInfo.inc|-gen-instr-info \
+	MipsGenAsmMatcher.inc|-gen-asm-matcher \
 	MipsGenAsmWriter.inc|-gen-asm-writer \
 	MipsGenCallingConv.inc|-gen-callingconv \
 	MipsGenCodeEmitter.inc|-gen-emitter \

Index: src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile:1.7 src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile:1.8
--- src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile:1.7	Thu Aug  9 14:37:07 2012
+++ src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile	Sun Sep 23 17:22:24 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2012/08/09 14:37:07 joerg Exp $
+#	$NetBSD: Makefile,v 1.8 2012/09/23 17:22:24 joerg Exp $
 
 LIB=	LLVMScalarOpts
 
@@ -32,6 +32,7 @@ SRCS+=	ADCE.cpp \
 	Reassociate.cpp \
 	Reg2Mem.cpp \
 	SCCP.cpp \
+	SROA.cpp \
 	Scalar.cpp \
 	ScalarReplAggregates.cpp \
 	SimplifyCFGPass.cpp \

Index: src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile:1.8 src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile:1.9
--- src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile:1.8	Wed Apr  4 10:42:03 2012
+++ src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile	Sun Sep 23 17:22:24 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2012/04/04 10:42:03 joerg Exp $
+#	$NetBSD: Makefile,v 1.9 2012/09/23 17:22:24 joerg Exp $
 
 LIB=	LLVMTransformsUtils
 
@@ -10,6 +10,7 @@ SRCS+=	AddrModeMatcher.cpp \
 	BasicBlockUtils.cpp \
 	BreakCriticalEdges.cpp \
 	BuildLibCalls.cpp \
+	BypassSlowDivision.cpp \
 	CloneFunction.cpp \
 	CloneModule.cpp \
 	CmpInstAnalysis.cpp \
@@ -17,6 +18,7 @@ SRCS+=	AddrModeMatcher.cpp \
 	DemoteRegToStack.cpp \
 	InlineFunction.cpp \
 	InstructionNamer.cpp \
+	IntegerDivision.cpp \
 	LCSSA.cpp \
 	Local.cpp \
 	LoopSimplify.cpp \
@@ -26,6 +28,7 @@ SRCS+=	AddrModeMatcher.cpp \
 	LowerInvoke.cpp \
 	LowerSwitch.cpp \
 	Mem2Reg.cpp \
+	MetaRenamer.cpp \
 	ModuleUtils.cpp \
 	PromoteMemoryToRegister.cpp \
 	SSAUpdater.cpp \

Index: src/external/bsd/llvm/lib/libclangAST/Makefile
diff -u src/external/bsd/llvm/lib/libclangAST/Makefile:1.6 src/external/bsd/llvm/lib/libclangAST/Makefile:1.7
--- src/external/bsd/llvm/lib/libclangAST/Makefile:1.6	Thu Aug  9 14:37:07 2012
+++ src/external/bsd/llvm/lib/libclangAST/Makefile	Sun Sep 23 17:22:24 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2012/08/09 14:37:07 joerg Exp $
+#	$NetBSD: Makefile,v 1.7 2012/09/23 17:22:24 joerg Exp $
 
 LIB=	clangAST
 
@@ -15,6 +15,7 @@ SRCS+=	APValue.cpp \
 	CXXInheritance.cpp \
 	Comment.cpp \
 	CommentBriefParser.cpp \
+	CommentCommandTraits.cpp \
 	CommentDumper.cpp \
 	CommentLexer.cpp \
 	CommentParser.cpp \

Index: src/external/bsd/llvm/lib/libclangAnalysis/Makefile
diff -u src/external/bsd/llvm/lib/libclangAnalysis/Makefile:1.8 src/external/bsd/llvm/lib/libclangAnalysis/Makefile:1.9
--- src/external/bsd/llvm/lib/libclangAnalysis/Makefile:1.8	Wed Apr  4 10:42:04 2012
+++ src/external/bsd/llvm/lib/libclangAnalysis/Makefile	Sun Sep 23 17:22:24 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2012/04/04 10:42:04 joerg Exp $
+#	$NetBSD: Makefile,v 1.9 2012/09/23 17:22:24 joerg Exp $
 
 LIB=	clangAnalysis
 
@@ -7,6 +7,7 @@ LIB=	clangAnalysis
 .PATH: ${CLANG_SRCDIR}/lib/Analysis
 
 SRCS+=	AnalysisDeclContext.cpp \
+	BodyFarm.cpp \
 	CFG.cpp \
 	CFGReachabilityAnalysis.cpp \
 	CFGStmtMap.cpp \
@@ -15,6 +16,7 @@ SRCS+=	AnalysisDeclContext.cpp \
 	Dominators.cpp \
 	FormatString.cpp \
 	LiveVariables.cpp \
+	ObjCNoReturn.cpp \
 	PostOrderCFGView.cpp \
 	ProgramPoint.cpp \
 	PrintfFormatString.cpp \

Index: src/external/bsd/llvm/lib/libclangSema/Makefile
diff -u src/external/bsd/llvm/lib/libclangSema/Makefile:1.9 src/external/bsd/llvm/lib/libclangSema/Makefile:1.10
--- src/external/bsd/llvm/lib/libclangSema/Makefile:1.9	Sun Apr 29 19:19:06 2012
+++ src/external/bsd/llvm/lib/libclangSema/Makefile	Sun Sep 23 17:22:25 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2012/04/29 19:19:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.10 2012/09/23 17:22:25 joerg Exp $
 
 LIB=	clangSema
 
@@ -39,6 +39,7 @@ SRCS+=	AnalysisBasedWarnings.cpp \
 	SemaOverload.cpp \
 	SemaPseudoObject.cpp \
 	SemaStmt.cpp \
+	SemaStmtAsm.cpp \
 	SemaStmtAttr.cpp \
 	SemaTemplate.cpp \
 	SemaTemplateDeduction.cpp \

Index: src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile
diff -u src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile:1.15 src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile:1.16
--- src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile:1.15	Thu Aug  9 14:37:07 2012
+++ src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile	Sun Sep 23 17:22:25 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2012/08/09 14:37:07 joerg Exp $
+#	$NetBSD: Makefile,v 1.16 2012/09/23 17:22:25 joerg Exp $
 
 LIB=	clangStaticAnalyzerCheckers
 
@@ -6,8 +6,7 @@ LIB=	clangStaticAnalyzerCheckers
 
 .PATH: ${CLANG_SRCDIR}/lib/StaticAnalyzer/Checkers
 
-SRCS+=	AdjustedReturnValueChecker.cpp \
-	AnalyzerStatsChecker.cpp \
+SRCS+=	AnalyzerStatsChecker.cpp \
 	ArrayBoundChecker.cpp \
 	ArrayBoundCheckerV2.cpp \
 	AttrNonNullChecker.cpp \

Index: src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile
diff -u src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile:1.11 src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile:1.12
--- src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile:1.11	Thu Aug  9 14:37:07 2012
+++ src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile	Sun Sep 23 17:22:25 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2012/08/09 14:37:07 joerg Exp $
+#	$NetBSD: Makefile,v 1.12 2012/09/23 17:22:25 joerg Exp $
 
 LIB=	clangStaticAnalyzerCore
 
@@ -8,7 +8,7 @@ LIB=	clangStaticAnalyzerCore
 
 SRCS+=	APSIntType.cpp \
 	AnalysisManager.cpp \
-	BasicConstraintManager.cpp \
+	AnalyzerOptions.cpp \
 	BasicValueFactory.cpp \
 	BlockCounter.cpp \
 	BugReporter.cpp \
@@ -19,6 +19,7 @@ SRCS+=	APSIntType.cpp \
 	CheckerHelpers.cpp \
 	CheckerManager.cpp \
 	CheckerRegistry.cpp \
+	ConstraintManager.cpp \
 	CoreEngine.cpp \
 	Environment.cpp \
 	ExplodedGraph.cpp \

Index: src/external/bsd/llvm/lib/libclangTooling/Makefile
diff -u src/external/bsd/llvm/lib/libclangTooling/Makefile:1.6 src/external/bsd/llvm/lib/libclangTooling/Makefile:1.7
--- src/external/bsd/llvm/lib/libclangTooling/Makefile:1.6	Thu Aug  9 14:37:07 2012
+++ src/external/bsd/llvm/lib/libclangTooling/Makefile	Sun Sep 23 17:22:25 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2012/08/09 14:37:07 joerg Exp $
+#	$NetBSD: Makefile,v 1.7 2012/09/23 17:22:25 joerg Exp $
 
 LIB=	clangTooling
 
@@ -7,8 +7,9 @@ LIB=	clangTooling
 .PATH: ${CLANG_SRCDIR}/lib/Tooling
 
 SRCS+=	ArgumentsAdjusters.cpp \
-	CommandLineClangTool.cpp \
+	CommonOptionsParser.cpp \
 	CompilationDatabase.cpp \
+	JSONCompilationDatabase.cpp \
 	Refactoring.cpp \
 	RefactoringCallbacks.cpp \
 	Tooling.cpp

Index: src/external/gpl2/xcvs/Makefile.inc
diff -u src/external/gpl2/xcvs/Makefile.inc:1.2 src/external/gpl2/xcvs/Makefile.inc:1.3
--- src/external/gpl2/xcvs/Makefile.inc:1.2	Thu May 26 12:56:27 2011
+++ src/external/gpl2/xcvs/Makefile.inc	Sun Sep 23 17:22:25 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.2 2011/05/26 12:56:27 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.3 2012/09/23 17:22:25 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,8 @@ USE_FORT?= yes	# network client/server
 WARNS?=	0
 
 CWARNFLAGS.clang+=	-Wno-tautological-compare -Wno-parentheses \
-			-Wno-format-security -Wno-format
+			-Wno-format-security -Wno-format \
+			-Wno-tautological-constant-out-of-range-compare
 
 BINDIR?= /usr/bin
 IDIST=	${NETBSDSRCDIR}/external/gpl2/xcvs/dist

Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.218 src/share/mk/bsd.sys.mk:1.219
--- src/share/mk/bsd.sys.mk:1.218	Wed Sep  5 22:40:30 2012
+++ src/share/mk/bsd.sys.mk	Sun Sep 23 17:22:25 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.218 2012/09/05 22:40:30 riz Exp $
+#	$NetBSD: bsd.sys.mk,v 1.219 2012/09/23 17:22:25 joerg Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -33,7 +33,7 @@ CFLAGS+=	-Wno-sign-compare
 CFLAGS+=	${${ACTIVE_CC} != "clang":? -Wno-traditional :}
 .if !defined(NOGCCERROR)
 # Set assembler warnings to be fatal
-CFLAGS+=	-Wa,--fatal-warnings
+#CFLAGS+=	-Wa,--fatal-warnings
 .endif
 # Set linker warnings to be fatal
 # XXX no proper way to avoid "FOO is a patented algorithm" warnings
@@ -109,7 +109,7 @@ CPPFLAGS+=	-D_FORTIFY_SOURCE=2
 .if (${USE_SSP:Uno} != "no") && (${BINDIR:Ux} != "/usr/mdec")
 .if ${HAS_SSP} == "yes"
 COPTS+=	-fstack-protector -Wstack-protector 
-COPTS+=	${${ACTIVE_CC} == "clang":? -mllvm -stack-protector-buffer-size=1 :}
+COPTS+=	${${ACTIVE_CC} == "clang":? --param ssp-buffer-size=1 :}
 COPTS+=	${${ACTIVE_CC} == "gcc":? --param ssp-buffer-size=1 :}
 .endif
 .endif
@@ -132,7 +132,7 @@ CFLAGS+=	-Wa,-Av8plus
 
 .if !defined(NOGCCERROR)
 .if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
-CPUFLAGS+=	-Wa,--fatal-warnings
+#CPUFLAGS+=	-Wa,--fatal-warnings
 .endif
 .endif
 

Index: src/tests/lib/libc/ssp/Makefile
diff -u src/tests/lib/libc/ssp/Makefile:1.5 src/tests/lib/libc/ssp/Makefile:1.6
--- src/tests/lib/libc/ssp/Makefile:1.5	Wed Apr  4 10:59:48 2012
+++ src/tests/lib/libc/ssp/Makefile	Sun Sep 23 17:22:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/04/04 10:59:48 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2012/09/23 17:22:25 joerg Exp $
 
 NOMAN=		# defined
 
@@ -10,8 +10,7 @@ CPPFLAGS+=	-D_FORTIFY_SOURCE=2
 
 COPTS.h_raw.c=	-fstack-protector-all -Wstack-protector
 COPTS.h_raw.c+=	${${ACTIVE_CC} == "gcc":? --param ssp-buffer-size=1 :}
-COPTS.h_raw.c+=	${${ACTIVE_CC} == "clang":? -mllvm -stack-protector-buffer-size=1 :}
-
+COPTS.h_raw.c+=	${${ACTIVE_CC} == "clang":? --param ssp-buffer-size=1 :}
 
 # Bootstrap hack
 

Added files:

Index: src/external/bsd/llvm/lib/libclangRewriteCore/Makefile
diff -u /dev/null src/external/bsd/llvm/lib/libclangRewriteCore/Makefile:1.1
--- /dev/null	Sun Sep 23 17:22:27 2012
+++ src/external/bsd/llvm/lib/libclangRewriteCore/Makefile	Sun Sep 23 17:22:24 2012
@@ -0,0 +1,19 @@
+#	$NetBSD: Makefile,v 1.1 2012/09/23 17:22:24 joerg Exp $
+
+LIB=	clangRewriteCore
+
+.include <bsd.init.mk>
+
+.PATH: ${CLANG_SRCDIR}/lib/Rewrite/Core
+
+SRCS+=	DeltaTree.cpp \
+	HTMLRewrite.cpp \
+	RewriteRope.cpp \
+	Rewriter.cpp \
+	TokenRewriter.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

Index: src/external/bsd/llvm/lib/libclangRewriteFrontend/Makefile
diff -u /dev/null src/external/bsd/llvm/lib/libclangRewriteFrontend/Makefile:1.1
--- /dev/null	Sun Sep 23 17:22:27 2012
+++ src/external/bsd/llvm/lib/libclangRewriteFrontend/Makefile	Sun Sep 23 17:22:24 2012
@@ -0,0 +1,22 @@
+#	$NetBSD: Makefile,v 1.1 2012/09/23 17:22:24 joerg Exp $
+
+LIB=	clangRewriteFrontend
+
+.include <bsd.init.mk>
+
+.PATH: ${CLANG_SRCDIR}/lib/Rewrite/Frontend
+
+SRCS+=	FixItRewriter.cpp \
+	FrontendActions.cpp \
+	HTMLPrint.cpp \
+	InclusionRewriter.cpp \
+	RewriteMacros.cpp \
+	RewriteModernObjC.cpp \
+	RewriteObjC.cpp \
+	RewriteTest.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

Index: src/tools/llvm-lib/libLLVMMipsDisassembler/Makefile
diff -u /dev/null src/tools/llvm-lib/libLLVMMipsDisassembler/Makefile:1.1
--- /dev/null	Sun Sep 23 17:22:27 2012
+++ src/tools/llvm-lib/libLLVMMipsDisassembler/Makefile	Sun Sep 23 17:22:26 2012
@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2012/09/23 17:22:26 joerg Exp $
+
+.include <bsd.init.mk>

Index: src/tools/llvm-lib/libclangRewriteCore/Makefile
diff -u /dev/null src/tools/llvm-lib/libclangRewriteCore/Makefile:1.1
--- /dev/null	Sun Sep 23 17:22:27 2012
+++ src/tools/llvm-lib/libclangRewriteCore/Makefile	Sun Sep 23 17:22:26 2012
@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2012/09/23 17:22:26 joerg Exp $
+
+.include <bsd.init.mk>

Index: src/tools/llvm-lib/libclangRewriteFrontend/Makefile
diff -u /dev/null src/tools/llvm-lib/libclangRewriteFrontend/Makefile:1.1
--- /dev/null	Sun Sep 23 17:22:27 2012
+++ src/tools/llvm-lib/libclangRewriteFrontend/Makefile	Sun Sep 23 17:22:26 2012
@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2012/09/23 17:22:26 joerg Exp $
+
+.include <bsd.init.mk>

Reply via email to