Module Name: src
Committed By: joerg
Date: Fri Apr 15 19:31:07 UTC 2011
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: ad.powerpc md.amd64 md.i386
src/etc/mtree: NetBSD.dist.base
src/external/bsd/llvm/include: Makefile
Log Message:
Install clang's MD headers into /usr/include/clang-3.0 similar to GCC.
To generate a diff of this commit:
cvs rdiff -u -r1.930 -r1.931 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/comp/ad.powerpc
cvs rdiff -u -r1.107 -r1.108 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.116 -r1.117 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.81 -r1.82 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/include/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.930 src/distrib/sets/lists/base/mi:1.931
--- src/distrib/sets/lists/base/mi:1.930 Fri Apr 15 18:05:42 2011
+++ src/distrib/sets/lists/base/mi Fri Apr 15 19:31:06 2011
@@ -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
Index: src/distrib/sets/lists/comp/ad.powerpc
diff -u src/distrib/sets/lists/comp/ad.powerpc:1.48 src/distrib/sets/lists/comp/ad.powerpc:1.49
--- src/distrib/sets/lists/comp/ad.powerpc:1.48 Fri Apr 15 13:42:22 2011
+++ src/distrib/sets/lists/comp/ad.powerpc Fri Apr 15 19:31:06 2011
@@ -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
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.107 src/distrib/sets/lists/comp/md.amd64:1.108
--- src/distrib/sets/lists/comp/md.amd64:1.107 Fri Apr 15 18:05:43 2011
+++ src/distrib/sets/lists/comp/md.amd64 Fri Apr 15 19:31:06 2011
@@ -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
Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.116 src/distrib/sets/lists/comp/md.i386:1.117
--- src/distrib/sets/lists/comp/md.i386:1.116 Fri Apr 15 13:42:22 2011
+++ src/distrib/sets/lists/comp/md.i386 Fri Apr 15 19:31:06 2011
@@ -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
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.81 src/etc/mtree/NetBSD.dist.base:1.82
--- src/etc/mtree/NetBSD.dist.base:1.81 Fri Apr 15 13:42:22 2011
+++ src/etc/mtree/NetBSD.dist.base Fri Apr 15 19:31:07 2011
@@ -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
Index: src/external/bsd/llvm/include/Makefile
diff -u src/external/bsd/llvm/include/Makefile:1.1 src/external/bsd/llvm/include/Makefile:1.2
--- src/external/bsd/llvm/include/Makefile:1.1 Sun Feb 6 01:13:52 2011
+++ src/external/bsd/llvm/include/Makefile Fri Apr 15 19:31:07 2011
@@ -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 \
