Update LLVM/Clang snapshot to r172366. Catch up with the move past 3.2 trunk
authorjoerg <joerg@NetBSD.org>
Wed, 23 Jan 2013 15:02:52 +0000
branchtrunk
changeset 216087 c369c8f28999
parent 216086 0e935faa3bed
child 216088 99444f39fca1
Update LLVM/Clang snapshot to r172366. Catch up with the move past 3.2 release.
distrib/sets/lists/base/mi
distrib/sets/lists/comp/ad.powerpc
distrib/sets/lists/comp/md.amd64
distrib/sets/lists/comp/md.i386
etc/mtree/NetBSD.dist.base
external/bsd/llvm/Makefile.inc
external/bsd/llvm/bin/Makefile
external/bsd/llvm/bin/bugpoint/Makefile
external/bsd/llvm/bin/clang/Makefile
external/bsd/llvm/bin/llc/Makefile
external/bsd/llvm/bin/lli/Makefile
external/bsd/llvm/bin/llvm-ar/Makefile
external/bsd/llvm/bin/llvm-as/Makefile
external/bsd/llvm/bin/llvm-cov/Makefile
external/bsd/llvm/bin/llvm-diff/Makefile
external/bsd/llvm/bin/llvm-dis/Makefile
external/bsd/llvm/bin/llvm-extract/Makefile
external/bsd/llvm/bin/llvm-link/Makefile
external/bsd/llvm/bin/llvm-mc/Makefile
external/bsd/llvm/bin/llvm-nm/Makefile
external/bsd/llvm/bin/llvm-objdump/Makefile
external/bsd/llvm/bin/llvm-prof/Makefile
external/bsd/llvm/bin/llvm-ranlib/Makefile
external/bsd/llvm/bin/llvm-readobj/Makefile
external/bsd/llvm/bin/macho-dumpx/Makefile
external/bsd/llvm/bin/opt/Makefile
external/bsd/llvm/bin/tblgen/Makefile
external/bsd/llvm/config/clang/Config/config.h
external/bsd/llvm/config/llvm/Config/config.h.in
external/bsd/llvm/include/Makefile
external/bsd/llvm/lib/Makefile
external/bsd/llvm/lib/libLLVMARMAsmParser/Makefile
external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile
external/bsd/llvm/lib/libLLVMARMMCTargetDesc/Makefile
external/bsd/llvm/lib/libLLVMAnalysis/Makefile
external/bsd/llvm/lib/libLLVMCodeGen/Makefile
external/bsd/llvm/lib/libLLVMCore/Makefile
external/bsd/llvm/lib/libLLVMIR/Makefile
external/bsd/llvm/lib/libLLVMInstrumentation/Makefile
external/bsd/llvm/lib/libLLVMMC/Makefile
external/bsd/llvm/lib/libLLVMMCDisassembler/Makefile
external/bsd/llvm/lib/libLLVMMCJIT/Makefile
external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile
external/bsd/llvm/lib/libLLVMOption/Makefile
external/bsd/llvm/lib/libLLVMSupport/Makefile
external/bsd/llvm/lib/libLLVMTarget/Makefile
external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile
external/bsd/llvm/lib/libLLVMX86AsmParser/Makefile
external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile
external/bsd/llvm/lib/libLLVMipa/Makefile
external/bsd/llvm/lib/libclangARCMigrate/Makefile
external/bsd/llvm/lib/libclangAST/Makefile
external/bsd/llvm/lib/libclangBasic/Makefile
external/bsd/llvm/lib/libclangFormat/Makefile
external/bsd/llvm/lib/libclangLex/Makefile
tools/llvm-lib/libLLVMCore/Makefile
tools/llvm-lib/libLLVMIR/Makefile
--- a/distrib/sets/lists/base/mi	Wed Jan 23 14:24:14 2013 +0000
+++ b/distrib/sets/lists/base/mi	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1016 2013/01/11 23:49:23 mlelstv Exp $
+# $NetBSD: mi,v 1.1017 2013/01/23 15:02:52 joerg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -792,7 +792,8 @@
 ./usr/include/arpa				base-c-usr
 ./usr/include/cdk				base-obsolete		obsolete
 ./usr/include/clang-3.0				base-obsolete		obsolete
-./usr/include/clang-3.2				base-c-usr
+./usr/include/clang-3.2				base-obsolete		obsolete
+./usr/include/clang-3.3				base-c-usr
 ./usr/include/compat				base-obsolete		obsolete
 ./usr/include/crypto				base-c-usr
 ./usr/include/dev				base-c-usr
--- a/distrib/sets/lists/comp/ad.powerpc	Wed Jan 23 14:24:14 2013 +0000
+++ b/distrib/sets/lists/comp/ad.powerpc	Wed Jan 23 15:02:52 2013 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: ad.powerpc,v 1.60 2013/01/16 16:01:05 christos Exp $
+# $NetBSD: ad.powerpc,v 1.61 2013/01/23 15:02:53 joerg Exp $
 ./usr/bin/elf2aout				comp-sysutil-bin
 ./usr/bin/psim					comp-debug-bin		gdb
 ./usr/include/altivec.h				comp-obsolete		obsolete
 ./usr/include/clang-3.0/altivec.h		comp-obsolete		obsolete
-./usr/include/clang-3.2/altivec.h		comp-c-include		llvm
+./usr/include/clang-3.2/altivec.h		comp-obsolete		obsolete
+./usr/include/clang-3.3/altivec.h		comp-c-include		llvm
 ./usr/include/gcc-4.1/altivec.h			comp-c-include		gcccmds,gcc=4
 ./usr/include/gcc-4.1/altivec.h			comp-obsolete		gcc=45,obsolete
 ./usr/include/gcc-4.5/altivec.h			comp-c-include		gcccmds,gcc=45
--- a/distrib/sets/lists/comp/md.amd64	Wed Jan 23 14:24:14 2013 +0000
+++ b/distrib/sets/lists/comp/md.amd64	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.188 2013/01/16 16:01:05 christos Exp $
+# $NetBSD: md.amd64,v 1.189 2013/01/23 15:02:53 joerg Exp $
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
@@ -87,32 +87,58 @@
 ./usr/include/clang-3.0/wmmintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.0/x86intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.0/xmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.2/__wmmintrin_aes.h	comp-c-include		llvm
-./usr/include/clang-3.2/__wmmintrin_pclmul.h	comp-c-include		llvm
-./usr/include/clang-3.2/ammintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/avxintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/avx2intrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/bmi2intrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/bmiintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/emmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/f16cintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/fma4intrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/fmaintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/immintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/lzcntintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/mm3dnow.h		comp-c-include		llvm
-./usr/include/clang-3.2/mm_malloc.h		comp-c-include		llvm
-./usr/include/clang-3.2/mmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/nmmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/pmmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/popcntintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/rtmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/smmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/tmmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/wmmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/x86intrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/xmmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/xopintrin.h		comp-c-include		llvm
+./usr/include/clang-3.2/__wmmintrin_aes.h	comp-obsolete		obsolete
+./usr/include/clang-3.2/__wmmintrin_pclmul.h	comp-obsolete		obsolete
+./usr/include/clang-3.2/ammintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/avxintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/avx2intrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/bmi2intrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/bmiintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/emmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/f16cintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/fma4intrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/fmaintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/immintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/lzcntintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/mm3dnow.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/mm_malloc.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/mmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/nmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/pmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/popcntintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/rtmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/smmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/tmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/wmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/x86intrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/xmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/xopintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.3/__wmmintrin_aes.h	comp-c-include		llvm
+./usr/include/clang-3.3/__wmmintrin_pclmul.h	comp-c-include		llvm
+./usr/include/clang-3.3/ammintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/avxintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/avx2intrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/bmi2intrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/bmiintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/emmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/f16cintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/fma4intrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/fmaintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/immintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/lzcntintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/mm3dnow.h		comp-c-include		llvm
+./usr/include/clang-3.3/mm_malloc.h		comp-c-include		llvm
+./usr/include/clang-3.3/mmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/nmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/pmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/popcntintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/rtmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/smmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/tmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/wmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/x86intrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/xmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/xopintrin.h		comp-c-include		llvm
 ./usr/include/emmintrin.h			comp-obsolete		obsolete
 ./usr/include/gcc-4.1/emmintrin.h		comp-c-include		gcccmds,gcc=4
 ./usr/include/gcc-4.1/emmintrin.h		comp-obsolete		gcc=45,obsolete
--- a/distrib/sets/lists/comp/md.i386	Wed Jan 23 14:24:14 2013 +0000
+++ b/distrib/sets/lists/comp/md.i386	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.132 2013/01/16 16:01:06 christos Exp $
+# $NetBSD: md.i386,v 1.133 2013/01/23 15:02:53 joerg Exp $
 ./usr/include/clang-3.0/avxintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.0/avx2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.0/bmi2intrin.h		comp-obsolete		obsolete
@@ -18,32 +18,58 @@
 ./usr/include/clang-3.0/wmmintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.0/x86intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.0/xmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.2/__wmmintrin_aes.h	comp-c-include		llvm
-./usr/include/clang-3.2/__wmmintrin_pclmul.h	comp-c-include		llvm
-./usr/include/clang-3.2/ammintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/avxintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/avx2intrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/bmi2intrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/bmiintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/emmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/f16cintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/fma4intrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/fmaintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/immintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/lzcntintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/mm3dnow.h		comp-c-include		llvm
-./usr/include/clang-3.2/mm_malloc.h		comp-c-include		llvm
-./usr/include/clang-3.2/mmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/nmmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/pmmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/popcntintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/rtmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/smmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/tmmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/wmmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/x86intrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/xmmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.2/xopintrin.h		comp-c-include		llvm
+./usr/include/clang-3.2/__wmmintrin_aes.h	comp-obsolete		obsolete
+./usr/include/clang-3.2/__wmmintrin_pclmul.h	comp-obsolete		obsolete
+./usr/include/clang-3.2/ammintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/avxintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/avx2intrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/bmi2intrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/bmiintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/emmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/f16cintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/fma4intrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/fmaintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/immintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/lzcntintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/mm3dnow.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/mm_malloc.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/mmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/nmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/pmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/popcntintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/rtmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/smmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/tmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/wmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/x86intrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/xmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/xopintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.3/__wmmintrin_aes.h	comp-c-include		llvm
+./usr/include/clang-3.3/__wmmintrin_pclmul.h	comp-c-include		llvm
+./usr/include/clang-3.3/ammintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/avxintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/avx2intrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/bmi2intrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/bmiintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/emmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/f16cintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/fma4intrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/fmaintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/immintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/lzcntintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/mm3dnow.h		comp-c-include		llvm
+./usr/include/clang-3.3/mm_malloc.h		comp-c-include		llvm
+./usr/include/clang-3.3/mmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/nmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/pmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/popcntintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/rtmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/smmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/tmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/wmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/x86intrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/xmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.3/xopintrin.h		comp-c-include		llvm
 ./usr/include/emmintrin.h			comp-obsolete		obsolete
 ./usr/include/gcc-4.1/emmintrin.h		comp-c-include		gcccmds,gcc=4
 ./usr/include/gcc-4.1/emmintrin.h		comp-obsolete		gcc=45,obsolete
--- a/etc/mtree/NetBSD.dist.base	Wed Jan 23 14:24:14 2013 +0000
+++ b/etc/mtree/NetBSD.dist.base	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.107 2012/11/20 15:02:44 pgoyette Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.108 2013/01/23 15:02:53 joerg Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -94,7 +94,7 @@
 ./usr/include/arpa
 ./usr/include/atf-c
 ./usr/include/atf-c++
-./usr/include/clang-3.2
+./usr/include/clang-3.3
 ./usr/include/crypto
 ./usr/include/dev
 ./usr/include/dev/apm
--- a/external/bsd/llvm/Makefile.inc	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/Makefile.inc	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.43 2012/11/17 04:57:26 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.44 2013/01/23 15:02:53 joerg Exp $
 
 .if !defined(LLVM_TOPLEVEL_MK)
 LLVM_TOPLEVEL_MK=
@@ -7,13 +7,13 @@
 
 SVN_ROOT=		http://llvm.org/svn/llvm-project
 
-COMMON_REVISION=	168187
+COMMON_REVISION=	172366
 LLVM_REVISION=		${COMMON_REVISION}
 CLANG_REVISION=		${COMMON_REVISION}
 COMPILER_RT_REVISION=	${COMMON_REVISION}
 
-LLVM_VERSION=		3.2
-CLANG_VERSION=		3.2
+LLVM_VERSION=		3.3
+CLANG_VERSION=		3.3
 
 LLVM_SRCDIR:=	${.PARSEDIR}/dist/llvm
 CLANG_SRCDIR:=	${.PARSEDIR}/dist/clang
--- a/external/bsd/llvm/bin/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2012/11/17 04:57:26 joerg Exp $
+#	$NetBSD: Makefile,v 1.7 2013/01/23 15:02:54 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -22,6 +22,7 @@
 	llvm-link \
 	llvm-mc \
 	llvm-nm \
+	llvm-objdump \
 	llvm-prof \
 	llvm-ranlib \
 	llvm-readobj \
--- a/external/bsd/llvm/bin/bugpoint/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/bugpoint/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2012/04/04 10:42:00 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2013/01/23 15:02:54 joerg Exp $
 
 PROG_CXX=	bugpoint
 NOMAN=		yes
@@ -31,7 +31,7 @@
 	TransformsUtils \
 	Analysis \
 	ipa \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/clang/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/clang/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.21 2012/09/23 17:22:22 joerg Exp $
+#	$NetBSD: Makefile,v 1.22 2013/01/23 15:02:54 joerg Exp $
 
 PROG_CXX=	clang
 NOMAN=		yes
@@ -20,7 +20,6 @@
 	clangFrontendTool \
 	clangFrontend \
 	clangARCMigrate \
-	clangEdit \
 	clangStaticAnalyzerFrontend \
 	clangStaticAnalyzerCheckers \
 	clangStaticAnalyzerCore \
@@ -29,6 +28,7 @@
 	clangCodeGen \
 	clangParse \
 	clangSema \
+	clangEdit \
 	clangAnalysis \
 	clangRewriteFrontend \
 	clangRewriteCore \
@@ -79,7 +79,7 @@
 	Linker \
 	TransformsUtils \
 	ipa \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/llc/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/llc/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2012/04/04 10:42:00 joerg Exp $
+#	$NetBSD: Makefile,v 1.12 2013/01/23 15:02:54 joerg Exp $
 
 PROG_CXX=	llc
 NOMAN=		yes
@@ -44,7 +44,7 @@
 	Target \
 	MCParser \
 	MC \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/lli/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/lli/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2012/09/23 17:22:22 joerg Exp $
+#	$NetBSD: Makefile,v 1.8 2013/01/23 15:02:54 joerg Exp $
 
 PROG_CXX=	lli
 NOMAN=		yes
@@ -34,7 +34,7 @@
 	Analysis \
 	Target \
 	MC \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/llvm-ar/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/llvm-ar/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:13:45 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2013/01/23 15:02:54 joerg Exp $
 
 PROG_CXX=	llvm-ar
 NOMAN=		yes
@@ -12,7 +12,7 @@
 LLVM_LIBS+= \
 	Archive \
 	BitReader \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/llvm-as/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/llvm-as/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:13:45 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2013/01/23 15:02:55 joerg Exp $
 
 PROG_CXX=	llvm-as
 NOMAN=		yes
@@ -12,7 +12,7 @@
 LLVM_LIBS+= \
 	AsmParser \
 	BitWriter \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/llvm-cov/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/llvm-cov/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/10/11 13:53:57 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2013/01/23 15:02:55 joerg Exp $
 
 PROG_CXX=	llvm-cov
 NOMAN=		yes
@@ -10,7 +10,7 @@
 SRCS=	llvm-cov.cpp
 
 LLVM_LIBS+= \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/llvm-diff/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/llvm-diff/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2011/03/18 23:32:01 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2013/01/23 15:02:55 joerg Exp $
 
 PROG_CXX=	llvm-diff
 NOMAN=		yes
@@ -15,7 +15,7 @@
 LLVM_LIBS+= \
 	AsmParser \
 	BitReader \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/llvm-dis/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/llvm-dis/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2011/03/18 23:32:02 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2013/01/23 15:02:55 joerg Exp $
 
 PROG_CXX=	llvm-dis
 NOMAN=		yes
@@ -12,7 +12,7 @@
 LLVM_LIBS+= \
 	Analysis \
 	BitReader \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/llvm-extract/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/llvm-extract/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2012/09/23 17:22:22 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2013/01/23 15:02:55 joerg Exp $
 
 PROG_CXX=	llvm-extract
 NOMAN=		yes
@@ -18,7 +18,7 @@
 	Analysis \
 	Target \
 	ipa \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/llvm-link/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/llvm-link/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2011/10/11 13:53:58 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2013/01/23 15:02:55 joerg Exp $
 
 PROG_CXX=	llvm-link
 NOMAN=		yes
@@ -17,7 +17,7 @@
 	TransformsUtils \
 	Analysis \
 	Target \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/llvm-mc/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/llvm-mc/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2012/09/23 17:22:22 joerg Exp $
+#	$NetBSD: Makefile,v 1.13 2013/01/23 15:02:56 joerg Exp $
 
 PROG_CXX=	llvm-mc
 NOMAN=		yes
@@ -47,7 +47,7 @@
 	AsmPrinter \
 	MCParser \
 	MC \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/llvm-nm/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/llvm-nm/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:13:47 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2013/01/23 15:02:56 joerg Exp $
 
 PROG_CXX=	llvm-nm
 NOMAN=		yes
@@ -12,7 +12,7 @@
 LLVM_LIBS+= \
 	Archive \
 	BitReader \
-	Core \
+	IR \
 	Object \
 	Support
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/llvm/bin/llvm-objdump/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -0,0 +1,47 @@
+#	$NetBSD: Makefile,v 1.1 2013/01/23 15:02:56 joerg Exp $
+
+PROG_CXX=	llvm-objdump
+NOMAN=		yes
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/tools/llvm-objdump
+
+SRCS=	llvm-objdump.cpp \
+	COFFDump.cpp \
+	ELFDump.cpp \
+	MachODump.cpp \
+	MCFunction.cpp \
+
+LLVM_LIBS+= \
+	Object \
+	ARMDisassembler \
+	ARMTargetInfo \
+	ARMMCTargetDesc \
+	ARMAsmParser \
+	ARMAsmPrinter \
+	MipsDisassembler \
+	MipsTargetInfo \
+	MipsMCTargetDesc \
+	MipsAsmPrinter \
+	MipsAsmParser \
+	PowerPCTargetInfo \
+	PowerPCMCTargetDesc \
+	PowerPCAsmPrinter \
+	SparcTargetInfo \
+	SparcMCTargetDesc \
+	X86Disassembler \
+	X86MCTargetDesc \
+	X86TargetInfo \
+	X86AsmParser \
+	X86AsmPrinter \
+	X86Utils \
+	DebugInfo \
+	MCParser \
+	MC \
+	IR \
+	Support
+
+.include "${.PARSEDIR}/../../link.mk"
+
+.include <bsd.prog.mk>
--- a/external/bsd/llvm/bin/llvm-prof/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/llvm-prof/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:13:47 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2013/01/23 15:02:56 joerg Exp $
 
 PROG_CXX=	llvm-prof
 NOMAN=		yes
@@ -12,7 +12,7 @@
 LLVM_LIBS+= \
 	BitReader \
 	Analysis \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/llvm-ranlib/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/llvm-ranlib/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:13:47 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2013/01/23 15:02:56 joerg Exp $
 
 PROG_CXX=	llvm-ranlib
 NOMAN=		yes
@@ -12,7 +12,7 @@
 LLVM_LIBS+= \
 	Archive \
 	BitReader \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/llvm-readobj/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/llvm-readobj/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2012/04/04 10:44:21 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2013/01/23 15:02:56 joerg Exp $
 
 PROG_CXX=	llvm-readobj
 NOMAN=		yes
@@ -13,7 +13,7 @@
 	Archive \
 	BitReader \
 	Object \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/macho-dumpx/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/macho-dumpx/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:13:48 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2013/01/23 15:02:56 joerg Exp $
 
 ROG_CXX=	machdo-dumpx
 NOMAN=		yes
@@ -11,7 +11,7 @@
 
 LLVM_LIBS+= \
 	Object \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/opt/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/opt/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2012/10/28 17:07:45 joerg Exp $
+#	$NetBSD: Makefile,v 1.5 2013/01/23 15:02:57 joerg Exp $
 
 PROG_CXX=	opt
 NOMAN=		yes
@@ -48,7 +48,7 @@
 	MC \
 	TransformsUtils \
 	ipa \
-	Core \
+	IR \
 	Support
 
 .include "${.PARSEDIR}/../../link.mk"
--- a/external/bsd/llvm/bin/tblgen/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/bin/tblgen/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2012/10/28 17:07:45 joerg Exp $
+#	$NetBSD: Makefile,v 1.16 2013/01/23 15:02:57 joerg Exp $
 
 PROG_CXX=	llvm-tblgen
 NOMAN=		yes
@@ -25,11 +25,11 @@
 	DAGISelMatcherOpt.cpp \
 	DFAPacketizerEmitter.cpp \
 	DisassemblerEmitter.cpp \
-	EDEmitter.cpp \
 	FastISelEmitter.cpp \
 	FixedLenDecoderEmitter.cpp \
 	InstrInfoEmitter.cpp \
 	IntrinsicEmitter.cpp \
+	OptParserEmitter.cpp \
 	PseudoLoweringEmitter.cpp \
 	RegisterInfoEmitter.cpp \
 	SetTheory.cpp \
--- a/external/bsd/llvm/config/clang/Config/config.h	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/config/clang/Config/config.h	Wed Jan 23 15:02:52 2013 +0000
@@ -11,7 +11,7 @@
 #define CLANG_RESOURCE_DIR ""
 
 /* Directories clang will search for headers */
-#define C_INCLUDE_DIRS "/usr/include/clang-3.2:/usr/include"
+#define C_INCLUDE_DIRS "/usr/include/clang-3.3:/usr/include"
 
 /* Linker version detected at compile time. */
 #define HOST_LINK_VERSION "2.22"
--- a/external/bsd/llvm/config/llvm/Config/config.h.in	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/config/llvm/Config/config.h.in	Wed Jan 23 15:02:52 2013 +0000
@@ -14,7 +14,7 @@
 #define CLANG_RESOURCE_DIR ""
 
 /* Directories clang will search for headers */
-#define C_INCLUDE_DIRS "/usr/include/clang-3.2:/usr/include"
+#define C_INCLUDE_DIRS "/usr/include/clang-3.3:/usr/include"
 
 /* Default <path> to all compiler invocations for --sysroot=<path>. */
 #define DEFAULT_SYSROOT ""
--- a/external/bsd/llvm/include/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/include/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2012/11/17 04:57:27 joerg Exp $
+#	$NetBSD: Makefile,v 1.16 2013/01/23 15:02:57 joerg Exp $
 
 .include <bsd.init.mk>
 
@@ -46,7 +46,7 @@
   stdint.h \
   tgmath.h
 
-.PATH:	${LLVM_SRCDIR}/include/llvm \
+.PATH:	${LLVM_SRCDIR}/include/llvm/IR \
 	${CLANG_SRCDIR}/include/clang/AST \
 	${CLANG_SRCDIR}/include/clang/Basic \
 	${CLANG_SRCDIR}/include/clang/Driver
@@ -54,7 +54,7 @@
 TABLEGEN_SRC=	Intrinsics.td
 
 TABLEGEN_OUTPUT.Intrinsics.td= \
-	llvm/Intrinsics.gen|-gen-intrinsic
+	llvm/IR/Intrinsics.gen|-gen-intrinsic
 
 CLANG_TABLEGEN_SRC=	Attr.td CommentCommands.td CommentHTMLTags.td \
 	CommentNodes.td DeclNodes.td StmtNodes.td \
@@ -64,7 +64,8 @@
 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/AST/AttrDump.inc|-gen-clang-attr-dump \
+	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 \
--- a/external/bsd/llvm/lib/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/09/23 17:22:23 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2013/01/23 15:02:57 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -9,7 +9,7 @@
 	libLLVMBitReader \
 	libLLVMBitWriter \
 	libLLVMCodeGen \
-	libLLVMCore \
+	libLLVMIR \
 	libLLVMInstCombine \
 	libLLVMInstrumentation \
 	libLLVMipa \
@@ -76,6 +76,7 @@
 	libLLVMJIT \
 	libLLVMMCJIT \
 	libLLVMObject \
+	libLLVMOption \
 	libLLVMRuntimeDyld
 .endif
 
@@ -102,8 +103,9 @@
 
 .if ${NO_LLVM_DEVELOPER:Uno} == "no" && ${LLVM_DEVELOPER:U} == "yes"
 SUBDIR+= \
-	libclangTooling \
-	libclangASTMatchers
+	libclangASTMatchers \
+	libclangFormat \
+	libclangTooling
 .endif
 
 .include <bsd.subdir.mk>
--- a/external/bsd/llvm/lib/libLLVMARMAsmParser/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMARMAsmParser/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/07/05 17:22:22 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2013/01/23 15:02:58 joerg Exp $
 
 LIB=	LLVMARMAsmParser
 
@@ -9,8 +9,7 @@
 
 .PATH: ${LLVM_SRCDIR}/lib/Target/ARM/AsmParser
 
-SRCS+=	ARMAsmLexer.cpp \
-	ARMAsmParser.cpp
+SRCS+=	ARMAsmParser.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>
--- a/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2012/11/17 04:57:27 joerg Exp $
+#	$NetBSD: Makefile,v 1.11 2013/01/23 15:02:58 joerg Exp $
 
 LIB=	LLVMARMCodeGen
 
@@ -28,6 +28,7 @@
 	ARMSubtarget.cpp \
 	ARMTargetMachine.cpp \
 	ARMTargetObjectFile.cpp \
+	ARMTargetTransformInfo.cpp \
 	MLxExpansionPass.cpp \
 	Thumb1InstrInfo.cpp \
 	Thumb1FrameLowering.cpp \
@@ -51,7 +52,6 @@
 	ARMGenFastISel.inc|-gen-fast-isel \
 	ARMGenCallingConv.inc|-gen-callingconv \
 	ARMGenSubtargetInfo.inc|-gen-subtarget \
-	ARMGenEDInfo.inc|-gen-enhanced-disassembly-info \
 	ARMGenDisassemblerTables.inc|-gen-disassembler
 
 .include "${.PARSEDIR}/../../tablegen.mk"
--- a/external/bsd/llvm/lib/libLLVMARMMCTargetDesc/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMARMMCTargetDesc/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2012/01/11 23:24:47 joerg Exp $
+#	$NetBSD: Makefile,v 1.5 2013/01/23 15:02:58 joerg Exp $
 
 LIB=	LLVMARMMCTargetDesc
 
@@ -11,6 +11,7 @@
 
 SRCS+=	ARMAsmBackend.cpp \
 	ARMELFObjectWriter.cpp \
+	ARMELFStreamer.cpp \
 	ARMMCAsmInfo.cpp \
 	ARMMCCodeEmitter.cpp \
 	ARMMCExpr.cpp \
--- a/external/bsd/llvm/lib/libLLVMAnalysis/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMAnalysis/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2012/11/17 04:57:27 joerg Exp $
+#	$NetBSD: Makefile,v 1.11 2013/01/23 15:02:58 joerg Exp $
 
 LIB=	LLVMAnalysis
 
@@ -54,6 +54,7 @@
 	ProfileInfoLoader.cpp \
 	ProfileInfoLoaderPass.cpp \
 	ProfileVerifierPass.cpp \
+	PtrUseVisitor.cpp \
 	RegionInfo.cpp \
 	RegionPass.cpp \
 	RegionPrinter.cpp \
@@ -62,6 +63,7 @@
 	ScalarEvolutionExpander.cpp \
 	ScalarEvolutionNormalization.cpp \
 	SparsePropagation.cpp \
+	TargetTransformInfo.cpp \
 	Trace.cpp \
 	TypeBasedAliasAnalysis.cpp \
 	ValueTracking.cpp
--- a/external/bsd/llvm/lib/libLLVMCodeGen/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMCodeGen/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2012/09/23 17:22:23 joerg Exp $
+#	$NetBSD: Makefile,v 1.21 2013/01/23 15:02:58 joerg Exp $
 
 LIB=	LLVMCodeGen
 
@@ -9,6 +9,7 @@
 SRCS+=	AggressiveAntiDepBreaker.cpp \
 	AllocationOrder.cpp \
 	Analysis.cpp \
+	BasicTargetTransformInfo.cpp \
 	BranchFolding.cpp \
 	CalcSpillWeights.cpp \
 	CallingConvLower.cpp \
@@ -60,7 +61,6 @@
 	MachineInstrBundle.cpp \
 	MachineLICM.cpp \
 	MachineLoopInfo.cpp \
-	MachineLoopRanges.cpp \
 	MachineModuleInfo.cpp \
 	MachineModuleInfoImpls.cpp \
 	MachinePassRegistry.cpp \
@@ -107,9 +107,11 @@
 	StrongPHIElimination.cpp \
 	TailDuplication.cpp \
 	TargetFrameLoweringImpl.cpp \
-	TargetInstrInfoImpl.cpp \
+	TargetInstrInfo.cpp \
+	TargetLoweringBase.cpp \
 	TargetLoweringObjectFileImpl.cpp \
 	TargetOptionsImpl.cpp \
+	TargetRegisterInfo.cpp \
 	TargetSchedule.cpp \
 	TwoAddressInstructionPass.cpp \
 	UnreachableBlockElim.cpp \
--- a/external/bsd/llvm/lib/libLLVMCore/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#	$NetBSD: Makefile,v 1.9 2012/10/28 17:07:45 joerg Exp $
-
-LIB=	LLVMCore
-
-.include <bsd.init.mk>
-
-.PATH: ${LLVM_SRCDIR}/lib/VMCore
-
-SRCS+=	AsmWriter.cpp \
-	Attributes.cpp \
-	AutoUpgrade.cpp \
-	BasicBlock.cpp \
-	ConstantFold.cpp \
-	Constants.cpp \
-	Core.cpp \
-	DIBuilder.cpp \
-	DataLayout.cpp \
-	DebugInfo.cpp \
-	DebugLoc.cpp \
-	Dominators.cpp \
-	Function.cpp \
-	GCOV.cpp \
-	GVMaterializer.cpp \
-	Globals.cpp \
-	IRBuilder.cpp \
-	InlineAsm.cpp \
-	Instruction.cpp \
-	Instructions.cpp \
-	IntrinsicInst.cpp \
-	LLVMContext.cpp \
-	LLVMContextImpl.cpp \
-	LeakDetector.cpp \
-	Metadata.cpp \
-	Module.cpp \
-	Pass.cpp \
-	PassManager.cpp \
-	PassRegistry.cpp \
-	PrintModulePass.cpp \
-	TargetTransformInfo.cpp \
-	Type.cpp \
-	TypeFinder.cpp \
-	Use.cpp \
-	User.cpp \
-	Value.cpp \
-	ValueSymbolTable.cpp \
-	ValueTypes.cpp \
-	Verifier.cpp
-
-.if defined(HOSTLIB)
-.include <bsd.hostlib.mk>
-.else
-.include <bsd.lib.mk>
-.endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/llvm/lib/libLLVMIR/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -0,0 +1,52 @@
+#	$NetBSD: Makefile,v 1.1 2013/01/23 15:02:59 joerg Exp $
+
+LIB=	LLVMIR
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/IR
+
+SRCS+=	AsmWriter.cpp \
+	Attributes.cpp \
+	AutoUpgrade.cpp \
+	BasicBlock.cpp \
+	ConstantFold.cpp \
+	Constants.cpp \
+	Core.cpp \
+	DIBuilder.cpp \
+	DataLayout.cpp \
+	DebugInfo.cpp \
+	DebugLoc.cpp \
+	Dominators.cpp \
+	Function.cpp \
+	GCOV.cpp \
+	GVMaterializer.cpp \
+	Globals.cpp \
+	IRBuilder.cpp \
+	InlineAsm.cpp \
+	Instruction.cpp \
+	Instructions.cpp \
+	IntrinsicInst.cpp \
+	LLVMContext.cpp \
+	LLVMContextImpl.cpp \
+	LeakDetector.cpp \
+	Metadata.cpp \
+	Module.cpp \
+	Pass.cpp \
+	PassManager.cpp \
+	PassRegistry.cpp \
+	PrintModulePass.cpp \
+	Type.cpp \
+	TypeFinder.cpp \
+	Use.cpp \
+	User.cpp \
+	Value.cpp \
+	ValueSymbolTable.cpp \
+	ValueTypes.cpp \
+	Verifier.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif
--- a/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2012/09/23 17:22:23 joerg Exp $
+#	$NetBSD: Makefile,v 1.8 2013/01/23 15:02:59 joerg Exp $
 
 LIB=	LLVMInstrumentation
 
@@ -12,6 +12,7 @@
 	EdgeProfiling.cpp \
 	GCOVProfiling.cpp \
 	Instrumentation.cpp \
+	MemorySanitizer.cpp \
 	OptimalEdgeProfiling.cpp \
 	PathProfiling.cpp \
 	ProfilingUtils.cpp \
--- a/external/bsd/llvm/lib/libLLVMMC/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMMC/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2012/08/09 14:37:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.11 2013/01/23 15:02:59 joerg Exp $
 
 LIB=	LLVMMC
 
@@ -43,7 +43,6 @@
 	MCStreamer.cpp \
 	MCSubtargetInfo.cpp \
 	MCSymbol.cpp \
-	MCTargetAsmLexer.cpp \
 	MCValue.cpp \
 	MCWin64EH.cpp \
 	MachObjectWriter.cpp \
--- a/external/bsd/llvm/lib/libLLVMMCDisassembler/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMMCDisassembler/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2011/12/11 14:58:50 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2013/01/23 15:02:59 joerg Exp $
 
 LIB=	LLVMMCDisassembler
 
@@ -6,12 +6,7 @@
 
 .PATH: ${LLVM_SRCDIR}/lib/MC/MCDisassembler
 
-SRCS+=	Disassembler.cpp \
-	EDDisassembler.cpp \
-	EDMain.cpp \
-	EDOperand.cpp \
-	EDInst.cpp \
-	EDToken.cpp
+SRCS+=	Disassembler.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>
--- a/external/bsd/llvm/lib/libLLVMMCJIT/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMMCJIT/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2012/11/17 04:57:27 joerg Exp $
+#	$NetBSD: Makefile,v 1.7 2013/01/23 15:02:59 joerg Exp $
 
 LIB=	LLVMMCJIT
 
@@ -6,6 +6,7 @@
 
 .PATH: ${LLVM_SRCDIR}/lib/ExecutionEngine/MCJIT
 
-SRCS+=	MCJIT.cpp
+SRCS+=	MCJIT.cpp \
+	SectionMemoryManager.cpp
 
 .include <bsd.lib.mk>
--- a/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2012/11/17 04:57:27 joerg Exp $
+#	$NetBSD: Makefile,v 1.15 2013/01/23 15:02:59 joerg Exp $
 
 LIB=	LLVMMipsCodeGen
 
@@ -41,7 +41,6 @@
 	MipsGenCodeEmitter.inc|-gen-emitter \
 	MipsGenDAGISel.inc|-gen-dag-isel \
 	MipsGenDisassemblerTables.inc|-gen-disassembler \
-	MipsGenEDInfo.inc|-gen-enhanced-disassembly-info \
 	MipsGenMCCodeEmitter.inc|-gen-emitter^-mc-emitter \
 	MipsGenMCPseudoLowering.inc|-gen-pseudo-lowering \
 	MipsGenSubtargetInfo.inc|-gen-subtarget
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/llvm/lib/libLLVMOption/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -0,0 +1,20 @@
+#	$NetBSD: Makefile,v 1.1 2013/01/23 15:02:59 joerg Exp $
+
+LIB=	LLVMOption
+
+NOGCCERROR=	yes
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/Option
+
+SRCS+=	ArgList.cpp  \
+	Arg.cpp \
+	OptTable.cpp \
+	Option.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif
--- a/external/bsd/llvm/lib/libLLVMSupport/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMSupport/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2012/08/09 14:37:07 joerg Exp $
+#	$NetBSD: Makefile,v 1.14 2013/01/23 15:03:00 joerg Exp $
 
 LIB=	LLVMSupport
 
@@ -60,6 +60,7 @@
 	Triple.cpp \
 	Twine.cpp \
 	YAMLParser.cpp \
+	YAMLTraits.cpp \
 	raw_os_ostream.cpp \
 	raw_ostream.cpp \
 	regcomp.c \
--- a/external/bsd/llvm/lib/libLLVMTarget/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMTarget/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2012/11/17 04:57:27 joerg Exp $
+#	$NetBSD: Makefile,v 1.11 2013/01/23 15:03:00 joerg Exp $
 
 LIB=	LLVMTarget
 
@@ -8,16 +8,13 @@
 
 SRCS+=	Mangler.cpp \
 	Target.cpp \
-	TargetInstrInfo.cpp \
 	TargetIntrinsicInfo.cpp \
 	TargetJITInfo.cpp \
 	TargetLibraryInfo.cpp \
 	TargetLoweringObjectFile.cpp \
 	TargetMachine.cpp \
 	TargetMachineC.cpp \
-	TargetRegisterInfo.cpp \
-	TargetSubtargetInfo.cpp \
-	TargetTransformImpl.cpp
+	TargetSubtargetInfo.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>
--- a/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2012/10/28 17:07:46 joerg Exp $
+#	$NetBSD: Makefile,v 1.11 2013/01/23 15:03:00 joerg Exp $
 
 LIB=	LLVMTransformsUtils
 
@@ -6,8 +6,7 @@
 
 .PATH: ${LLVM_SRCDIR}/lib/Transforms/Utils
 
-SRCS+=	AddrModeMatcher.cpp \
-	BasicBlockUtils.cpp \
+SRCS+=	BasicBlockUtils.cpp \
 	BreakCriticalEdges.cpp \
 	BuildLibCalls.cpp \
 	BypassSlowDivision.cpp \
--- a/external/bsd/llvm/lib/libLLVMX86AsmParser/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMX86AsmParser/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:14:02 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2013/01/23 15:03:00 joerg Exp $
 
 LIB=	LLVMX86AsmParser
 
@@ -9,8 +9,7 @@
 
 .PATH: ${LLVM_SRCDIR}/lib/Target/X86/AsmParser
 
-SRCS+=	X86AsmLexer.cpp \
-	X86AsmParser.cpp
+SRCS+=	X86AsmParser.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>
--- a/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2012/11/17 04:57:27 joerg Exp $
+#	$NetBSD: Makefile,v 1.9 2013/01/23 15:03:00 joerg Exp $
 
 LIB=	LLVMX86CodeGen
 
@@ -18,11 +18,13 @@
 	X86JITInfo.cpp \
 	X86MachineFunctionInfo.cpp \
 	X86MCInstLower.cpp \
+	X86PadShortFunction.cpp \
 	X86RegisterInfo.cpp \
 	X86SelectionDAGInfo.cpp \
 	X86Subtarget.cpp \
 	X86TargetMachine.cpp \
 	X86TargetObjectFile.cpp \
+	X86TargetTransformInfo.cpp \
 	X86VZeroUpper.cpp
 
 TABLEGEN_SRC=		X86.td
@@ -34,7 +36,6 @@
 	X86GenCallingConv.inc|-gen-callingconv \
 	X86GenDAGISel.inc|-gen-dag-isel \
 	X86GenDisassemblerTables.inc|-gen-disassembler \
-	X86GenEDInfo.inc|-gen-enhanced-disassembly-info \
 	X86GenFastISel.inc|-gen-fast-isel \
 	X86GenInstrInfo.inc|-gen-instr-info \
 	X86GenRegisterInfo.inc|-gen-register-info \
--- a/external/bsd/llvm/lib/libLLVMipa/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libLLVMipa/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:14:05 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2013/01/23 15:03:00 joerg Exp $
 
 LIB=	LLVMipa
 
@@ -6,7 +6,8 @@
 
 .PATH: ${LLVM_SRCDIR}/lib/Analysis/IPA
 
-SRCS+=	CallGraph.cpp \
+SRCS+=	CallPrinter.cpp \
+	CallGraph.cpp \
 	CallGraphSCCPass.cpp \
 	FindUsedTypes.cpp \
 	GlobalsModRef.cpp \
--- a/external/bsd/llvm/lib/libclangARCMigrate/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libclangARCMigrate/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2012/04/04 10:42:04 joerg Exp $
+#	$NetBSD: Makefile,v 1.5 2013/01/23 15:03:00 joerg Exp $
 
 LIB=	clangARCMigrate
 
@@ -19,6 +19,7 @@
 	TransGCAttrs.cpp \
 	TransGCCalls.cpp \
 	TransProperties.cpp \
+	TransProtectedScope.cpp \
 	TransRetainReleaseDealloc.cpp \
 	TransUnbridgedCasts.cpp \
 	TransUnusedInitDelegate.cpp \
--- a/external/bsd/llvm/lib/libclangAST/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libclangAST/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2012/09/23 17:22:24 joerg Exp $
+#	$NetBSD: Makefile,v 1.8 2013/01/23 15:03:01 joerg Exp $
 
 LIB=	clangAST
 
@@ -10,6 +10,7 @@
 	ASTConsumer.cpp \
 	ASTContext.cpp \
 	ASTDiagnostic.cpp \
+	ASTDumper.cpp \
 	ASTImporter.cpp \
 	AttrImpl.cpp \
 	CXXInheritance.cpp \
@@ -50,7 +51,6 @@
 	RecordLayoutBuilder.cpp \
 	SelectorLocationsKind.cpp \
 	Stmt.cpp \
-	StmtDumper.cpp \
 	StmtIterator.cpp \
 	StmtPrinter.cpp \
 	StmtProfile.cpp \
--- a/external/bsd/llvm/lib/libclangBasic/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libclangBasic/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2012/08/09 14:37:07 joerg Exp $
+#	$NetBSD: Makefile,v 1.7 2013/01/23 15:03:01 joerg Exp $
 
 LIB=	clangBasic
 
@@ -17,6 +17,7 @@
 	LangOptions.cpp \
 	Module.cpp \
 	ObjCRuntime.cpp \
+	OperatorPrecedence.cpp \
 	SourceLocation.cpp \
 	SourceManager.cpp \
 	TargetInfo.cpp \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/llvm/lib/libclangFormat/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -0,0 +1,16 @@
+#	$NetBSD: Makefile,v 1.1 2013/01/23 15:03:01 joerg Exp $
+
+LIB=	clangFormat
+
+.include <bsd.init.mk>
+
+.PATH: ${CLANG_SRCDIR}/lib/Format
+
+SRCS+=	Format.cpp \
+	UnwrappedLineParser.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif
--- a/external/bsd/llvm/lib/libclangLex/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ b/external/bsd/llvm/lib/libclangLex/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2012/01/11 23:24:49 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2013/01/23 15:03:01 joerg Exp $
 
 LIB=	clangLex
 
@@ -15,6 +15,7 @@
 	ModuleMap.cpp \
 	PPCaching.cpp \
 	PPCallbacks.cpp \
+	PPConditionalDirectiveRecord.cpp \
 	PPDirectives.cpp \
 	PPExpressions.cpp \
 	PPLexerChange.cpp \
--- a/tools/llvm-lib/libLLVMCore/Makefile	Wed Jan 23 14:24:14 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:14:14 joerg Exp $
-
-.include <bsd.init.mk>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/llvm-lib/libLLVMIR/Makefile	Wed Jan 23 15:02:52 2013 +0000
@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2013/01/23 15:03:01 joerg Exp $
+
+.include <bsd.init.mk>