Module Name: src
Committed By: mrg
Date: Thu Jul 7 08:46:22 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: ad.arm ad.armeb ad.m68k ad.mips
ad.mips64eb ad.mips64el ad.powerpc ad.sh3 md.amd64 md.i386 mi
src/external/gpl3/gcc/usr.bin/include: Makefile
Log Message:
- un-obsolete a pair of files we want to remain installed (XXX i wonder
if a way to have "clean builds" not run "postinstall fix obsolete" in
the $DESTDIR so that these sorts of errors will appear as set list
errors instead of being skipped
- fix the list of headers to install for GCC 4.5, based upon the mknative
${G_EXTRA_HEADERS}. XXX move the location of G_EXTRA_HEADERS.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/comp/ad.arm
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/comp/ad.armeb
cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/comp/ad.m68k
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/comp/ad.mips
cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/comp/ad.mips64eb \
src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/comp/ad.powerpc
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/comp/ad.sh3
cvs rdiff -u -r1.121 -r1.122 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.119 -r1.120 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.1639 -r1.1640 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/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/comp/ad.arm
diff -u src/distrib/sets/lists/comp/ad.arm:1.35 src/distrib/sets/lists/comp/ad.arm:1.36
--- src/distrib/sets/lists/comp/ad.arm:1.35 Wed May 12 13:15:00 2010
+++ src/distrib/sets/lists/comp/ad.arm Thu Jul 7 08:46:21 2011
@@ -1,4 +1,7 @@
-# $NetBSD: ad.arm,v 1.35 2010/05/12 13:15:00 lukem Exp $
+# $NetBSD: ad.arm,v 1.36 2011/07/07 08:46:21 mrg Exp $
+./usr/include/gcc-4.5/arm_neon.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/mmintrin.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/arm comp-c-include
./usr/include/arm/ansi.h comp-c-include
./usr/include/arm/aout_machdep.h comp-c-include
Index: src/distrib/sets/lists/comp/ad.armeb
diff -u src/distrib/sets/lists/comp/ad.armeb:1.2 src/distrib/sets/lists/comp/ad.armeb:1.3
--- src/distrib/sets/lists/comp/ad.armeb:1.2 Mon Jan 31 09:19:52 2011
+++ src/distrib/sets/lists/comp/ad.armeb Thu Jul 7 08:46:21 2011
@@ -1,8 +1,11 @@
-# $NetBSD: ad.armeb,v 1.2 2011/01/31 09:19:52 matt Exp $
+# $NetBSD: ad.armeb,v 1.3 2011/07/07 08:46:21 mrg Exp $
#
# The armeb MACHINE_ARCH never existed in NetBSD as a.out, so we
# skip the old a.out compatibility tools.
#
+./usr/include/gcc-4.5/arm_neon.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/mmintrin.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/arm comp-c-include
./usr/include/arm/ansi.h comp-c-include
./usr/include/arm/aout_machdep.h comp-c-include
Index: src/distrib/sets/lists/comp/ad.m68k
diff -u src/distrib/sets/lists/comp/ad.m68k:1.42 src/distrib/sets/lists/comp/ad.m68k:1.43
--- src/distrib/sets/lists/comp/ad.m68k:1.42 Mon May 30 15:38:07 2011
+++ src/distrib/sets/lists/comp/ad.m68k Thu Jul 7 08:46:21 2011
@@ -1,5 +1,6 @@
-# $NetBSD: ad.m68k,v 1.42 2011/05/30 15:38:07 christos Exp $
+# $NetBSD: ad.m68k,v 1.43 2011/07/07 08:46:21 mrg Exp $
./usr/bin/elf2aout comp-sysutil-bin
+./usr/include/gcc-4.5/math-68881.h comp-c-include gcccmds,gcc=45
./usr/include/m68k comp-c-include
./usr/include/m68k/ansi.h comp-c-include
./usr/include/m68k/aout_machdep.h comp-c-include
Index: src/distrib/sets/lists/comp/ad.mips
diff -u src/distrib/sets/lists/comp/ad.mips:1.36 src/distrib/sets/lists/comp/ad.mips:1.37
--- src/distrib/sets/lists/comp/ad.mips:1.36 Wed Aug 19 08:24:43 2009
+++ src/distrib/sets/lists/comp/ad.mips Thu Jul 7 08:46:21 2011
@@ -1,6 +1,8 @@
-# $NetBSD: ad.mips,v 1.36 2009/08/19 08:24:43 he Exp $
+# $NetBSD: ad.mips,v 1.37 2011/07/07 08:46:21 mrg Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
+./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/mips comp-c-include
./usr/include/mips/ansi.h comp-c-include
./usr/include/mips/aout_machdep.h comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/ad.mips64eb
diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.41 src/distrib/sets/lists/comp/ad.mips64eb:1.42
--- src/distrib/sets/lists/comp/ad.mips64eb:1.41 Tue Jul 5 10:01:15 2011
+++ src/distrib/sets/lists/comp/ad.mips64eb Thu Jul 7 08:46:21 2011
@@ -1,6 +1,8 @@
-# $NetBSD: ad.mips64eb,v 1.41 2011/07/05 10:01:15 spz Exp $
+# $NetBSD: ad.mips64eb,v 1.42 2011/07/07 08:46:21 mrg Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
+./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/mips comp-c-include
./usr/include/mips/ansi.h comp-c-include
./usr/include/mips/aout_machdep.h comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/ad.mips64el
diff -u src/distrib/sets/lists/comp/ad.mips64el:1.41 src/distrib/sets/lists/comp/ad.mips64el:1.42
--- src/distrib/sets/lists/comp/ad.mips64el:1.41 Tue Jul 5 10:01:15 2011
+++ src/distrib/sets/lists/comp/ad.mips64el Thu Jul 7 08:46:21 2011
@@ -1,6 +1,8 @@
-# $NetBSD: ad.mips64el,v 1.41 2011/07/05 10:01:15 spz Exp $
+# $NetBSD: ad.mips64el,v 1.42 2011/07/07 08:46:21 mrg Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
+./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/mips comp-c-include
./usr/include/mips/ansi.h comp-c-include
./usr/include/mips/aout_machdep.h comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/ad.powerpc
diff -u src/distrib/sets/lists/comp/ad.powerpc:1.52 src/distrib/sets/lists/comp/ad.powerpc:1.53
--- src/distrib/sets/lists/comp/ad.powerpc:1.52 Sun Jul 3 06:37:42 2011
+++ src/distrib/sets/lists/comp/ad.powerpc Thu Jul 7 08:46:21 2011
@@ -1,10 +1,18 @@
-# $NetBSD: ad.powerpc,v 1.52 2011/07/03 06:37:42 mrg Exp $
+# $NetBSD: ad.powerpc,v 1.53 2011/07/07 08:46:21 mrg 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/gcc-4.5/altivec.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/paired.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/ppc-asm.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/ppu_intrinsics.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/si2vmx.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/spe.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/spu2vmx.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/vec_types.h comp-c-include gcccmds,gcc=45
./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/ad.sh3
diff -u src/distrib/sets/lists/comp/ad.sh3:1.24 src/distrib/sets/lists/comp/ad.sh3:1.25
--- src/distrib/sets/lists/comp/ad.sh3:1.24 Fri Aug 22 13:30:56 2008
+++ src/distrib/sets/lists/comp/ad.sh3 Thu Jul 7 08:46:21 2011
@@ -1,4 +1,5 @@
-# $NetBSD: ad.sh3,v 1.24 2008/08/22 13:30:56 lukem Exp $
+# $NetBSD: ad.sh3,v 1.25 2011/07/07 08:46:21 mrg Exp $
+./usr/include/gcc-4.5/tgmath.h comp-c-include
./usr/include/ieeefp.h comp-c-include
./usr/include/sh3 comp-c-include
./usr/include/sh3/ansi.h comp-c-include
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.121 src/distrib/sets/lists/comp/md.amd64:1.122
--- src/distrib/sets/lists/comp/md.amd64:1.121 Tue Jul 5 10:01:15 2011
+++ src/distrib/sets/lists/comp/md.amd64 Thu Jul 7 08:46:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.121 2011/07/05 10:01:15 spz Exp $
+# $NetBSD: md.amd64,v 1.122 2011/07/07 08:46:21 mrg 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,6 +87,8 @@
./usr/include/gcc-4.5/ammintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/avxintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/bmmintrin.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/cross-stdarg.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/cpuid.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/emmintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/fma4intrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/ia32intrin.h comp-c-include gcccmds,gcc=45
@@ -99,6 +101,7 @@
./usr/include/gcc-4.5/pmmintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/popcntintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/smmintrin.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/tmmintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/wmmintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/x86intrin.h comp-c-include gcccmds,gcc=45
Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.119 src/distrib/sets/lists/comp/md.i386:1.120
--- src/distrib/sets/lists/comp/md.i386:1.119 Fri Jul 1 02:10:09 2011
+++ src/distrib/sets/lists/comp/md.i386 Thu Jul 7 08:46:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.119 2011/07/01 02:10:09 mrg Exp $
+# $NetBSD: md.i386,v 1.120 2011/07/07 08:46:21 mrg 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
@@ -19,6 +19,8 @@
./usr/include/gcc-4.5/ammintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/avxintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/bmmintrin.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/cpuid.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/cross-stdarg.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/emmintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/fma4intrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/ia32intrin.h comp-c-include gcccmds,gcc=45
@@ -31,6 +33,7 @@
./usr/include/gcc-4.5/pmmintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/popcntintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/smmintrin.h comp-c-include gcccmds,gcc=45
+./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/tmmintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/wmmintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/x86intrin.h comp-c-include gcccmds,gcc=45
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1639 src/distrib/sets/lists/comp/mi:1.1640
--- src/distrib/sets/lists/comp/mi:1.1639 Wed Jul 6 18:18:08 2011
+++ src/distrib/sets/lists/comp/mi Thu Jul 7 08:46:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1639 2011/07/06 18:18:08 dyoung Exp $
+# $NetBSD: mi,v 1.1640 2011/07/07 08:46:21 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -745,7 +745,7 @@
./usr/include/g++/backward/hash_set.h comp-cxx-include gcc=4,cxx
./usr/include/g++/backward/hash_set.h comp-obsolete gcc=45,obsolete
./usr/include/g++/backward/hashtable.h comp-cxx-include gcc=4,cxx
-./usr/include/g++/backward/hashtable.h comp-obsolete gcc=45,obsolete
+./usr/include/g++/backward/hashtable.h comp-cxx-include gcc=45,cxx
./usr/include/g++/backward/heap.h comp-cxx-include gcc=4,cxx
./usr/include/g++/backward/heap.h comp-obsolete gcc=45,obsolete
./usr/include/g++/backward/iomanip.h comp-cxx-include gcc=4,cxx
@@ -953,7 +953,7 @@
./usr/include/g++/cmath comp-cxx-include cxx
./usr/include/g++/compare.h comp-obsolete obsolete
./usr/include/g++/complex comp-cxx-include cxx
-./usr/include/g++/complex.h comp-obsolete obsolete
+./usr/include/g++/complex.h comp-obsolete gcc=45,cxx
./usr/include/g++/condition_variable comp-cxx-include gcc=45,cxx
./usr/include/g++/csetjmp comp-cxx-include cxx
./usr/include/g++/csignal comp-cxx-include cxx
Index: src/external/gpl3/gcc/usr.bin/include/Makefile
diff -u src/external/gpl3/gcc/usr.bin/include/Makefile:1.3 src/external/gpl3/gcc/usr.bin/include/Makefile:1.4
--- src/external/gpl3/gcc/usr.bin/include/Makefile:1.3 Fri Jul 1 01:22:07 2011
+++ src/external/gpl3/gcc/usr.bin/include/Makefile Thu Jul 7 08:46:20 2011
@@ -1,33 +1,21 @@
-# $NetBSD: Makefile,v 1.3 2011/07/01 01:22:07 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/07/07 08:46:20 mrg Exp $
.include "../Makefile.inc"
-.if ${MACHINE_CPU} == "powerpc"
-INCS= altivec.h
-.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-INCS= \
- abmintrin.h \
- ammintrin.h \
- avxintrin.h \
- bmmintrin.h \
- emmintrin.h \
- fma4intrin.h \
- ia32intrin.h \
- immintrin.h \
- lwpintrin.h \
- mm3dnow.h \
- mmintrin.h \
- nmmintrin.h \
- pmmintrin.h \
- popcntintrin.h \
- smmintrin.h \
- tmmintrin.h \
- wmmintrin.h \
- x86intrin.h \
- xmmintrin.h \
- xopintrin.h \
- mm_malloc.h
+# XXX for G_EXTRA_HEADERS. make mknative-gcc put that somewhere
+# inside usr.bin/ not lib/
+.if exists(${.CURDIR}/../../lib/libgcc/arch/${MACHINE_ARCH}.mk)
+.include "${.CURDIR}/../../lib/libgcc/arch/${MACHINE_ARCH}.mk"
+.endif
+
+INCS= ${G_EXTRA_HEADERS:T}
+
+# XXX missed some how
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+INCS+= mm_malloc.h
+# XXX we should put this in gcc/config.gcc and regenerate the i386/x86
+# mknative files
mm_malloc.h: ${DIST}/gcc/config/i386/pmm_malloc.h
cp $> ${.TARGET}
@@ -38,4 +26,6 @@
.include <bsd.prog.mk>
+# XXX probably don't need the first of these
.PATH: ${G_out_file:H}
+.PATH: ${G_EXTRA_HEADERS:H:O:u}
