Module Name: src
Committed By: skrll
Date: Tue Sep 8 07:08:03 UTC 2009
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: md.amd64 mi shl.elf shl.mi
src/distrib/sets/lists/comp: md.amd64 md.sparc64 mi shl.mi
src/distrib/sets/lists/man: mi
src/etc: Makefile
src/external/gpl3: Makefile
src/external/gpl3/binutils/usr.bin: Makefile
src/external/gpl3/binutils/usr.sbin/dbsym: Makefile
src/external/gpl3/binutils/usr.sbin/mdsetimage: Makefile
src/gnu/lib: Makefile
src/gnu/usr.bin/binutils: Makefile
src/gnu/usr.sbin/dbsym: Makefile
src/gnu/usr.sbin/mdsetimage: Makefile
src/share/man/man5: mk.conf.5
src/share/mk: bsd.README bsd.own.mk
src/tools/gcc: README.mknative
Log Message:
Rename MKBFD to MKBINUTILS and support HAVE_BINUTILS for set lists. This
makes {MK,HAVE_}BINUTILS consistent with {MK,HAVE_}{GCC,GDB}.
Allow MKBFD to defines MKBINUTILS as a backwards compatibility hook.
Update the sets lists and add conditionals for lib{bfd,opcodes}.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/sets.subr
cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.828 -r1.829 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.183 -r1.184 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.489 -r1.490 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.1305 -r1.1306 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.1156 -r1.1157 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.371 -r1.372 src/etc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
cvs rdiff -u -r1.43 -r1.44 src/gnu/lib/Makefile
cvs rdiff -u -r1.22 -r1.23 src/gnu/usr.bin/binutils/Makefile
cvs rdiff -u -r1.13 -r1.14 src/gnu/usr.sbin/dbsym/Makefile
cvs rdiff -u -r1.19 -r1.20 src/gnu/usr.sbin/mdsetimage/Makefile
cvs rdiff -u -r1.46 -r1.47 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.251 -r1.252 src/share/mk/bsd.README
cvs rdiff -u -r1.571 -r1.572 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.6 -r1.7 src/tools/gcc/README.mknative
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/sets.subr
diff -u src/distrib/sets/sets.subr:1.86 src/distrib/sets/sets.subr:1.87
--- src/distrib/sets/sets.subr:1.86 Mon Sep 7 02:27:27 2009
+++ src/distrib/sets/sets.subr Tue Sep 8 07:08:00 2009
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.86 2009/09/07 02:27:27 jnemeth Exp $
+# $NetBSD: sets.subr,v 1.87 2009/09/08 07:08:00 skrll Exp $
#
#
@@ -15,6 +15,7 @@
# MACHINE
# MACHINE_ARCH
# MACHINE_CPU
+# HAVE_BINUTILS
# HAVE_GCC
# HAVE_GDB
# TOOLCHAIN_MISSING
@@ -23,6 +24,7 @@
#
MKVARS="\
MKBFD \
+ MKBINUTILS \
MKCATPAGES \
MKCOMPAT \
MKCRYPTO \
@@ -181,7 +183,7 @@
.endif
all:
.for i in MACHINE MACHINE_ARCH MACHINE_CPU \
- HAVE_GCC HAVE_GDB OBJECT_FMT TOOLCHAIN_MISSING \
+ HAVE_BINUTILS HAVE_GCC HAVE_GDB OBJECT_FMT TOOLCHAIN_MISSING \
${MKVARS}
@echo "export \$i=\${\$i}"
.endfor
@@ -233,7 +235,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.86 2009/09/07 02:27:27 jnemeth Exp $
+# # $NetBSD: sets.subr,v 1.87 2009/09/08 07:08:00 skrll Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -253,7 +255,8 @@
# obsolete file is obsolete, and only printed if
# ${obsolete} != 0
#
-# bfd ${MKBFD} != no
+# bfd obsolete, use binutils.
+# binutils ${MKBINUTILS} != no
# catpages ${MKCATPAGES} != no
# compat ${MKCOMPAT} != no
# crypto ${MKCRYPTO} != no
@@ -295,6 +298,7 @@
# xorg ${MKX11} != no && ${X11FLAVOUR} == "Xorg"
# yp ${MKYP} != no
#
+# binutils=<n> <n> = value of ${HAVE_BINUTILS}
# gcc=<n> <n> = value of ${HAVE_GCC}
# gdb=<n> <n> = value of ${HAVE_GDB}
#
@@ -339,6 +343,7 @@
}
if ("'"${TOOLCHAIN_MISSING}"'" != "yes") {
+ wanted["binutils=" "'"${HAVE_BINUTILS}"'"] = 1
wanted["gcc=" "'"${HAVE_GCC}"'"] = 1
wanted["gdb=" "'"${HAVE_GDB}"'"] = 1
}
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.66 src/distrib/sets/lists/base/md.amd64:1.67
--- src/distrib/sets/lists/base/md.amd64:1.66 Thu Sep 3 15:35:59 2009
+++ src/distrib/sets/lists/base/md.amd64 Tue Sep 8 07:08:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.66 2009/09/03 15:35:59 pooka Exp $
+# $NetBSD: md.amd64,v 1.67 2009/09/08 07:08:01 skrll Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -54,8 +54,10 @@
./usr/lib/i386/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic
./usr/lib/i386/libasn1.so.8 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libasn1.so.8.0 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libbfd.so.10 base-compat-shlib compat,pic,bfd
-./usr/lib/i386/libbfd.so.10.0 base-compat-shlib compat,pic,bfd
+./usr/lib/i386/libbfd.so.10 base-compat-shlib compat,pic,binutils=216
+./usr/lib/i386/libbfd.so.10.0 base-compat-shlib compat,pic,binutils=216
+./usr/lib/i386/libbfd.so.11 base-compat-shlib compat,pic,binutils=219
+./usr/lib/i386/libbfd.so.11.0 base-compat-shlib compat,pic,binutils=219
./usr/lib/i386/libbind9.so.4 base-compat-shlib compat,pic
./usr/lib/i386/libbind9.so.4.0 base-compat-shlib compat,pic
./usr/lib/i386/libbluetooth.so.4 base-compat-shlib compat,pic
@@ -136,8 +138,8 @@
./usr/lib/i386/libnetpgp.so.2.0 base-compat-shlib compat,pic
./usr/lib/i386/libobjc.so.3 base-compat-shlib compat,pic
./usr/lib/i386/libobjc.so.3.0 base-compat-shlib compat,pic
-./usr/lib/i386/libopcodes.so.3 base-compat-shlib compat,pic,bfd
-./usr/lib/i386/libopcodes.so.3.0 base-compat-shlib compat,pic,bfd
+./usr/lib/i386/libopcodes.so.3 base-compat-shlib compat,pic,binutils
+./usr/lib/i386/libopcodes.so.3.0 base-compat-shlib compat,pic,binutils
./usr/lib/i386/libossaudio.so.1 base-compat-shlib compat,pic
./usr/lib/i386/libossaudio.so.1.0 base-compat-shlib compat,pic
./usr/lib/i386/libp2k.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.828 src/distrib/sets/lists/base/mi:1.829
--- src/distrib/sets/lists/base/mi:1.828 Mon Sep 7 21:07:02 2009
+++ src/distrib/sets/lists/base/mi Tue Sep 8 07:08:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.828 2009/09/07 21:07:02 mrg Exp $
+# $NetBSD: mi,v 1.829 2009/09/08 07:08:01 skrll Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -434,7 +434,7 @@
./usr/bin/lam base-util-bin
./usr/bin/last base-util-bin
./usr/bin/lastcomm base-util-bin
-./usr/bin/ld base-util-bin bfd
+./usr/bin/ld base-util-bin binutils
./usr/bin/ldapadd base-ldap-bin ldap
./usr/bin/ldapcompare base-ldap-bin ldap
./usr/bin/ldapdelete base-ldap-bin ldap
@@ -1016,7 +1016,7 @@
./usr/sbin/crash base-sysutil-bin
./usr/sbin/cron base-cron-bin
./usr/sbin/daicctl base-isdn-bin
-./usr/sbin/dbsym base-sysutil-bin bfd
+./usr/sbin/dbsym base-sysutil-bin binutils
./usr/sbin/dev_mkdb base-sysutil-bin
./usr/sbin/dhcpd base-dhcpd-bin
./usr/sbin/dhcrelay base-dhcpd-bin
@@ -1118,7 +1118,7 @@
./usr/sbin/map-mbone base-netutil-bin
./usr/sbin/mbrlabel base-obsolete obsolete
./usr/sbin/mdconfig base-sysutil-bin
-./usr/sbin/mdsetimage base-sysutil-bin bfd
+./usr/sbin/mdsetimage base-sysutil-bin binutils
./usr/sbin/mk-amd-map base-amd-bin
./usr/sbin/mkalias base-nis-bin yp
./usr/sbin/mknetid base-nis-bin yp
Index: src/distrib/sets/lists/base/shl.elf
diff -u src/distrib/sets/lists/base/shl.elf:1.183 src/distrib/sets/lists/base/shl.elf:1.184
--- src/distrib/sets/lists/base/shl.elf:1.183 Fri Sep 4 17:21:33 2009
+++ src/distrib/sets/lists/base/shl.elf Tue Sep 8 07:08:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.183 2009/09/04 17:21:33 pooka Exp $
+# $NetBSD: shl.elf,v 1.184 2009/09/08 07:08:01 skrll Exp $
#
# Note: Do not mark "old" major and major.minor shared libraries as
# "obsolete"; just remove the entry, as third-party applications
@@ -94,7 +94,8 @@
./usr/lib/libarchive.so.3 base-sys-shlib
./usr/lib/libasn1.so base-krb5-shlib kerberos
./usr/lib/libasn1.so.8 base-krb5-shlib kerberos
-./usr/lib/libbfd.so.10 base-sys-shlib bfd
+./usr/lib/libbfd.so.10 base-sys-shlib binutils=216
+./usr/lib/libbfd.so.11 base-sys-shlib binutils=219
./usr/lib/libbind9.so base-bind-shlib
./usr/lib/libbind9.so.4 base-bind-shlib
./usr/lib/libbluetooth.so base-sys-shlib
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.489 src/distrib/sets/lists/base/shl.mi:1.490
--- src/distrib/sets/lists/base/shl.mi:1.489 Fri Sep 4 17:21:33 2009
+++ src/distrib/sets/lists/base/shl.mi Tue Sep 8 07:08:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.489 2009/09/04 17:21:33 pooka Exp $
+# $NetBSD: shl.mi,v 1.490 2009/09/08 07:08:01 skrll Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -55,7 +55,8 @@
./usr/lib/libamu.so.4.0 base-amd-shlib
./usr/lib/libarchive.so.3.0 base-sys-shlib
./usr/lib/libasn1.so.8.0 base-krb5-shlib kerberos
-./usr/lib/libbfd.so.10.0 base-sys-shlib bfd
+./usr/lib/libbfd.so.10.0 base-sys-shlib binutils=216
+./usr/lib/libbfd.so.11.0 base-sys-shlib binutils=219
./usr/lib/libbind9.so.4.0 base-bind-shlib
./usr/lib/libbluetooth.so.4.2 base-sys-shlib
./usr/lib/libbsdmalloc.so.0.0 base-sys-shlib
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.54 src/distrib/sets/lists/comp/md.amd64:1.55
--- src/distrib/sets/lists/comp/md.amd64:1.54 Thu Sep 3 15:35:59 2009
+++ src/distrib/sets/lists/comp/md.amd64 Tue Sep 8 07:08:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.54 2009/09/03 15:35:59 pooka Exp $
+# $NetBSD: md.amd64,v 1.55 2009/09/08 07:08:01 skrll Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -341,9 +341,9 @@
./usr/lib/i386/libatf-c_p.a comp-c-proflib compat,profile
./usr/lib/i386/libatf-c_pic.a comp-c-piclib compat,pic
./usr/lib/i386/libbfd.a comp-c-lib compat,pic
-./usr/lib/i386/libbfd.so comp-sys-shlib compat,pic,bfd
-./usr/lib/i386/libbfd_p.a comp-c-proflib compat,profile,bfd
-./usr/lib/i386/libbfd_pic.a comp-c-piclib compat,pic,bfd
+./usr/lib/i386/libbfd.so comp-sys-shlib compat,pic,binutils
+./usr/lib/i386/libbfd_p.a comp-c-proflib compat,profile,binutils
+./usr/lib/i386/libbfd_pic.a comp-c-piclib compat,pic,binutils
./usr/lib/i386/libbind9.a comp-c-lib compat
./usr/lib/i386/libbind9.so comp-sys-shlib compat,pic
./usr/lib/i386/libbind9_p.a comp-c-proflib compat,profile
@@ -448,9 +448,9 @@
./usr/lib/i386/libi386.so comp-sys-shlib compat,pic
./usr/lib/i386/libi386_p.a comp-c-proflib compat,profile
./usr/lib/i386/libi386_pic.a comp-c-piclib compat,pic
-./usr/lib/i386/libiberty.a comp-c-lib compat,bfd
-./usr/lib/i386/libiberty_p.a comp-c-proflib compat,profile,bfd
-./usr/lib/i386/libiberty_pic.a comp-c-piclib compat,pic,bfd
+./usr/lib/i386/libiberty.a comp-c-lib compat,binutils
+./usr/lib/i386/libiberty_p.a comp-c-proflib compat,profile,binutils
+./usr/lib/i386/libiberty_pic.a comp-c-piclib compat,pic,binutils
./usr/lib/i386/libintl.a comp-c-lib compat
./usr/lib/i386/libintl.so comp-sys-shlib compat,pic
./usr/lib/i386/libintl_p.a comp-c-proflib compat,profile
@@ -530,10 +530,10 @@
./usr/lib/i386/libobjc.so comp-sys-shlib compat,pic
./usr/lib/i386/libobjc_p.a comp-c-proflib compat,profile
./usr/lib/i386/libobjc_pic.a comp-c-piclib compat,pic
-./usr/lib/i386/libopcodes.a comp-c-lib compat,bfd
-./usr/lib/i386/libopcodes.so comp-sys-shlib compat,pic,bfd
-./usr/lib/i386/libopcodes_p.a comp-c-proflib compat,profile,bfd
-./usr/lib/i386/libopcodes_pic.a comp-c-piclib compat,pic,bfd
+./usr/lib/i386/libopcodes.a comp-c-lib compat,binutils
+./usr/lib/i386/libopcodes.so comp-sys-shlib compat,pic,binutils
+./usr/lib/i386/libopcodes_p.a comp-c-proflib compat,profile,binutils
+./usr/lib/i386/libopcodes_pic.a comp-c-piclib compat,pic,binutils
./usr/lib/i386/libossaudio.a comp-c-lib compat
./usr/lib/i386/libossaudio.so comp-sys-shlib compat,pic
./usr/lib/i386/libossaudio_p.a comp-c-proflib compat,profile
@@ -697,37 +697,37 @@
./usr/libdata/debug/usr/bin/iasl.debug comp-util-debug debug
./usr/libdata/debug/usr/sbin/acpidump.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/amldb.debug comp-sysutil-debug debug
-./usr/libdata/ldscripts/elf_i386.x comp-util-bin bfd
-./usr/libdata/ldscripts/elf_i386.xbn comp-util-bin bfd
-./usr/libdata/ldscripts/elf_i386.xc comp-util-bin bfd
-./usr/libdata/ldscripts/elf_i386.xd comp-util-bin bfd
-./usr/libdata/ldscripts/elf_i386.xdc comp-util-bin bfd
-./usr/libdata/ldscripts/elf_i386.xdw comp-util-bin bfd
-./usr/libdata/ldscripts/elf_i386.xn comp-util-bin bfd
-./usr/libdata/ldscripts/elf_i386.xr comp-util-bin bfd
-./usr/libdata/ldscripts/elf_i386.xs comp-util-bin bfd
-./usr/libdata/ldscripts/elf_i386.xsc comp-util-bin bfd
-./usr/libdata/ldscripts/elf_i386.xsw comp-util-bin bfd
-./usr/libdata/ldscripts/elf_i386.xu comp-util-bin bfd
-./usr/libdata/ldscripts/elf_i386.xw comp-util-bin bfd
-./usr/libdata/ldscripts/elf_x86_64.x comp-util-bin bfd
-./usr/libdata/ldscripts/elf_x86_64.xbn comp-util-bin bfd
-./usr/libdata/ldscripts/elf_x86_64.xc comp-util-bin bfd
-./usr/libdata/ldscripts/elf_x86_64.xd comp-util-bin bfd
-./usr/libdata/ldscripts/elf_x86_64.xdc comp-util-bin bfd
-./usr/libdata/ldscripts/elf_x86_64.xdw comp-util-bin bfd
-./usr/libdata/ldscripts/elf_x86_64.xn comp-util-bin bfd
-./usr/libdata/ldscripts/elf_x86_64.xr comp-util-bin bfd
-./usr/libdata/ldscripts/elf_x86_64.xs comp-util-bin bfd
-./usr/libdata/ldscripts/elf_x86_64.xsc comp-util-bin bfd
-./usr/libdata/ldscripts/elf_x86_64.xsw comp-util-bin bfd
-./usr/libdata/ldscripts/elf_x86_64.xu comp-util-bin bfd
-./usr/libdata/ldscripts/elf_x86_64.xw comp-util-bin bfd
-./usr/libdata/ldscripts/i386nbsd.x comp-util-bin bfd
-./usr/libdata/ldscripts/i386nbsd.xbn comp-util-bin bfd
-./usr/libdata/ldscripts/i386nbsd.xn comp-util-bin bfd
-./usr/libdata/ldscripts/i386nbsd.xr comp-util-bin bfd
-./usr/libdata/ldscripts/i386nbsd.xu comp-util-bin bfd
+./usr/libdata/ldscripts/elf_i386.x comp-util-bin binutils
+./usr/libdata/ldscripts/elf_i386.xbn comp-util-bin binutils
+./usr/libdata/ldscripts/elf_i386.xc comp-util-bin binutils
+./usr/libdata/ldscripts/elf_i386.xd comp-util-bin binutils
+./usr/libdata/ldscripts/elf_i386.xdc comp-util-bin binutils
+./usr/libdata/ldscripts/elf_i386.xdw comp-util-bin binutils
+./usr/libdata/ldscripts/elf_i386.xn comp-util-bin binutils
+./usr/libdata/ldscripts/elf_i386.xr comp-util-bin binutils
+./usr/libdata/ldscripts/elf_i386.xs comp-util-bin binutils
+./usr/libdata/ldscripts/elf_i386.xsc comp-util-bin binutils
+./usr/libdata/ldscripts/elf_i386.xsw comp-util-bin binutils
+./usr/libdata/ldscripts/elf_i386.xu comp-util-bin binutils
+./usr/libdata/ldscripts/elf_i386.xw comp-util-bin binutils
+./usr/libdata/ldscripts/elf_x86_64.x comp-util-bin binutils
+./usr/libdata/ldscripts/elf_x86_64.xbn comp-util-bin binutils
+./usr/libdata/ldscripts/elf_x86_64.xc comp-util-bin binutils
+./usr/libdata/ldscripts/elf_x86_64.xd comp-util-bin binutils
+./usr/libdata/ldscripts/elf_x86_64.xdc comp-util-bin binutils
+./usr/libdata/ldscripts/elf_x86_64.xdw comp-util-bin binutils
+./usr/libdata/ldscripts/elf_x86_64.xn comp-util-bin binutils
+./usr/libdata/ldscripts/elf_x86_64.xr comp-util-bin binutils
+./usr/libdata/ldscripts/elf_x86_64.xs comp-util-bin binutils
+./usr/libdata/ldscripts/elf_x86_64.xsc comp-util-bin binutils
+./usr/libdata/ldscripts/elf_x86_64.xsw comp-util-bin binutils
+./usr/libdata/ldscripts/elf_x86_64.xu comp-util-bin binutils
+./usr/libdata/ldscripts/elf_x86_64.xw comp-util-bin binutils
+./usr/libdata/ldscripts/i386nbsd.x comp-util-bin binutils
+./usr/libdata/ldscripts/i386nbsd.xbn comp-util-bin binutils
+./usr/libdata/ldscripts/i386nbsd.xn comp-util-bin binutils
+./usr/libdata/ldscripts/i386nbsd.xr comp-util-bin binutils
+./usr/libdata/ldscripts/i386nbsd.xu comp-util-bin binutils
./usr/libdata/lint/llib-lx86_64.ln comp-c-lintlib lint
./usr/share/ldscripts/elf_i386.x comp-obsolete obsolete
./usr/share/ldscripts/elf_i386.xbn comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.47 src/distrib/sets/lists/comp/md.sparc64:1.48
--- src/distrib/sets/lists/comp/md.sparc64:1.47 Thu Sep 3 15:35:59 2009
+++ src/distrib/sets/lists/comp/md.sparc64 Tue Sep 8 07:08:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.47 2009/09/03 15:35:59 pooka Exp $
+# $NetBSD: md.sparc64,v 1.48 2009/09/08 07:08:01 skrll Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete
@@ -593,34 +593,34 @@
./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug
./usr/libdata/debug/usr/sbin/eeprom.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/ofctl.debug comp-sysutil-debug debug
-./usr/libdata/ldscripts/elf32_sparc.x comp-util-bin bfd
-./usr/libdata/ldscripts/elf32_sparc.xbn comp-util-bin bfd
-./usr/libdata/ldscripts/elf32_sparc.xc comp-util-bin bfd
-./usr/libdata/ldscripts/elf32_sparc.xd comp-util-bin bfd
-./usr/libdata/ldscripts/elf32_sparc.xdc comp-util-bin bfd
-./usr/libdata/ldscripts/elf32_sparc.xdw comp-util-bin bfd
-./usr/libdata/ldscripts/elf32_sparc.xn comp-util-bin bfd
-./usr/libdata/ldscripts/elf32_sparc.xr comp-util-bin bfd
-./usr/libdata/ldscripts/elf32_sparc.xs comp-util-bin bfd
-./usr/libdata/ldscripts/elf32_sparc.xsc comp-util-bin bfd
-./usr/libdata/ldscripts/elf32_sparc.xsw comp-util-bin bfd
-./usr/libdata/ldscripts/elf32_sparc.xu comp-util-bin bfd
-./usr/libdata/ldscripts/elf32_sparc.xw comp-util-bin bfd
-./usr/libdata/ldscripts/elf64_sparc.x comp-util-bin bfd
-./usr/libdata/ldscripts/elf64_sparc.xbn comp-util-bin bfd
-./usr/libdata/ldscripts/elf64_sparc.xc comp-util-bin bfd
-./usr/libdata/ldscripts/elf64_sparc.xd comp-util-bin bfd
-./usr/libdata/ldscripts/elf64_sparc.xdc comp-util-bin bfd
-./usr/libdata/ldscripts/elf64_sparc.xdw comp-util-bin bfd
-./usr/libdata/ldscripts/elf64_sparc.xn comp-util-bin bfd
-./usr/libdata/ldscripts/elf64_sparc.xr comp-util-bin bfd
-./usr/libdata/ldscripts/elf64_sparc.xs comp-util-bin bfd
-./usr/libdata/ldscripts/elf64_sparc.xsc comp-util-bin bfd
-./usr/libdata/ldscripts/elf64_sparc.xsw comp-util-bin bfd
-./usr/libdata/ldscripts/elf64_sparc.xu comp-util-bin bfd
-./usr/libdata/ldscripts/elf64_sparc.xw comp-util-bin bfd
-./usr/libdata/ldscripts/sparcnbsd.x comp-util-bin bfd
-./usr/libdata/ldscripts/sparcnbsd.xbn comp-util-bin bfd
-./usr/libdata/ldscripts/sparcnbsd.xn comp-util-bin bfd
-./usr/libdata/ldscripts/sparcnbsd.xr comp-util-bin bfd
-./usr/libdata/ldscripts/sparcnbsd.xu comp-util-bin bfd
+./usr/libdata/ldscripts/elf32_sparc.x comp-util-bin binutils
+./usr/libdata/ldscripts/elf32_sparc.xbn comp-util-bin binutils
+./usr/libdata/ldscripts/elf32_sparc.xc comp-util-bin binutils
+./usr/libdata/ldscripts/elf32_sparc.xd comp-util-bin binutils
+./usr/libdata/ldscripts/elf32_sparc.xdc comp-util-bin binutils
+./usr/libdata/ldscripts/elf32_sparc.xdw comp-util-bin binutils
+./usr/libdata/ldscripts/elf32_sparc.xn comp-util-bin binutils
+./usr/libdata/ldscripts/elf32_sparc.xr comp-util-bin binutils
+./usr/libdata/ldscripts/elf32_sparc.xs comp-util-bin binutils
+./usr/libdata/ldscripts/elf32_sparc.xsc comp-util-bin binutils
+./usr/libdata/ldscripts/elf32_sparc.xsw comp-util-bin binutils
+./usr/libdata/ldscripts/elf32_sparc.xu comp-util-bin binutils
+./usr/libdata/ldscripts/elf32_sparc.xw comp-util-bin binutils
+./usr/libdata/ldscripts/elf64_sparc.x comp-util-bin binutils
+./usr/libdata/ldscripts/elf64_sparc.xbn comp-util-bin binutils
+./usr/libdata/ldscripts/elf64_sparc.xc comp-util-bin binutils
+./usr/libdata/ldscripts/elf64_sparc.xd comp-util-bin binutils
+./usr/libdata/ldscripts/elf64_sparc.xdc comp-util-bin binutils
+./usr/libdata/ldscripts/elf64_sparc.xdw comp-util-bin binutils
+./usr/libdata/ldscripts/elf64_sparc.xn comp-util-bin binutils
+./usr/libdata/ldscripts/elf64_sparc.xr comp-util-bin binutils
+./usr/libdata/ldscripts/elf64_sparc.xs comp-util-bin binutils
+./usr/libdata/ldscripts/elf64_sparc.xsc comp-util-bin binutils
+./usr/libdata/ldscripts/elf64_sparc.xsw comp-util-bin binutils
+./usr/libdata/ldscripts/elf64_sparc.xu comp-util-bin binutils
+./usr/libdata/ldscripts/elf64_sparc.xw comp-util-bin binutils
+./usr/libdata/ldscripts/sparcnbsd.x comp-util-bin binutils
+./usr/libdata/ldscripts/sparcnbsd.xbn comp-util-bin binutils
+./usr/libdata/ldscripts/sparcnbsd.xn comp-util-bin binutils
+./usr/libdata/ldscripts/sparcnbsd.xr comp-util-bin binutils
+./usr/libdata/ldscripts/sparcnbsd.xu comp-util-bin binutils
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1305 src/distrib/sets/lists/comp/mi:1.1306
--- src/distrib/sets/lists/comp/mi:1.1305 Sun Sep 6 21:03:28 2009
+++ src/distrib/sets/lists/comp/mi Tue Sep 8 07:08:01 2009
@@ -1,15 +1,15 @@
-# $NetBSD: mi,v 1.1305 2009/09/06 21:03:28 pooka Exp $
+# $NetBSD: mi,v 1.1306 2009/09/08 07:08:01 skrll Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
./etc/mtree/set.comp comp-sys-root
-./usr/bin/addr2line comp-debug-bin bfd
-./usr/bin/ar comp-util-bin bfd
-./usr/bin/as comp-util-bin bfd
+./usr/bin/addr2line comp-debug-bin binutils
+./usr/bin/ar comp-util-bin binutils
+./usr/bin/as comp-util-bin binutils
./usr/bin/asa comp-fortran-bin
./usr/bin/atf-compile comp-atf-bin
./usr/bin/c++ comp-cxx-bin gcccmds
-./usr/bin/c++filt comp-cxx-bin bfd
+./usr/bin/c++filt comp-cxx-bin binutils
./usr/bin/c89 comp-c-bin
./usr/bin/c99 comp-c-bin
./usr/bin/cc comp-c-bin gcccmds
@@ -38,7 +38,7 @@
./usr/bin/genclass comp-obsolete obsolete
./usr/bin/gettext comp-c-bin
./usr/bin/gettextize comp-obsolete obsolete
-./usr/bin/gprof comp-debug-bin bfd
+./usr/bin/gprof comp-debug-bin binutils
./usr/bin/lex comp-c-bin
./usr/bin/lint comp-c-bin
./usr/bin/lorder comp-util-bin
@@ -58,17 +58,17 @@
./usr/bin/msgunfmt comp-c-bin
./usr/bin/msguniq comp-c-bin
./usr/bin/nbperf comp-util-bin
-./usr/bin/nm comp-util-bin bfd
-./usr/bin/objcopy comp-util-bin bfd
-./usr/bin/objdump comp-util-bin bfd
+./usr/bin/nm comp-util-bin binutils
+./usr/bin/objcopy comp-util-bin binutils
+./usr/bin/objdump comp-util-bin binutils
./usr/bin/protoize comp-c-bin gcccmds
-./usr/bin/ranlib comp-util-bin bfd
+./usr/bin/ranlib comp-util-bin binutils
./usr/bin/rcs2log comp-cvs-bin cvs
-./usr/bin/readelf comp-util-bin bfd
+./usr/bin/readelf comp-util-bin binutils
./usr/bin/rpcgen comp-c-bin
-./usr/bin/size comp-util-bin bfd
-./usr/bin/strings comp-util-bin bfd
-./usr/bin/strip comp-util-bin bfd
+./usr/bin/size comp-util-bin binutils
+./usr/bin/strings comp-util-bin binutils
+./usr/bin/strip comp-util-bin binutils
./usr/bin/tsort comp-util-bin
./usr/bin/unifdef comp-util-bin
./usr/bin/unifdefall comp-util-bin
@@ -2809,11 +2809,11 @@
./usr/libdata/debug/sbin/wdogctl.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/wsconsctl.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/bin/addftinfo.debug comp-groff-debug debug
-./usr/libdata/debug/usr/bin/addr2line.debug comp-debug-debug bfd,debug
+./usr/libdata/debug/usr/bin/addr2line.debug comp-debug-debug binutils,debug
./usr/libdata/debug/usr/bin/apply.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/apropos.debug comp-man-debug debug
-./usr/libdata/debug/usr/bin/ar.debug comp-util-debug bfd,debug
-./usr/libdata/debug/usr/bin/as.debug comp-util-debug bfd,debug
+./usr/libdata/debug/usr/bin/ar.debug comp-util-debug binutils,debug
+./usr/libdata/debug/usr/bin/as.debug comp-util-debug binutils,debug
./usr/libdata/debug/usr/bin/asa.debug comp-fortran-debug debug
./usr/libdata/debug/usr/bin/at.debug comp-cron-debug debug
./usr/libdata/debug/usr/bin/atf-check.debug comp-atf-debug debug
@@ -2836,7 +2836,7 @@
./usr/libdata/debug/usr/bin/btpin.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/bzip2.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/bzip2recover.debug comp-util-debug debug
-./usr/libdata/debug/usr/bin/c++filt.debug comp-cxx-debug bfd,debug
+./usr/libdata/debug/usr/bin/c++filt.debug comp-cxx-debug binutils,debug
./usr/libdata/debug/usr/bin/cal.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/calendar.debug comp-calendar-debug debug
./usr/libdata/debug/usr/bin/cap_mkdb.debug comp-util-debug debug
@@ -2904,7 +2904,7 @@
./usr/libdata/debug/usr/bin/getopt.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/gettext.debug comp-c-debug debug
./usr/libdata/debug/usr/bin/gkermit.debug comp-util-debug debug
-./usr/libdata/debug/usr/bin/gprof.debug comp-debug-debug bfd,debug
+./usr/libdata/debug/usr/bin/gprof.debug comp-debug-debug binutils,debug
./usr/libdata/debug/usr/bin/grep.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/grn.debug comp-groff-debug debug
./usr/libdata/debug/usr/bin/grodvi.debug comp-groff-debug debug
@@ -2945,7 +2945,7 @@
./usr/libdata/debug/usr/bin/lam.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/last.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/lastcomm.debug comp-util-debug debug
-./usr/libdata/debug/usr/bin/ld.debug comp-util-debug bfd,debug
+./usr/libdata/debug/usr/bin/ld.debug comp-util-debug binutils,debug
./usr/libdata/debug/usr/bin/ldapcompare.debug comp-ldap-debug ldap,debug
./usr/libdata/debug/usr/bin/ldapdelete.debug comp-ldap-debug ldap,debug
./usr/libdata/debug/usr/bin/ldapexop.debug comp-ldap-debug ldap,debug
@@ -3019,13 +3019,13 @@
./usr/libdata/debug/usr/bin/nfsstat.debug comp-nfsclient-debug debug
./usr/libdata/debug/usr/bin/nice.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/nl.debug comp-util-debug debug
-./usr/libdata/debug/usr/bin/nm.debug comp-util-debug bfd,debug
+./usr/libdata/debug/usr/bin/nm.debug comp-util-debug binutils,debug
./usr/libdata/debug/usr/bin/nohup.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/nslookup.debug comp-netutil-debug debug
./usr/libdata/debug/usr/bin/nsupdate.debug comp-netutil-debug debug
./usr/libdata/debug/usr/bin/nvi.debug comp-obsolete obsolete
-./usr/libdata/debug/usr/bin/objcopy.debug comp-util-debug bfd,debug
-./usr/libdata/debug/usr/bin/objdump.debug comp-util-debug bfd,debug
+./usr/libdata/debug/usr/bin/objcopy.debug comp-util-debug binutils,debug
+./usr/libdata/debug/usr/bin/objdump.debug comp-util-debug binutils,debug
./usr/libdata/debug/usr/bin/openpgp.debug comp-obsolete obsolete
./usr/libdata/debug/usr/bin/openssl.debug comp-crypto-debug crypto,debug
./usr/libdata/debug/usr/bin/passwd.debug comp-util-debug debug
@@ -3051,13 +3051,13 @@
./usr/libdata/debug/usr/bin/qsubst.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/quota.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/radioctl.debug comp-audio-debug debug
-./usr/libdata/debug/usr/bin/ranlib.debug comp-util-debug bfd,debug
+./usr/libdata/debug/usr/bin/ranlib.debug comp-util-debug binutils,debug
./usr/libdata/debug/usr/bin/rcs.debug comp-rcs-debug debug
./usr/libdata/debug/usr/bin/rcsclean.debug comp-rcs-debug debug
./usr/libdata/debug/usr/bin/rcsdiff.debug comp-rcs-debug debug
./usr/libdata/debug/usr/bin/rcsmerge.debug comp-rcs-debug debug
./usr/libdata/debug/usr/bin/rdist.debug comp-netutil-debug debug
-./usr/libdata/debug/usr/bin/readelf.debug comp-util-debug bfd,debug
+./usr/libdata/debug/usr/bin/readelf.debug comp-util-debug binutils,debug
./usr/libdata/debug/usr/bin/refer.debug comp-groff-debug debug
./usr/libdata/debug/usr/bin/renice.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/rev.debug comp-util-debug debug
@@ -3084,7 +3084,7 @@
./usr/libdata/debug/usr/bin/shlock.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/showmount.debug comp-nfsclient-debug debug
./usr/libdata/debug/usr/bin/shuffle.debug comp-util-debug debug
-./usr/libdata/debug/usr/bin/size.debug comp-util-debug bfd,debug
+./usr/libdata/debug/usr/bin/size.debug comp-util-debug binutils,debug
./usr/libdata/debug/usr/bin/skey.debug comp-util-debug skey,debug
./usr/libdata/debug/usr/bin/skeyinfo.debug comp-util-debug skey,debug
./usr/libdata/debug/usr/bin/skeyinit.debug comp-util-debug skey,debug
@@ -3099,8 +3099,8 @@
./usr/libdata/debug/usr/bin/ssh.debug comp-secsh-debug crypto,debug
./usr/libdata/debug/usr/bin/stat.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/string2key.debug comp-krb5-debug kerberos,debug
-./usr/libdata/debug/usr/bin/strings.debug comp-util-debug bfd,debug
-./usr/libdata/debug/usr/bin/strip.debug comp-util-debug bfd,debug
+./usr/libdata/debug/usr/bin/strings.debug comp-util-debug binutils,debug
+./usr/libdata/debug/usr/bin/strip.debug comp-util-debug binutils,debug
./usr/libdata/debug/usr/bin/su.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/systat.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/tabs.debug comp-util-debug debug
@@ -3327,7 +3327,7 @@
./usr/libdata/debug/usr/sbin/crash.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/cron.debug comp-cron-debug debug
./usr/libdata/debug/usr/sbin/daicctl.debug comp-isdn-debug debug
-./usr/libdata/debug/usr/sbin/dbsym.debug comp-sysutil-debug bfd,debug
+./usr/libdata/debug/usr/sbin/dbsym.debug comp-sysutil-debug binutils,debug
./usr/libdata/debug/usr/sbin/dev_mkdb.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/dhcpd.debug comp-dhcpd-debug debug
./usr/libdata/debug/usr/sbin/dhcrelay.debug comp-dhcpd-debug debug
@@ -3402,7 +3402,7 @@
./usr/libdata/debug/usr/sbin/makefs.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/map-mbone.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/mdconfig.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/mdsetimage.debug comp-sysutil-debug bfd,debug
+./usr/libdata/debug/usr/sbin/mdsetimage.debug comp-sysutil-debug binutils,debug
./usr/libdata/debug/usr/sbin/mk-amd-map.debug comp-amd-debug debug
./usr/libdata/debug/usr/sbin/mkalias.debug comp-nis-debug yp,debug
./usr/libdata/debug/usr/sbin/mknetid.debug comp-nis-debug yp,debug
@@ -3566,7 +3566,7 @@
./usr/libdata/debug/usr/sbin/ypxfr.debug comp-nis-debug yp,debug
./usr/libdata/debug/usr/sbin/zdump.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/zic.debug comp-sysutil-debug debug
-./usr/libdata/ldscripts/kmodule comp-util-share bfd
+./usr/libdata/ldscripts/kmodule comp-util-share binutils
./usr/libdata/lint/llib-larchive.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lbind9.ln comp-bind-lintlib lint
./usr/libdata/lint/llib-lbluetooth.ln comp-c-lintlib lint
@@ -3784,12 +3784,12 @@
./usr/share/locale/uk/LC_MESSAGES/gettext-tools.mo comp-c_locale-uk nls
./usr/share/locale/zh_CN/LC_MESSAGES/gettext-tools.mo comp-c_locale-zh_CN nls
./usr/share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo comp-c_locale-zh_TW nls
-./usr/share/man/cat1/addr2line.0 comp-debug-catman bfd,.cat
-./usr/share/man/cat1/ar.0 comp-util-catman bfd,.cat
-./usr/share/man/cat1/as.0 comp-util-catman bfd,.cat
+./usr/share/man/cat1/addr2line.0 comp-debug-catman binutils,.cat
+./usr/share/man/cat1/ar.0 comp-util-catman binutils,.cat
+./usr/share/man/cat1/as.0 comp-util-catman binutils,.cat
./usr/share/man/cat1/asa.0 comp-fortran-catman .cat
./usr/share/man/cat1/c++.0 comp-cxx-catman gcccmds,.cat
-./usr/share/man/cat1/c++filt.0 comp-cxx-catman bfd,.cat
+./usr/share/man/cat1/c++filt.0 comp-cxx-catman binutils,.cat
./usr/share/man/cat1/c89.0 comp-c-catman .cat
./usr/share/man/cat1/c99.0 comp-c-catman .cat
./usr/share/man/cat1/cc.0 comp-c-catman gcccmds,.cat
@@ -3816,8 +3816,8 @@
./usr/share/man/cat1/gcov.0 comp-debug-catman gcccmds,.cat
./usr/share/man/cat1/gdb.0 comp-debug-catman gdb,.cat
./usr/share/man/cat1/genassym.0 comp-util-catman .cat
-./usr/share/man/cat1/gprof.0 comp-debug-catman bfd,.cat
-./usr/share/man/cat1/ld.0 comp-util-catman bfd,.cat
+./usr/share/man/cat1/gprof.0 comp-debug-catman binutils,.cat
+./usr/share/man/cat1/ld.0 comp-util-catman binutils,.cat
./usr/share/man/cat1/lex.0 comp-c-catman .cat
./usr/share/man/cat1/lexdoc.0 comp-obsolete obsolete
./usr/share/man/cat1/lint.0 comp-c-catman .cat
@@ -3838,17 +3838,17 @@
./usr/share/man/cat1/msg_window.0 comp-obsolete obsolete
./usr/share/man/cat1/msgc.0 comp-c-catman .cat
./usr/share/man/cat1/nbperf.0 comp-util-catman .cat
-./usr/share/man/cat1/nm.0 comp-util-catman bfd,.cat
-./usr/share/man/cat1/objcopy.0 comp-util-catman bfd,.cat
-./usr/share/man/cat1/objdump.0 comp-util-catman bfd,.cat
+./usr/share/man/cat1/nm.0 comp-util-catman binutils,.cat
+./usr/share/man/cat1/objcopy.0 comp-util-catman binutils,.cat
+./usr/share/man/cat1/objdump.0 comp-util-catman binutils,.cat
./usr/share/man/cat1/openssl_ocsp.0 comp-c-catman crypto,.cat
-./usr/share/man/cat1/ranlib.0 comp-util-catman bfd,.cat
+./usr/share/man/cat1/ranlib.0 comp-util-catman binutils,.cat
./usr/share/man/cat1/rcs2log.0 comp-cvs-catman cvs,.cat
-./usr/share/man/cat1/readelf.0 comp-util-catman bfd,.cat
+./usr/share/man/cat1/readelf.0 comp-util-catman binutils,.cat
./usr/share/man/cat1/rpcgen.0 comp-c-catman .cat
-./usr/share/man/cat1/size.0 comp-util-catman bfd,.cat
-./usr/share/man/cat1/strings.0 comp-util-catman bfd,.cat
-./usr/share/man/cat1/strip.0 comp-util-catman bfd,.cat
+./usr/share/man/cat1/size.0 comp-util-catman binutils,.cat
+./usr/share/man/cat1/strings.0 comp-util-catman binutils,.cat
+./usr/share/man/cat1/strip.0 comp-util-catman binutils,.cat
./usr/share/man/cat1/tsort.0 comp-c-catman .cat
./usr/share/man/cat1/unifdef.0 comp-c-catman .cat
./usr/share/man/cat1/unifdefall.0 comp-c-catman .cat
@@ -9399,12 +9399,12 @@
./usr/share/man/cat9/wsmouse_input.0 comp-sys-catman .cat
./usr/share/man/cat9/wsmousedevprint.0 comp-sys-catman .cat
./usr/share/man/cat9/yield.0 comp-sys-catman .cat
-./usr/share/man/html1/addr2line.html comp-debug-htmlman bfd,html
-./usr/share/man/html1/ar.html comp-util-htmlman bfd,html
-./usr/share/man/html1/as.html comp-util-htmlman bfd,html
+./usr/share/man/html1/addr2line.html comp-debug-htmlman binutils,html
+./usr/share/man/html1/ar.html comp-util-htmlman binutils,html
+./usr/share/man/html1/as.html comp-util-htmlman binutils,html
./usr/share/man/html1/asa.html comp-fortran-htmlman html
./usr/share/man/html1/c++.html comp-cxx-htmlman gcccmds,html
-./usr/share/man/html1/c++filt.html comp-cxx-htmlman bfd,html
+./usr/share/man/html1/c++filt.html comp-cxx-htmlman binutils,html
./usr/share/man/html1/c89.html comp-c-htmlman html
./usr/share/man/html1/c99.html comp-c-htmlman html
./usr/share/man/html1/cc.html comp-c-htmlman gcccmds,html
@@ -9427,8 +9427,8 @@
./usr/share/man/html1/gcov.html comp-debug-htmlman gcccmds,html
./usr/share/man/html1/gdb.html comp-debug-htmlman gdb,html
./usr/share/man/html1/genassym.html comp-util-htmlman html
-./usr/share/man/html1/gprof.html comp-debug-htmlman bfd,html
-./usr/share/man/html1/ld.html comp-util-htmlman bfd,html
+./usr/share/man/html1/gprof.html comp-debug-htmlman binutils,html
+./usr/share/man/html1/ld.html comp-util-htmlman binutils,html
./usr/share/man/html1/lex.html comp-c-htmlman html
./usr/share/man/html1/lint.html comp-c-htmlman html
./usr/share/man/html1/lorder.html comp-util-htmlman html
@@ -9436,17 +9436,17 @@
./usr/share/man/html1/mkstr.html comp-c-htmlman html
./usr/share/man/html1/msgc.html comp-c-htmlman html
./usr/share/man/html1/nbperf.html comp-util-htmlman html
-./usr/share/man/html1/nm.html comp-util-htmlman bfd,html
-./usr/share/man/html1/objcopy.html comp-util-htmlman bfd,html
-./usr/share/man/html1/objdump.html comp-util-htmlman bfd,html
+./usr/share/man/html1/nm.html comp-util-htmlman binutils,html
+./usr/share/man/html1/objcopy.html comp-util-htmlman binutils,html
+./usr/share/man/html1/objdump.html comp-util-htmlman binutils,html
./usr/share/man/html1/openssl_ocsp.html comp-c-htmlman crypto,html
-./usr/share/man/html1/ranlib.html comp-util-htmlman bfd,html
+./usr/share/man/html1/ranlib.html comp-util-htmlman binutils,html
./usr/share/man/html1/rcs2log.html comp-cvs-htmlman cvs,html
-./usr/share/man/html1/readelf.html comp-util-htmlman bfd,html
+./usr/share/man/html1/readelf.html comp-util-htmlman binutils,html
./usr/share/man/html1/rpcgen.html comp-c-htmlman html
-./usr/share/man/html1/size.html comp-util-htmlman bfd,html
-./usr/share/man/html1/strings.html comp-util-htmlman bfd,html
-./usr/share/man/html1/strip.html comp-util-htmlman bfd,html
+./usr/share/man/html1/size.html comp-util-htmlman binutils,html
+./usr/share/man/html1/strings.html comp-util-htmlman binutils,html
+./usr/share/man/html1/strip.html comp-util-htmlman binutils,html
./usr/share/man/html1/tsort.html comp-c-htmlman html
./usr/share/man/html1/unifdef.html comp-c-htmlman html
./usr/share/man/html1/unifdefall.html comp-c-htmlman html
@@ -14746,12 +14746,12 @@
./usr/share/man/html9/wsmouse_input.html comp-sys-htmlman html
./usr/share/man/html9/wsmousedevprint.html comp-sys-htmlman html
./usr/share/man/html9/yield.html comp-sys-htmlman html
-./usr/share/man/man1/addr2line.1 comp-debug-man bfd,.man
-./usr/share/man/man1/ar.1 comp-util-man bfd,.man
-./usr/share/man/man1/as.1 comp-util-man bfd,.man
+./usr/share/man/man1/addr2line.1 comp-debug-man binutils,.man
+./usr/share/man/man1/ar.1 comp-util-man binutils,.man
+./usr/share/man/man1/as.1 comp-util-man binutils,.man
./usr/share/man/man1/asa.1 comp-fortran-man .man
./usr/share/man/man1/c++.1 comp-cxx-man gcccmds,.man
-./usr/share/man/man1/c++filt.1 comp-cxx-man bfd,.man
+./usr/share/man/man1/c++filt.1 comp-cxx-man binutils,.man
./usr/share/man/man1/c89.1 comp-c-man .man
./usr/share/man/man1/c99.1 comp-c-man .man
./usr/share/man/man1/cc.1 comp-c-man gcccmds,.man
@@ -14777,8 +14777,8 @@
./usr/share/man/man1/gcov.1 comp-debug-man gcccmds,.man
./usr/share/man/man1/gdb.1 comp-debug-man gdb,.man
./usr/share/man/man1/genassym.1 comp-util-man .man
-./usr/share/man/man1/gprof.1 comp-debug-man bfd,.man
-./usr/share/man/man1/ld.1 comp-util-man bfd,.man
+./usr/share/man/man1/gprof.1 comp-debug-man binutils,.man
+./usr/share/man/man1/ld.1 comp-util-man binutils,.man
./usr/share/man/man1/lex.1 comp-c-man .man
./usr/share/man/man1/lint.1 comp-c-man .man
./usr/share/man/man1/lorder.1 comp-util-man .man
@@ -14798,17 +14798,17 @@
./usr/share/man/man1/msg_window.1 comp-obsolete obsolete
./usr/share/man/man1/msgc.1 comp-c-man .man
./usr/share/man/man1/nbperf.1 comp-util-man .man
-./usr/share/man/man1/nm.1 comp-util-man bfd,.man
-./usr/share/man/man1/objcopy.1 comp-util-man bfd,.man
-./usr/share/man/man1/objdump.1 comp-util-man bfd,.man
+./usr/share/man/man1/nm.1 comp-util-man binutils,.man
+./usr/share/man/man1/objcopy.1 comp-util-man binutils,.man
+./usr/share/man/man1/objdump.1 comp-util-man binutils,.man
./usr/share/man/man1/openssl_ocsp.1 comp-c-man crypto,.man
-./usr/share/man/man1/ranlib.1 comp-util-man bfd,.man
+./usr/share/man/man1/ranlib.1 comp-util-man binutils,.man
./usr/share/man/man1/rcs2log.1 comp-cvs-man cvs,.man
-./usr/share/man/man1/readelf.1 comp-util-man bfd,.man
+./usr/share/man/man1/readelf.1 comp-util-man binutils,.man
./usr/share/man/man1/rpcgen.1 comp-c-man .man
-./usr/share/man/man1/size.1 comp-util-man bfd,.man
-./usr/share/man/man1/strings.1 comp-util-man bfd,.man
-./usr/share/man/man1/strip.1 comp-util-man bfd,.man
+./usr/share/man/man1/size.1 comp-util-man binutils,.man
+./usr/share/man/man1/strings.1 comp-util-man binutils,.man
+./usr/share/man/man1/strip.1 comp-util-man binutils,.man
./usr/share/man/man1/tsort.1 comp-util-man .man
./usr/share/man/man1/unifdef.1 comp-util-man .man
./usr/share/man/man1/unifdefall.1 comp-util-man .man
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.86 src/distrib/sets/lists/comp/shl.mi:1.87
--- src/distrib/sets/lists/comp/shl.mi:1.86 Fri Sep 4 17:21:34 2009
+++ src/distrib/sets/lists/comp/shl.mi Tue Sep 8 07:08:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.86 2009/09/04 17:21:34 pooka Exp $
+# $NetBSD: shl.mi,v 1.87 2009/09/08 07:08:01 skrll Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -61,8 +61,10 @@
./usr/lib/libmenu_pic.a comp-c-piclib
./usr/lib/libnetpgp_pic.a comp-c-piclib crypto
./usr/lib/libobjc_pic.a comp-objc-piclib
-./usr/lib/libopcodes.so.3 comp-c-shlib bfd
-./usr/lib/libopcodes.so.3.0 comp-c-shlib bfd
+./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.4 comp-c-shlib binutils=219
+./usr/lib/libopcodes.so.4.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
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1156 src/distrib/sets/lists/man/mi:1.1157
--- src/distrib/sets/lists/man/mi:1.1156 Sun Sep 6 21:03:28 2009
+++ src/distrib/sets/lists/man/mi Tue Sep 8 07:08:01 2009
@@ -1,13 +1,13 @@
-# $NetBSD: mi,v 1.1156 2009/09/06 21:03:28 pooka Exp $
+# $NetBSD: mi,v 1.1157 2009/09/08 07:08:01 skrll Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
./etc/mtree/set.man man-sys-root
./usr/share/info/am-utils.info man-amd-info info
-./usr/share/info/as.info man-computil-info bfd,info
+./usr/share/info/as.info man-computil-info binutils,info
./usr/share/info/awk.info man-util-info info
-./usr/share/info/bfd.info man-computil-info bfd,info
-./usr/share/info/binutils.info man-computil-info bfd,info
+./usr/share/info/bfd.info man-computil-info binutils,info
+./usr/share/info/binutils.info man-computil-info binutils,info
./usr/share/info/bzip2.info man-obsolete obsolete
./usr/share/info/cpp.info man-util-info gcccmds,info
./usr/share/info/cvs.info man-cvs-info cvs,info
@@ -22,7 +22,7 @@
./usr/share/info/gdb.info man-debug-info gdb,info
./usr/share/info/gdbint.info man-debug-info gdb,info
./usr/share/info/gettext.info man-sys-info info
-./usr/share/info/gprof.info man-debug-info bfd,info
+./usr/share/info/gprof.info man-debug-info binutils,info
./usr/share/info/grep.info man-util-info info
./usr/share/info/groff.info man-groff-info info
./usr/share/info/gzip.info man-obsolete obsolete
@@ -31,7 +31,7 @@
./usr/share/info/info.info man-texinfo-info info
./usr/share/info/iostream.info man-obsolete obsolete
./usr/share/info/kth-krb.info man-obsolete obsolete
-./usr/share/info/ld.info man-computil-info bfd,info
+./usr/share/info/ld.info man-computil-info binutils,info
./usr/share/info/send-pr.info man-gnats-info info
./usr/share/info/stabs.info man-debug-info gdb,info
./usr/share/info/tar.info man-obsolete obsolete
@@ -2029,7 +2029,7 @@
./usr/share/man/cat8/cpuctl.0 man-sysutil-catman .cat
./usr/share/man/cat8/crash.0 man-sysutil-catman .cat
./usr/share/man/cat8/cron.0 man-cron-catman .cat
-./usr/share/man/cat8/dbsym.0 man-sysutil-catman bfd,.cat
+./usr/share/man/cat8/dbsym.0 man-sysutil-catman binutils,.cat
./usr/share/man/cat8/defer.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/dev_mkdb.0 man-sysutil-catman .cat
./usr/share/man/cat8/dhclient-script.0 man-dhclient-catman .cat
@@ -2261,7 +2261,7 @@
./usr/share/man/cat8/mbr.0 man-obsolete obsolete
./usr/share/man/cat8/mbrlabel.0 man-sysutil-catman .cat
./usr/share/man/cat8/mdconfig.0 man-sysutil-catman .cat
-./usr/share/man/cat8/mdsetimage.0 man-sysutil-catman bfd,.cat
+./usr/share/man/cat8/mdsetimage.0 man-sysutil-catman binutils,.cat
./usr/share/man/cat8/mfs.0 man-sys-catman .cat
./usr/share/man/cat8/mipsco/MAKEDEV.0 man-obsolete obsolete
./usr/share/man/cat8/mipsco/makedev.0 man-obsolete obsolete
@@ -4504,7 +4504,7 @@
./usr/share/man/html8/cpuctl.html man-sysutil-htmlman html
./usr/share/man/html8/crash.html man-sysutil-htmlman html
./usr/share/man/html8/cron.html man-cron-htmlman html
-./usr/share/man/html8/dbsym.html man-sysutil-htmlman bfd,html
+./usr/share/man/html8/dbsym.html man-sysutil-htmlman binutils,html
./usr/share/man/html8/defer.html man-postfix-htmlman postfix,html
./usr/share/man/html8/dev_mkdb.html man-sysutil-htmlman html
./usr/share/man/html8/dhclient-script.html man-dhclient-htmlman html
@@ -4680,7 +4680,7 @@
./usr/share/man/html8/master.html man-postfix-htmlman postfix,html
./usr/share/man/html8/mbrlabel.html man-sysutil-htmlman html
./usr/share/man/html8/mdconfig.html man-sysutil-htmlman html
-./usr/share/man/html8/mdsetimage.html man-sysutil-htmlman bfd,html
+./usr/share/man/html8/mdsetimage.html man-sysutil-htmlman binutils,html
./usr/share/man/html8/mfs.html man-sys-htmlman html
./usr/share/man/html8/mk-amd-map.html man-amd-htmlman html
./usr/share/man/html8/mkalias.html man-nis-htmlman yp,html
@@ -7038,7 +7038,7 @@
./usr/share/man/man8/cpuctl.8 man-sysutil-man .man
./usr/share/man/man8/crash.8 man-crash-man .man
./usr/share/man/man8/cron.8 man-cron-man .man
-./usr/share/man/man8/dbsym.8 man-sysutil-man bfd,.man
+./usr/share/man/man8/dbsym.8 man-sysutil-man binutils,.man
./usr/share/man/man8/defer.8 man-postfix-man postfix,.man
./usr/share/man/man8/dev_mkdb.8 man-sysutil-man .man
./usr/share/man/man8/dhclient-script.8 man-dhclient-man .man
@@ -7271,7 +7271,7 @@
./usr/share/man/man8/mbr.8 man-obsolete obsolete
./usr/share/man/man8/mbrlabel.8 man-sysutil-man .man
./usr/share/man/man8/mdconfig.8 man-sysutil-man .man
-./usr/share/man/man8/mdsetimage.8 man-sysutil-man bfd,.man
+./usr/share/man/man8/mdsetimage.8 man-sysutil-man binutils,.man
./usr/share/man/man8/mfs.8 man-sys-man .man
./usr/share/man/man8/mipsco/MAKEDEV.8 man-obsolete obsolete
./usr/share/man/man8/mipsco/makedev.8 man-obsolete obsolete
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.371 src/etc/Makefile:1.372
--- src/etc/Makefile:1.371 Mon Sep 7 19:34:30 2009
+++ src/etc/Makefile Tue Sep 8 07:08:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.371 2009/09/07 19:34:30 mrg Exp $
+# $NetBSD: Makefile,v 1.372 2009/09/08 07:08:01 skrll Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -183,7 +183,7 @@
KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR \
MACHINE MACHINE_ARCH MAKE MAKECONF MAKEFLAGS \
MAKEOBJDIR MAKEOBJDIRPREFIX MAKEVERBOSE \
- MKBFD MKCATPAGES \
+ MKBFD MKBINUTILS MKCATPAGES \
MKCRYPTO MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKCVS \
MKDEBUG MKDEBUGLIB MKDOC MKDYNAMICROOT \
MKGCC MKGCCCMDS MKGDB \
Index: src/external/gpl3/Makefile
diff -u src/external/gpl3/Makefile:1.1 src/external/gpl3/Makefile:1.2
--- src/external/gpl3/Makefile:1.1 Fri Aug 21 06:54:01 2009
+++ src/external/gpl3/Makefile Tue Sep 8 07:08:02 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2009/08/21 06:54:01 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2009/09/08 07:08:02 skrll Exp $
.include <bsd.own.mk>
-.if ${MKBFD} != "no" && ${HAVE_BINUTILS} == "219"
+.if ${MKBINUTILS} != "no" && ${HAVE_BINUTILS} == "219"
SUBDIR+= binutils
.endif
Index: src/external/gpl3/binutils/usr.bin/Makefile
diff -u src/external/gpl3/binutils/usr.bin/Makefile:1.1 src/external/gpl3/binutils/usr.bin/Makefile:1.2
--- src/external/gpl3/binutils/usr.bin/Makefile:1.1 Tue Aug 18 20:22:07 2009
+++ src/external/gpl3/binutils/usr.bin/Makefile Tue Sep 8 07:08:02 2009
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:07 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2009/09/08 07:08:02 skrll Exp $
.include <bsd.own.mk>
-.if ${MKBFD} != "no" && exists(${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk)
+.if ${MKBINUTILS} != "no" && exists(${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk)
.include "${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk"
SSUBDIR+= common gas gprof ld ${G_PROGRAMS:C/-new$//:C/sysdump//:C/srconv//:cxxfilt=c++filt}
SUBDIR+= ${SSUBDIR:O} # alphabetize
-.endif # MKBFD != no
+.endif # MKBINUTILS != no
.include <bsd.subdir.mk>
Index: src/external/gpl3/binutils/usr.sbin/dbsym/Makefile
diff -u src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.1 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.2
--- src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.1 Tue Aug 18 20:22:20 2009
+++ src/external/gpl3/binutils/usr.sbin/dbsym/Makefile Tue Sep 8 07:08:02 2009
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:20 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2009/09/08 07:08:02 skrll Exp $
.include <bsd.own.mk>
.if (defined(HOSTPROG) && \
(${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))) || \
- ${MKBFD} != "no"
+ ${MKBINUTILS} != "no"
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
DIST= ${TOP}/dist
BFDSUBDIR= lib
@@ -34,6 +34,6 @@
LDADD+= -lintl
DPADD+= ${LIBINTL}
.endif # HOSTPROG
-.endif # MKBFD != no
+.endif # MKBINUTILS != no
.include <bsd.prog.mk>
Index: src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
diff -u src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.1 src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.2
--- src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.1 Tue Aug 18 20:22:20 2009
+++ src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile Tue Sep 8 07:08:02 2009
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:20 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2009/09/08 07:08:02 skrll Exp $
.include <bsd.own.mk>
.if (defined(HOSTPROG) && \
(${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))) || \
- ${MKBFD} != "no"
+ ${MKBINUTILS} != "no"
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
DIST= ${TOP}/dist
BFDSUBDIR= lib
@@ -34,6 +34,6 @@
LDADD+= -lintl
DPADD+= ${LIBINTL}
.endif # HOSTPROG
-.endif # MKBFD != no
+.endif # MKBINUTILS != no
.include <bsd.prog.mk>
Index: src/gnu/lib/Makefile
diff -u src/gnu/lib/Makefile:1.43 src/gnu/lib/Makefile:1.44
--- src/gnu/lib/Makefile:1.43 Tue Aug 18 15:11:25 2009
+++ src/gnu/lib/Makefile Tue Sep 8 07:08:02 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2009/08/18 15:11:25 skrll Exp $
+# $NetBSD: Makefile,v 1.44 2009/09/08 07:08:02 skrll Exp $
.include <bsd.own.mk>
-.if ${MKBFD} != "no"
+.if ${MKBINUTILS} != "no"
.if ${HAVE_BINUTILS} == "216"
SUBDIR+= libopcodes libbfd libiberty
.endif
Index: src/gnu/usr.bin/binutils/Makefile
diff -u src/gnu/usr.bin/binutils/Makefile:1.22 src/gnu/usr.bin/binutils/Makefile:1.23
--- src/gnu/usr.bin/binutils/Makefile:1.22 Thu Dec 4 09:29:33 2003
+++ src/gnu/usr.bin/binutils/Makefile Tue Sep 8 07:08:02 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2003/12/04 09:29:33 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2009/09/08 07:08:02 skrll Exp $
.include <bsd.own.mk>
-.if ${MKBFD} != "no" && exists(${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk)
+.if ${MKBINUTILS} != "no" && exists(${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk)
.include "${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk"
#SUBDIR= libopcodes libbfd libiberty .WAIT
@@ -10,6 +10,6 @@
SSUBDIR+= common gas gprof ld ${G_PROGRAMS:C/-new$//:C/sysdump//:C/srconv//:cxxfilt=c++filt}
SUBDIR+= ${SSUBDIR:O} # alphabetize
-.endif # MKBFD != no
+.endif # MKBINUTILS != no
.include <bsd.subdir.mk>
Index: src/gnu/usr.sbin/dbsym/Makefile
diff -u src/gnu/usr.sbin/dbsym/Makefile:1.13 src/gnu/usr.sbin/dbsym/Makefile:1.14
--- src/gnu/usr.sbin/dbsym/Makefile:1.13 Sat Jan 3 14:04:27 2004
+++ src/gnu/usr.sbin/dbsym/Makefile Tue Sep 8 07:08:02 2009
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2004/01/03 14:04:27 lukem Exp $
+# $NetBSD: Makefile,v 1.14 2009/09/08 07:08:02 skrll Exp $
.include <bsd.own.mk>
.if (defined(HOSTPROG) && \
(${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))) || \
- ${MKBFD} != "no"
+ ${MKBINUTILS} != "no"
TOP= ${NETBSDSRCDIR}/gnu
DIST= ${TOP}/dist/binutils
BFDSUBDIR= lib
@@ -34,6 +34,6 @@
LDADD+= -lintl
DPADD+= ${LIBINTL}
.endif # HOSTPROG
-.endif # MKBFD != no
+.endif # MKBINUTILS != no
.include <bsd.prog.mk>
Index: src/gnu/usr.sbin/mdsetimage/Makefile
diff -u src/gnu/usr.sbin/mdsetimage/Makefile:1.19 src/gnu/usr.sbin/mdsetimage/Makefile:1.20
--- src/gnu/usr.sbin/mdsetimage/Makefile:1.19 Sat Feb 9 02:37:21 2008
+++ src/gnu/usr.sbin/mdsetimage/Makefile Tue Sep 8 07:08:02 2009
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2008/02/09 02:37:21 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2009/09/08 07:08:02 skrll Exp $
.include <bsd.own.mk>
.if (defined(HOSTPROG) && \
(${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))) || \
- ${MKBFD} != "no"
+ ${MKBINUTILS} != "no"
TOP= ${NETBSDSRCDIR}/gnu
DIST= ${TOP}/dist/binutils
BFDSUBDIR= lib
@@ -34,6 +34,6 @@
LDADD+= -lintl
DPADD+= ${LIBINTL}
.endif # HOSTPROG
-.endif # MKBFD != no
+.endif # MKBINUTILS != no
.include <bsd.prog.mk>
Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.46 src/share/man/man5/mk.conf.5:1.47
--- src/share/man/man5/mk.conf.5:1.46 Sat Nov 15 11:27:49 2008
+++ src/share/man/man5/mk.conf.5 Tue Sep 8 07:08:03 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: mk.conf.5,v 1.46 2008/11/15 11:27:49 mrg Exp $
+.\" $NetBSD: mk.conf.5,v 1.47 2009/09/08 07:08:03 skrll Exp $
.\"
.\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -224,20 +224,18 @@
Indicates whether the Automated Testing Framework is built and installed.
.DFLTy
.
-.It Sy MKBFD
+.It Sy MKBINUTILS
.YorN
-Indicates whether
+Indicates whether any of the binutils tools or libraries should be built.
+That is, the libraries
.Sy libbfd ,
.Sy libiberty ,
-or any of the things that depend
-upon them (such as the binutils,
+or any of the things that depend upon them, e.g.
.Xr as 1 ,
-.Xr gdb 1 ,
.Xr ld 1 ,
.Xr dbsym 8 ,
or
-.Xr mdsetimage 8 )
-should be built.
+.Xr mdsetimage 8 .
.DFLTy
.
.It Sy MKCATPAGES
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.251 src/share/mk/bsd.README:1.252
--- src/share/mk/bsd.README:1.251 Thu Jun 18 06:36:59 2009
+++ src/share/mk/bsd.README Tue Sep 8 07:08:03 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.251 2009/06/18 06:36:59 mrg Exp $
+# $NetBSD: bsd.README,v 1.252 2009/09/08 07:08:03 skrll Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -117,8 +117,9 @@
with the Automated Testing Framework (ATF).
Default: yes
-MKBFD If "no", don't build libbfd, libiberty, or any of the things
- that depend on them (binutils/gas/ld, gdb, dbsym, mdsetimage).
+MKBFD Obsolete, use MKBINUTILS
+
+MKBINUTILS If "no", don't build binutils (gas, ld, etc and libbfd, libopcodes)
Default: yes
MKCATPAGES If "no", don't build or install the catman pages.
@@ -591,7 +592,7 @@
TOOLCHAIN_MISSING is conditionally assigned the value "yes".
Otherwise, the variable is unconditionally assigned the
value "no".
- If not "no", ${MKBFD}, ${MKGCC}, and ${MKGDB} are
+ If not "no", ${MKBINUTILS}, ${MKGCC}, and ${MKGDB} are
unconditionally assigned the value "no".
EXTERNAL_TOOLCHAIN
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.571 src/share/mk/bsd.own.mk:1.572
--- src/share/mk/bsd.own.mk:1.571 Fri Sep 4 20:19:04 2009
+++ src/share/mk/bsd.own.mk Tue Sep 8 07:08:03 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.571 2009/09/04 20:19:04 macallan Exp $
+# $NetBSD: bsd.own.mk,v 1.572 2009/09/08 07:08:03 skrll Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -476,14 +476,14 @@
# If this platform's toolchain is missing, we obviously cannot build it.
#
.if ${TOOLCHAIN_MISSING} != "no"
-MKBFD:= no
+MKBINUTILS:= no
MKGDB:= no
MKGCC:= no
.endif
#
# If we are using an external toolchain, we can still build the target's
-# BFD stuff, but we cannot build GCC's support libraries, since those are
+# binutils, but we cannot build GCC's support libraries, since those are
# tightly-coupled to the version of GCC being used.
#
.if defined(EXTERNAL_TOOLCHAIN)
@@ -650,11 +650,18 @@
.endif
#
+# MK* backward compatibility.
+#
+.if defined(MKBFD)
+MKBINUTILS?= ${MKBFD}
+.endif
+
+#
# MK* options which default to "yes".
#
.for var in \
MKATF \
- MKBFD MKBINUTILS \
+ MKBINUTILS \
MKCATPAGES MKCRYPTO MKCOMPLEX MKCVS \
MKDOC \
MKGCC MKGCCCMDS MKGDB \
Index: src/tools/gcc/README.mknative
diff -u src/tools/gcc/README.mknative:1.6 src/tools/gcc/README.mknative:1.7
--- src/tools/gcc/README.mknative:1.6 Wed Aug 23 20:52:15 2006
+++ src/tools/gcc/README.mknative Tue Sep 8 07:08:03 2009
@@ -1,4 +1,4 @@
-$NetBSD: README.mknative,v 1.6 2006/08/23 20:52:15 mrg Exp $
+$NetBSD: README.mknative,v 1.7 2009/09/08 07:08:03 skrll Exp $
This file describes how to bootstrap the native toolchain on a new NetBSD
platform (and how to update the new toolchain files, if needed). These
@@ -32,7 +32,7 @@
will regenerate the "proper" libgcc config files.
4. At top level, do
- "nbmake-MACHINE do-distrib-dirs obj includes MKGCC=no MKBFD=no".
+ "nbmake-MACHINE do-distrib-dirs obj includes MKGCC=no MKBINUTILS=no".
5. In src/gnu/lib/libgcc4, do "nbmake-MACHINE obj includes".
