Module Name: src
Committed By: matt
Date: Wed Nov 21 00:07:37 UTC 2012
Modified Files:
src/distrib/sets [matt-nb6-plus]: mkvars.mk
src/distrib/sets/lists/base [matt-nb6-plus]: shl.mi
src/distrib/sets/lists/comp [matt-nb6-plus]: ad.arm shl.mi
Log Message:
Add HAVE_BINUTILS back.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.6.1 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.616.2.4.2.1 -r1.616.2.4.2.2 \
src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.38 -r1.38.6.1 src/distrib/sets/lists/comp/ad.arm
cvs rdiff -u -r1.209.2.4.2.1 -r1.209.2.4.2.2 \
src/distrib/sets/lists/comp/shl.mi
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/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.6 src/distrib/sets/mkvars.mk:1.6.6.1
--- src/distrib/sets/mkvars.mk:1.6 Wed Nov 2 14:42:43 2011
+++ src/distrib/sets/mkvars.mk Wed Nov 21 00:07:33 2012
@@ -1,9 +1,10 @@
-# $NetBSD: mkvars.mk,v 1.6 2011/11/02 14:42:43 he Exp $
+# $NetBSD: mkvars.mk,v 1.6.6.1 2012/11/21 00:07:33 matt Exp $
MKEXTRAVARS= \
MACHINE \
MACHINE_ARCH \
MACHINE_CPU \
+ HAVE_BINUTILS \
HAVE_GCC \
HAVE_GDB \
HAS_SSP \
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.616.2.4.2.1 src/distrib/sets/lists/base/shl.mi:1.616.2.4.2.2
--- src/distrib/sets/lists/base/shl.mi:1.616.2.4.2.1 Thu Nov 1 16:44:47 2012
+++ src/distrib/sets/lists/base/shl.mi Wed Nov 21 00:07:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.616.2.4.2.1 2012/11/01 16:44:47 matt Exp $
+# $NetBSD: shl.mi,v 1.616.2.4.2.2 2012/11/21 00:07:34 matt Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -157,8 +157,10 @@
./usr/lib/libavl.so base-zfs-shlib dynamicroot,zfs
./usr/lib/libavl.so.0 base-zfs-shlib dynamicroot,zfs
./usr/lib/libavl.so.0.0 base-zfs-shlib zfs,dynamicroot
-./usr/lib/libbfd.so.12 base-sys-shlib binutils
-./usr/lib/libbfd.so.12.0 base-sys-shlib binutils
+./usr/lib/libbfd.so.10 base-sys-shlib binutils=216
+./usr/lib/libbfd.so.10.0 base-sys-shlib binutils=216
+./usr/lib/libbfd.so.12 base-sys-shlib binutils=219
+./usr/lib/libbfd.so.12.0 base-sys-shlib binutils=219
./usr/lib/libbind9.so base-bind-shlib
./usr/lib/libbind9.so.5 base-bind-shlib
./usr/lib/libbind9.so.5.7 base-bind-shlib
Index: src/distrib/sets/lists/comp/ad.arm
diff -u src/distrib/sets/lists/comp/ad.arm:1.38 src/distrib/sets/lists/comp/ad.arm:1.38.6.1
--- src/distrib/sets/lists/comp/ad.arm:1.38 Mon Jul 18 17:39:05 2011
+++ src/distrib/sets/lists/comp/ad.arm Wed Nov 21 00:07:34 2012
@@ -1,8 +1,9 @@
-# $NetBSD: ad.arm,v 1.38 2011/07/18 17:39:05 dyoung Exp $
+# $NetBSD: ad.arm,v 1.38.6.1 2012/11/21 00:07:34 matt 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/aeabi.h comp-c-include
./usr/include/arm/ansi.h comp-c-include
./usr/include/arm/aout_machdep.h comp-c-include
./usr/include/arm/arm26 comp-c-include
@@ -27,6 +28,7 @@
./usr/include/arm/byte_swap.h comp-c-include
./usr/include/arm/cdefs.h comp-c-include
./usr/include/arm/cpu.h comp-c-include
+./usr/include/arm/cpuconf.h comp-c-include
./usr/include/arm/db_machdep.h comp-obsolete obsolete
./usr/include/arm/disklabel.h comp-c-include
./usr/include/arm/disklabel_acorn.h comp-obsolete obsolete
@@ -70,6 +72,7 @@
./usr/include/arm/trap.h comp-c-include
./usr/include/arm/types.h comp-c-include
./usr/include/arm/varargs.h comp-obsolete obsolete
+./usr/include/arm/vfpreg.h comp-c-include
./usr/include/arm/wchar_limits.h comp-c-include
./usr/include/arm32/bootconfig.h comp-obsolete obsolete
./usr/include/arm32/cpufunc.h comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.209.2.4.2.1 src/distrib/sets/lists/comp/shl.mi:1.209.2.4.2.2
--- src/distrib/sets/lists/comp/shl.mi:1.209.2.4.2.1 Thu Nov 1 16:44:51 2012
+++ src/distrib/sets/lists/comp/shl.mi Wed Nov 21 00:07:36 2012
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.209.2.4.2.1 2012/11/01 16:44:51 matt Exp $
+# $NetBSD: shl.mi,v 1.209.2.4.2.2 2012/11/21 00:07:36 matt Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -94,8 +94,10 @@
./usr/lib/libnpf_pic.a comp-npf-piclib npf
./usr/lib/libnvpair_pic.a comp-zfs-piclib zfs
./usr/lib/libobjc_pic.a comp-objc-piclib
-./usr/lib/libopcodes.so.5 comp-c-shlib binutils
-./usr/lib/libopcodes.so.5.0 comp-c-shlib binutils
+./usr/lib/libopcodes.so.3 comp-c-shlib binutils=216
+./usr/lib/libopcodes.so.3.0 comp-c-shlib binutils=216
+./usr/lib/libopcodes.so.5 comp-c-shlib binutils=219
+./usr/lib/libopcodes.so.5.0 comp-c-shlib binutils=219
./usr/lib/libopenpgpsdk_pic.a comp-obsolete obsolete
./usr/lib/libossaudio_pic.a comp-c-piclib
./usr/lib/libp2k_pic.a comp-puffs-piclib
@@ -244,7 +246,8 @@
./usr/libdata/debug/usr/lib/libarchive.so.3.1.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libasn1.so.9.0.debug comp-krb5-debug kerberos,debug
./usr/libdata/debug/usr/lib/libavl.so.0.0.debug comp-zfs-debug zfs,dynamicroot,debug
-./usr/libdata/debug/usr/lib/libbfd.so.12.0.debug comp-sys-debug binutils,debug
+./usr/libdata/debug/usr/lib/libbfd.so.10.0.debug comp-sys-debug binutils=216,debug
+./usr/libdata/debug/usr/lib/libbfd.so.12.0.debug comp-sys-debug binutils=219,debug
./usr/libdata/debug/usr/lib/libbind9.so.5.7.debug comp-bind-debug debug
./usr/libdata/debug/usr/lib/libbluetooth.so.4.2.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libbsdmalloc.so.0.0.debug comp-sys-debug debug
@@ -311,7 +314,8 @@
./usr/libdata/debug/usr/lib/libobjc.so.2.0.debug comp-sys-debug gcc=3,debug
./usr/libdata/debug/usr/lib/libobjc.so.3.0.debug comp-sys-debug gcc=4,debug
./usr/libdata/debug/usr/lib/libobjc.so.3.0.debug comp-sys-debug gcc=45,debug
-./usr/libdata/debug/usr/lib/libopcodes.so.5.0.debug comp-c-debug binutils,debug
+./usr/libdata/debug/usr/lib/libopcodes.so.3.0.debug comp-c-debug binutils=216,debug
+./usr/libdata/debug/usr/lib/libopcodes.so.5.0.debug comp-c-debug binutils=219,debug
./usr/libdata/debug/usr/lib/libossaudio.so.1.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libp2k.so.2.0.debug comp-puffs-debug debug
./usr/libdata/debug/usr/lib/libpam.so.3.0.debug comp-sys-debug pam,debug
