Module Name: src
Committed By: christos
Date: Sun Jan 31 18:41:36 UTC 2016
Modified Files:
src/distrib/sets: mkvars.mk
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/comp: md.amd64 shl.mi
src/distrib/sets/lists/debug: shl.mi
Log Message:
handle both binutils 2.23 and 2.26
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.760 -r1.761 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.233 -r1.234 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.284 -r1.285 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.122 -r1.123 src/distrib/sets/lists/debug/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.24 src/distrib/sets/mkvars.mk:1.25
--- src/distrib/sets/mkvars.mk:1.24 Thu Jul 23 04:03:25 2015
+++ src/distrib/sets/mkvars.mk Sun Jan 31 13:41:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.24 2015/07/23 08:03:25 mrg Exp $
+# $NetBSD: mkvars.mk,v 1.25 2016/01/31 18:41:35 christos Exp $
MKEXTRAVARS= \
MACHINE \
@@ -6,6 +6,7 @@ MKEXTRAVARS= \
MACHINE_CPU \
HAVE_GCC \
HAVE_GDB \
+ HAVE_BINUTILS \
HAVE_LIBGCC_EH \
HAVE_SSP \
OBJECT_FMT \
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.760 src/distrib/sets/lists/base/shl.mi:1.761
--- src/distrib/sets/lists/base/shl.mi:1.760 Tue Jan 19 21:20:41 2016
+++ src/distrib/sets/lists/base/shl.mi Sun Jan 31 13:41:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.760 2016/01/20 02:20:41 christos Exp $
+# $NetBSD: shl.mi,v 1.761 2016/01/31 18:41:35 christos Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -187,8 +187,10 @@
./usr/lib/libavl.so base-zfs-shlib compatfile,zfs
./usr/lib/libavl.so.0 base-zfs-shlib compatfile,zfs
./usr/lib/libavl.so.0.0 base-zfs-shlib compatfile,zfs
-./usr/lib/libbfd.so.13 base-sys-shlib compatfile,binutils
-./usr/lib/libbfd.so.13.0 base-sys-shlib compatfile,binutils
+./usr/lib/libbfd.so.13 base-sys-shlib compatfile,binutils=223
+./usr/lib/libbfd.so.13.0 base-sys-shlib compatfile,binutils=223
+./usr/lib/libbfd.so.14 base-sys-shlib compatfile,binutils=226
+./usr/lib/libbfd.so.14.0 base-sys-shlib compatfile,binutils=226
./usr/lib/libbind9.so base-bind-shlib compatfile
./usr/lib/libbind9.so.8 base-bind-shlib compatfile
./usr/lib/libbind9.so.8.4 base-bind-shlib compatfile
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.233 src/distrib/sets/lists/comp/md.amd64:1.234
--- src/distrib/sets/lists/comp/md.amd64:1.233 Sun Aug 9 23:21:44 2015
+++ src/distrib/sets/lists/comp/md.amd64 Sun Jan 31 13:41:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.233 2015/08/10 03:21:44 mrg Exp $
+# $NetBSD: md.amd64,v 1.234 2016/01/31 18:41:36 christos Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
@@ -475,6 +475,19 @@
./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/ldscripts/elf_iamcu.x comp-util-bin binutils=226
+./usr/libdata/ldscripts/elf_iamcu.xbn comp-util-bin binutils=226
+./usr/libdata/ldscripts/elf_iamcu.xc comp-util-bin binutils=226
+./usr/libdata/ldscripts/elf_iamcu.xd comp-util-bin binutils=226
+./usr/libdata/ldscripts/elf_iamcu.xdc comp-util-bin binutils=226
+./usr/libdata/ldscripts/elf_iamcu.xdw comp-util-bin binutils=226
+./usr/libdata/ldscripts/elf_iamcu.xn comp-util-bin binutils=226
+./usr/libdata/ldscripts/elf_iamcu.xr comp-util-bin binutils=226
+./usr/libdata/ldscripts/elf_iamcu.xs comp-util-bin binutils=226
+./usr/libdata/ldscripts/elf_iamcu.xsc comp-util-bin binutils=226
+./usr/libdata/ldscripts/elf_iamcu.xsw comp-util-bin binutils=226
+./usr/libdata/ldscripts/elf_iamcu.xu comp-util-bin binutils=226
+./usr/libdata/ldscripts/elf_iamcu.xw comp-util-bin binutils=226
./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/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.284 src/distrib/sets/lists/comp/shl.mi:1.285
--- src/distrib/sets/lists/comp/shl.mi:1.284 Sat Jan 23 10:01:31 2016
+++ src/distrib/sets/lists/comp/shl.mi Sun Jan 31 13:41:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.284 2016/01/23 15:01:31 christos Exp $
+# $NetBSD: shl.mi,v 1.285 2016/01/31 18:41:36 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -113,8 +113,10 @@
./usr/lib/libntp_pic.a comp-obsolete obsolete
./usr/lib/libnvpair_pic.a comp-zfs-piclib compatfile,picinstall,zfs
./usr/lib/libobjc_pic.a comp-objc-piclib compatfile,picinstall,gcccmds
-./usr/lib/libopcodes.so.6 comp-c-shlib compatfile,binutils
-./usr/lib/libopcodes.so.6.0 comp-c-shlib compatfile,binutils
+./usr/lib/libopcodes.so.6 comp-c-shlib compatfile,binutils=223
+./usr/lib/libopcodes.so.6.0 comp-c-shlib compatfile,binutils=223
+./usr/lib/libopcodes.so.7 comp-c-shlib compatfile,binutils=226
+./usr/lib/libopcodes.so.7.0 comp-c-shlib compatfile,binutils=226
./usr/lib/libopenpgpsdk_pic.a comp-obsolete obsolete
./usr/lib/libossaudio_pic.a comp-c-piclib compatfile,picinstall
./usr/lib/libp2k_pic.a comp-puffs-piclib compatfile,picinstall,rump
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.122 src/distrib/sets/lists/debug/shl.mi:1.123
--- src/distrib/sets/lists/debug/shl.mi:1.122 Tue Jan 19 21:20:41 2016
+++ src/distrib/sets/lists/debug/shl.mi Sun Jan 31 13:41:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.122 2016/01/20 02:20:41 christos Exp $
+# $NetBSD: shl.mi,v 1.123 2016/01/31 18:41:36 christos Exp $
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libc.so.12.200.debug comp-sys-debug debug,dynamicroot
@@ -60,7 +60,8 @@
./usr/libdata/debug/usr/lib/libatf-c++.so.1.0.debug comp-atf-debug debug,compatfile,atf
./usr/libdata/debug/usr/lib/libatf-c.so.0.0.debug comp-atf-debug debug,compatfile,atf
./usr/libdata/debug/usr/lib/libavl.so.0.0.debug comp-zfs-debug debug,compatfile,zfs
-./usr/libdata/debug/usr/lib/libbfd.so.13.0.debug comp-sys-debug debug,compatfile,binutils
+./usr/libdata/debug/usr/lib/libbfd.so.14.0.debug comp-sys-debug debug,compatfile,binutils=226
+./usr/libdata/debug/usr/lib/libbfd.so.13.0.debug comp-sys-debug debug,compatfile,binutils=223
./usr/libdata/debug/usr/lib/libbind9.so.8.4.debug comp-bind-debug debug,compatfile
./usr/libdata/debug/usr/lib/libblacklist.so.0.0.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/libbluetooth.so.4.2.debug comp-sys-debug debug,compatfile
@@ -142,7 +143,8 @@
./usr/libdata/debug/usr/lib/libnpf.so.0.0.debug comp-npf-debug debug,compatfile,npf
./usr/libdata/debug/usr/lib/libnvpair.so.0.0.debug comp-zfs-debug debug,compatfile,zfs
./usr/libdata/debug/usr/lib/libobjc.so.4.0.debug comp-sys-debug debug,compatfile,gcc
-./usr/libdata/debug/usr/lib/libopcodes.so.6.0.debug comp-c-debug debug,compatfile,binutils
+./usr/libdata/debug/usr/lib/libopcodes.so.6.0.debug comp-c-debug debug,compatfile,binutils=223
+./usr/libdata/debug/usr/lib/libopcodes.so.7.0.debug comp-c-debug debug,compatfile,binutils=226
./usr/libdata/debug/usr/lib/libossaudio.so.1.1.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/libp2k.so.2.0.debug comp-puffs-debug debug,compatfile,rump
./usr/libdata/debug/usr/lib/libpam.so.4.0.debug comp-sys-debug debug,compatfile,pam
