Install clang's MD headers into /usr/include/clang-3.0 similar to GCC. trunk
authorjoerg <joerg@NetBSD.org>
Fri, 15 Apr 2011 19:31:06 +0000
branchtrunk
changeset 200060 50a69d2fcb5f
parent 200059 ad99b3ef248f
child 200061 7ff44cbb85a3
Install clang's MD headers into /usr/include/clang-3.0 similar to GCC.
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/include/Makefile
--- a/distrib/sets/lists/base/mi	Fri Apr 15 18:05:42 2011 +0000
+++ b/distrib/sets/lists/base/mi	Fri Apr 15 19:31:06 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.930 2011/04/15 18:05:42 elric Exp $
+# $NetBSD: mi,v 1.931 2011/04/15 19:31:06 joerg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -739,6 +739,7 @@
 ./usr/include/altq				base-c-usr
 ./usr/include/arpa				base-c-usr
 ./usr/include/cdk				base-obsolete		obsolete
+./usr/include/clang-3.0				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	Fri Apr 15 18:05:42 2011 +0000
+++ b/distrib/sets/lists/comp/ad.powerpc	Fri Apr 15 19:31:06 2011 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: ad.powerpc,v 1.48 2011/04/15 13:42:22 joerg Exp $
+# $NetBSD: ad.powerpc,v 1.49 2011/04/15 19:31:06 joerg Exp $
 ./usr/bin/elf2aout				comp-sysutil-bin
 ./usr/bin/psim					comp-debug-bin		gdb,gdb=6
 ./usr/include/altivec.h				comp-obsolete		obsolete
+./usr/include/clang-3.0/altivec.h		comp-c-include		llvm
 ./usr/include/gcc-4.1/altivec.h			comp-c-include		gcccmds,gcc=4
 ./usr/include/powerpc				comp-c-include
 ./usr/include/powerpc/ansi.h			comp-c-include
--- a/distrib/sets/lists/comp/md.amd64	Fri Apr 15 18:05:42 2011 +0000
+++ b/distrib/sets/lists/comp/md.amd64	Fri Apr 15 19:31:06 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.107 2011/04/15 18:05:43 elric Exp $
+# $NetBSD: md.amd64,v 1.108 2011/04/15 19:31:06 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
@@ -67,6 +67,15 @@
 ./usr/include/amd64/varargs.h			comp-c-include
 ./usr/include/amd64/vmparam.h			comp-c-include
 ./usr/include/amd64/wchar_limits.h		comp-c-include
+./usr/include/clang-3.0/avxintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/emmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/immintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/mm_malloc.h		comp-c-include		llvm
+./usr/include/clang-3.0/mmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/pmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/smmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/tmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/xmmintrin.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/mm_malloc.h		comp-c-include		gcccmds,gcc=4
--- a/distrib/sets/lists/comp/md.i386	Fri Apr 15 18:05:42 2011 +0000
+++ b/distrib/sets/lists/comp/md.i386	Fri Apr 15 19:31:06 2011 +0000
@@ -1,4 +1,13 @@
-# $NetBSD: md.i386,v 1.116 2011/04/15 13:42:22 joerg Exp $
+# $NetBSD: md.i386,v 1.117 2011/04/15 19:31:06 joerg Exp $
+./usr/include/clang-3.0/avxintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/emmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/immintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/mm_malloc.h		comp-c-include		llvm
+./usr/include/clang-3.0/mmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/pmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/smmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/tmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/xmmintrin.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/mmintrin.h		comp-c-include		gcccmds,gcc=4
--- a/etc/mtree/NetBSD.dist.base	Fri Apr 15 18:05:42 2011 +0000
+++ b/etc/mtree/NetBSD.dist.base	Fri Apr 15 19:31:06 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.81 2011/04/15 13:42:22 joerg Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.82 2011/04/15 19:31:07 joerg Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -91,6 +91,7 @@
 ./usr/include/arpa
 ./usr/include/atf-c
 ./usr/include/atf-c++
+./usr/include/clang-3.0
 ./usr/include/crypto
 ./usr/include/dev
 ./usr/include/dev/apm
--- a/external/bsd/llvm/include/Makefile	Fri Apr 15 18:05:42 2011 +0000
+++ b/external/bsd/llvm/include/Makefile	Fri Apr 15 19:31:06 2011 +0000
@@ -1,26 +1,25 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:13:52 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2011/04/15 19:31:07 joerg Exp $
 
 .include <bsd.init.mk>
 
 .PATH:	${CLANG_SRCDIR}/lib/Headers
 
-#INCS=	${INCS.x86}
-INCSDIR=	/usr/include
-
-INCS.x86= \
-  emmintrin.h \
-  immintrin.h \
-  mm_malloc.h \
-  mmintrin.h \
-  pmmintrin.h \
-  smmintrin.h \
-  tmmintrin.h \
-  xmmintrin.h
-
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+INCS=	avxintrin.h \
+	emmintrin.h \
+	immintrin.h \
+	mm_malloc.h \
+	mmintrin.h \
+	pmmintrin.h \
+	smmintrin.h \
+	tmmintrin.h \
+	xmmintrin.h
+.elif ${MACHINE_ARCH} == "powerpc"
+INCS=	altivec.h
+.endif
+INCSDIR=	/usr/include/clang-3.0
 
 HEADER=	\
-  altivec.h \
-  avxintrin.h \
   float.h \
   iso646.h \
   limits.h \