Move the headers for compiler and platform specific intrinsincs from trunk
authorjoerg <joerg@NetBSD.org>
Fri, 15 Apr 2011 13:42:22 +0000
branchtrunk
changeset 200048 d6dd25e77c63
parent 200047 7cbcc45c2504
child 200049 0ce8fdc3b127
Move the headers for compiler and platform specific intrinsincs from /usr/include to /usr/include/gcc-4.1.
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
gnu/dist/gcc4/gcc/config/netbsd.h
gnu/usr.bin/gcc4/include/Makefile
--- a/distrib/sets/lists/base/mi	Fri Apr 15 13:07:37 2011 +0000
+++ b/distrib/sets/lists/base/mi	Fri Apr 15 13:42:22 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.928 2011/04/11 22:09:56 martin Exp $
+# $NetBSD: mi,v 1.929 2011/04/15 13:42:22 joerg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -795,6 +795,7 @@
 ./usr/include/g++/gen				base-obsolete		obsolete
 ./usr/include/g++/std				base-cxx-usr
 ./usr/include/g++/tr1				base-cxx-usr
+./usr/include/gcc-4.1				base-c-usr
 ./usr/include/gssapi				base-c-usr
 ./usr/include/gssapi/rpc			base-obsolete		obsolete
 ./usr/include/dev/pci/hdaudio			base-c-usr
--- a/distrib/sets/lists/comp/ad.powerpc	Fri Apr 15 13:07:37 2011 +0000
+++ b/distrib/sets/lists/comp/ad.powerpc	Fri Apr 15 13:42:22 2011 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: ad.powerpc,v 1.47 2010/03/14 09:52:00 mrg Exp $
+# $NetBSD: ad.powerpc,v 1.48 2011/04/15 13:42:22 joerg Exp $
 ./usr/bin/elf2aout				comp-sysutil-bin
 ./usr/bin/psim					comp-debug-bin		gdb,gdb=6
-./usr/include/altivec.h				comp-c-include		gcccmds
+./usr/include/altivec.h				comp-obsolete		obsolete
+./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
 ./usr/include/powerpc/aout_machdep.h		comp-c-include
--- a/distrib/sets/lists/comp/md.amd64	Fri Apr 15 13:07:37 2011 +0000
+++ b/distrib/sets/lists/comp/md.amd64	Fri Apr 15 13:42:22 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.105 2011/03/30 19:57:15 roy Exp $
+# $NetBSD: md.amd64,v 1.106 2011/04/15 13:42:22 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,7 +67,12 @@
 ./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/emmintrin.h			comp-c-include		gcccmds
+./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
+./usr/include/gcc-4.1/mmintrin.h		comp-c-include		gcccmds,gcc=4
+./usr/include/gcc-4.1/pmmintrin.h		comp-c-include		gcccmds,gcc=4
+./usr/include/gcc-4.1/xmmintrin.h		comp-c-include		gcccmds,gcc=4
 ./usr/include/i386				comp-c-include
 ./usr/include/i386/ansi.h			comp-c-include
 ./usr/include/i386/aout_machdep.h		comp-c-include
@@ -139,9 +144,9 @@
 ./usr/include/i386/vmparam.h			comp-c-include
 ./usr/include/i386/wchar_limits.h		comp-c-include
 ./usr/include/ieeefp.h				comp-c-include
-./usr/include/mm_malloc.h			comp-c-include		gcccmds,gcc=4
-./usr/include/mmintrin.h			comp-c-include		gcccmds
-./usr/include/pmmintrin.h			comp-c-include		gcccmds,gcc=4
+./usr/include/mm_malloc.h			comp-obsolete		obsolete
+./usr/include/mmintrin.h			comp-obsolete		obsolete
+./usr/include/pmmintrin.h			comp-obsolete		obsolete
 ./usr/include/x64_64				comp-obsolete		obsolete
 ./usr/include/x64_64/ansi.h			comp-obsolete		obsolete
 ./usr/include/x64_64/aout_machdep.h		comp-obsolete		obsolete
@@ -232,7 +237,7 @@
 ./usr/include/xen				comp-c-include
 ./usr/include/xen/xenio.h			comp-c-include
 ./usr/include/xen/xenio3.h			comp-c-include
-./usr/include/xmmintrin.h			comp-c-include		gcccmds
+./usr/include/xmmintrin.h			comp-obsolete		obsolete
 ./usr/lib/i386/crt0.o				comp-c-lib		compat
 ./usr/lib/i386/crtbegin.o			comp-c-lib		compat
 ./usr/lib/i386/crtbeginS.o			comp-c-lib		compat,pic
--- a/distrib/sets/lists/comp/md.i386	Fri Apr 15 13:07:37 2011 +0000
+++ b/distrib/sets/lists/comp/md.i386	Fri Apr 15 13:42:22 2011 +0000
@@ -1,5 +1,10 @@
-# $NetBSD: md.i386,v 1.115 2010/12/20 04:29:29 christos Exp $
-./usr/include/emmintrin.h			comp-c-include		gcccmds
+# $NetBSD: md.i386,v 1.116 2011/04/15 13:42:22 joerg Exp $
+./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
+./usr/include/gcc-4.1/mm_malloc.h		comp-c-include		gcccmds,gcc=4
+./usr/include/gcc-4.1/pmmintrin.h		comp-c-include		gcccmds,gcc=4
+./usr/include/gcc-4.1/xmmintrin.h		comp-c-include		gcccmds,gcc=4
 ./usr/include/i386				comp-c-include
 ./usr/include/i386/_G_config.h			comp-obsolete		obsolete
 ./usr/include/i386/ansi.h			comp-c-include
@@ -79,10 +84,10 @@
 ./usr/include/i386/vmparam.h			comp-c-include
 ./usr/include/i386/wchar_limits.h		comp-c-include
 ./usr/include/ieeefp.h				comp-c-include
-./usr/include/mmintrin.h			comp-c-include		gcccmds
-./usr/include/mm_malloc.h			comp-c-include		gcccmds,gcc=4
+./usr/include/mmintrin.h			comp-obsolete		obsolete
+./usr/include/mm_malloc.h			comp-obsolete		obsolete
 ./usr/include/pmc.h				comp-c-include
-./usr/include/pmmintrin.h			comp-c-include		gcccmds,gcc=4
+./usr/include/pmmintrin.h			comp-obsolete		obsolete
 ./usr/include/x86				comp-c-include
 ./usr/include/x86/aout_machdep.h		comp-c-include
 ./usr/include/x86/autoconf.h			comp-obsolete		obsolete
@@ -114,7 +119,7 @@
 ./usr/include/xen				comp-c-include
 ./usr/include/xen/xenio.h			comp-c-include
 ./usr/include/xen/xenio3.h			comp-c-include
-./usr/include/xmmintrin.h			comp-c-include		gcccmds
+./usr/include/xmmintrin.h			comp-obsolete		obsolete
 ./usr/lib/libi386.a				comp-c-lib
 ./usr/lib/libi386_g.a				-unknown-		debuglib
 ./usr/lib/libi386_p.a				comp-c-proflib		profile
--- a/etc/mtree/NetBSD.dist.base	Fri Apr 15 13:07:37 2011 +0000
+++ b/etc/mtree/NetBSD.dist.base	Fri Apr 15 13:42:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.80 2011/04/11 20:03:45 martin Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.81 2011/04/15 13:42:22 joerg Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -126,6 +126,7 @@
 ./usr/include/g++/bits
 ./usr/include/g++/tr1
 ./usr/include/g++/debug
+./usr/include/gcc-4.1
 ./usr/include/gssapi
 ./usr/include/isofs
 ./usr/include/isofs/cd9660
--- a/gnu/dist/gcc4/gcc/config/netbsd.h	Fri Apr 15 13:07:37 2011 +0000
+++ b/gnu/dist/gcc4/gcc/config/netbsd.h	Fri Apr 15 13:42:22 2011 +0000
@@ -60,7 +60,7 @@
 #define GPLUSPLUS_BACKWARD_INCLUDE_DIR "/usr/include/g++/backward"
 
 #undef GCC_INCLUDE_DIR
-#define GCC_INCLUDE_DIR "/usr/include"
+#define GCC_INCLUDE_DIR "/usr/include/gcc-4.1"
 
 #undef INCLUDE_DEFAULTS
 #define INCLUDE_DEFAULTS				\
@@ -68,6 +68,7 @@
     { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1 },		\
     { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 1 },	\
     { GCC_INCLUDE_DIR, "GCC", 0, 0, 1 },		\
+    { "/usr/include", "GCC", 0, 0, 1 },			\
     { 0, 0, 0, 0 }					\
   }
 
--- a/gnu/usr.bin/gcc4/include/Makefile	Fri Apr 15 13:07:37 2011 +0000
+++ b/gnu/usr.bin/gcc4/include/Makefile	Fri Apr 15 13:42:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2010/03/30 07:27:08 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2011/04/15 13:42:23 joerg Exp $
 
 .include "../Makefile.inc"
 
@@ -14,7 +14,7 @@
 CLEANFILES+=	mm_malloc.h
 .endif
 
-INCSDIR=	/usr/include
+INCSDIR=	/usr/include/gcc-4.1
 
 .include <bsd.prog.mk>