Module Name: src
Committed By: snj
Date: Thu Jun 4 16:33:03 UTC 2015
Modified Files:
src/distrib/sets/lists/base [netbsd-7]: ad.arm
src/distrib/sets/lists/debug [netbsd-7]: ad.arm
src/share/mk [netbsd-7]: bsd.own.mk
Log Message:
Pull up following revision(s) (requested by martin in ticket #823):
share/mk/bsd.own.mk: revisions 1.852, 1.853 via patch
distrib/sets/lists/base/ad.arm: revision 1.75 via patch
distrib/sets/lists/debug/ad.arm: revisions 1.64, 1.65 via patch
Fix setlists and enable MKCOMPAT for OABI on earm platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.54.2.7 -r1.54.2.8 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.42.2.7 -r1.42.2.8 src/distrib/sets/lists/debug/ad.arm
cvs rdiff -u -r1.829.2.7 -r1.829.2.8 src/share/mk/bsd.own.mk
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/base/ad.arm
diff -u src/distrib/sets/lists/base/ad.arm:1.54.2.7 src/distrib/sets/lists/base/ad.arm:1.54.2.8
--- src/distrib/sets/lists/base/ad.arm:1.54.2.7 Thu Apr 30 06:07:31 2015
+++ src/distrib/sets/lists/base/ad.arm Thu Jun 4 16:33:03 2015
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.54.2.7 2015/04/30 06:07:31 riz Exp $
+# $NetBSD: ad.arm,v 1.54.2.8 2015/06/04 16:33:03 snj Exp $
./lib/oabi base-compat-shlib compat
./lib/oabi/npf base-npf-shlib compat
./lib/oabi/npf/ext_log.so base-npf-shlib compat,pic
@@ -10,6 +10,10 @@
./lib/oabi/npf/ext_rndblock.so base-npf-shlib compat,pic
./lib/oabi/npf/ext_rndblock.so.0 base-npf-shlib compat,pic
./lib/oabi/npf/ext_rndblock.so.0.0 base-npf-shlib compat,pic
+./usr/libdata/debug/lib/oabi base-compat-lib compat
+./usr/libdata/debug/lib/oabi/npf base-compat-lib compat
+./usr/libdata/debug/usr/lib/oabi base-compat-lib compat
+./usr/libdata/debug/usr/lib/oabi/i18n base-compat-lib compat
./libexec/ld.elf_so-oabi base-sysutil-bin compat,pic
./sbin/ldconfig base-sysutil-root pic,endian=1234
./usr/bin/fdformat base-util-bin
Index: src/distrib/sets/lists/debug/ad.arm
diff -u src/distrib/sets/lists/debug/ad.arm:1.42.2.7 src/distrib/sets/lists/debug/ad.arm:1.42.2.8
--- src/distrib/sets/lists/debug/ad.arm:1.42.2.7 Thu Apr 30 06:07:32 2015
+++ src/distrib/sets/lists/debug/ad.arm Thu Jun 4 16:33:03 2015
@@ -1,18 +1,158 @@
-# $NetBSD: ad.arm,v 1.42.2.7 2015/04/30 06:07:32 riz Exp $
+# $NetBSD: ad.arm,v 1.42.2.8 2015/06/04 16:33:03 snj Exp $
./usr/lib/libarm_g.a comp-c-debuglib debuglib
./usr/lib/libc_vfp_g.a comp-c-debuglib debuglib,softfloat
./usr/lib/libpmc_g.a comp-c-debuglib debuglib
+./usr/lib/oabi/i18n/libBIG5_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libDECHanyu_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libEUCTW_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libEUC_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libGBK2K_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libHZ_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libISO2022_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libJOHAB_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libMSKanji_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libUES_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libUTF1632_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libUTF7_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libUTF8_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libVIQR_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libZW_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libiconv_none_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libiconv_std_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libmapper_646_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libmapper_none_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libmapper_parallel_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libmapper_serial_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libmapper_std_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/i18n/libmapper_zone_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libamu_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libarchive_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libarm_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libasan_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libasn1_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libatf-c++_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libatf-c_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libbfd_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libbind9_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libblacklist_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libbluetooth_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libbsdmalloc_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libbz2_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libc_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libc_vfp_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libcom_err_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libcompat_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libcrypt_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libcrypto_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libcurses_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libdes_g.a comp-c-debuglib compat,debuglib
./usr/lib/oabi/libdevmapper_g.a comp-c-debuglib compat,debuglib,lvm
./usr/lib/oabi/libdm_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libdns_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libdns_sd_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libdwarf_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libedit_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libelf_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libevent_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libevent_openssl_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libevent_pthreads_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libexecinfo_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libexpat_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libfetch_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libfl_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libform_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libgcc_eh_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libgcc_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libgcc_s_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libgcov_g.a comp-c-debuglib compat,debuglib
./usr/lib/oabi/libgmp_g.a comp-c-debuglib obsolete
+./usr/lib/oabi/libgnumalloc_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libgomp_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libgssapi_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libhdb_g.a comp-c-debuglib compat,debuglib
./usr/lib/oabi/libheimbase_g.a comp-c-debuglib compat,debuglib,kerberos
+./usr/lib/oabi/libheimntlm_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libhx509_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libiberty_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libintl_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libipsec_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libirs_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libisc_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libisccc_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libisccfg_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libiscsi_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libisns_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libkadm5clnt_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libkadm5srv_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libkafs_g.a comp-c-debuglib compat,debuglib
./usr/lib/oabi/libkdc_g.a comp-c-debuglib compat,debuglib,kerberos
+./usr/lib/oabi/libkrb5_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libkvm_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libl_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/liblber_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libldap_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libldap_r_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/liblua_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/liblwres_g.a comp-c-debuglib compat,debuglib
./usr/lib/oabi/liblzf_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/liblzma_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libm_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libmagic_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libmenu_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libmj_g.a comp-c-debuglib compat,debuglib
./usr/lib/oabi/libmpc_g.a comp-c-debuglib obsolete
./usr/lib/oabi/libmpfr_g.a comp-c-debuglib obsolete
+./usr/lib/oabi/libnetpgp_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libnetpgpverify_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libnpf_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libobjc_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libopcodes_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libossaudio_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libp2k_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libpam_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libpcap_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libpci_g.a comp-c-debuglib compat,debuglib
./usr/lib/oabi/libperfuse_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libpmc_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libposix_g.a comp-c-debuglib compat,debuglib
./usr/lib/oabi/libppath_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libprop_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libpthread_dbg_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libpthread_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libpuffs_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libquota_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libradius_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/librefuse_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libresolv_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/librmt_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libroken_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/librpcsvc_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/librt_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/librump_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/librumpclient_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/librumpdev_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/librumphijack_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/librumpnet_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/librumpuser_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/librumpvfs_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libsaslc_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libskey_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libsl_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libsqlite3_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libssh_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libssl_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libstdc++_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libsupc++_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libterminfo_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libtre_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libukfs_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libusbhid_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libutil_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libvers_g.a comp-c-debuglib compat,debuglib
./usr/lib/oabi/libwind_g.a comp-c-debuglib compat,debuglib,kerberos
+./usr/lib/oabi/libwrap_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/liby_g.a comp-c-debuglib compat,debuglib
+./usr/lib/oabi/libz_g.a comp-c-debuglib compat,debuglib
./usr/libdata/debug/lib/libc_vfp.so.0.0.debug comp-sys-debug debug,pic,softfloat
./usr/libdata/debug/lib/oabi -unknown- debug,compat
./usr/libdata/debug/lib/oabi/npf -unknown- debug,compat
@@ -53,8 +193,8 @@
./usr/libdata/debug/usr/lib/oabi/libamu.so.4.0.debug comp-amd-debug debug,compat
./usr/libdata/debug/usr/lib/oabi/libarchive.so.3.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/oabi/libarm.so.0.0.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/oabi/libasn1.so.8.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/oabi/libasan.so.0.0.debug comp-compat-shlib compat,pic,debug,gcc=48
+./usr/libdata/debug/usr/lib/oabi/libasn1.so.8.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/oabi/libasn1.so.9.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/oabi/libatf-c++.so.0.0.debug comp-compat-shlib compat,pic,atf,debug,obsolete
./usr/libdata/debug/usr/lib/oabi/libatf-c++.so.1.0.debug comp-compat-shlib compat,pic,atf,debug
@@ -211,6 +351,7 @@
./usr/libdata/debug/usr/lib/oabi/npf/libext_normalise.so.0.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/lib/oabi/npf/libext_rndblock.so.0.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/libexec/ld.elf_so-oabi comp-obsolete obsolete
+./usr/libdata/debug/usr/libexec/ld.elf_so-oabi.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/sbin/apm.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/apmd.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/eeprom.debug comp-util-debug debug
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.829.2.7 src/share/mk/bsd.own.mk:1.829.2.8
--- src/share/mk/bsd.own.mk:1.829.2.7 Thu May 7 03:48:27 2015
+++ src/share/mk/bsd.own.mk Thu Jun 4 16:33:03 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.829.2.7 2015/05/07 03:48:27 snj Exp $
+# $NetBSD: bsd.own.mk,v 1.829.2.8 2015/06/04 16:33:03 snj Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -872,10 +872,9 @@ MK${var}:= yes
#
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" \
|| ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
- || ${MACHINE_ARCH} == "powerpc64"
+ || ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_CPU} == "aarch64" \
+ || !empty(MACHINE_ARCH:Mearm*)
MKCOMPAT?= yes
-.elif !empty(MACHINE_ARCH:Mearm*) || ${MACHINE_CPU} == "aarch64"
-MKCOMPAT?= no
.else
# Don't let this build where it really isn't supported.
MKCOMPAT:= no
