Module Name: src
Committed By: joerg
Date: Fri Apr 15 13:42:23 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/gnu/dist/gcc4/gcc/config: netbsd.h
src/gnu/usr.bin/gcc4/include: Makefile
Log Message:
Move the headers for compiler and platform specific intrinsincs from
/usr/include to /usr/include/gcc-4.1.
To generate a diff of this commit:
cvs rdiff -u -r1.928 -r1.929 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/comp/ad.powerpc
cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.115 -r1.116 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.80 -r1.81 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.8 -r1.9 src/gnu/dist/gcc4/gcc/config/netbsd.h
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/gcc4/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.928 src/distrib/sets/lists/base/mi:1.929
--- src/distrib/sets/lists/base/mi:1.928 Mon Apr 11 22:09:56 2011
+++ src/distrib/sets/lists/base/mi Fri Apr 15 13:42:22 2011
@@ -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
Index: src/distrib/sets/lists/comp/ad.powerpc
diff -u src/distrib/sets/lists/comp/ad.powerpc:1.47 src/distrib/sets/lists/comp/ad.powerpc:1.48
--- src/distrib/sets/lists/comp/ad.powerpc:1.47 Sun Mar 14 09:52:00 2010
+++ src/distrib/sets/lists/comp/ad.powerpc Fri Apr 15 13:42:22 2011
@@ -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
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.105 src/distrib/sets/lists/comp/md.amd64:1.106
--- src/distrib/sets/lists/comp/md.amd64:1.105 Wed Mar 30 19:57:15 2011
+++ src/distrib/sets/lists/comp/md.amd64 Fri Apr 15 13:42:22 2011
@@ -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
Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.115 src/distrib/sets/lists/comp/md.i386:1.116
--- src/distrib/sets/lists/comp/md.i386:1.115 Mon Dec 20 04:29:29 2010
+++ src/distrib/sets/lists/comp/md.i386 Fri Apr 15 13:42:22 2011
@@ -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
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.80 src/etc/mtree/NetBSD.dist.base:1.81
--- src/etc/mtree/NetBSD.dist.base:1.80 Mon Apr 11 20:03:45 2011
+++ src/etc/mtree/NetBSD.dist.base Fri Apr 15 13:42:22 2011
@@ -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
Index: src/gnu/dist/gcc4/gcc/config/netbsd.h
diff -u src/gnu/dist/gcc4/gcc/config/netbsd.h:1.8 src/gnu/dist/gcc4/gcc/config/netbsd.h:1.9
--- src/gnu/dist/gcc4/gcc/config/netbsd.h:1.8 Sun Apr 10 21:25:56 2011
+++ src/gnu/dist/gcc4/gcc/config/netbsd.h Fri Apr 15 13:42:22 2011
@@ -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 } \
}
Index: src/gnu/usr.bin/gcc4/include/Makefile
diff -u src/gnu/usr.bin/gcc4/include/Makefile:1.4 src/gnu/usr.bin/gcc4/include/Makefile:1.5
--- src/gnu/usr.bin/gcc4/include/Makefile:1.4 Tue Mar 30 07:27:08 2010
+++ src/gnu/usr.bin/gcc4/include/Makefile Fri Apr 15 13:42:23 2011
@@ -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>
