handle both binutils 2.23 and 2.26

This commit is contained in:
christos 2016-01-31 18:41:35 +00:00
parent f97ac7c8ea
commit 0487dcd8aa
5 changed files with 31 additions and 11 deletions

View File

@ -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, # Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below. # unless otherwise stated below.
@ -187,8 +187,10 @@
./usr/lib/libavl.so base-zfs-shlib compatfile,zfs ./usr/lib/libavl.so base-zfs-shlib compatfile,zfs
./usr/lib/libavl.so.0 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/libavl.so.0.0 base-zfs-shlib compatfile,zfs
./usr/lib/libbfd.so.13 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 ./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 base-bind-shlib compatfile
./usr/lib/libbind9.so.8 base-bind-shlib compatfile ./usr/lib/libbind9.so.8 base-bind-shlib compatfile
./usr/lib/libbind9.so.8.4 base-bind-shlib compatfile ./usr/lib/libbind9.so.8.4 base-bind-shlib compatfile

View File

@ -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 comp-c-include
./usr/include/amd64/ansi.h 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.xn comp-util-bin binutils
./usr/libdata/ldscripts/i386nbsd.xr 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/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/libdata/lint/llib-lx86_64.ln comp-c-lintlib lint
./usr/share/ldscripts/elf_i386.x comp-obsolete obsolete ./usr/share/ldscripts/elf_i386.x comp-obsolete obsolete
./usr/share/ldscripts/elf_i386.xbn comp-obsolete obsolete ./usr/share/ldscripts/elf_i386.xbn comp-obsolete obsolete

View File

@ -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. # 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/libntp_pic.a comp-obsolete obsolete
./usr/lib/libnvpair_pic.a comp-zfs-piclib compatfile,picinstall,zfs ./usr/lib/libnvpair_pic.a comp-zfs-piclib compatfile,picinstall,zfs
./usr/lib/libobjc_pic.a comp-objc-piclib compatfile,picinstall,gcccmds ./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 comp-c-shlib compatfile,binutils=223
./usr/lib/libopcodes.so.6.0 comp-c-shlib compatfile,binutils ./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/libopenpgpsdk_pic.a comp-obsolete obsolete
./usr/lib/libossaudio_pic.a comp-c-piclib compatfile,picinstall ./usr/lib/libossaudio_pic.a comp-c-piclib compatfile,picinstall
./usr/lib/libp2k_pic.a comp-puffs-piclib compatfile,picinstall,rump ./usr/lib/libp2k_pic.a comp-puffs-piclib compatfile,picinstall,rump

View File

@ -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 base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot ./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 ./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.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/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/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/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/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 ./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/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/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/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/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/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 ./usr/libdata/debug/usr/lib/libpam.so.4.0.debug comp-sys-debug debug,compatfile,pam

View File

@ -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= \ MKEXTRAVARS= \
MACHINE \ MACHINE \
@ -6,6 +6,7 @@ MKEXTRAVARS= \
MACHINE_CPU \ MACHINE_CPU \
HAVE_GCC \ HAVE_GCC \
HAVE_GDB \ HAVE_GDB \
HAVE_BINUTILS \
HAVE_LIBGCC_EH \ HAVE_LIBGCC_EH \
HAVE_SSP \ HAVE_SSP \
OBJECT_FMT \ OBJECT_FMT \