CVS commit: [netbsd-6-0] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Aug 30 05:50:52 UTC 2017

Modified Files:
src/doc [netbsd-6-0]: 3RDPARTY
src/external/bsd/wpa/bin [netbsd-6-0]: Makefile.inc
src/external/bsd/wpa/bin/hostapd [netbsd-6-0]: Makefile aes-xinternal.c
hostapd.8 hostapd.conf.5
src/external/bsd/wpa/bin/hostapd_cli [netbsd-6-0]: Makefile
hostapd_cli.8
src/external/bsd/wpa/bin/wpa_cli [netbsd-6-0]: Makefile wpa_cli.8
src/external/bsd/wpa/bin/wpa_passphrase [netbsd-6-0]: Makefile
wpa_passphrase.8
src/external/bsd/wpa/bin/wpa_supplicant [netbsd-6-0]: Makefile
aes-xinternal.c wpa_supplicant.8 wpa_supplicant.conf.5
src/external/bsd/wpa/dist [netbsd-6-0]: COPYING README
src/external/bsd/wpa/dist/hostapd [netbsd-6-0]: ChangeLog Makefile
README README-WPS config_file.c config_file.h ctrl_iface.c
ctrl_iface.h defconfig eap_register.c eap_register.h hlr_auc_gw.c
hlr_auc_gw.milenage_db hostapd.8 hostapd.conf hostapd.eap_user
hostapd_cli.c main.c nt_password_hash.c
src/external/bsd/wpa/dist/src [netbsd-6-0]: Makefile lib.rules
src/external/bsd/wpa/dist/src/ap [netbsd-6-0]: Makefile accounting.c
accounting.h ap_config.c ap_config.h ap_drv_ops.c ap_drv_ops.h
ap_list.c ap_list.h ap_mlme.c ap_mlme.h authsrv.c authsrv.h
beacon.c beacon.h ctrl_iface_ap.c ctrl_iface_ap.h drv_callbacks.c
hostapd.c hostapd.h hw_features.c hw_features.h iapp.c iapp.h
ieee802_11.c ieee802_11.h ieee802_11_auth.c ieee802_11_auth.h
ieee802_11_ht.c ieee802_1x.c ieee802_1x.h peerkey_auth.c
pmksa_cache_auth.c pmksa_cache_auth.h preauth_auth.c preauth_auth.h
sta_info.c sta_info.h tkip_countermeasures.c tkip_countermeasures.h
utils.c vlan_init.c vlan_init.h wmm.c wmm.h wpa_auth.c wpa_auth.h
wpa_auth_ft.c wpa_auth_glue.c wpa_auth_glue.h wpa_auth_i.h
wpa_auth_ie.c wpa_auth_ie.h wps_hostapd.c wps_hostapd.h
src/external/bsd/wpa/dist/src/common [netbsd-6-0]: Makefile defs.h
eapol_common.h ieee802_11_common.c ieee802_11_common.h
ieee802_11_defs.h privsep_commands.h version.h wpa_common.c
wpa_common.h wpa_ctrl.c wpa_ctrl.h
src/external/bsd/wpa/dist/src/crypto [netbsd-6-0]: Makefile aes-cbc.c
aes-ctr.c aes-eax.c aes-encblock.c aes-internal-dec.c
aes-internal-enc.c aes-internal.c aes-omac1.c aes-unwrap.c
aes-wrap.c aes.h aes_i.h aes_wrap.h crypto.h crypto_gnutls.c
crypto_internal-cipher.c crypto_internal-modexp.c
crypto_internal-rsa.c crypto_internal.c crypto_libtomcrypt.c
crypto_none.c crypto_openssl.c des-internal.c des_i.h dh_group5.c
dh_group5.h dh_groups.c dh_groups.h fips_prf_internal.c
fips_prf_openssl.c md4-internal.c md5-internal.c md5.c md5.h
md5_i.h milenage.c milenage.h ms_funcs.c ms_funcs.h rc4.c
sha1-internal.c sha1-pbkdf2.c sha1-tlsprf.c sha1-tprf.c sha1.c
sha1.h sha1_i.h sha256-internal.c sha256.c sha256.h tls.h
tls_gnutls.c tls_internal.c tls_none.c tls_openssl.c
src/external/bsd/wpa/dist/src/drivers [netbsd-6-0]: Makefile driver.h
driver_atheros.c driver_bsd.c driver_hostap.c driver_hostap.h
driver_ndis.c driver_ndis.h driver_ndis_.c driver_nl80211.c
driver_none.c driver_privsep.c driver_roboswitch.c driver_wext.c
driver_wext.h driver_wired.c drivers.c drivers.mak linux_ioctl.c
linux_ioctl.h ndis_events.c netlink.c netlink.h nl80211_copy.h
priv_netlink.h
src/external/bsd/wpa/dist/src/eap_common [netbsd-6-0]: Makefile chap.c
chap.h eap_common.c eap_common.h eap_defs.h eap_fast_common.c
eap_fast_common.h eap_gpsk_common.c eap_gpsk_common.h
eap_ikev2_common.c eap_ikev2_common.h eap_pax_common.c
eap_pax_common.h eap_peap_common.c eap_peap_common.h
eap_psk_common.c eap_psk_common.h eap_sake_common.c
eap_sake_common.h eap_sim_common.c eap_sim_common.h
eap_tlv_common.h eap_ttls.h eap_wsc_common.c eap_wsc_common.h
ikev2_common.c ikev2_common.h
src/external/bsd/wpa/dist/src/eap_peer [netbsd-6-0]: Makefile eap.c
eap.h eap_aka.c eap_config.h eap_fast.c eap_fast_pac.c
eap_fast_pac.h eap_gpsk.c eap_gtc.c eap_i.h eap_ikev2.c eap_leap.c
eap_md5.c eap_methods.c eap_methods.h eap_mschapv2.c eap_otp.c
eap_pax.c eap_peap.c eap_psk.c eap_sake.c eap_sim.c eap_tls.c
eap_tls_common.c eap_tls_common.h eap_tnc.c eap_ttls.c
eap_vendor_test.c eap_wsc.c ikev2.c ikev2.h mschapv2.c mschapv2.h
tncc.c tncc.h
src/external/bsd/wpa/dist/src/eap_server [netbsd-6-0]: Makefile eap.h

CVS commit: [netbsd-6-1] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Aug 30 05:49:13 UTC 2017

Modified Files:
src/doc [netbsd-6-1]: 3RDPARTY
src/external/bsd/wpa/bin [netbsd-6-1]: Makefile.inc
src/external/bsd/wpa/bin/hostapd [netbsd-6-1]: Makefile aes-xinternal.c
hostapd.8 hostapd.conf.5
src/external/bsd/wpa/bin/hostapd_cli [netbsd-6-1]: Makefile
hostapd_cli.8
src/external/bsd/wpa/bin/wpa_cli [netbsd-6-1]: Makefile wpa_cli.8
src/external/bsd/wpa/bin/wpa_passphrase [netbsd-6-1]: Makefile
wpa_passphrase.8
src/external/bsd/wpa/bin/wpa_supplicant [netbsd-6-1]: Makefile
aes-xinternal.c wpa_supplicant.8 wpa_supplicant.conf.5
src/external/bsd/wpa/dist [netbsd-6-1]: COPYING README
src/external/bsd/wpa/dist/hostapd [netbsd-6-1]: ChangeLog Makefile
README README-WPS config_file.c config_file.h ctrl_iface.c
ctrl_iface.h defconfig eap_register.c eap_register.h hlr_auc_gw.c
hlr_auc_gw.milenage_db hostapd.8 hostapd.conf hostapd.eap_user
hostapd_cli.c main.c nt_password_hash.c
src/external/bsd/wpa/dist/src [netbsd-6-1]: Makefile lib.rules
src/external/bsd/wpa/dist/src/ap [netbsd-6-1]: Makefile accounting.c
accounting.h ap_config.c ap_config.h ap_drv_ops.c ap_drv_ops.h
ap_list.c ap_list.h ap_mlme.c ap_mlme.h authsrv.c authsrv.h
beacon.c beacon.h ctrl_iface_ap.c ctrl_iface_ap.h drv_callbacks.c
hostapd.c hostapd.h hw_features.c hw_features.h iapp.c iapp.h
ieee802_11.c ieee802_11.h ieee802_11_auth.c ieee802_11_auth.h
ieee802_11_ht.c ieee802_1x.c ieee802_1x.h peerkey_auth.c
pmksa_cache_auth.c pmksa_cache_auth.h preauth_auth.c preauth_auth.h
sta_info.c sta_info.h tkip_countermeasures.c tkip_countermeasures.h
utils.c vlan_init.c vlan_init.h wmm.c wmm.h wpa_auth.c wpa_auth.h
wpa_auth_ft.c wpa_auth_glue.c wpa_auth_glue.h wpa_auth_i.h
wpa_auth_ie.c wpa_auth_ie.h wps_hostapd.c wps_hostapd.h
src/external/bsd/wpa/dist/src/common [netbsd-6-1]: Makefile defs.h
eapol_common.h ieee802_11_common.c ieee802_11_common.h
ieee802_11_defs.h privsep_commands.h version.h wpa_common.c
wpa_common.h wpa_ctrl.c wpa_ctrl.h
src/external/bsd/wpa/dist/src/crypto [netbsd-6-1]: Makefile aes-cbc.c
aes-ctr.c aes-eax.c aes-encblock.c aes-internal-dec.c
aes-internal-enc.c aes-internal.c aes-omac1.c aes-unwrap.c
aes-wrap.c aes.h aes_i.h aes_wrap.h crypto.h crypto_gnutls.c
crypto_internal-cipher.c crypto_internal-modexp.c
crypto_internal-rsa.c crypto_internal.c crypto_libtomcrypt.c
crypto_none.c crypto_openssl.c des-internal.c des_i.h dh_group5.c
dh_group5.h dh_groups.c dh_groups.h fips_prf_internal.c
fips_prf_openssl.c md4-internal.c md5-internal.c md5.c md5.h
md5_i.h milenage.c milenage.h ms_funcs.c ms_funcs.h rc4.c
sha1-internal.c sha1-pbkdf2.c sha1-tlsprf.c sha1-tprf.c sha1.c
sha1.h sha1_i.h sha256-internal.c sha256.c sha256.h tls.h
tls_gnutls.c tls_internal.c tls_none.c tls_openssl.c
src/external/bsd/wpa/dist/src/drivers [netbsd-6-1]: Makefile driver.h
driver_atheros.c driver_bsd.c driver_hostap.c driver_hostap.h
driver_ndis.c driver_ndis.h driver_ndis_.c driver_nl80211.c
driver_none.c driver_privsep.c driver_roboswitch.c driver_wext.c
driver_wext.h driver_wired.c drivers.c drivers.mak linux_ioctl.c
linux_ioctl.h ndis_events.c netlink.c netlink.h nl80211_copy.h
priv_netlink.h
src/external/bsd/wpa/dist/src/eap_common [netbsd-6-1]: Makefile chap.c
chap.h eap_common.c eap_common.h eap_defs.h eap_fast_common.c
eap_fast_common.h eap_gpsk_common.c eap_gpsk_common.h
eap_ikev2_common.c eap_ikev2_common.h eap_pax_common.c
eap_pax_common.h eap_peap_common.c eap_peap_common.h
eap_psk_common.c eap_psk_common.h eap_sake_common.c
eap_sake_common.h eap_sim_common.c eap_sim_common.h
eap_tlv_common.h eap_ttls.h eap_wsc_common.c eap_wsc_common.h
ikev2_common.c ikev2_common.h
src/external/bsd/wpa/dist/src/eap_peer [netbsd-6-1]: Makefile eap.c
eap.h eap_aka.c eap_config.h eap_fast.c eap_fast_pac.c
eap_fast_pac.h eap_gpsk.c eap_gtc.c eap_i.h eap_ikev2.c eap_leap.c
eap_md5.c eap_methods.c eap_methods.h eap_mschapv2.c eap_otp.c
eap_pax.c eap_peap.c eap_psk.c eap_sake.c eap_sim.c eap_tls.c
eap_tls_common.c eap_tls_common.h eap_tnc.c eap_ttls.c
eap_vendor_test.c eap_wsc.c ikev2.c ikev2.h mschapv2.c mschapv2.h
tncc.c tncc.h
src/external/bsd/wpa/dist/src/eap_server [netbsd-6-1]: Makefile eap.h

CVS commit: [netbsd-6] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Aug 30 05:48:19 UTC 2017

Modified Files:
src/doc [netbsd-6]: 3RDPARTY
src/external/bsd/wpa/bin [netbsd-6]: Makefile.inc
src/external/bsd/wpa/bin/hostapd [netbsd-6]: Makefile aes-xinternal.c
hostapd.8 hostapd.conf.5
src/external/bsd/wpa/bin/hostapd_cli [netbsd-6]: Makefile hostapd_cli.8
src/external/bsd/wpa/bin/wpa_cli [netbsd-6]: Makefile wpa_cli.8
src/external/bsd/wpa/bin/wpa_passphrase [netbsd-6]: Makefile
wpa_passphrase.8
src/external/bsd/wpa/bin/wpa_supplicant [netbsd-6]: Makefile
aes-xinternal.c wpa_supplicant.8 wpa_supplicant.conf.5
src/external/bsd/wpa/dist [netbsd-6]: COPYING README
src/external/bsd/wpa/dist/hostapd [netbsd-6]: ChangeLog Makefile README
README-WPS config_file.c config_file.h ctrl_iface.c ctrl_iface.h
defconfig eap_register.c eap_register.h hlr_auc_gw.c
hlr_auc_gw.milenage_db hostapd.8 hostapd.conf hostapd.eap_user
hostapd_cli.c main.c nt_password_hash.c
src/external/bsd/wpa/dist/src [netbsd-6]: Makefile lib.rules
src/external/bsd/wpa/dist/src/ap [netbsd-6]: Makefile accounting.c
accounting.h ap_config.c ap_config.h ap_drv_ops.c ap_drv_ops.h
ap_list.c ap_list.h ap_mlme.c ap_mlme.h authsrv.c authsrv.h
beacon.c beacon.h ctrl_iface_ap.c ctrl_iface_ap.h drv_callbacks.c
hostapd.c hostapd.h hw_features.c hw_features.h iapp.c iapp.h
ieee802_11.c ieee802_11.h ieee802_11_auth.c ieee802_11_auth.h
ieee802_11_ht.c ieee802_1x.c ieee802_1x.h peerkey_auth.c
pmksa_cache_auth.c pmksa_cache_auth.h preauth_auth.c preauth_auth.h
sta_info.c sta_info.h tkip_countermeasures.c tkip_countermeasures.h
utils.c vlan_init.c vlan_init.h wmm.c wmm.h wpa_auth.c wpa_auth.h
wpa_auth_ft.c wpa_auth_glue.c wpa_auth_glue.h wpa_auth_i.h
wpa_auth_ie.c wpa_auth_ie.h wps_hostapd.c wps_hostapd.h
src/external/bsd/wpa/dist/src/common [netbsd-6]: Makefile defs.h
eapol_common.h ieee802_11_common.c ieee802_11_common.h
ieee802_11_defs.h privsep_commands.h version.h wpa_common.c
wpa_common.h wpa_ctrl.c wpa_ctrl.h
src/external/bsd/wpa/dist/src/crypto [netbsd-6]: Makefile aes-cbc.c
aes-ctr.c aes-eax.c aes-encblock.c aes-internal-dec.c
aes-internal-enc.c aes-internal.c aes-omac1.c aes-unwrap.c
aes-wrap.c aes.h aes_i.h aes_wrap.h crypto.h crypto_gnutls.c
crypto_internal-cipher.c crypto_internal-modexp.c
crypto_internal-rsa.c crypto_internal.c crypto_libtomcrypt.c
crypto_none.c crypto_openssl.c des-internal.c des_i.h dh_group5.c
dh_group5.h dh_groups.c dh_groups.h fips_prf_internal.c
fips_prf_openssl.c md4-internal.c md5-internal.c md5.c md5.h
md5_i.h milenage.c milenage.h ms_funcs.c ms_funcs.h rc4.c
sha1-internal.c sha1-pbkdf2.c sha1-tlsprf.c sha1-tprf.c sha1.c
sha1.h sha1_i.h sha256-internal.c sha256.c sha256.h tls.h
tls_gnutls.c tls_internal.c tls_none.c tls_openssl.c
src/external/bsd/wpa/dist/src/drivers [netbsd-6]: Makefile driver.h
driver_atheros.c driver_bsd.c driver_hostap.c driver_hostap.h
driver_ndis.c driver_ndis.h driver_ndis_.c driver_nl80211.c
driver_none.c driver_privsep.c driver_roboswitch.c driver_wext.c
driver_wext.h driver_wired.c drivers.c drivers.mak linux_ioctl.c
linux_ioctl.h ndis_events.c netlink.c netlink.h nl80211_copy.h
priv_netlink.h
src/external/bsd/wpa/dist/src/eap_common [netbsd-6]: Makefile chap.c
chap.h eap_common.c eap_common.h eap_defs.h eap_fast_common.c
eap_fast_common.h eap_gpsk_common.c eap_gpsk_common.h
eap_ikev2_common.c eap_ikev2_common.h eap_pax_common.c
eap_pax_common.h eap_peap_common.c eap_peap_common.h
eap_psk_common.c eap_psk_common.h eap_sake_common.c
eap_sake_common.h eap_sim_common.c eap_sim_common.h
eap_tlv_common.h eap_ttls.h eap_wsc_common.c eap_wsc_common.h
ikev2_common.c ikev2_common.h
src/external/bsd/wpa/dist/src/eap_peer [netbsd-6]: Makefile eap.c eap.h
eap_aka.c eap_config.h eap_fast.c eap_fast_pac.c eap_fast_pac.h
eap_gpsk.c eap_gtc.c eap_i.h eap_ikev2.c eap_leap.c eap_md5.c
eap_methods.c eap_methods.h eap_mschapv2.c eap_otp.c eap_pax.c
eap_peap.c eap_psk.c eap_sake.c eap_sim.c eap_tls.c
eap_tls_common.c eap_tls_common.h eap_tnc.c eap_ttls.c
eap_vendor_test.c eap_wsc.c ikev2.c ikev2.h mschapv2.c mschapv2.h
tncc.c tncc.h
src/external/bsd/wpa/dist/src/eap_server [netbsd-6]: Makefile eap.h
eap_i.h eap_methods.h eap_server.c 

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Aug 30 05:47:24 UTC 2017

Modified Files:
src/share/man/man4: veriexec.4

Log Message:
Make all headers bold.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/share/man/man4/veriexec.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/veriexec.4
diff -u src/share/man/man4/veriexec.4:1.24 src/share/man/man4/veriexec.4:1.25
--- src/share/man/man4/veriexec.4:1.24	Tue Aug 29 23:38:50 2017
+++ src/share/man/man4/veriexec.4	Wed Aug 30 05:47:24 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: veriexec.4,v 1.24 2017/08/29 23:38:50 pgoyette Exp $
+.\" $NetBSD: veriexec.4,v 1.25 2017/08/30 05:47:24 wiz Exp $
 .\"
 .\" Copyright 2005 Elad Efrat 
 .\" Copyright 2005 Brett Lymn 
@@ -60,7 +60,7 @@ Load an entry for a file to be monitored
 .Pp
 The dictionary passed contains the following elements:
 .Bl -column keepxfilename string
-.It Sy Name	Type	Purpose
+.It Sy Name Ta Sy Type Ta Sy Purpose
 .It file	string	filename for this entry
 .It entry-type	uint8	entry type ( see below )
 .It fp-type	string	fingerprint hashing algorithm
@@ -71,7 +71,7 @@ The dictionary passed contains the follo
 .Dq entry-type
 can be one or more (binary-OR'd) of the following:
 .Bl -column veriexecxuntrusted effect
-.It Sy Type	Effect
+.It Sy Type Ta Sy Effect
 .It Dv VERIEXEC_DIRECT	can execute directly
 .It Dv VERIEXEC_INDIRECT	can execute indirectly (interpreter, Xr mmap 2 )
 .It Dv VERIEXEC_FILE	can be opened
@@ -83,7 +83,7 @@ Removes either an entry for a single fil
 .Pp
 The dictionary passed contains the following elements:
 .Bl -column file string
-.It Sy Name	Type	Purpose
+.It Sy Name Ta Sy Type Ta Sy Purpose
 .It file	string	filename or mount-point
 .El
 .It Dv VERIEXEC_DUMP
@@ -94,7 +94,7 @@ monitored files database from the kernel
 Only files for which the filename was kept will be dumped.
 The returned array contains dictionaries with the following elements:
 .Bl -column entryxtype string
-.It Sy Name	Type	Purpose
+.It Sy Name Ta Sy Type Ta Sy Purpose
 .It file	string	filename
 .It fp-type	string	fingerprint hashing algorithm
 .It fp	data	the fingerprint
@@ -113,13 +113,13 @@ about a file, returning information that
 .Pp
 The dictionary passed contains the following elements:
 .Bl -column file string
-.It Sy Name	Type	Purpose
+.It Sy Name Ta Sy Type Ta Sy Purpose
 .It file	string	filename
 .El
 .Pp
 The dictionary returned contains the following elements:
 .Bl -column entryxtype string
-.It Sy Name	Type	Purpose
+.It Sy Name Ta Sy Type Ta Sy Purpose
 .It entry-type	uint8	entry type ( see above )
 .It status	uint8	entry status
 .It fp-type	string	fingerprint hashing algorithm
@@ -129,7 +129,7 @@ The dictionary returned contains the fol
 .Dq status
 can be one of the following:
 .Bl -column fingerprintxmismatch effect
-.It Sy Status	Meaning
+.It Sy Status Ta Sy Meaning
 .It Dv FINGERPRINT_NOTEVAL	not evaluated
 .It Dv FINGERPRINT_VALID	fingerprint match
 .It Dv FINGERPRINT_MISMATCH	fingerprint mismatch

CVS commit: src/sys/dev/pci/ixgbe

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Aug 30 01:25:07 UTC 2017

Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c

Log Message:
 Don't limit number of queue pair to 8. Take max TX queues and max RX queues
into account. 82598 has 32 TX queue and 64 RX queues. Others has 128 TX queues
and 128 RX queues. Number of MSI-X table entries is 64, so the max queue pairs
is 63 (64 minus the Others (e.g. link status change)).


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/dev/pci/ixgbe/ixgbe.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.96 src/sys/dev/pci/ixgbe/ixgbe.c:1.97
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.96	Thu Aug 24 10:43:42 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Wed Aug 30 01:25:07 2017
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/if_ix.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixgbe.c,v 1.96 2017/08/24 10:43:42 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.97 2017/08/30 01:25:07 msaitoh Exp $*/
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -2960,6 +2960,7 @@ static int
 ixgbe_setup_msix(struct adapter *adapter)
 {
 	device_t dev = adapter->dev;
+	struct ixgbe_mac_info *mac = >hw.mac;
 	int want, queues, msgs;
 
 	/* Override by tuneable */
@@ -2986,8 +2987,9 @@ ixgbe_setup_msix(struct adapter *adapter
 	if (ixgbe_num_queues != 0)
 		queues = ixgbe_num_queues;
 	/* Set max queues to 8 when autoconfiguring */
-	else if ((ixgbe_num_queues == 0) && (queues > 8))
-		queues = 8;
+	else
+		queues = min(queues,
+		min(mac->max_tx_queues, mac->max_rx_queues));
 
 	/* reflect correct sysctl value */
 	ixgbe_num_queues = queues;

CVS commit: src/sys/dev/i2c

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Aug 30 00:40:09 UTC 2017

Modified Files:
src/sys/dev/i2c: tcakp.c

Log Message:
Use linux_keymap instead of pckbd keymap


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/tcakp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/i2c/tcakp.c
diff -u src/sys/dev/i2c/tcakp.c:1.2 src/sys/dev/i2c/tcakp.c:1.3
--- src/sys/dev/i2c/tcakp.c:1.2	Sat Aug 26 22:31:02 2017
+++ src/sys/dev/i2c/tcakp.c	Wed Aug 30 00:40:09 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tcakp.c,v 1.2 2017/08/26 22:31:02 jmcneill Exp $ */
+/* $NetBSD: tcakp.c,v 1.3 2017/08/30 00:40:09 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -29,7 +29,7 @@
 #include "opt_fdt.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tcakp.c,v 1.2 2017/08/26 22:31:02 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcakp.c,v 1.3 2017/08/30 00:40:09 jmcneill Exp $");
 
 #include 
 #include 
@@ -46,9 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: tcakp.c,v 1.
 #include 
 #include 
 #include 
-
-/* XXX keymap */
-#include 
+#include 
 
 #ifdef FDT
 #include 
@@ -317,7 +315,7 @@ static const struct wskbd_consops tcakp_
 #endif
 
 static const struct wskbd_mapdata tcakp_keymapdata = {
-	pckbd_keydesctab,
+	linux_keymap_keydesctab,
 	KB_US,
 };
 

CVS commit: src/sys/dev/wscons

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Aug 30 00:39:27 UTC 2017

Modified Files:
src/sys/dev/wscons: files.wscons
Added Files:
src/sys/dev/wscons: linux_keymap.c linux_keymap.h

Log Message:
Add a keymap for converting Linux event codes to wscons keysyms.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/wscons/files.wscons
cvs rdiff -u -r0 -r1.1 src/sys/dev/wscons/linux_keymap.c \
src/sys/dev/wscons/linux_keymap.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/wscons/files.wscons
diff -u src/sys/dev/wscons/files.wscons:1.53 src/sys/dev/wscons/files.wscons:1.54
--- src/sys/dev/wscons/files.wscons:1.53	Sun Jun 18 05:57:58 2017
+++ src/sys/dev/wscons/files.wscons	Wed Aug 30 00:39:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.wscons,v 1.53 2017/06/18 05:57:58 pgoyette Exp $
+# $NetBSD: files.wscons,v 1.54 2017/08/30 00:39:27 jmcneill Exp $
 
 #
 # "Workstation Console" glue; attaches frame buffer to emulator & keyboard,
@@ -86,3 +86,6 @@ defflag	opt_vcons.h		VCONS_DRAW_INTR VCO
 define	glyphcache
 file	dev/wscons/wsdisplay_glyphcache.c	glyphcache
 defflag	opt_glyphcache.h GLYPHCACHE_DEBUG
+
+# linux event code keymap
+file	dev/wscons/linux_keymap.c	linux_keymap

Added files:

Index: src/sys/dev/wscons/linux_keymap.c
diff -u /dev/null src/sys/dev/wscons/linux_keymap.c:1.1
--- /dev/null	Wed Aug 30 00:39:27 2017
+++ src/sys/dev/wscons/linux_keymap.c	Wed Aug 30 00:39:27 2017
@@ -0,0 +1,174 @@
+/* $NetBSD: linux_keymap.c,v 1.1 2017/08/30 00:39:27 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 1997-2017 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Juergen Hannken-Illjes and Jared McNeill.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include 
+__KERNEL_RCSID(0, "$NetBSD: linux_keymap.c,v 1.1 2017/08/30 00:39:27 jmcneill Exp $");
+
+#include 
+#include 
+#include 
+#include 
+
+#define KC(n) KS_KEYCODE(n)
+
+static const keysym_t linux_keymap_keydesc_us[] = {
+/*  pos  command		normal		shifted */
+KC(1),   KS_Cmd_Debugger,	KS_Escape,
+KC(2),  			KS_1,		KS_exclam,
+KC(3),  			KS_2,		KS_at,
+KC(4),  			KS_3,		KS_numbersign,
+KC(5),  			KS_4,		KS_dollar,
+KC(6),  			KS_5,		KS_percent,
+KC(7),  			KS_6,		KS_asciicircum,
+KC(8),  			KS_7,		KS_ampersand,
+KC(9),  			KS_8,		KS_asterisk,
+KC(10), 			KS_9,		KS_parenleft,
+KC(11), 			KS_0,		KS_parenright,
+KC(12), 			KS_minus,	KS_underscore,
+KC(13), 			KS_equal,	KS_plus,
+KC(14),  KS_Cmd_ResetEmul,	KS_Delete,
+KC(15), 			KS_Tab,
+KC(16), 			KS_q,
+KC(17), 			KS_w,
+KC(18), 			KS_e,
+KC(19), 			KS_r,
+KC(20), 			KS_t,
+KC(21), 			KS_y,
+KC(22), 			KS_u,
+KC(23), 			KS_i,
+KC(24), 			KS_o,
+KC(25), 			KS_p,
+KC(26), 			KS_bracketleft,	KS_braceleft,
+KC(27), 			KS_bracketright, KS_braceright,
+KC(28), 			KS_Return,
+KC(29),  KS_Cmd1,		KS_Control_L,
+KC(30), 			KS_a,
+KC(31), 			KS_s,
+KC(32), 			KS_d,
+KC(33), 			KS_f,
+KC(34), 			KS_g,
+KC(35), 			KS_h,
+KC(36), 			KS_j,
+KC(37), 			KS_k,
+KC(38), 			KS_l,
+KC(39), 			KS_semicolon,	KS_colon,
+KC(40), 			KS_apostrophe,	KS_quotedbl,
+KC(41), 			KS_grave,	KS_asciitilde,
+KC(42), 			KS_Shift_L,
+KC(43), 			KS_backslash,	KS_bar,
+KC(44), 			KS_z,
+KC(45), 			KS_x,
+KC(46), 			KS_c,
+KC(47), 			KS_v,
+KC(48), 			KS_b,
+KC(49), 			KS_n,
+KC(50), 			KS_m,
+KC(51), 			KS_comma,	KS_less,
+KC(52), 			

CVS commit: src/share/man/man4

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Aug 29 23:38:50 UTC 2017

Modified Files:
src/share/man/man4: veriexec.4

Log Message:
Document the keep-filename entry in the dictionary passed to VERIEXEC_LOAD.

Clean up English grammar in description of VERIEXEC_DUMP (relating to the
retention of filenames).

XXX There are several tables in this man page with column headers defined
XXX using .It Sy Col1 Col2 Col3   This causes the first header to appear
XXX as "Bold" but the remaining column headers are "Normal".  I don't know
XXX how to fix it to make all the headers "Bold".  :(


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/share/man/man4/veriexec.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/veriexec.4
diff -u src/share/man/man4/veriexec.4:1.23 src/share/man/man4/veriexec.4:1.24
--- src/share/man/man4/veriexec.4:1.23	Tue Mar 18 18:20:39 2014
+++ src/share/man/man4/veriexec.4	Tue Aug 29 23:38:50 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: veriexec.4,v 1.23 2014/03/18 18:20:39 riastradh Exp $
+.\" $NetBSD: veriexec.4,v 1.24 2017/08/29 23:38:50 pgoyette Exp $
 .\"
 .\" Copyright 2005 Elad Efrat 
 .\" Copyright 2005 Brett Lymn 
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 19, 2011
+.Dd August 30, 2017
 .Dt VERIEXEC 4
 .Os
 .Sh NAME
@@ -59,12 +59,13 @@ Load an entry for a file to be monitored
 .Em Veriexec .
 .Pp
 The dictionary passed contains the following elements:
-.Bl -column entryxtype string
+.Bl -column keepxfilename string
 .It Sy Name	Type	Purpose
 .It file	string	filename for this entry
 .It entry-type	uint8	entry type ( see below )
 .It fp-type	string	fingerprint hashing algorithm
 .It fp	data	the fingerprint
+.It keep-filename	bool	whether or not to retain the entry's filename
 .El
 .Pp
 .Dq entry-type
@@ -90,7 +91,7 @@ Dump the
 .Em Veriexec
 monitored files database from the kernel.
 .Pp
-Only files that the filename is kept for them will be dumped.
+Only files for which the filename was kept will be dumped.
 The returned array contains dictionaries with the following elements:
 .Bl -column entryxtype string
 .It Sy Name	Type	Purpose

CVS commit: src/sys/arch/arm/pic

[Tohru Nishimura]

Module Name:src
Committed By:   nisimura
Date:   Tue Aug 29 22:57:05 UTC 2017

Modified Files:
src/sys/arch/arm/pic: pic.c

Log Message:
decouple pic_ipi_kpreempt() from DDB


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/pic/pic.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/pic/pic.c
diff -u src/sys/arch/arm/pic/pic.c:1.38 src/sys/arch/arm/pic/pic.c:1.39
--- src/sys/arch/arm/pic/pic.c:1.38	Fri Aug 25 20:36:16 2017
+++ src/sys/arch/arm/pic/pic.c	Tue Aug 29 22:57:05 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: pic.c,v 1.38 2017/08/25 20:36:16 jmcneill Exp $	*/
+/*	$NetBSD: pic.c,v 1.39 2017/08/29 22:57:05 nisimura Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -33,7 +33,7 @@
 #include "opt_multiprocessor.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.38 2017/08/25 20:36:16 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.39 2017/08/29 22:57:05 nisimura Exp $");
 
 #include 
 #include 
@@ -159,6 +159,7 @@ pic_ipi_ddb(void *arg)
 	kdb_trap(-1, arg);
 	return 1;
 }
+#endif /* DDB */
 
 #ifdef __HAVE_PREEMPTION
 int
@@ -167,8 +168,7 @@ pic_ipi_kpreempt(void *arg)
 	atomic_or_uint(()->ci_astpending, __BIT(1));
 	return 1;
 }
-#endif
-#endif /* MULTIPROCESSOR */
+#endif /* __HAVE_PREEMPTION */
 
 void
 intr_cpu_init(struct cpu_info *ci)

CVS commit: src/external/mit/xorg/lib/fontconfig/etc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 29 20:53:56 UTC 2017

Modified Files:
src/external/mit/xorg/lib/fontconfig/etc: Makefile fonts.conf

Log Message:
update fonts.conf for fontconfig 2.12.4.  removes  section.
add a Makefile comment about how to regenerate it.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/fontconfig/etc/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/fontconfig/etc/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/Makefile:1.3 src/external/mit/xorg/lib/fontconfig/etc/Makefile:1.4
--- src/external/mit/xorg/lib/fontconfig/etc/Makefile:1.3	Mon Sep  7 21:07:03 2009
+++ src/external/mit/xorg/lib/fontconfig/etc/Makefile	Tue Aug 29 20:53:56 2017
@@ -1,4 +1,18 @@
-#	$NetBSD: Makefile,v 1.3 2009/09/07 21:07:03 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2017/08/29 20:53:56 mrg Exp $
+
+# When updating fontconfig, be sure to update the fonts.conf.  This
+# requires running ./configure like this:
+#
+#   env PKG_CONFIG_PATH=/usr/X11R7/share/pkgconfig \
+#   ./configure \
+#  --localstatedir=/var \
+#  --with-default-fonts=/usr/X11R7/lib/X11/fonts \
+#  --with-add-fonts=/usr/pkg/lib/X11/fonts,/usr/pkg/share/fonts \
+#  --with-configdir=conf.d
+#
+# and then running gmake fonts.conf and copying the new file here.
+# (gmake is required here as the FC_CONFIGDIR pattern uses $(subst).)
+#
 
 SUBDIR=	conf.d conf.avail
 

Index: src/external/mit/xorg/lib/fontconfig/etc/fonts.conf
diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.7 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.8
--- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.7	Thu Jun  5 10:45:39 2014
+++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf	Tue Aug 29 20:53:56 2017
@@ -1,6 +1,5 @@
 
 
-
 
 
 
@@ -25,8 +24,7 @@
 
 
 	/usr/X11R7/lib/X11/fonts
-	/usr/pkg/lib/X11/fonts
-	/usr/pkg/share/fonts
+	/usr/pkg/lib/X11/fonts /usr/pkg/share/fonts
 	fonts
 	
 	~/.fonts
@@ -81,72 +79,6 @@
 
 	
 
-		
-			0x0020	
-			0x00A0	
-			0x00AD	
-			0x034F	
-			0x0600	
-			0x0601	
-			0x0602	
-			0x0603	
-			0x06DD	
-			0x070F	
-			0x115F	
-			0x1160	
-			0x1680	
-			0x17B4	
-			0x17B5	
-			0x180E	
-			0x2000	
-			0x2001	
-			0x2002	
-			0x2003	
-			0x2004	
-			0x2005	
-			0x2006	
-			0x2007	
-			0x2008	
-			0x2009	
-			0x200A	
-			0x200B	
-			0x200C	
-			0x200D	
-			0x200E	
-			0x200F	
-			0x2028	
-			0x2029	
-			0x202A	
-			0x202B	
-			0x202C	
-			0x202D	
-			0x202E	
-			0x202F	
-			0x205F	
-			0x2060	
-			0x2061	
-			0x2062	
-			0x2063	
-			0x206A	
-			0x206B	
-			0x206C	
-			0x206D	
-			0x206E	
-			0x206F	
-			0x2800	
-			0x3000	
-			0x3164	
-			0xFEFF	
-			0xFFA0	
-			0xFFF9	
-			0xFFFA	
-			0xFFFB	
-		
-
 		

CVS commit: src/external/mit/xorg/lib/xkeyboard-config/rules

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 29 20:27:54 UTC 2017

Modified Files:
src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev
evdev.lst

Log Message:
update for xkeyboard-config 2.21.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/lib/xkeyboard-config/rules/base \
src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \
src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \
src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.10 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.11
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.10	Tue Nov 22 19:51:37 2016
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base	Tue Aug 29 20:27:54 2017
@@ -126,7 +126,8 @@
   sven sven303 symplon \
   toshiba_s3000 trust trustda \
   unitekkb1925 yahoo \
-  teck227 teck229
+  teck227 teck229 \
+  apex300
 
 ! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
 		cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \
@@ -192,6 +193,7 @@
   thinkpad	=	thinkpad(intl)
   thinkpad60	=	thinkpad(60)
   thinkpadz60	=	thinkpad(60)
+  apex300	=	steelseries(apex300)
  $tmgeometries	=	typematrix(%m)
   winbook	=	winbook(XP5)
   pc98		=	nec(pc98)
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.10 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.11
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.10	Tue Nov 22 19:51:37 2016
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst	Tue Aug 29 20:27:54 2017
@@ -1,24 +1,24 @@
 ! model
   pc101   Generic 101-key PC
-  pc102   Generic 102-key (Intl) PC
+  pc102   Generic 101-key PC (intl.)
   pc104   Generic 104-key PC
-  pc105   Generic 105-key (Intl) PC
+  pc105   Generic 105-key PC (intl.)
   dell101 Dell 101-key PC
-  latitudeDell Latitude series laptop
-  dellm65 Dell Precision M65
+  latitudeDell Latutude laptop
+  dellm65 Dell Precision M65 laptop
   everex  Everex STEPnote
   flexpro Keytronic FlexPro
   microsoft   Microsoft Natural
   omnikey101  Northgate OmniKey 101
   winbook Winbook Model XP5
-  pc98PC-98xx Series
+  pc98PC-98
   a4techKB21  A4Tech KB-21
   a4techKBS8  A4Tech KBS-8
   a4_rfkb23   A4Tech Wireless Desktop RFKB-23
   airkey  Acer AirKey V
-  azonaRF2300 Azona RF2300 wireless Internet Keyboard
+  azonaRF2300 Azona RF2300 wireless Internet
   scorpiusAdvance Scorpius KI
-  brother Brother Internet Keyboard
+  brother Brother Internet
   btc5113rf   BTC 5113RF Multimedia
   btc5126tBTC 5126T
   btc6301urf  BTC 6301URF
@@ -30,34 +30,34 @@
   btc9116uBTC 9116U Mini Wireless Internet and Gaming
   cherryblue  Cherry Blue Line CyBo@rd
   cherryblueb Cherry CyMotion Master XPress
-  cherrybluea Cherry Blue Line CyBo@rd (alternate option)
+  cherrybluea Cherry Blue Line CyBo@rd (alt.)
   cherrycyboard   Cherry CyBo@rd USB-Hub
   cherrycmexpert  Cherry CyMotion Expert
   cherrybunlimCherry B.UNLIMITED
-  chicony Chicony Internet Keyboard
+  chicony Chicony Internet
   chicony0108 Chicony KU-0108
   chicony0420 Chicony KU-0420
   chicony9885 Chicony KB-9885
-  compaqeak8  Compaq Easy Access Keyboard
-  compaqik7   Compaq Internet Keyboard (7 keys)
-  compaqik13  Compaq Internet Keyboard (13 keys)
-  compaqik18  Compaq Internet Keyboard (18 keys)
+  compaqeak8  Compaq Easy Access
+  compaqik7   Compaq Internet (7 keys)
+  compaqik13  Compaq Internet (13 keys)
+  compaqik18  Compaq Internet (18 keys)
   cymotionlinux   Cherry CyMotion Master Linux
-  armada  Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
-  presarioLaptop/notebook Compaq (eg. Presario) Internet Keyboard
-  ipaqCompaq iPaq Keyboard
+  armada  Compaq Armada laptop
+  presarioCompaq Presario laptop
+  ipaqCompaq iPaq
   dellDell
   dellsk8125  Dell SK-8125
   dellsk8135  Dell SK-8135
-  dellusbmm   Dell USB Multimedia Keyboard
-  inspironDell Laptop/notebook Inspiron 6xxx/8xxx
-  precision_m Dell Laptop/notebook Precision M series
-  dexxa   Dexxa Wireless Desktop Keyboard
-  diamond Diamond 9801 / 9802 series
+  dellusbmm   Dell USB Multimedia
+  inspironDell Inspiron 6000/8000 

CVS commit: src/sys/arch/hppa/stand/boot

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Aug 29 19:14:04 UTC 2017

Modified Files:
src/sys/arch/hppa/stand/boot: ld.script

Log Message:
Ensure all data is captured under the edata symbol for srt0.S to relocate
it correctly.

gcc 5.3 marks some data as .data.rel.local, .data.rel or .data.rel.ro

port-hppa/52484: lif images from -8 and HEAD not loadable/bootable over network


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/boot/ld.script

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hppa/stand/boot/ld.script
diff -u src/sys/arch/hppa/stand/boot/ld.script:1.1 src/sys/arch/hppa/stand/boot/ld.script:1.2
--- src/sys/arch/hppa/stand/boot/ld.script:1.1	Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/stand/boot/ld.script	Tue Aug 29 19:14:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ld.script,v 1.1 2014/02/24 07:23:43 skrll Exp $	*/
+/*	$NetBSD: ld.script,v 1.2 2017/08/29 19:14:04 skrll Exp $	*/
 
 /*	$OpenBSD: ld.script,v 1.2 1999/04/20 20:02:37 mickey Exp $	*/
 
@@ -23,7 +23,7 @@ SECTIONS {
 	.data : {
 		$global$ = .;
 		*(.data)
-		*(.data1)
+		*(.data*)
 		*(.sdata)
 		*(.sdata2)
 		*(.dynamic)

CVS commit: src/sys/dev/usb

[Ryo ONODERA]

Module Name:src
Committed By:   ryoon
Date:   Tue Aug 29 18:33:16 UTC 2017

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.731 -r1.732 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.732 -r1.733 src/sys/dev/usb/usbdevs_data.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.731 src/sys/dev/usb/usbdevs.h:1.732
--- src/sys/dev/usb/usbdevs.h:1.731	Sun Aug  6 02:33:13 2017
+++ src/sys/dev/usb/usbdevs.h	Tue Aug 29 18:33:15 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdevs.h,v 1.731 2017/08/06 02:33:13 ryoon Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.732 2017/08/29 18:33:15 ryoon Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -3403,6 +3403,8 @@
 #define	USB_PRODUCT_WACOM_GRAPHIRE4_4X5	0x0015		/* Graphire4 4x5 */
 #define	USB_PRODUCT_WACOM_INTUOSA5	0x0021		/* Intuos A5 */
 #define	USB_PRODUCT_WACOM_GD0912U	0x0022		/* Intuos 9x12 Graphics Tablet */
+#define	USB_PRODUCT_WACOM_XD0912U	0x0043		/* Intuos2 A4 i-920 XD-0912-U */
+#define	USB_PRODUCT_WACOM_CTH690K0	0x033e		/* Intuos Art CTH-690/K0 */
 
 /* Weltrend Semiconductor */
 #define	USB_PRODUCT_WELTREND_HID	0x2201		/* HID Device */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.732 src/sys/dev/usb/usbdevs_data.h:1.733
--- src/sys/dev/usb/usbdevs_data.h:1.732	Sun Aug  6 02:33:13 2017
+++ src/sys/dev/usb/usbdevs_data.h	Tue Aug 29 18:33:16 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdevs_data.h,v 1.732 2017/08/06 02:33:13 ryoon Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.733 2017/08/29 18:33:16 ryoon Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -4606,24 +4606,28 @@ static const uint16_t usb_products[] = {
 	19234, 19241, 0,
 	USB_VENDOR_WACOM, USB_PRODUCT_WACOM_GD0912U, 
 	19234, 19244, 1886, 19169, 0,
+	USB_VENDOR_WACOM, USB_PRODUCT_WACOM_XD0912U, 
+	19249, 18315, 19257, 19263, 0,
+	USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CTH690K0, 
+	19234, 19273, 19277, 0,
 	USB_VENDOR_WELTREND, USB_PRODUCT_WELTREND_HID, 
-	19249, 7711, 0,
+	19288, 7711, 0,
 	USB_VENDOR_WESTERN, USB_PRODUCT_WESTERN_EXTHDD, 
-	19253, 19262, 0,
+	19292, 19301, 0,
 	USB_VENDOR_WINCHIPHEAD, USB_PRODUCT_WINCHIPHEAD_CH341SER, 
-	19266, 16975, 1786, 0,
+	19305, 16975, 1786, 0,
 	USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341, 
-	19278, 16975, 1786, 0,
+	19317, 16975, 1786, 0,
 	USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341_2, 
-	19278, 16975, 1786, 0,
+	19317, 16975, 1786, 0,
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_WNC0600, 
-	19284, 0,
+	19323, 0,
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR045G, 
 	5210, 4743, 5218, 5183, 0,
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR055G, 
-	19296, 0,
+	19335, 0,
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_O8494, 
-	19303, 19311, 0,
+	19342, 19350, 0,
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_1, 
 	6807, 0,
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_1_NF, 
@@ -4633,7 +4637,7 @@ static const uint16_t usb_products[] = {
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_2_NF, 
 	6807, 0,
 	USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_IMAGING, 
-	19319, 19327, 0,
+	19358, 19366, 0,
 	USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_PCCAM, 
 	672, 5667, 2901, 0,
 	USB_VENDOR_CONEXANT, USB_PRODUCT_CONEXANT_MODEM_1, 
@@ -4643,53 +4647,53 @@ static const uint16_t usb_products[] = {
 	USB_VENDOR_CONEXANT, USB_PRODUCT_CONEXANT_PRISM_GT_2, 
 	5210, 4743, 5218, 5183, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX256, 
-	19334, 16462, 16453, 0,
+	19373, 16462, 16453, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU1000, 
-	19340, 16462, 16497, 0,
+	19379, 16462, 16497, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU2000, 
-	19347, 16462, 16497, 0,
+	19386, 16462, 16497, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU500, 
-	19354, 16462, 16497, 0,
+	19393, 16462, 16497, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UW500, 
-	19360, 4743, 7058, 16453, 0,
+	19399, 4743, 7058, 16453, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF6, 
-	19366, 16462, 16497, 19373, 0,
+	19405, 16462, 16497, 19412, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF7, 
-	19385, 16462, 16497, 19373, 0,
+	19424, 16462, 16497, 19412, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF8, 
-	19392, 16462, 16497, 19373, 0,
+	19431, 16462, 16497, 19412, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX96, 
-	19399, 16462, 16453, 0,
+	19438, 16462, 16453, 0,
 	USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX16, 
-	19404, 16462, 16453, 0,
+	19443, 

CVS commit: src/sys/dev/usb

[Ryo ONODERA]

Module Name:src
Committed By:   ryoon
Date:   Tue Aug 29 18:31:19 UTC 2017

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
Add Wacom Intuos2 A4 and Intuos Art pen tablets


To generate a diff of this commit:
cvs rdiff -u -r1.738 -r1.739 src/sys/dev/usb/usbdevs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.738 src/sys/dev/usb/usbdevs:1.739
--- src/sys/dev/usb/usbdevs:1.738	Sun Jul  9 19:37:33 2017
+++ src/sys/dev/usb/usbdevs	Tue Aug 29 18:31:19 2017
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.738 2017/07/09 19:37:33 christos Exp $
+$NetBSD: usbdevs,v 1.739 2017/08/29 18:31:19 ryoon Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -3396,6 +3396,8 @@ product WACOM GRAPHIRE3_6X8	0x0014	Graph
 product WACOM GRAPHIRE4_4X5	0x0015	Graphire4 4x5
 product WACOM INTUOSA5		0x0021	Intuos A5
 product WACOM GD0912U		0x0022	Intuos 9x12 Graphics Tablet
+product WACOM XD0912U		0x0043	Intuos2 A4 i-920 XD-0912-U
+product WACOM CTH690K0		0x033e	Intuos Art CTH-690/K0
 
 /* Weltrend Semiconductor */
 product WELTREND HID		0x2201	HID Device

CVS commit: src/external/mit/xorg/server/xorg-server

[Ryo ONODERA]

Module Name:src
Committed By:   ryoon
Date:   Tue Aug 29 18:19:49 UTC 2017

Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile

Log Message:
xorg-server.pc should include pixman-1 dependency because
include/xorg/miscstruct.h includes pixman.h


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/mit/xorg/server/xorg-server/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.28 src/external/mit/xorg/server/xorg-server/Makefile:1.29
--- src/external/mit/xorg/server/xorg-server/Makefile:1.28	Sun Mar  5 11:52:39 2017
+++ src/external/mit/xorg/server/xorg-server/Makefile	Tue Aug 29 18:19:49 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2017/03/05 11:52:39 mrg Exp $
+#	$NetBSD: Makefile,v 1.29 2017/08/29 18:19:49 ryoon Exp $
 
 .include 
 
@@ -30,7 +30,7 @@ PKGCONFIG=	xorg-server
 PKGCONFIG_SED_FLAGS= \
 	-e "s,@sysconfigdir@,${X11ETCDIR},; \
 	s,@XORG_DRIVER_LIBS@,,; \
-	s,@SDK_REQUIRED_MODULES@,xproto >= 7.0.28 randrproto >= 1.5.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3 fixesproto >= 5.0 damageproto >= 1.1 xcmiscproto >= 1.2.0 bigreqsproto >= 1.1.0 xtrans >= 1.3.5 presentproto >= 1.0,; \
+	s,@SDK_REQUIRED_MODULES@,xproto >= 7.0.28 randrproto >= 1.5.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3 pixman-1 >= 0.27.2 fixesproto >= 5.0 damageproto >= 1.1 xcmiscproto >= 1.2.0 bigreqsproto >= 1.1.0 xtrans >= 1.3.5 presentproto >= 1.0,; \
 	s,@symbol_visibility@,,"
 
 .include 

CVS commit: xsrc/external/mit/fontconfig/dist/src

[Maya Rashish]

Module Name:xsrc
Committed By:   maya
Date:   Tue Aug 29 16:47:07 UTC 2017

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcobjs.c

Log Message:
Build fix. don't provide a conflicting declaration of FcObjectTypeHash and
FcObjectTypeLookup. they're defined in fcobjshash.h included just after.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/fontconfig/dist/src/fcobjs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fcobjs.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcobjs.c:1.1.1.3 xsrc/external/mit/fontconfig/dist/src/fcobjs.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fcobjs.c:1.1.1.3	Tue Aug 29 08:32:28 2017
+++ xsrc/external/mit/fontconfig/dist/src/fcobjs.c	Tue Aug 29 16:47:07 2017
@@ -24,12 +24,6 @@
 
 #include "fcint.h"
 
-static unsigned int
-FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len);
-
-static const struct FcObjectTypeInfo *
-FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len);
-
 #include "fcobjshash.h"
 
 #include 

CVS commit: src

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Tue Aug 29 15:50:57 UTC 2017

Modified Files:
src/distrib/sets/lists/xetc: mi
src/external/mit/xorg/lib/fontconfig/etc/conf.d: Makefile

Log Message:
Don't fc-match bitmap fonts by default.

Now things using Helvetica won't look terrible, and will use the fallback
font instead.

Idea by jakllsch, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile

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/xetc/mi
diff -u src/distrib/sets/lists/xetc/mi:1.28 src/distrib/sets/lists/xetc/mi:1.29
--- src/distrib/sets/lists/xetc/mi:1.28	Tue Aug 29 09:02:10 2017
+++ src/distrib/sets/lists/xetc/mi	Tue Aug 29 15:50:57 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.28 2017/08/29 09:02:10 mrg Exp $
+# $NetBSD: mi,v 1.29 2017/08/29 15:50:57 maya Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -106,6 +106,7 @@
 ./etc/fonts/conf.d/65-fonts-persian.conf		-unknown-	xorg
 ./etc/fonts/conf.d/65-nonlatin.conf			-unknown-	xorg
 ./etc/fonts/conf.d/69-unifont.conf			-unknown-	xorg
+./etc/fonts/conf.d/70-no-bitmaps.conf			-unknown-	xorg
 ./etc/fonts/conf.d/80-delicious.conf			-unknown-	xorg
 ./etc/fonts/conf.d/90-synthetic.conf			-unknown-	xorg
 ./etc/fonts/fonts.conf	-unknown-	x11

Index: src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.4 src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.5
--- src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.4	Tue Aug 29 09:02:10 2017
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile	Tue Aug 29 15:50:57 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2017/08/29 09:02:10 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2017/08/29 15:50:57 maya Exp $
 
 .include 
 
@@ -18,6 +18,7 @@ FONTCONFIG_LINKS= \
 	65-fonts-persian.conf \
 	65-nonlatin.conf \
 	69-unifont.conf \
+	70-no-bitmaps.conf \
 	80-delicious.conf \
 	90-synthetic.conf
 

CVS commit: [netbsd-8] src/lib/libm/src

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Aug 29 15:07:31 UTC 2017

Modified Files:
src/lib/libm/src [netbsd-8]: s_nextafter.c

Log Message:
Also pull up rev 1.15 and 1.16 for ticket #217:

On systems without __HAVE_LONG_DOUBLE, alias nexttoward() to nextafter().


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.18.1 src/lib/libm/src/s_nextafter.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libm/src/s_nextafter.c
diff -u src/lib/libm/src/s_nextafter.c:1.14 src/lib/libm/src/s_nextafter.c:1.14.18.1
--- src/lib/libm/src/s_nextafter.c:1.14	Tue Mar 18 18:20:37 2014
+++ src/lib/libm/src/s_nextafter.c	Tue Aug 29 15:07:31 2017
@@ -12,7 +12,7 @@
 
 #include 
 #if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_nextafter.c,v 1.14 2014/03/18 18:20:37 riastradh Exp $");
+__RCSID("$NetBSD: s_nextafter.c,v 1.14.18.1 2017/08/29 15:07:31 martin Exp $");
 #endif
 
 /* IEEE functions
@@ -27,6 +27,7 @@ __RCSID("$NetBSD: s_nextafter.c,v 1.14 2
 
 #ifndef __HAVE_LONG_DOUBLE
 __strong_alias(nextafterl, nextafter)
+__strong_alias(nexttoward, nextafter)
 #endif
 
 double

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Aug 29 15:05:55 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
Ammend ticket #217


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.47 -r1.1.2.48 src/doc/CHANGES-8.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.47 src/doc/CHANGES-8.0:1.1.2.48
--- src/doc/CHANGES-8.0:1.1.2.47	Tue Aug 29 13:20:05 2017
+++ src/doc/CHANGES-8.0	Tue Aug 29 15:05:55 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.47 2017/08/29 13:20:05 martin Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.48 2017/08/29 15:05:55 martin Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -5458,9 +5458,12 @@ tests/lib/libc/locale/t_strfmon.c		1.1
 	[joerg, ticket #215]
 
 lib/libm/Makefile   1.197-1.201
+lib/libm/src/s_nextafter.c	1.15-1.16
 tests/lib/libm/t_fe_round.c 1.7
 
 	Ensure nexttowardf() is included on all IEEE targets.
+	On systems without __HAVE_LONG_DOUBLE, alias nexttoward()
+	to nextafter().
 	Add rintl() for aarch64 and mips, and nexttoward() for m68k.
 	Add a test which verifies that nextafter() and nexttoward() are
 	present in the implementation.

CVS commit: src/common/lib/libc/arch/aarch64/string

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Tue Aug 29 15:00:23 UTC 2017

Modified Files:
src/common/lib/libc/arch/aarch64/string: memset.S

Log Message:
* aarch64/memset.S didn't work! fixed some bugs.
* maximum size of DCZID_EL0:BS (2048) supported.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/aarch64/string/memset.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/common/lib/libc/arch/aarch64/string/memset.S
diff -u src/common/lib/libc/arch/aarch64/string/memset.S:1.1 src/common/lib/libc/arch/aarch64/string/memset.S:1.2
--- src/common/lib/libc/arch/aarch64/string/memset.S:1.1	Sun Aug 10 05:47:35 2014
+++ src/common/lib/libc/arch/aarch64/string/memset.S	Tue Aug 29 15:00:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: memset.S,v 1.1 2014/08/10 05:47:35 matt Exp $ */
+/* $NetBSD: memset.S,v 1.2 2017/08/29 15:00:23 ryo Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@ ENTRY(memset)
 	add	x13, x15, x2	/* get ending address */
 	asr	x13, x13, x9	/* "ending" block numebr */
 	cmp	x13, x12	/* how many blocks? */
-	b.eq	.Lfilled	/*   none, do it 16 bytes at a time */
+	b.ls	.Lfilled	/*   none, do it 16 bytes at a time */
 
 	/*
 	 * Now we have one or more blocks to deal with.  First now we need
@@ -144,7 +144,7 @@ ENTRY(memset)
 
 	sub	x7, x10, x7	/* subtract offset from block length */
 	sub	x2, x2, x7	/* subtract that from length */
-	asr	x7, x7, #2	/* qword -> word */
+	asr	x7, x7, #4	/* length -> N*16 */
 
 	tbz	x15, #0, .Lzero_hword_aligned
 	strb	wzr, [x15], #1
@@ -158,28 +158,18 @@ ENTRY(memset)
 	tbz	x15, #3, .Lzero_qword_aligned
 	str	xzr, [x15], #8
 .Lzero_qword_aligned:
-	cbz	x7, .Lblock_aligned /* no qwords? just branch */
-	adr	x6, .Lblock_aligned
-	sub	x6, x6, x7	/* backup to write the last N qwords */
-	br	x6		/* and do it */
+	cbz	x7, .Lblock_aligned	/* less than 16 bytes? just branch */
+	adr	x6, .Lunrolled_end
+	sub	x6, x6, x7, lsl #2	/* backup to write the last N insn */
+	br	x6			/* and do it */
+
 	/*
-	 * This is valid for cache lines <= 256 bytes.
+	 * The maximum size of DCZID_EL0:BS supported is 2048 bytes.
 	 */
+	.rept (2048 / 16) - 1
 	stp	xzr, xzr, [x15], #16
-	stp	xzr, xzr, [x15], #16
-	stp	xzr, xzr, [x15], #16
-	stp	xzr, xzr, [x15], #16
-	stp	xzr, xzr, [x15], #16
-	stp	xzr, xzr, [x15], #16
-	stp	xzr, xzr, [x15], #16
-	stp	xzr, xzr, [x15], #16
-	stp	xzr, xzr, [x15], #16
-	stp	xzr, xzr, [x15], #16
-	stp	xzr, xzr, [x15], #16
-	stp	xzr, xzr, [x15], #16
-	stp	xzr, xzr, [x15], #16
-	stp	xzr, xzr, [x15], #16
-	stp	xzr, xzr, [x15], #16
+	.endr
+.Lunrolled_end:
 
 /*
  * Now we are block aligned.
@@ -193,7 +183,7 @@ ENTRY(memset)
 	ret
 
 .Lblock_done:
-	and	x2, x2, x12	/* make positive again */
+	and	x2, x2, x11	/* make positive again */
 	mov	x6, xzr		/* fill 2nd xword */
 	b	.Lqword_loop	/* and finish filling */
 

CVS commit: [netbsd-8] src/lib/libm

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Aug 29 14:31:43 UTC 2017

Modified Files:
src/lib/libm [netbsd-8]: Makefile

Log Message:
Actually apply revision 1.201 (as the previous pullup claimed to do already).


To generate a diff of this commit:
cvs rdiff -u -r1.191.2.2 -r1.191.2.3 src/lib/libm/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.191.2.2 src/lib/libm/Makefile:1.191.2.3
--- src/lib/libm/Makefile:1.191.2.2	Tue Aug 29 11:58:26 2017
+++ src/lib/libm/Makefile	Tue Aug 29 14:31:43 2017
@@ -1,4 +1,4 @@
-#  $NetBSD: Makefile,v 1.191.2.2 2017/08/29 11:58:26 martin Exp $
+#  $NetBSD: Makefile,v 1.191.2.3 2017/08/29 14:31:43 martin Exp $
 #
 #  @(#)Makefile 5.1beta 93/09/24
 #
@@ -60,7 +60,7 @@ ARCH_SRCS+= s_fma.S s_fmaf.S s_fmax.S s_
 .if ${MKSOFTFLOAT} == "no"
 COMMON_SRCS+= fenv.c
 .endif
-COMMON_SRCS+= s_rintl.c
+COMMON_SRCS+= s_nexttoward.c s_rintl.c
 COMMON_SRCS+= e_sqrtl.c
 COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
 
@@ -195,6 +195,10 @@ COMMON_SRCS += fenv.c
 COMMON_SRCS += fenv.c
 .endif
 COMMON_SRCS+= s_rintl.c
+.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el") \
+&& (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
+COMMON_SRCS+= s_nexttoward.c
+.endif
 
 .elif (${LIBC_MACHINE_CPU} == "sh3")
 .PATH:	${.CURDIR}/arch/sh3

CVS commit: [jdolecek-ncq] src/sys/dev/ata

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Tue Aug 29 13:38:38 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq

Log Message:
some notes around c_start/atastart()


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.36 -r1.1.2.37 src/sys/dev/ata/TODO.ncq

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.1.2.36 src/sys/dev/ata/TODO.ncq:1.1.2.37
--- src/sys/dev/ata/TODO.ncq:1.1.2.36	Sun Aug 13 11:46:32 2017
+++ src/sys/dev/ata/TODO.ncq	Tue Aug 29 13:38:38 2017
@@ -2,6 +2,11 @@ Bugs
 
 test wd* at umass?, confirm the ata_channel kludge works
 
+c_start() needs to be called on splbio to avoid spurious irq during reset,
+is not e.g. in ata thread and may not in atastart() neither
+- wdc.c never calls atastart() (start always false)
+- ata_wdc.c calls atastart() regardless if error
+
 Other random notes (do outside the NCQ branch):
 -
 do biodone() in wddone() starting the dump to not leak bufs when dumping from

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Aug 29 13:20:05 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
Note tickets #212, #215, #217, #246, #222


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.46 -r1.1.2.47 src/doc/CHANGES-8.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.46 src/doc/CHANGES-8.0:1.1.2.47
--- src/doc/CHANGES-8.0:1.1.2.46	Tue Aug 29 09:45:47 2017
+++ src/doc/CHANGES-8.0	Tue Aug 29 13:20:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.46 2017/08/29 09:45:47 martin Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.47 2017/08/29 13:20:05 martin Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -5439,3 +5439,45 @@ sys/arch/zaurus/conf/GENERIC
 	ticket #60, we will re-apply it later).
 	[skrll, ticket #60]
 
+lib/libm/Makefile   1.192-1.196
+tests/lib/libm/t_fe_round.c 1.3-1.6
+
+	Ensure that nearbyint() is included in all targets except for vax,
+	and add a test case for nearbyint(), stubbed out for non-IEEE (vax).
+	[he, ticket #212]
+
+distrib/sets/lists/debug/mi			1.224
+distrib/sets/lists/tests/mi			1.761
+include/monetary.h1.3
+lib/libc/stdlib/strfmon.3			1.6-1.7
+lib/libc/stdlib/strfmon.c			1.11
+tests/lib/libc/locale/Makefile			1.12
+tests/lib/libc/locale/t_strfmon.c		1.1
+
+	Add missing strfmon_l. Noticed by Bruno Haible. Add test case.
+	[joerg, ticket #215]
+
+lib/libm/Makefile   1.197-1.201
+tests/lib/libm/t_fe_round.c 1.7
+
+	Ensure nexttowardf() is included on all IEEE targets.
+	Add rintl() for aarch64 and mips, and nexttoward() for m68k.
+	Add a test which verifies that nextafter() and nexttoward() are
+	present in the implementation.
+	[he, ticket #217]
+
+sys/arch/evbmips/conf/std.loongson		1.2
+sys/arch/mips/mips/mipsX_subr.S			1.101-1.104
+usr.sbin/sysinst/arch/evbmips/md.h		1.2
+
+	Work around more loongson 2F errata in the kernel.
+	Build the loongson kernels with all the binutils loongson2f
+	errata workaround toolchain options.
+	Allow booting evbmips machines from FFSv2.
+	[maya, ticket #246]
+
+sys/arch/evbmips/conf/LOONGSON			1.33
+
+	Get rid of ATADEBUG on LOONGSON
+	[maya, ticket #222]
+

CVS commit: [netbsd-8] src/sys/arch/evbmips/conf

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Aug 29 13:12:48 UTC 2017

Modified Files:
src/sys/arch/evbmips/conf [netbsd-8]: LOONGSON

Log Message:
Pull up following revision(s) (requested by maya in ticket #222):
sys/arch/evbmips/conf/LOONGSON: revision 1.33
Get rid of ATADEBUG on LOONGSON


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.2.1 src/sys/arch/evbmips/conf/LOONGSON

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/evbmips/conf/LOONGSON
diff -u src/sys/arch/evbmips/conf/LOONGSON:1.31 src/sys/arch/evbmips/conf/LOONGSON:1.31.2.1
--- src/sys/arch/evbmips/conf/LOONGSON:1.31	Thu May 11 07:56:43 2017
+++ src/sys/arch/evbmips/conf/LOONGSON	Tue Aug 29 13:12:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: LOONGSON,v 1.31 2017/05/11 07:56:43 maya Exp $
+# $NetBSD: LOONGSON,v 1.31.2.1 2017/08/29 13:12:47 martin Exp $
 #
 # LOONGSON machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/evbmips/conf/std.loongson
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"LOONGSON-$Revision: 1.31 $"
+#ident 		"LOONGSON-$Revision: 1.31.2.1 $"
 
 maxusers	16
 
@@ -220,7 +220,7 @@ options  	WDC_NO_IDS #workaround CS5536+
 
 # ATA (IDE) bus support
 atabus* at ata?
-options 	ATADEBUG
+#options 	ATADEBUG
 
 # IDE drives
 # Flags are used only with controllers that support DMA operations

CVS commit: src/sys/kern

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Aug 29 12:48:50 UTC 2017

Modified Files:
src/sys/kern: kern_veriexec.c

Log Message:
Revert previous changes.  They are wrong.  The intended clean-up
is already being handled by the call to veriexec_file_free() in
the "out:" path.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/kern/kern_veriexec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/kern_veriexec.c
diff -u src/sys/kern/kern_veriexec.c:1.14 src/sys/kern/kern_veriexec.c:1.15
--- src/sys/kern/kern_veriexec.c:1.14	Tue Aug 29 10:23:12 2017
+++ src/sys/kern/kern_veriexec.c	Tue Aug 29 12:48:50 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_veriexec.c,v 1.14 2017/08/29 10:23:12 pgoyette Exp $	*/
+/*	$NetBSD: kern_veriexec.c,v 1.15 2017/08/29 12:48:50 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006 Elad Efrat 
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.14 2017/08/29 10:23:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.15 2017/08/29 12:48:50 pgoyette Exp $");
 
 #include "opt_veriexec.h"
 
@@ -1079,7 +1079,7 @@ veriexec_file_add(struct lwp *l, prop_di
 		log(LOG_ERR, "Veriexec: Invalid or unknown fingerprint type "
 		"`%s' for file `%s'.\n", fp_type, file);
 		error = EOPNOTSUPP;
-		goto free_out;
+		goto out;
 	}
 
 	if (prop_data_size(prop_dictionary_get(dict, "fp")) !=
@@ -1087,7 +1087,7 @@ veriexec_file_add(struct lwp *l, prop_di
 		log(LOG_ERR, "Veriexec: Bad fingerprint length for `%s'.\n",
 		file);
 		error = EINVAL;
-		goto free_out;
+		goto out;
 	}
 
 	vfe->fp = kmem_alloc(vfe->ops->hash_len, KM_SLEEP);
@@ -1156,19 +1156,8 @@ veriexec_file_add(struct lwp *l, prop_di
 	veriexec_bypass = 0;
 
   unlock_out:
-	if (error) {
-		kmem_free(vfe->fp, vfe->ops->hash_len);
-		if (vfe->filename != NULL)
-			kmem_free(vfe->filename, vfe->filename_len);
-	}
 	rw_exit(_op_lock);
 
-  free_out:
-	if (error) {
-		rw_destroy(>lock);
-		kmem_free(vfe, sizeof(*vfe));
-	}
-
   out:
 	vrele(vp);
 	if (error)

CVS commit: [netbsd-8] src

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Aug 29 12:47:29 UTC 2017

Modified Files:
src/sys/arch/evbmips/conf [netbsd-8]: std.loongson
src/sys/arch/mips/mips [netbsd-8]: mipsX_subr.S
src/usr.sbin/sysinst/arch/evbmips [netbsd-8]: md.h

Log Message:
Pull up following revision(s) (requested by maya in ticket #246):
sys/arch/evbmips/conf/std.loongson: revision 1.2
usr.sbin/sysinst/arch/evbmips/md.h: revision 1.2
sys/arch/mips/mips/mipsX_subr.S: revision 1.101
sys/arch/mips/mips/mipsX_subr.S: revision 1.102
sys/arch/mips/mips/mipsX_subr.S: revision 1.103
sys/arch/mips/mips/mipsX_subr.S: revision 1.104
In working around loongson errata clear BTB and RAS, same as
other operating systems.
15 Errata: Issue of Out-of-order in loongson (translated)
In loongson 2F, because of the branch prediction, sometimes the CPU
may fetch the instructions from some unexpected area (for example I/O
space). It is an invalid operation. There are two ways for the CPU to
choose the branch target. The first one is predicting the branch
target according to the branch target history. The second one is
calculating the branch target by the ALU. There are most 8
instructions in the instruction window at the same time in loongson2f
(Remember the loongson 2f is superscalar, right?). Hence, the
branch target of an indirect branch(such as jr) could be got(may be
predicted by the branch target history) earlier and the instrctions of
the branch target could be prefetched even if there are branch
instructions before it. As a result, it is possible to fetch the
instructions from I/O region( say out-of the physical address range of
[0- 0x10]) in kernel model because of the instruction prefetch of
the branch target.
There are some suggestions to prevent prefetching instructions from
the I/O region in kernel mode.
(1) When switching from user model to kernel model, you should flush
the branch target history such as BTB and RAS.
(2) Doing some tricks to the indirect branch target to make sure that
the indirect branch target can not be in the I/O region.
Remove whitespace I just introduced
Build the loongson kernels with all the binutils loongson2f errata workarounds
>From Zhang Fuxin via href="https://sourceware.org/ml/binutils/2009-11/msg00387.html;>https://sourceware.org/ml/binutils/2009-11/msg00387.html
  - The NOP issue
"The nature of the erratum is deeply related to the microarchitecture of
Loongson-2. It uses roughly a 4-way superscalar dynamically scheduled core,
instructions are excuted as much as possible in parallel with technics like
branch prediction etc. We use a 8-entry internal branch prediction queue to
keep track of each predicted branches, if some branches are proved to be
wrongly predicted, all the instructions following it will be cancelled,together
with the resources used by them, including the registers used for renaming, and
the queue entry will be freeed. There is a bug that might cause a hang when the
queue is full(some resources might been leaked due to conflict branch entries),
the workaround is to reduce the possiblity of branch queue full by using
renaming registers(they are also limited, can prevent too many simutaneos
branches). In theory this is still not enough to fully eliminate possible
hangs, but the possiblity is extremely low now and hard to be hit in real
code."
  - The JUMP instructions issue
"The Loongson-2 series processors have quite complex micro-architecture, it will
try to execute instructions from the predicated branch of coming instruction
stream before they are confirmed to be run, if the predication of branch
direction is proved wrong later, the instructions will be cancelled, but if the
instructions is a read from memory, the read action might not be cancelled(but
the changes to register will) to enable some prefetch. This will lead to some
problems when compining with some chipsets. E.g. the AMD CS5536 used in
Yeeloong/Fuloong will hang if it gets an address in the physical address range
of 0x10-0x20(might be more other ranges). Speculative reads can perform
read at any address in theory(due to wrong prediction of branch directions and
the use of branch target buffer), thus in very few occasions they might cause a
hard lock of the machine.
To prevent this, we need to prevent some addresses from entering branch
target buffers. A way to do this is that to modify all jump targets, e.g.,
 calulations of t9
 ...
 jalr t9  =>
 calculations of t9
 or t9, t9, 0x8000;  // to make sure t9 is in kseg0
 jalr t9
Of course, we have to consider 64/32bit, and modules addresses etc.
This only need to be performed on kernel code, because only there we can have
accesses not translated/limited by TLB. For user code, it is impossible to
generate accesses to unwanted physical address. So it is safe.
Also, to prevent addresses generated by user mode code to be used by the
kernel, we add a few 

CVS commit: [netbsd-8] src

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Aug 29 11:58:26 UTC 2017

Modified Files:
src/lib/libm [netbsd-8]: Makefile
src/tests/lib/libm [netbsd-8]: t_fe_round.c

Log Message:
Pull up the following, requested by he in ticket #217:

lib/libm/Makefile   1.197-1.201
tests/lib/libm/t_fe_round.c 1.7

Ensure nexttowardf() is included on all IEEE targets.
Add rintl() for aarch64 and mips, and nexttoward() for m68k.
Add a test which verifies that nextafter() and nexttoward() are
present in the implementation.


To generate a diff of this commit:
cvs rdiff -u -r1.191.2.1 -r1.191.2.2 src/lib/libm/Makefile
cvs rdiff -u -r1.2.8.1 -r1.2.8.2 src/tests/lib/libm/t_fe_round.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.191.2.1 src/lib/libm/Makefile:1.191.2.2
--- src/lib/libm/Makefile:1.191.2.1	Tue Aug 29 11:45:18 2017
+++ src/lib/libm/Makefile	Tue Aug 29 11:58:26 2017
@@ -1,4 +1,4 @@
-#  $NetBSD: Makefile,v 1.191.2.1 2017/08/29 11:45:18 martin Exp $
+#  $NetBSD: Makefile,v 1.191.2.2 2017/08/29 11:58:26 martin Exp $
 #
 #  @(#)Makefile 5.1beta 93/09/24
 #
@@ -60,6 +60,7 @@ ARCH_SRCS+= s_fma.S s_fmaf.S s_fmax.S s_
 .if ${MKSOFTFLOAT} == "no"
 COMMON_SRCS+= fenv.c
 .endif
+COMMON_SRCS+= s_rintl.c
 COMMON_SRCS+= e_sqrtl.c
 COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
 
@@ -74,7 +75,7 @@ COPTS+=	-mfloat-ieee -mieee-with-inexact
 .if ${MKSOFTFLOAT} == "no"
 COMMON_SRCS+= fenv.c
 .endif
-COMMON_SRCS+= s_nexttowardf.c s_rintl.c
+COMMON_SRCS+= s_rintl.c
 .for f in fenv.c lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
 COPTS.$f +=	-mfpu=vfp
 .endfor
@@ -90,7 +91,7 @@ COMMON_SRCS += fenv.c
 
 .elif (${LIBC_MACHINE_ARCH} == "hppa")
 .PATH.c: ${.CURDIR}/arch/hppa
-COMMON_SRCS+= fenv.c s_nexttowardf.c s_rintl.c
+COMMON_SRCS+= fenv.c s_rintl.c
 
 .elif (${LIBC_MACHINE_ARCH} == "sparc")
 .PATH: ${.CURDIR}/arch/sparc
@@ -100,7 +101,7 @@ COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
 .elif (${LIBC_MACHINE_ARCH} == "sparc64")
 .PATH: ${.CURDIR}/arch/sparc64
 COMMON_SRCS+= fenv.c
-COMMON_SRCS+= s_nexttowardf.c s_rintl.c
+COMMON_SRCS+= s_rintl.c
 .ifndef _COMPAT_M32_MK_
 COMMON_SRCS+= s_nexttoward.c
 .endif
@@ -114,7 +115,7 @@ COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
 .endif
 .PATH:	${.CURDIR}/arch/i387
 
-COMMON_SRCS+= fenv.c s_nexttoward.c s_nexttowardf.c s_rintl.c
+COMMON_SRCS+= fenv.c s_nexttoward.c s_rintl.c
 COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
 
 ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_expf.S e_fmod.S e_log.S \
@@ -153,7 +154,7 @@ ARCH_SRCS = e_acos.S e_asin.S e_atanh.S 
 	e_log10.S e_remainder.S e_scalb.S e_sinh.S e_sqrt.S s_atan.S \
 	s_ceil.S s_copysign.S s_cos.S s_expm1.S s_finite.S s_floor.S \
 	s_log1p.S s_logb.S s_rint.S s_scalbn.S s_sin.S s_tan.S s_tanh.S
-COMMON_SRCS += fenv.c s_rintl.c
+COMMON_SRCS += fenv.c s_nexttoward.c s_rintl.c
 .endif
 .endif
 # end of m68k
@@ -193,6 +194,7 @@ COMMON_SRCS += fenv.c
 .if ${MKSOFTFLOAT} == "no"
 COMMON_SRCS += fenv.c
 .endif
+COMMON_SRCS+= s_rintl.c
 
 .elif (${LIBC_MACHINE_CPU} == "sh3")
 .PATH:	${.CURDIR}/arch/sh3
@@ -267,7 +269,7 @@ COMMON_SRCS+= b_exp.c b_log.c b_tgamma.c
 	s_lround.c s_lroundf.c s_lroundl.c \
 	s_log1pf.c s_logb.c s_logbf.c s_logbl.c \
 	s_matherr.c s_modff.c s_modfl.c s_nearbyint.c s_nextafter.c s_nextafterl.c \
-	s_nextafterf.c s_remquo.c s_remquof.c s_rint.c s_rintf.c \
+	s_nextafterf.c s_nexttowardf.c s_remquo.c s_remquof.c s_rint.c s_rintf.c \
 	s_round.c s_roundf.c s_roundl.c s_scalbn.c \
 	s_scalbnf.c s_scalbnl.c s_signgam.c s_significand.c s_significandf.c s_sin.c \
 	s_sinf.c s_tan.c s_tanf.c s_tanh.c s_tanhf.c s_tgammaf.c \

Index: src/tests/lib/libm/t_fe_round.c
diff -u src/tests/lib/libm/t_fe_round.c:1.2.8.1 src/tests/lib/libm/t_fe_round.c:1.2.8.2
--- src/tests/lib/libm/t_fe_round.c:1.2.8.1	Tue Aug 29 11:45:18 2017
+++ src/tests/lib/libm/t_fe_round.c	Tue Aug 29 11:58:26 2017
@@ -122,11 +122,74 @@ ATF_TC_BODY(fe_nearbyint, tc)
 	}
 }
 
+static const struct {
+	double input;
+	double toward;
+	double expected;
+} values2[] = {
+	{ 10.0, 11.0, 10.0 },
+	{ -5.0, -6.0, -5.0 },
+};
+
+ATF_TC(fe_nextafter);
+ATF_TC_HEAD(fe_nextafter, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checking IEEE 754 rounding using nextafter()");
+}
+
+ATF_TC_BODY(fe_nextafter, tc)
+{
+	double received;
+	int res;
+
+	for (unsigned int i = 0; i < __arraycount(values2); i++) {
+		received = nextafter(values2[i].input, values2[i].toward);
+		if (values2[i].input < values2[i].toward) {
+			res = (received > values2[i].input);
+		} else {
+			res = (received < values2[i].input);
+		}
+		ATF_CHECK_MSG(
+			res && (fabs(received - values2[i].expected) < EPSILON),
+			"nextafter() rounding wrong, difference too large\n"
+			"input: %f (index %d): got %f, expected %f, res %d\n",
+			values2[i].input, i, received, values2[i].expected, res);
+	}
+}
+
+ATF_TC(fe_nexttoward);

CVS commit: [netbsd-8] src

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Aug 29 11:51:51 UTC 2017

Modified Files:
src/distrib/sets/lists/debug [netbsd-8]: mi
src/distrib/sets/lists/tests [netbsd-8]: mi
src/include [netbsd-8]: monetary.h
src/lib/libc/stdlib [netbsd-8]: strfmon.3 strfmon.c
src/tests/lib/libc/locale [netbsd-8]: Makefile
Added Files:
src/tests/lib/libc/locale [netbsd-8]: t_strfmon.c

Log Message:
Pull up following revision(s) (requested by joerg in ticket #215):
tests/lib/libc/locale/t_strfmon.c: revision 1.1
tests/lib/libc/locale/Makefile: revision 1.12
lib/libc/stdlib/strfmon.c: revision 1.11
distrib/sets/lists/debug/mi: revision 1.224
include/monetary.h: revision 1.3
distrib/sets/lists/tests/mi: revision 1.761
lib/libc/stdlib/strfmon.3: revision 1.6
lib/libc/stdlib/strfmon.3: revision 1.7
Add missing strfmon_l. Noticed by Bruno Haible. Add test case.
Typo fix.


To generate a diff of this commit:
cvs rdiff -u -r1.216.2.2 -r1.216.2.3 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.752.2.1 -r1.752.2.2 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.2.56.1 src/include/monetary.h
cvs rdiff -u -r1.5 -r1.5.18.1 src/lib/libc/stdlib/strfmon.3
cvs rdiff -u -r1.10 -r1.10.24.1 src/lib/libc/stdlib/strfmon.c
cvs rdiff -u -r1.9 -r1.9.2.1 src/tests/lib/libc/locale/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/tests/lib/libc/locale/t_strfmon.c

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/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.216.2.2 src/distrib/sets/lists/debug/mi:1.216.2.3
--- src/distrib/sets/lists/debug/mi:1.216.2.2	Tue Aug 29 09:43:16 2017
+++ src/distrib/sets/lists/debug/mi	Tue Aug 29 11:51:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.216.2.2 2017/08/29 09:43:16 bouyer Exp $
+# $NetBSD: mi,v 1.216.2.3 2017/08/29 11:51:50 martin Exp $
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib	comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -1952,6 +1952,7 @@
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_mbstowcs.debug		tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_mbtowc.debug		tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_sprintf.debug		tests-lib-debug		debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/lib/libc/locale/t_strfmon.debug		tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_toupper.debug		tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_wcscspn.debug		tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_wcspbrk.debug		tests-lib-debug		debug,atf,compattestfile

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.752.2.1 src/distrib/sets/lists/tests/mi:1.752.2.2
--- src/distrib/sets/lists/tests/mi:1.752.2.1	Tue Aug 29 09:43:17 2017
+++ src/distrib/sets/lists/tests/mi	Tue Aug 29 11:51:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.752.2.1 2017/08/29 09:43:17 bouyer Exp $
+# $NetBSD: mi,v 1.752.2.2 2017/08/29 11:51:51 martin Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2549,6 +2549,7 @@
 ./usr/tests/lib/libc/locale/t_mbstowcs		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libc/locale/t_mbtowc		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libc/locale/t_sprintf		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libc/locale/t_strfmon		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libc/locale/t_toupper		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libc/locale/t_wcscspn		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libc/locale/t_wcspbrk		tests-lib-tests		compattestfile,atf

Index: src/include/monetary.h
diff -u src/include/monetary.h:1.2 src/include/monetary.h:1.2.56.1
--- src/include/monetary.h:1.2	Sun Sep 21 16:59:46 2008
+++ src/include/monetary.h	Tue Aug 29 11:51:51 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: monetary.h,v 1.2 2008/09/21 16:59:46 christos Exp $	*/
+/*	$NetBSD: monetary.h,v 1.2.56.1 2017/08/29 11:51:51 martin Exp $	*/
 
 /*-
  * Copyright (c) 2001 Alexey Zelkin 
@@ -44,6 +44,16 @@ typedef	_BSD_SSIZE_T_	ssize_t;
 #undef	_BSD_SSIZE_T_
 #endif
 
+#if defined(_NETBSD_SOURCE)
+#  ifndef __LOCALE_T_DECLARED
+typedef struct _locale		*locale_t;
+#  define __LOCALE_T_DECLARED
+#  endif
+__BEGIN_DECLS
+ssize_t	strfmon_l(char * __restrict, size_t, locale_t, const char * __restrict, ...)
+__attribute__((__format__(__strfmon__, 4, 5)));
+#endif
+
 __BEGIN_DECLS
 ssize_t	strfmon(char * __restrict, size_t, const char * __restrict, ...)
 __attribute__((__format__(__strfmon__, 3, 4)));

Index: src/lib/libc/stdlib/strfmon.3
diff -u 

CVS commit: [netbsd-8] src

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Aug 29 11:45:18 UTC 2017

Modified Files:
src/lib/libm [netbsd-8]: Makefile
src/tests/lib/libm [netbsd-8]: t_fe_round.c

Log Message:
Pull up the following, requested by he in ticket #212:

lib/libm/Makefile   1.192-1.196
tests/lib/libm/t_fe_round.c 1.3-1.6

Ensure that nearbyint() is included in all targets except for vax,
and add a test case for nearbyint(), stubbed out for non-IEEE (vax).


To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.191.2.1 src/lib/libm/Makefile
cvs rdiff -u -r1.2 -r1.2.8.1 src/tests/lib/libm/t_fe_round.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.191 src/lib/libm/Makefile:1.191.2.1
--- src/lib/libm/Makefile:1.191	Sat May  6 18:03:24 2017
+++ src/lib/libm/Makefile	Tue Aug 29 11:45:18 2017
@@ -1,4 +1,4 @@
-#  $NetBSD: Makefile,v 1.191 2017/05/06 18:03:24 christos Exp $
+#  $NetBSD: Makefile,v 1.191.2.1 2017/08/29 11:45:18 martin Exp $
 #
 #  @(#)Makefile 5.1beta 93/09/24
 #
@@ -62,17 +62,19 @@ COMMON_SRCS+= fenv.c
 .endif
 COMMON_SRCS+= e_sqrtl.c
 COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
+
 .elif (${LIBC_MACHINE_ARCH} == "alpha")
 .PATH: ${.CURDIR}/arch/alpha
 ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
 COMMON_SRCS+= fenv.c
 COPTS+=	-mfloat-ieee -mieee-with-inexact -mfp-trap-mode=sui -mtrap-precision=i
+
 .elif (${LIBC_MACHINE_CPU} == "arm")
 .PATH.c: ${.CURDIR}/arch/arm
 .if ${MKSOFTFLOAT} == "no"
 COMMON_SRCS+= fenv.c
 .endif
-COMMON_SRCS+= s_nexttowardf.c s_nearbyint.c s_rintl.c
+COMMON_SRCS+= s_nexttowardf.c s_rintl.c
 .for f in fenv.c lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
 COPTS.$f +=	-mfpu=vfp
 .endfor
@@ -81,24 +83,29 @@ COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
 .PATH.S: ${.CURDIR}/arch/arm
 ARCH_SRCS = e_sqrt.S e_sqrtf.S lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
 .endif
+
 .elif (${LIBC_MACHINE_ARCH} == "ia64")
 .PATH: ${.CURDIR}/arch/ia64
 COMMON_SRCS += fenv.c
+
 .elif (${LIBC_MACHINE_ARCH} == "hppa")
 .PATH.c: ${.CURDIR}/arch/hppa
-COMMON_SRCS+= fenv.c s_nexttowardf.c s_nearbyint.c s_rintl.c
+COMMON_SRCS+= fenv.c s_nexttowardf.c s_rintl.c
+
 .elif (${LIBC_MACHINE_ARCH} == "sparc")
 .PATH: ${.CURDIR}/arch/sparc
 COMMON_SRCS+= fenv.c
 COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
+
 .elif (${LIBC_MACHINE_ARCH} == "sparc64")
 .PATH: ${.CURDIR}/arch/sparc64
 COMMON_SRCS+= fenv.c
-COMMON_SRCS+= s_nexttowardf.c s_nearbyint.c s_rintl.c
+COMMON_SRCS+= s_nexttowardf.c s_rintl.c
 .ifndef _COMPAT_M32_MK_
 COMMON_SRCS+= s_nexttoward.c
 .endif
 COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
+
 .elif ((${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64"))
 
 # XXX consider making this LIBC_MACHINE_ARCH?
@@ -107,8 +114,7 @@ COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
 .endif
 .PATH:	${.CURDIR}/arch/i387
 
-COMMON_SRCS+= fenv.c s_nexttoward.c s_nexttowardf.c \
-	s_nearbyint.c s_rintl.c
+COMMON_SRCS+= fenv.c s_nexttoward.c s_nexttowardf.c s_rintl.c
 COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
 
 ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_expf.S e_fmod.S e_log.S \
@@ -128,6 +134,7 @@ s_${f}.o s_${f}.pico s_${f}.po s_${f}.go
 .if (${MACHINE_ARCH} == "i386")
 SUBDIR=arch/i387
 .endif
+
 .elif (${LIBC_MACHINE_ARCH} == "m68k")
 .if defined(M68060)
 .PATH:	${.CURDIR}/arch/m68060
@@ -146,10 +153,11 @@ ARCH_SRCS = e_acos.S e_asin.S e_atanh.S 
 	e_log10.S e_remainder.S e_scalb.S e_sinh.S e_sqrt.S s_atan.S \
 	s_ceil.S s_copysign.S s_cos.S s_expm1.S s_finite.S s_floor.S \
 	s_log1p.S s_logb.S s_rint.S s_scalbn.S s_sin.S s_tan.S s_tanh.S
-COMMON_SRCS += fenv.c
+COMMON_SRCS += fenv.c s_rintl.c
 .endif
 .endif
 # end of m68k
+
 .elif (${LIBC_MACHINE_ARCH} == "vax")
 .PATH:	${.CURDIR}/arch/vax
 
@@ -160,6 +168,7 @@ COMMON_SRCS += fenv.c
 # and emulation code isn't written yet.
 ARCH_SRCS = n_scalbn.S
 WARNS?=5
+
 .elif (${LIBC_MACHINE_CPU} == "riscv")
 .PATH:	${.CURDIR}/arch/riscv
 
@@ -172,22 +181,26 @@ ARCH_SRCS += s_fma.S s_fmaf.S
 ARCH_SRCS += s_fmax.S s_fmaxf.S
 ARCH_SRCS += s_fmin.S s_fminf.S
 .endif
+
 .elif (${LIBC_MACHINE_ARCH} == "powerpc")
 .PATH:	${.CURDIR}/arch/powerpc
 .if ${MKSOFTFLOAT} == "no"
 COMMON_SRCS += fenv.c
 .endif
+
 .elif (${LIBC_MACHINE_CPU} == "mips")
 .PATH:	${.CURDIR}/arch/mips
 .if ${MKSOFTFLOAT} == "no"
 COMMON_SRCS += fenv.c
 .endif
+
 .elif (${LIBC_MACHINE_CPU} == "sh3")
 .PATH:	${.CURDIR}/arch/sh3
 .if ${MKSOFTFLOAT} == "no"
 COMMON_SRCS += fenv.c
 .endif
 .endif
+# End of list of CPU tests
 
 WARNS?=5
 
@@ -253,7 +266,7 @@ COMMON_SRCS+= b_exp.c b_log.c b_tgamma.c
 	s_lrint.c s_lrintf.c s_lrintl.c \
 	s_lround.c s_lroundf.c s_lroundl.c \
 	s_log1pf.c s_logb.c s_logbf.c s_logbl.c \
-	s_matherr.c s_modff.c s_modfl.c s_nextafter.c s_nextafterl.c \
+	s_matherr.c s_modff.c s_modfl.c s_nearbyint.c s_nextafter.c s_nextafterl.c \
 	s_nextafterf.c s_remquo.c s_remquof.c s_rint.c s_rintf.c \
 	

CVS commit: [netbsd-8] src/tests/lib/libpthread

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Tue Aug 29 11:25:51 UTC 2017

Added Files:
src/tests/lib/libpthread [netbsd-8]: h_thread_local_dtor.cpp
t_thread_local_dtor.sh

Log Message:
Pull up following revision(s) (requested by joerg in ticket #127):
tests/libexec/ld.elf_so/h_thread_local_dtor.c: revision 1.1
external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h: revision 
1.14
external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h: revision 
1.17
lib/libc/stdlib/atexit.h: file removal
lib/libc/stdlib/exit.c: revision 1.16
external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64/c++config.h: revision 
1.8
lib/libc/stdlib/exit.c: revision 1.17
external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++config.h: revision 
1.14
distrib/sets/lists/debug/shl.mi: revision 1.178
external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/c++config.h: revision 1.21
distrib/sets/lists/debug/shl.mi: revision 1.179
distrib/sets/lists/debug/mi: revision 1.219
lib/libpthread/pthread.c: revision 1.150
external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++config.h: revision 
1.14
libexec/ld.elf_so/symbols.map: revision 1.2
include/dlfcn.h: revision 1.25
external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h: revision 1.21
external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/c++config.h: revision 
1.23
external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el/c++config.h: revision 
1.18
external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++config.h: revision 
1.14
external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h: revision 1.19
external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/c++config.h: revision 
1.19
external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/c++config.h: revision 1.5
external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++config.h: revision 
1.14
external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h: revision 
1.17
distrib/sets/lists/tests/mi: revision 1.755
external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb/c++config.h: revision 
1.19
external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h: revision 1.20
external/gpl3/gcc/lib/libstdc++-v3/arch/vax/c++config.h: revision 1.21
external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/c++config.h: revision 1.21
external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/c++config.h: revision 1.20
lib/libc/dlfcn/dlfcn_elf.c: revision 1.14
tests/libexec/ld.elf_so/t_thread_local_dtor.sh: revision 1.1
tests/lib/libpthread/t_thread_local_dtor.sh: revision 1.1
lib/libc/stdlib/Makefile.inc: revision 1.93
lib/libc/include/atexit.h: revision 1.1
lib/libc/include/atexit.h: revision 1.2
external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/c++config.h: revision 1.19
external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++config.h: revision 
1.14
distrib/sets/lists/debug/shl.mi: revision 1.180
external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/c++config.h: revision 
1.19
external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h: 
revision 1.14
external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/c++config.h: revision 1.19
external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h: 
revision 1.14
lib/libc/stdlib/cxa_thread_atexit.c: revision 1.1
tests/libexec/ld.elf_so/helper_dso3/h_helper_dso3.cpp: revision 1.1
tests/libexec/ld.elf_so/helper_dso3/Makefile: revision 1.1
external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/c++config.h: revision 
1.5
libexec/ld.elf_so/rtld.c: revision 1.185
external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb/c++config.h: revision 1.19
external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32/c++config.h: revision 
1.5
external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/c++config.h: revision 
1.15
external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/c++config.h: revision 
1.21
external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire/c++config.h: revision 
1.12
external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h: revision 
1.14
external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h: revision 
1.15
external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/c++config.h: revision 1.19
tests/libexec/ld.elf_so/Makefile: revision 1.9
external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h: revision 
1.20
external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++config.h: revision 
1.14
tests/lib/libpthread/h_thread_local_dtor.cpp: revision 1.1
distrib/sets/lists/tests/shl.mi: revision 1.11
tests/lib/libpthread/Makefile: revision 1.13
libexec/ld.elf_so/rtld.h: revision 1.129
external/gpl3/gcc/lib/libstdc++-v3/arch/or1k/c++config.h: revision 1.6
Implement __cxa_thread_atexit and __cxa_thread_atexit_impl. This
functions are used 

CVS commit: src/sys/kern

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Aug 29 10:23:13 UTC 2017

Modified Files:
src/sys/kern: kern_veriexec.c

Log Message:
One more resource to release - the filename, if we kept it.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/kern/kern_veriexec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/kern_veriexec.c
diff -u src/sys/kern/kern_veriexec.c:1.13 src/sys/kern/kern_veriexec.c:1.14
--- src/sys/kern/kern_veriexec.c:1.13	Tue Aug 29 10:19:54 2017
+++ src/sys/kern/kern_veriexec.c	Tue Aug 29 10:23:12 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_veriexec.c,v 1.13 2017/08/29 10:19:54 pgoyette Exp $	*/
+/*	$NetBSD: kern_veriexec.c,v 1.14 2017/08/29 10:23:12 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006 Elad Efrat 
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.13 2017/08/29 10:19:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.14 2017/08/29 10:23:12 pgoyette Exp $");
 
 #include "opt_veriexec.h"
 
@@ -1156,8 +1156,11 @@ veriexec_file_add(struct lwp *l, prop_di
 	veriexec_bypass = 0;
 
   unlock_out:
-	if (error)
+	if (error) {
 		kmem_free(vfe->fp, vfe->ops->hash_len);
+		if (vfe->filename != NULL)
+			kmem_free(vfe->filename, vfe->filename_len);
+	}
 	rw_exit(_op_lock);
 
   free_out:

CVS commit: src/sys/kern

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Aug 29 10:19:54 UTC 2017

Modified Files:
src/sys/kern: kern_veriexec.c

Log Message:
Release any allocated resources if we take the error paths.

As posted on tech-kern and discussed on IRC.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/kern/kern_veriexec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/kern_veriexec.c
diff -u src/sys/kern/kern_veriexec.c:1.12 src/sys/kern/kern_veriexec.c:1.13
--- src/sys/kern/kern_veriexec.c:1.12	Wed Apr 12 10:30:02 2017
+++ src/sys/kern/kern_veriexec.c	Tue Aug 29 10:19:54 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_veriexec.c,v 1.12 2017/04/12 10:30:02 hannken Exp $	*/
+/*	$NetBSD: kern_veriexec.c,v 1.13 2017/08/29 10:19:54 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006 Elad Efrat 
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.12 2017/04/12 10:30:02 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.13 2017/08/29 10:19:54 pgoyette Exp $");
 
 #include "opt_veriexec.h"
 
@@ -1079,7 +1079,7 @@ veriexec_file_add(struct lwp *l, prop_di
 		log(LOG_ERR, "Veriexec: Invalid or unknown fingerprint type "
 		"`%s' for file `%s'.\n", fp_type, file);
 		error = EOPNOTSUPP;
-		goto out;
+		goto free_out;
 	}
 
 	if (prop_data_size(prop_dictionary_get(dict, "fp")) !=
@@ -1087,7 +1087,7 @@ veriexec_file_add(struct lwp *l, prop_di
 		log(LOG_ERR, "Veriexec: Bad fingerprint length for `%s'.\n",
 		file);
 		error = EINVAL;
-		goto out;
+		goto free_out;
 	}
 
 	vfe->fp = kmem_alloc(vfe->ops->hash_len, KM_SLEEP);
@@ -1156,8 +1156,16 @@ veriexec_file_add(struct lwp *l, prop_di
 	veriexec_bypass = 0;
 
   unlock_out:
+	if (error)
+		kmem_free(vfe->fp, vfe->ops->hash_len);
 	rw_exit(_op_lock);
 
+  free_out:
+	if (error) {
+		rw_destroy(>lock);
+		kmem_free(vfe, sizeof(*vfe));
+	}
+
   out:
 	vrele(vp);
 	if (error)

CVS commit: src/sys/dev/i2c

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Tue Aug 29 10:10:54 UTC 2017

Modified Files:
src/sys/dev/i2c: axp20x.c axp20xvar.h

Log Message:
Add powerdown support and hook it in to FDT


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/i2c/axp20x.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/axp20xvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/i2c/axp20x.c
diff -u src/sys/dev/i2c/axp20x.c:1.6 src/sys/dev/i2c/axp20x.c:1.7
--- src/sys/dev/i2c/axp20x.c:1.6	Tue Aug 29 09:55:03 2017
+++ src/sys/dev/i2c/axp20x.c	Tue Aug 29 10:10:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: axp20x.c,v 1.6 2017/08/29 09:55:03 jmcneill Exp $ */
+/* $NetBSD: axp20x.c,v 1.7 2017/08/29 10:10:54 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014-2017 Jared McNeill 
@@ -29,7 +29,7 @@
 #include "opt_fdt.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1.6 2017/08/29 09:55:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1.7 2017/08/29 10:10:54 jmcneill Exp $");
 
 #include 
 #include 
@@ -43,6 +43,10 @@ __KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1
 
 #include 
 
+#ifdef FDT
+#include 
+#endif
+
 #define AXP_INPUT_STATUS	0x00
 #define AXP_INPUT_STATUS_AC_PRESENT	__BIT(7)
 #define AXP_INPUT_STATUS_AC_OK		__BIT(6)
@@ -101,6 +105,9 @@ static int ldo4_mvV[] = {
 #define AXP_LDO3_VOLT_MASK		__BITS(0,6)
 #define AXP_LDO3_VOLT_SHIFT		0
 
+#define	AXP_SHUTDOWN		0x32
+#define	AXP_SHUTDOWN_CTRL	__BIT(7)
+
 #define AXP_BKUP_CTRL			0x35
 #define AXP_BKUP_CTRL_ENABLE		__BIT(7)
 #define AXP_BKUP_CTRL_VOLT_MASK		__BITS(5,6)
@@ -198,6 +205,10 @@ static void	axp20x_sensors_refresh(struc
 static int	axp20x_read(struct axp20x_softc *, uint8_t, uint8_t *, size_t, int);
 static int	axp20x_write(struct axp20x_softc *, uint8_t, uint8_t *, size_t, int);
 
+#ifdef FDT
+static void	axp20x_fdt_attach(struct axp20x_softc *);
+#endif
+
 CFATTACH_DECL_NEW(axp20x, sizeof(struct axp20x_softc),
 axp20x_match, axp20x_attach, NULL, NULL);
 
@@ -400,6 +411,10 @@ axp20x_attach(device_t parent, device_t 
 			);
 		}
 	}
+
+#ifdef FDT
+	axp20x_fdt_attach(sc);
+#endif
 }
 
 static void
@@ -616,3 +631,33 @@ axp20x_set_dcdc(device_t dev, int dcdc, 
 		return EINVAL;
 	}
 }
+
+void
+axp20x_poweroff(device_t dev)
+{
+	struct axp20x_softc * const sc = device_private(dev);
+	uint8_t reg = AXP_SHUTDOWN_CTRL;
+
+	if (axp20x_write(sc, AXP_SHUTDOWN, , 1, I2C_F_POLL) != 0)
+		device_printf(dev, "WARNING: poweroff failed\n");
+}
+
+#ifdef FDT
+static void
+axp20x_fdt_poweroff(device_t dev)
+{
+	delay(100);
+	axp20x_poweroff(dev);
+}
+
+static struct fdtbus_power_controller_func axp20x_fdt_power_funcs = {
+	.poweroff = axp20x_fdt_poweroff,
+};
+
+static void
+axp20x_fdt_attach(struct axp20x_softc *sc)
+{
+	fdtbus_register_power_controller(sc->sc_dev, sc->sc_phandle,
+	_fdt_power_funcs);
+}
+#endif /* FDT */

Index: src/sys/dev/i2c/axp20xvar.h
diff -u src/sys/dev/i2c/axp20xvar.h:1.1 src/sys/dev/i2c/axp20xvar.h:1.2
--- src/sys/dev/i2c/axp20xvar.h:1.1	Thu Oct 15 13:41:11 2015
+++ src/sys/dev/i2c/axp20xvar.h	Tue Aug 29 10:10:54 2017
@@ -1,4 +1,4 @@
-/*  $NetBSD: axp20xvar.h,v 1.1 2015/10/15 13:41:11 bouyer Exp $   */
+/*  $NetBSD: axp20xvar.h,v 1.2 2017/08/29 10:10:54 jmcneill Exp $   */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -31,5 +31,6 @@
 #define AXP20X_DCDC3	3
 
 int	axp20x_set_dcdc(device_t, int, int, bool);
+void	axp20x_poweroff(device_t);
 
 #endif /* _DEV_I2C_AXP20XVAR_H_ */

CVS commit: src/sys/dev/i2c

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Tue Aug 29 09:55:03 UTC 2017

Modified Files:
src/sys/dev/i2c: axp20x.c

Log Message:
Add direct configuration support.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/i2c/axp20x.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/i2c/axp20x.c
diff -u src/sys/dev/i2c/axp20x.c:1.5 src/sys/dev/i2c/axp20x.c:1.6
--- src/sys/dev/i2c/axp20x.c:1.5	Sun May 14 11:39:17 2017
+++ src/sys/dev/i2c/axp20x.c	Tue Aug 29 09:55:03 2017
@@ -1,7 +1,7 @@
-/* $NetBSD: axp20x.c,v 1.5 2017/05/14 11:39:17 tnn Exp $ */
+/* $NetBSD: axp20x.c,v 1.6 2017/08/29 09:55:03 jmcneill Exp $ */
 
 /*-
- * Copyright (c) 2014 Jared D. McNeill 
+ * Copyright (c) 2014-2017 Jared McNeill 
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,8 +26,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "opt_fdt.h"
+
 #include 
-__KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1.5 2017/05/14 11:39:17 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1.6 2017/08/29 09:55:03 jmcneill Exp $");
 
 #include 
 #include 
@@ -180,6 +182,7 @@ struct axp20x_softc {
 	device_t	sc_dev;
 	i2c_tag_t	sc_i2c;
 	i2c_addr_t	sc_addr;
+	int		sc_phandle;
 
 	uint8_t 	sc_inputstatus;
 	uint8_t 	sc_powermode;
@@ -198,9 +201,19 @@ static int	axp20x_write(struct axp20x_so
 CFATTACH_DECL_NEW(axp20x, sizeof(struct axp20x_softc),
 axp20x_match, axp20x_attach, NULL, NULL);
 
+static const char * compatible[] = {
+	"x-powers,axp209",
+	NULL
+};
+
 static int
 axp20x_match(device_t parent, cfdata_t match, void *aux)
 {
+	struct i2c_attach_args * const ia = aux;
+
+	if (ia->ia_name != NULL)
+		return iic_compat_match(ia, compatible);
+
 	return 1;
 }
 
@@ -216,6 +229,7 @@ axp20x_attach(device_t parent, device_t 
 	sc->sc_dev = self;
 	sc->sc_i2c = ia->ia_tag;
 	sc->sc_addr = ia->ia_addr;
+	sc->sc_phandle = ia->ia_cookie;
 
 	error = axp20x_read(sc, AXP_INPUT_STATUS,
 	>sc_inputstatus, 1, I2C_F_POLL);

CVS commit: src/sys/arch/evbarm/conf

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Tue Aug 29 09:55:25 UTC 2017

Modified Files:
src/sys/arch/evbarm/conf: SUNXI

Log Message:
enable axp20x


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/conf/SUNXI

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/evbarm/conf/SUNXI
diff -u src/sys/arch/evbarm/conf/SUNXI:1.25 src/sys/arch/evbarm/conf/SUNXI:1.26
--- src/sys/arch/evbarm/conf/SUNXI:1.25	Sun Aug 27 16:05:26 2017
+++ src/sys/arch/evbarm/conf/SUNXI	Tue Aug 29 09:55:25 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: SUNXI,v 1.25 2017/08/27 16:05:26 jmcneill Exp $
+#	$NetBSD: SUNXI,v 1.26 2017/08/29 09:55:25 jmcneill Exp $
 #
 #	Allwinner sunxi family
 #
@@ -139,6 +139,7 @@ sunxirsb*	at fdt?			# P2WI/RSB
 iic*		at i2cbus?
 tcakp*		at iic?			# TI TCA8418 Keypad Scan IC
 wskbd*		at tcakp? console ?
+axp20x*		at iic?			# AXP209 Power Management IC
 
 # RTC
 sunxirtc*	at fdt?			# RTC

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Aug 29 09:45:47 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
Note partial backout of ticket #60


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.45 -r1.1.2.46 src/doc/CHANGES-8.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.45 src/doc/CHANGES-8.0:1.1.2.46
--- src/doc/CHANGES-8.0:1.1.2.45	Tue Aug 29 09:44:25 2017
+++ src/doc/CHANGES-8.0	Tue Aug 29 09:45:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.45 2017/08/29 09:44:25 bouyer Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.46 2017/08/29 09:45:47 martin Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -5419,3 +5419,23 @@ tests/libexec/ld.elf_so/t_thread_local_d
 	various fixes for destructors for thread_local objects at process exit.
 	[joerg, ticket #127]
 
+sys/arch/amd64/conf/GENERIC
+sys/arch/amd64/conf/XEN3_DOM0
+sys/arch/amd64/conf/XEN3_DOMU
+sys/arch/cobalt/conf/GENERIC
+sys/arch/evbarm/conf/BEAGLEBONE
+sys/arch/evbarm/conf/BEAGLEBOARD
+sys/arch/evbarm/conf/BEAGLEBOARDXM
+sys/arch/evbarm/conf/GENERIC.common
+sys/arch/i386/conf/GENERIC
+sys/arch/i386/conf/XEN3_DOM0
+sys/arch/i386/conf/XEN3_DOMU
+sys/arch/mvmeppc/conf/GENERIC
+sys/arch/shark/conf/GENERIC
+sys/arch/sparc64/conf/GENERIC
+sys/arch/zaurus/conf/GENERIC
+
+	Re-enable options DIAGNOSTIC temporarily (that is: partly back out
+	ticket #60, we will re-apply it later).
+	[skrll, ticket #60]
+

CVS commit: [netbsd-8] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Tue Aug 29 09:44:25 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
tickets 240 & 127


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.44 -r1.1.2.45 src/doc/CHANGES-8.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.44 src/doc/CHANGES-8.0:1.1.2.45
--- src/doc/CHANGES-8.0:1.1.2.44	Sat Aug 26 03:55:04 2017
+++ src/doc/CHANGES-8.0	Tue Aug 29 09:44:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.44 2017/08/26 03:55:04 snj Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.45 2017/08/29 09:44:25 bouyer Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -5339,3 +5339,83 @@ etc/etc.evbarm/Makefile.inc			1.83-1.84
 	Replace ALLWINNER_A80 (it's never really worked) with VEXPRESS_A15.
 	[snj, ticket #211]
 
+external/gpl3/binutils/dist/bfd/elfxx-mips.c	1.11
+external/gpl3/binutils/dist/bfd/elfxx-sparc.c	1.12
+external/gpl3/binutils/dist/gas/config/tc-mips.h 1.7
+external/gpl3/gcc/dist/gcc/config/arm/arm.h	1.14
+external/gpl3/gcc/dist/gcc/config/mips/netbsd.h	1.10
+external/gpl3/gcc/dist/gcc/configure		1.16
+external/gpl3/gcc/dist/gcc/configure.ac		1.14
+external/gpl3/gcc/dist/gcc/varasm.c		1.2, 1.3
+lib/csu/arch/mips/crtend.S			1.4
+lib/csu/common/crtbegin.c			1.14
+share/mk/bsd.own.mk1.1011
+
+	Fix a bunch of .eh_frame and TLS related issues.
+	[joerg, ticket #240]
+
+distrib/sets/lists/debug/mi			1.219
+distrib/sets/lists/debug/shl.mi			1.178 - 1.180
+distrib/sets/lists/tests/mi			1.755
+distrib/sets/lists/tests/shl.mi			1.11
+external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/c++config.h 1.19
+external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h 1.21
+external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/c++config.h 1.21
+external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire/c++config.h 1.12
+external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h 1.19
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h 1.17
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h 1.17
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h 1.15
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h 1.14
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++config.h 1.14
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h 1.14
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++config.h 1.14
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++config.h 1.14
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h 1.14
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++config.h 1.14
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++config.h 1.14
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++config.h 1.14
+external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h 1.14
+external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/c++config.h 1.19
+external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h 1.20
+external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/c++config.h 1.5
+external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/c++config.h 1.15
+external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/c++config.h 1.19
+external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb/c++config.h 1.19
+external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el/c++config.h 1.18
+external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/c++config.h 1.21
+external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/c++config.h 1.19
+external/gpl3/gcc/lib/libstdc++-v3/arch/or1k/c++config.h 1.6
+external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h 1.20
+external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64/c++config.h 1.8
+external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32/c++config.h 1.5
+external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/c++config.h 1.5
+external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb/c++config.h 1.19
+external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/c++config.h 1.21
+external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/c++config.h 1.20
+external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/c++config.h 1.19
+external/gpl3/gcc/lib/libstdc++-v3/arch/vax/c++config.h 1.21
+external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/c++config.h 1.23
+include/dlfcn.h	1.25
+lib/libc/dlfcn/dlfcn_elf.c			1.14
+lib/libc/include/atexit.h			1.1, 1.2
+lib/libc/stdlib/Makefile.inc			1.93
+lib/libc/stdlib/atexit.h			delete
+lib/libc/stdlib/cxa_thread_atexit.c		1.1
+lib/libc/stdlib/exit.c1.16, 1.17
+lib/libpthread/pthread.c			1.150
+libexec/ld.elf_so/rtld.c			1.185
+libexec/ld.elf_so/rtld.h			1.129
+libexec/ld.elf_so/symbols.map			1.2
+tests/lib/libpthread/Makefile			1.13
+tests/lib/libpthread/h_thread_local_dtor.cpp	1.1
+tests/lib/libpthread/t_thread_local_dtor.sh	1.1
+tests/libexec/ld.elf_so/Makefile		1.9
+tests/libexec/ld.elf_so/h_thread_local_dtor.c	1.1
+tests/libexec/ld.elf_so/helper_dso3/Makefile	1.1
+tests/libexec/ld.elf_so/helper_dso3/h_helper_dso3.cpp 1.1
+tests/libexec/ld.elf_so/t_thread_local_dtor.sh	1.1

CVS commit: [netbsd-8] src

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Tue Aug 29 09:43:20 UTC 2017

Modified Files:
src/distrib/sets/lists/debug [netbsd-8]: mi shl.mi
src/distrib/sets/lists/tests [netbsd-8]: mi shl.mi
src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm [netbsd-8]: c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4 [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6 [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7 [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386 [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64 [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000 [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/or1k [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64 [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32 [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64 [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64 [netbsd-8]:
c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax [netbsd-8]: c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64 [netbsd-8]:
c++config.h
src/include [netbsd-8]: dlfcn.h
src/lib/libc/dlfcn [netbsd-8]: dlfcn_elf.c
src/lib/libc/stdlib [netbsd-8]: Makefile.inc exit.c
src/lib/libpthread [netbsd-8]: pthread.c
src/libexec/ld.elf_so [netbsd-8]: rtld.c rtld.h symbols.map
src/tests/lib/libpthread [netbsd-8]: Makefile
src/tests/libexec/ld.elf_so [netbsd-8]: Makefile
Added Files:
src/lib/libc/include [netbsd-8]: atexit.h
src/lib/libc/stdlib [netbsd-8]: cxa_thread_atexit.c
src/tests/libexec/ld.elf_so [netbsd-8]: h_thread_local_dtor.c
t_thread_local_dtor.sh
src/tests/libexec/ld.elf_so/helper_dso3 [netbsd-8]: Makefile
h_helper_dso3.cpp
Removed Files:
src/lib/libc/stdlib [netbsd-8]: atexit.h

Log Message:
Pull up following revision(s) (requested by joerg in ticket #127):
tests/libexec/ld.elf_so/h_thread_local_dtor.c: revision 1.1
external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h: revision 
1.14
external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h: revision 
1.17
lib/libc/stdlib/atexit.h: file removal
lib/libc/stdlib/exit.c: revision 1.16
  

CVS commit: [netbsd-8] src/sys/arch

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Aug 29 09:42:19 UTC 2017

Modified Files:
src/sys/arch/amd64/conf [netbsd-8]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/cobalt/conf [netbsd-8]: GENERIC
src/sys/arch/evbarm/conf [netbsd-8]: BEAGLEBOARD BEAGLEBOARDXM
BEAGLEBONE GENERIC.common
src/sys/arch/i386/conf [netbsd-8]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/mvmeppc/conf [netbsd-8]: GENERIC
src/sys/arch/shark/conf [netbsd-8]: GENERIC
src/sys/arch/sparc64/conf [netbsd-8]: GENERIC
src/sys/arch/zaurus/conf [netbsd-8]: GENERIC

Log Message:
Requested by skrll in ticket #60:
sys/arch/amd64/conf/GENERIC
sys/arch/amd64/conf/XEN3_DOM0
sys/arch/amd64/conf/XEN3_DOMU
sys/arch/cobalt/conf/GENERIC
sys/arch/evbarm/conf/BEAGLEBONE
sys/arch/evbarm/conf/BEAGLEBOARD
sys/arch/evbarm/conf/BEAGLEBOARDXM
sys/arch/evbarm/conf/GENERIC.common
sys/arch/i386/conf/GENERIC
sys/arch/i386/conf/XEN3_DOM0
sys/arch/i386/conf/XEN3_DOMU
sys/arch/mvmeppc/conf/GENERIC
sys/arch/shark/conf/GENERIC
sys/arch/sparc64/conf/GENERIC
sys/arch/zaurus/conf/GENERIC

Re-enable option DIAGNOSTIC for now, will remove it again later.


To generate a diff of this commit:
cvs rdiff -u -r1.459.2.2 -r1.459.2.3 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.135.4.2 -r1.135.4.3 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.75.2.1 -r1.75.2.2 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.151.8.1 -r1.151.8.2 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.61.6.1 -r1.61.6.2 src/sys/arch/evbarm/conf/BEAGLEBOARD
cvs rdiff -u -r1.23.6.2 -r1.23.6.3 src/sys/arch/evbarm/conf/BEAGLEBOARDXM
cvs rdiff -u -r1.42.2.2 -r1.42.2.3 src/sys/arch/evbarm/conf/BEAGLEBONE
cvs rdiff -u -r1.18.6.2 -r1.18.6.3 src/sys/arch/evbarm/conf/GENERIC.common
cvs rdiff -u -r1.1156.2.3 -r1.1156.2.4 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.112.4.2 -r1.112.4.3 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.77.2.1 -r1.77.2.2 src/sys/arch/i386/conf/XEN3_DOMU
cvs rdiff -u -r1.27.6.1 -r1.27.6.2 src/sys/arch/mvmeppc/conf/GENERIC
cvs rdiff -u -r1.127.6.1 -r1.127.6.2 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.198.6.1 -r1.198.6.2 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.73.6.1 -r1.73.6.2 src/sys/arch/zaurus/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.459.2.2 src/sys/arch/amd64/conf/GENERIC:1.459.2.3
--- src/sys/arch/amd64/conf/GENERIC:1.459.2.2	Tue Aug  1 23:18:30 2017
+++ src/sys/arch/amd64/conf/GENERIC	Tue Aug 29 09:42:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.459.2.2 2017/08/01 23:18:30 snj Exp $
+# $NetBSD: GENERIC,v 1.459.2.3 2017/08/29 09:42:19 martin Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.459.2.2 $"
+#ident		"GENERIC-$Revision: 1.459.2.3 $"
 
 maxusers	64		# estimated number of users
 
@@ -89,7 +89,7 @@ options 	PMC		# performance-monitoring c
 options 	BUFQ_PRIOCSCAN
 
 # Diagnostic/debugging support options
-#options 	DIAGNOSTIC	# inexpensive kernel consistency checks
+options 	DIAGNOSTIC	# inexpensive kernel consistency checks
 # XXX to be commented out on release branch
 #options 	DEBUG		# expensive debugging checks/support
 #options 	LOCKDEBUG	# expensive locking checks/support

Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.135.4.2 src/sys/arch/amd64/conf/XEN3_DOM0:1.135.4.3
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.135.4.2	Wed Jul  5 13:58:48 2017
+++ src/sys/arch/amd64/conf/XEN3_DOM0	Tue Aug 29 09:42:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.135.4.2 2017/07/05 13:58:48 martin Exp $
+# $NetBSD: XEN3_DOM0,v 1.135.4.3 2017/08/29 09:42:19 martin Exp $
 
 include 	"arch/amd64/conf/std.xen"
 
@@ -50,7 +50,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include 
 options 	BUFQ_PRIOCSCAN
 
 # Diagnostic/debugging support options
-#options 	DIAGNOSTIC	# inexpensive kernel consistency checks
+options 	DIAGNOSTIC	# inexpensive kernel consistency checks
 #options 	DEBUG		# expensive debugging checks/support
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1	# see also sysctl(7): `ddb.onpanic'

Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.75.2.1 src/sys/arch/amd64/conf/XEN3_DOMU:1.75.2.2
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.75.2.1	Wed Jul  5 13:58:48 2017
+++ src/sys/arch/amd64/conf/XEN3_DOMU	Tue Aug 29 09:42:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.75.2.1 2017/07/05 13:58:48 martin Exp $
+# $NetBSD: XEN3_DOMU,v 1.75.2.2 2017/08/29 09:42:19 martin Exp $
 
 include 	"arch/amd64/conf/std.xen"
 
@@ -42,7 +42,7 @@ options 	

CVS commit: src/sys/arch/hppa/stand

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Aug 29 09:17:43 UTC 2017

Modified Files:
src/sys/arch/hppa/stand: Makefile.buildboot Makefile.inc

Log Message:
disable PIE and SSP


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/stand/Makefile.buildboot \
src/sys/arch/hppa/stand/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hppa/stand/Makefile.buildboot
diff -u src/sys/arch/hppa/stand/Makefile.buildboot:1.3 src/sys/arch/hppa/stand/Makefile.buildboot:1.4
--- src/sys/arch/hppa/stand/Makefile.buildboot:1.3	Sat Apr  8 15:53:20 2017
+++ src/sys/arch/hppa/stand/Makefile.buildboot	Tue Aug 29 05:17:43 2017
@@ -1,5 +1,7 @@
-#	$NetBSD: Makefile.buildboot,v 1.3 2017/04/08 19:53:20 christos Exp $
+#	$NetBSD: Makefile.buildboot,v 1.4 2017/08/29 09:17:43 christos Exp $
 
+NOPIE=yes
+NOSSP=yes
 NODEBUG=yes
 RELOC=	12
 HEAP_LIMIT=0x1c
Index: src/sys/arch/hppa/stand/Makefile.inc
diff -u src/sys/arch/hppa/stand/Makefile.inc:1.3 src/sys/arch/hppa/stand/Makefile.inc:1.4
--- src/sys/arch/hppa/stand/Makefile.inc:1.3	Sun Feb 21 09:50:05 2016
+++ src/sys/arch/hppa/stand/Makefile.inc	Tue Aug 29 05:17:43 2017
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile.inc,v 1.3 2016/02/21 14:50:05 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.4 2017/08/29 09:17:43 christos Exp $
 
+NOSSP=yes
 NOPIE=yes
 NOCTF=yes
 BINDIR=		/usr/mdec

CVS commit: [netbsd-8] src

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Tue Aug 29 09:10:36 UTC 2017

Modified Files:
src/external/gpl3/binutils/dist/bfd [netbsd-8]: elfxx-mips.c
elfxx-sparc.c
src/external/gpl3/binutils/dist/gas/config [netbsd-8]: tc-mips.h
src/external/gpl3/gcc/dist/gcc [netbsd-8]: configure configure.ac
varasm.c
src/external/gpl3/gcc/dist/gcc/config/arm [netbsd-8]: arm.h
src/external/gpl3/gcc/dist/gcc/config/mips [netbsd-8]: netbsd.h
src/lib/csu/arch/mips [netbsd-8]: crtend.S
src/lib/csu/common [netbsd-8]: crtbegin.c
src/share/mk [netbsd-8]: bsd.own.mk

Log Message:
Pull up following revision(s) (requested by joerg in ticket #240):
external/gpl3/binutils/dist/gas/config/tc-mips.h: revision 1.7
external/gpl3/gcc/dist/gcc/configure: revision 1.16
external/gpl3/gcc/dist/gcc/varasm.c: revision 1.2
external/gpl3/gcc/dist/gcc/varasm.c: revision 1.3
external/gpl3/gcc/dist/gcc/config/mips/netbsd.h: revision 1.10
lib/csu/arch/mips/crtend.S: revision 1.4
share/mk/bsd.own.mk: revision 1.1011
lib/csu/common/crtbegin.c: revision 1.14
external/gpl3/binutils/dist/bfd/elfxx-mips.c: revision 1.11
external/gpl3/gcc/dist/gcc/configure.ac: revision 1.14
external/gpl3/binutils/dist/bfd/elfxx-sparc.c: revision 1.12
external/gpl3/gcc/dist/gcc/config/arm/arm.h: revision 1.14
Create references as absolute pointers internally for .cfi*.
Do not warn for anonymous relocations in read-only .eh_frame,
they will be turned into relative entries afterwards.
A const declaration with explicit section attribute should create a
read-only section, whether it is initialized or not.
Use read-only .eh_frame.
Detect advance_loc support with readelf, not objdump. The latter is
broken in some situations before binutils 2.28.
.eh_frame should be read-only on MIPS too.
Build PIC libs on MIPS and PPC64. While the normal calling convention is
position-independent, real PIC defaults to Global Dynamic as TLS model,
while non-PIC and PIE code can use more restrictive models like Initial
Exec. This is most visible with the thread_local destructor code now
using TLS in libc as it would be clobbered by any other shared library
with TLS due to static offset assignment by ld.
Fix encoding of LSDA entries. .eh_frame references in non-PIC mode can
use plain pointers. For PIC, any references to global objects must be
indirect, but the .eh_frame entries themselve should be pcrel.
One more missing check for DECL_INITIAL being non-NULL.
TLS relocations for PIE and non-PIE main executable work the same, so
apply the same relaxation rules and the same static binding rules.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.6.1 \
src/external/gpl3/binutils/dist/bfd/elfxx-mips.c
cvs rdiff -u -r1.11 -r1.11.6.1 \
src/external/gpl3/binutils/dist/bfd/elfxx-sparc.c
cvs rdiff -u -r1.6 -r1.6.6.1 \
src/external/gpl3/binutils/dist/gas/config/tc-mips.h
cvs rdiff -u -r1.15 -r1.15.8.1 src/external/gpl3/gcc/dist/gcc/configure
cvs rdiff -u -r1.13 -r1.13.8.1 src/external/gpl3/gcc/dist/gcc/configure.ac
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.8.1 src/external/gpl3/gcc/dist/gcc/varasm.c
cvs rdiff -u -r1.13 -r1.13.8.1 \
src/external/gpl3/gcc/dist/gcc/config/arm/arm.h
cvs rdiff -u -r1.9 -r1.9.4.1 \
src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h
cvs rdiff -u -r1.3 -r1.3.22.1 src/lib/csu/arch/mips/crtend.S
cvs rdiff -u -r1.13 -r1.13.8.1 src/lib/csu/common/crtbegin.c
cvs rdiff -u -r1.1009.2.1 -r1.1009.2.2 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/external/gpl3/binutils/dist/bfd/elfxx-mips.c
diff -u src/external/gpl3/binutils/dist/bfd/elfxx-mips.c:1.10 src/external/gpl3/binutils/dist/bfd/elfxx-mips.c:1.10.6.1
--- src/external/gpl3/binutils/dist/bfd/elfxx-mips.c:1.10	Wed Oct 26 18:42:52 2016
+++ src/external/gpl3/binutils/dist/bfd/elfxx-mips.c	Tue Aug 29 09:10:36 2017
@@ -8596,12 +8596,18 @@ _bfd_mips_elf_check_relocs (bfd *abfd, s
 		  /* In the N32 and 64-bit ABIs there may be multiple
 		 consecutive relocations for the same offset.  If we have
 		 a R_MIPS_GPREL32 followed by a R_MIPS_64 then that
-		 relocation is complete and needs no futher adjustment.  */
+		 relocation is complete and needs no futher adjustment.
+		 
+		 Silently ignore absolute relocations in the .eh_frame
+		 section, they will be dropped latter.
+		   */
 		  if ((rel == relocs
 		  || rel[-1].r_offset != rel->r_offset
 		  || r_type != R_MIPS_64
 		  || ELF_R_TYPE(abfd, rel[-1].r_info) != R_MIPS_GPREL32)
-		  && MIPS_ELF_READONLY_SECTION (sec))
+		  && MIPS_ELF_READONLY_SECTION (sec)
+		  && !((r_type == R_MIPS_32 || r_type == R_MIPS_64)
+		   && strcmp(sec->name, ".eh_frame") == 0))
 		{
 		  /* We tell the 

CVS import: xsrc/external/mit/xkbcomp/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 29 09:09:06 UTC 2017

Update of /cvsroot/xsrc/external/mit/xkbcomp/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24906

Log Message:
initial import of xkbcomp-1.4.0

Status:

Vendor Tag: xorg
Release Tags:   xkbcomp-1-4-0

U xsrc/external/mit/xkbcomp/dist/xkbcomp.pc.in
U xsrc/external/mit/xkbcomp/dist/Makefile.am
U xsrc/external/mit/xkbcomp/dist/configure
U xsrc/external/mit/xkbcomp/dist/configure.ac
U xsrc/external/mit/xkbcomp/dist/aclocal.m4
U xsrc/external/mit/xkbcomp/dist/Makefile.in
U xsrc/external/mit/xkbcomp/dist/config.h.in
U xsrc/external/mit/xkbcomp/dist/ChangeLog
U xsrc/external/mit/xkbcomp/dist/COPYING
U xsrc/external/mit/xkbcomp/dist/config.guess
U xsrc/external/mit/xkbcomp/dist/INSTALL
U xsrc/external/mit/xkbcomp/dist/README
U xsrc/external/mit/xkbcomp/dist/compile
U xsrc/external/mit/xkbcomp/dist/geometry.c
U xsrc/external/mit/xkbcomp/dist/config.sub
U xsrc/external/mit/xkbcomp/dist/depcomp
U xsrc/external/mit/xkbcomp/dist/install-sh
U xsrc/external/mit/xkbcomp/dist/missing
U xsrc/external/mit/xkbcomp/dist/xkbparse.c
U xsrc/external/mit/xkbcomp/dist/ylwrap
U xsrc/external/mit/xkbcomp/dist/action.c
U xsrc/external/mit/xkbcomp/dist/action.h
U xsrc/external/mit/xkbcomp/dist/alias.c
U xsrc/external/mit/xkbcomp/dist/alias.h
U xsrc/external/mit/xkbcomp/dist/compat.c
U xsrc/external/mit/xkbcomp/dist/compat.h
U xsrc/external/mit/xkbcomp/dist/expr.c
U xsrc/external/mit/xkbcomp/dist/expr.h
U xsrc/external/mit/xkbcomp/dist/indicators.c
U xsrc/external/mit/xkbcomp/dist/indicators.h
U xsrc/external/mit/xkbcomp/dist/keycodes.c
U xsrc/external/mit/xkbcomp/dist/keycodes.h
U xsrc/external/mit/xkbcomp/dist/keymap.c
U xsrc/external/mit/xkbcomp/dist/keytypes.c
U xsrc/external/mit/xkbcomp/dist/listing.c
U xsrc/external/mit/xkbcomp/dist/misc.c
U xsrc/external/mit/xkbcomp/dist/misc.h
U xsrc/external/mit/xkbcomp/dist/parseutils.c
U xsrc/external/mit/xkbcomp/dist/parseutils.h
U xsrc/external/mit/xkbcomp/dist/symbols.c
U xsrc/external/mit/xkbcomp/dist/tokens.h
U xsrc/external/mit/xkbcomp/dist/utils.c
U xsrc/external/mit/xkbcomp/dist/utils.h
U xsrc/external/mit/xkbcomp/dist/vmod.c
U xsrc/external/mit/xkbcomp/dist/vmod.h
U xsrc/external/mit/xkbcomp/dist/xkbcomp.c
U xsrc/external/mit/xkbcomp/dist/xkbcomp.h
U xsrc/external/mit/xkbcomp/dist/xkbparse.y
U xsrc/external/mit/xkbcomp/dist/xkbpath.c
U xsrc/external/mit/xkbcomp/dist/xkbpath.h
U xsrc/external/mit/xkbcomp/dist/xkbscan.c
U xsrc/external/mit/xkbcomp/dist/man/Makefile.am
U xsrc/external/mit/xkbcomp/dist/man/Makefile.in
U xsrc/external/mit/xkbcomp/dist/man/xkbcomp.man

No conflicts created by this import

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 29 09:02:10 UTC 2017

Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/distrib/sets/lists/xetc: mi
src/external/mit/xorg/lib/fontconfig/etc/conf.avail: Makefile
src/external/mit/xorg/lib/fontconfig/etc/conf.d: Makefile
src/external/mit/xorg/lib/fontconfig/src: Makefile shlib_version
src/external/mit/xorg/tools/fc-cache: Makefile

Log Message:
updates for fontconfig 2.8.

note that we don't (yet?) install the new fc-blank as it
has a python generator.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/lib/fontconfig/src/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/lib/fontconfig/src/shlib_version
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/tools/fc-cache/Makefile

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/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.76 src/distrib/sets/lists/xbase/shl.mi:1.77
--- src/distrib/sets/lists/xbase/shl.mi:1.76	Sun Mar  5 09:27:52 2017
+++ src/distrib/sets/lists/xbase/shl.mi	Tue Aug 29 09:02:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.76 2017/03/05 09:27:52 mrg Exp $
+# $NetBSD: shl.mi,v 1.77 2017/08/29 09:02:10 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -175,7 +175,7 @@
 ./usr/X11R7/lib/libexpat.so.2.0			-obsolete-		obsolete
 ./usr/X11R7/lib/libfontconfig.so		-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libfontconfig.so.2		-unknown-		xorg,compatx11file
-./usr/X11R7/lib/libfontconfig.so.2.2		-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libfontconfig.so.2.3		-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libfontenc.so			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libfontenc.so.2			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libfontenc.so.2.0		-unknown-		xorg,compatx11file

Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.39 src/distrib/sets/lists/xdebug/shl.mi:1.40
--- src/distrib/sets/lists/xdebug/shl.mi:1.39	Sun Mar  5 22:24:29 2017
+++ src/distrib/sets/lists/xdebug/shl.mi	Tue Aug 29 09:02:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.39 2017/03/05 22:24:29 htodd Exp $
+# $NetBSD: shl.mi,v 1.40 2017/08/29 09:02:10 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/lib	-unknown-		xorg,debug,compatx11dir
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug	obsolete		xorg,obsolete
@@ -58,7 +58,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libepoxy.so.0.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug	-obsolete-		obsolete,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug	-unknown-		xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.3.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.18.0.13.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug	-unknown-		xorg,debug,compatx11file

Index: src/distrib/sets/lists/xetc/mi
diff -u src/distrib/sets/lists/xetc/mi:1.27 src/distrib/sets/lists/xetc/mi:1.28
--- src/distrib/sets/lists/xetc/mi:1.27	Thu Dec 15 12:56:52 2016
+++ src/distrib/sets/lists/xetc/mi	Tue Aug 29 09:02:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.27 2016/12/15 12:56:52 kre Exp $
+# $NetBSD: mi,v 1.28 2017/08/29 09:02:10 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -58,6 +58,10 @@
 ./etc/X11/xsm/system.xsm-unknown-	xorg
 ./etc/drirc		-unknown-	xorg
 ./etc/fonts/conf.avail/10-autohint.conf			-unknown-	xorg
+./etc/fonts/conf.avail/10-hinting-full.conf		-unknown-	xorg
+./etc/fonts/conf.avail/10-hinting-medium.conf		-unknown-	xorg
+./etc/fonts/conf.avail/10-hinting-none.conf		-unknown-	xorg
+./etc/fonts/conf.avail/10-hinting-slight.conf		-unknown-	xorg
 ./etc/fonts/conf.avail/10-no-sub-pixel.conf		-unknown-	xorg
 ./etc/fonts/conf.avail/10-scale-bitmap-fonts.conf	-unknown-	xorg
 ./etc/fonts/conf.avail/10-sub-pixel-bgr.conf		-unknown-	xorg
@@ -88,6 +92,7 @@
 ./etc/fonts/conf.avail/80-delicious.conf		-unknown-	xorg
 

CVS commit: xsrc/external/mit/fontconfig/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 29 08:46:05 UTC 2017

Modified Files:
xsrc/external/mit/fontconfig/include: config.h
Added Files:
xsrc/external/mit/fontconfig/include: fcalias.h fcaliastail.h
fcftalias.h fcftaliastail.h fcstdint.h

Log Message:
oops, update these, not delete them.  also add new fcstdint.h


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/fontconfig/include/config.h
cvs rdiff -u -r0 -r1.7 xsrc/external/mit/fontconfig/include/fcalias.h \
xsrc/external/mit/fontconfig/include/fcaliastail.h
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/fontconfig/include/fcftalias.h
cvs rdiff -u -r0 -r1.4 xsrc/external/mit/fontconfig/include/fcftaliastail.h
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/fontconfig/include/fcstdint.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/include/config.h
diff -u xsrc/external/mit/fontconfig/include/config.h:1.7 xsrc/external/mit/fontconfig/include/config.h:1.8
--- xsrc/external/mit/fontconfig/include/config.h:1.7	Tue Aug 29 08:38:50 2017
+++ xsrc/external/mit/fontconfig/include/config.h	Tue Aug 29 08:46:05 2017
@@ -19,8 +19,10 @@
 /* Architecture prefix to use for cache file names */
 /* #undef FC_ARCHITECTURE */
 
+#if 0
 /* System font directory */
 #define FC_DEFAULT_FONTS "/usr/share/fonts"
+#endif
 
 /* The type of len parameter of the gperf hash/lookup function */
 #define FC_GPERF_SIZE_T size_t

Added files:

Index: xsrc/external/mit/fontconfig/include/fcalias.h
diff -u /dev/null xsrc/external/mit/fontconfig/include/fcalias.h:1.7
--- /dev/null	Tue Aug 29 08:46:05 2017
+++ xsrc/external/mit/fontconfig/include/fcalias.h	Tue Aug 29 08:46:05 2017
@@ -0,0 +1,410 @@
+extern __typeof (FcBlanksCreate) IA__FcBlanksCreate __attribute((visibility("hidden")));
+#define FcBlanksCreate IA__FcBlanksCreate
+extern __typeof (FcBlanksDestroy) IA__FcBlanksDestroy __attribute((visibility("hidden")));
+#define FcBlanksDestroy IA__FcBlanksDestroy
+extern __typeof (FcBlanksAdd) IA__FcBlanksAdd __attribute((visibility("hidden")));
+#define FcBlanksAdd IA__FcBlanksAdd
+extern __typeof (FcBlanksIsMember) IA__FcBlanksIsMember __attribute((visibility("hidden")));
+#define FcBlanksIsMember IA__FcBlanksIsMember
+extern __typeof (FcCacheCopySet) IA__FcCacheCopySet __attribute((visibility("hidden")));
+#define FcCacheCopySet IA__FcCacheCopySet
+extern __typeof (FcCacheNumSubdir) IA__FcCacheNumSubdir __attribute((visibility("hidden")));
+#define FcCacheNumSubdir IA__FcCacheNumSubdir
+extern __typeof (FcCacheNumFont) IA__FcCacheNumFont __attribute((visibility("hidden")));
+#define FcCacheNumFont IA__FcCacheNumFont
+extern __typeof (FcDirCacheUnlink) IA__FcDirCacheUnlink __attribute((visibility("hidden")));
+#define FcDirCacheUnlink IA__FcDirCacheUnlink
+extern __typeof (FcDirCacheValid) IA__FcDirCacheValid __attribute((visibility("hidden")));
+#define FcDirCacheValid IA__FcDirCacheValid
+extern __typeof (FcDirCacheClean) IA__FcDirCacheClean __attribute((visibility("hidden")));
+#define FcDirCacheClean IA__FcDirCacheClean
+extern __typeof (FcCacheCreateTagFile) IA__FcCacheCreateTagFile __attribute((visibility("hidden")));
+#define FcCacheCreateTagFile IA__FcCacheCreateTagFile
+extern __typeof (FcConfigHome) IA__FcConfigHome __attribute((visibility("hidden")));
+#define FcConfigHome IA__FcConfigHome
+extern __typeof (FcConfigEnableHome) IA__FcConfigEnableHome __attribute((visibility("hidden")));
+#define FcConfigEnableHome IA__FcConfigEnableHome
+extern __typeof (FcConfigFilename) IA__FcConfigFilename __attribute((visibility("hidden")));
+#define FcConfigFilename IA__FcConfigFilename
+extern __typeof (FcConfigCreate) IA__FcConfigCreate __attribute((visibility("hidden")));
+#define FcConfigCreate IA__FcConfigCreate
+extern __typeof (FcConfigReference) IA__FcConfigReference __attribute((visibility("hidden")));
+#define FcConfigReference IA__FcConfigReference
+extern __typeof (FcConfigDestroy) IA__FcConfigDestroy __attribute((visibility("hidden")));
+#define FcConfigDestroy IA__FcConfigDestroy
+extern __typeof (FcConfigSetCurrent) IA__FcConfigSetCurrent __attribute((visibility("hidden")));
+#define FcConfigSetCurrent IA__FcConfigSetCurrent
+extern __typeof (FcConfigGetCurrent) IA__FcConfigGetCurrent __attribute((visibility("hidden")));
+#define FcConfigGetCurrent IA__FcConfigGetCurrent
+extern __typeof (FcConfigUptoDate) IA__FcConfigUptoDate __attribute((visibility("hidden")));
+#define FcConfigUptoDate IA__FcConfigUptoDate
+extern __typeof (FcConfigBuildFonts) IA__FcConfigBuildFonts __attribute((visibility("hidden")));
+#define FcConfigBuildFonts IA__FcConfigBuildFonts
+extern __typeof (FcConfigGetFontDirs) IA__FcConfigGetFontDirs __attribute((visibility("hidden")));
+#define FcConfigGetFontDirs IA__FcConfigGetFontDirs
+extern __typeof (FcConfigGetConfigDirs) IA__FcConfigGetConfigDirs 

CVS commit: xsrc/external/mit/fontconfig

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 29 08:38:50 UTC 2017

Modified Files:
xsrc/external/mit/fontconfig/dist/doc: FcLangSetGetLangs.3
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel:
fclangsetgetlangs.html
xsrc/external/mit/fontconfig/dist/fc-cache: fc-cache.c
xsrc/external/mit/fontconfig/dist/src: fccache.c fccfg.c fcinit.c
fcint.h fcmatch.c fcname.c fcstat.c
xsrc/external/mit/fontconfig/include: config.h
Removed Files:
xsrc/external/mit/fontconfig/dist/src: fchash.c
xsrc/external/mit/fontconfig/include: fcalias.h fcaliastail.h
fcftalias.h fcftaliastail.h

Log Message:
merge fontconfig 2.12.4.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3
cvs rdiff -u -r1.3 -r1.4 \

xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/fontconfig/dist/src/fccache.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/fontconfig/dist/src/fccfg.c \
xsrc/external/mit/fontconfig/dist/src/fcinit.c
cvs rdiff -u -r1.3 -r0 xsrc/external/mit/fontconfig/dist/src/fchash.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/fontconfig/dist/src/fcint.h \
xsrc/external/mit/fontconfig/dist/src/fcmatch.c \
xsrc/external/mit/fontconfig/dist/src/fcname.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/fontconfig/dist/src/fcstat.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/fontconfig/include/config.h
cvs rdiff -u -r1.5 -r0 xsrc/external/mit/fontconfig/include/fcalias.h \
xsrc/external/mit/fontconfig/include/fcaliastail.h
cvs rdiff -u -r1.1 -r0 xsrc/external/mit/fontconfig/include/fcftalias.h
cvs rdiff -u -r1.2 -r0 xsrc/external/mit/fontconfig/include/fcftaliastail.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3
diff -u xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.3 xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.4
--- xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.3	Sat Jul 12 04:11:34 2014
+++ xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3	Tue Aug 29 08:38:50 2017
@@ -1,5 +1,5 @@
 .\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetGetLangs" "3" "24 3月 2014" "Fontconfig 2.11.1" ""
+.TH "FcLangSetGetLangs" "3" "05 7月 2017" "Fontconfig 2.12.4" ""
 .SH NAME
 FcLangSetGetLangs \- get the list of languages in the langset
 .SH SYNOPSIS

Index: xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html
diff -u xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.3 xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.4
--- xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.3	Sat Jul 12 04:11:34 2014
+++ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html	Tue Aug 29 08:38:50 2017
@@ -10,7 +10,7 @@ REL="HOME"
 HREF="t1.html">NameSynopsisDescriptionUp
 const struct option longopts[] = {
+{"error-on-no-fonts", 0, 0, 'E'},
 {"force", 0, 0, 'f'},
 {"quick", 0, 0, 'q'},
 {"really-force", 0, 0, 'r'},
@@ -87,16 +88,17 @@ usage (char *program, int error)
 {
 FILE *file = error ? stderr : stdout;
 #if HAVE_GETOPT_LONG
-fprintf (file, "usage: %s [-fqrsvVh] [--quick] [-y SYSROOT] [--force|--really-force] [--sysroot=SYSROOT] [--system-only] [--verbose] [--version] [--help] [dirs]\n",
+fprintf (file, "usage: %s [-EfqrsvVh] [--quick] [-y SYSROOT] [--error-on-no-fonts] [--force|--really-force] [--sysroot=SYSROOT] [--system-only] [--verbose] [--version] [--help] [dirs]\n",
 	 program);
 #else
-fprintf (file, "usage: %s [-fqrsvVh] [-y SYSROOT] [dirs]\n",
+fprintf (file, "usage: %s [-EfqrsvVh] [-y SYSROOT] [dirs]\n",
 	 program);
 #endif
 fprintf (file, "Build font information caches in [dirs]\n"
 	 "(all directories in font configuration by default).\n");
 fprintf (file, "\n");
 #if HAVE_GETOPT_LONG
+fprintf (file, "  -E, --error-on-no-fonts  raise an error if no fonts in a directory\n");
 fprintf (file, "  -f, --force  scan directories with apparently valid caches\n");
 fprintf (file, "  -q, --quick  don't sleep before exiting\n");
 fprintf (file, "  -r, --really-force   erase all existing caches, then rescan\n");
@@ -106,6 +108,8 @@ usage (char *program, int error)
 fprintf (file, "  -V, --versiondisplay font config version and exit\n");
 fprintf (file, "  -h, --help   display this help and exit\n");
 #else
+fprintf (file, "  -E (error-on-no-fonts)\n");
+fprintf (file, "   raise an error if no fonts 

CVS import: xsrc/external/mit/fontconfig/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 29 08:32:35 UTC 2017

Update of /cvsroot/xsrc/external/mit/fontconfig/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv7468

Log Message:
initial import of fontconfig-2.12.4

Status:

Vendor Tag: xorg
Release Tags:   fontconfig-2-12-4

U xsrc/external/mit/fontconfig/dist/config.sub
U xsrc/external/mit/fontconfig/dist/missing
U xsrc/external/mit/fontconfig/dist/INSTALL
U xsrc/external/mit/fontconfig/dist/install-sh
U xsrc/external/mit/fontconfig/dist/NEWS
U xsrc/external/mit/fontconfig/dist/config-fixups.h
U xsrc/external/mit/fontconfig/dist/configure
U xsrc/external/mit/fontconfig/dist/Makefile.am
U xsrc/external/mit/fontconfig/dist/fonts.conf.in
U xsrc/external/mit/fontconfig/dist/depcomp
U xsrc/external/mit/fontconfig/dist/test-driver
U xsrc/external/mit/fontconfig/dist/fontconfig.pc.in
U xsrc/external/mit/fontconfig/dist/aclocal.m4
U xsrc/external/mit/fontconfig/dist/Makefile.in
U xsrc/external/mit/fontconfig/dist/README
U xsrc/external/mit/fontconfig/dist/ltmain.sh
U xsrc/external/mit/fontconfig/dist/compile
U xsrc/external/mit/fontconfig/dist/configure.ac
U xsrc/external/mit/fontconfig/dist/fontconfig.spec.in
U xsrc/external/mit/fontconfig/dist/fontconfig.spec
U xsrc/external/mit/fontconfig/dist/config.guess
U xsrc/external/mit/fontconfig/dist/config.h.in
U xsrc/external/mit/fontconfig/dist/AUTHORS
U xsrc/external/mit/fontconfig/dist/COPYING
U xsrc/external/mit/fontconfig/dist/ChangeLog
U xsrc/external/mit/fontconfig/dist/Tools.mk
U xsrc/external/mit/fontconfig/dist/fonts.dtd
U xsrc/external/mit/fontconfig/dist/fontconfig-zip.in
U xsrc/external/mit/fontconfig/dist/fc-case/fccase.tmpl.h
U xsrc/external/mit/fontconfig/dist/fc-case/Makefile.in
U xsrc/external/mit/fontconfig/dist/fc-case/Makefile.am
U xsrc/external/mit/fontconfig/dist/fc-case/fc-case.c
U xsrc/external/mit/fontconfig/dist/fc-case/fccase.h
U xsrc/external/mit/fontconfig/dist/fc-case/CaseFolding.txt
U xsrc/external/mit/fontconfig/dist/fontconfig/fcprivate.h
U xsrc/external/mit/fontconfig/dist/fontconfig/Makefile.in
U xsrc/external/mit/fontconfig/dist/fontconfig/Makefile.am
U xsrc/external/mit/fontconfig/dist/fontconfig/fcfreetype.h
U xsrc/external/mit/fontconfig/dist/fontconfig/fontconfig.h
U xsrc/external/mit/fontconfig/dist/fc-scan/Makefile.in
U xsrc/external/mit/fontconfig/dist/fc-scan/fc-scan.sgml
U xsrc/external/mit/fontconfig/dist/fc-scan/Makefile.am
U xsrc/external/mit/fontconfig/dist/fc-scan/fc-scan.c
U xsrc/external/mit/fontconfig/dist/fc-scan/fc-scan.1
N xsrc/external/mit/fontconfig/dist/test/out271.expected
U xsrc/external/mit/fontconfig/dist/test/4x6.pcf
U xsrc/external/mit/fontconfig/dist/test/fonts.conf.in
U xsrc/external/mit/fontconfig/dist/test/Makefile.in
N xsrc/external/mit/fontconfig/dist/test/test-bz96676.c
U xsrc/external/mit/fontconfig/dist/test/Makefile.am
U xsrc/external/mit/fontconfig/dist/test/test-migration.c
U xsrc/external/mit/fontconfig/dist/test/test-pthread.c
U xsrc/external/mit/fontconfig/dist/test/out.expected
N xsrc/external/mit/fontconfig/dist/test/test-bz89617.c
U xsrc/external/mit/fontconfig/dist/test/8x16.pcf
U xsrc/external/mit/fontconfig/dist/test/run-test.sh
N xsrc/external/mit/fontconfig/dist/test/test-bz131804.c
N xsrc/external/mit/fontconfig/dist/test/run-test271.sh
U xsrc/external/mit/fontconfig/dist/fc-query/fc-query.sgml
U xsrc/external/mit/fontconfig/dist/fc-query/Makefile.in
U xsrc/external/mit/fontconfig/dist/fc-query/fc-query.c
U xsrc/external/mit/fontconfig/dist/fc-query/Makefile.am
U xsrc/external/mit/fontconfig/dist/fc-query/fc-query.1
U xsrc/external/mit/fontconfig/dist/src/fcatomic.c
U xsrc/external/mit/fontconfig/dist/src/fcpat.c
U xsrc/external/mit/fontconfig/dist/src/fcstr.c
U xsrc/external/mit/fontconfig/dist/src/fcarch.h
U xsrc/external/mit/fontconfig/dist/src/fcobjshash.gperf.h
C xsrc/external/mit/fontconfig/dist/src/fcinit.c
U xsrc/external/mit/fontconfig/dist/src/fcserialize.c
C xsrc/external/mit/fontconfig/dist/src/fcstat.c
U xsrc/external/mit/fontconfig/dist/src/fcobjs.c
U xsrc/external/mit/fontconfig/dist/src/fcfreetype.c
U xsrc/external/mit/fontconfig/dist/src/fcdbg.c
U xsrc/external/mit/fontconfig/dist/src/fccharset.c
U xsrc/external/mit/fontconfig/dist/src/Makefile.in
U xsrc/external/mit/fontconfig/dist/src/fcdeprecate.h
U xsrc/external/mit/fontconfig/dist/src/fcblanks.c
C xsrc/external/mit/fontconfig/dist/src/fcmatch.c
U xsrc/external/mit/fontconfig/dist/src/fcmutex.h
U xsrc/external/mit/fontconfig/dist/src/fcdir.c
U xsrc/external/mit/fontconfig/dist/src/fcobjshash.gperf
U xsrc/external/mit/fontconfig/dist/src/fcobjshash.h
U xsrc/external/mit/fontconfig/dist/src/fcfs.c
U xsrc/external/mit/fontconfig/dist/src/fclist.c
U xsrc/external/mit/fontconfig/dist/src/Makefile.am
U xsrc/external/mit/fontconfig/dist/src/fcformat.c
U xsrc/external/mit/fontconfig/dist/src/fcwindows.h
U xsrc/external/mit/fontconfig/dist/src/fclang.c
U xsrc/external/mit/fontconfig/dist/src/fcdefault.c
U 

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 29 07:53:54 UTC 2017

Modified Files:
src/distrib/sets/lists/xbase: mi
src/etc/mtree: NetBSD.dist.Xorg
src/external/mit/xorg/lib/xkeyboard-config/geometry: Makefile
src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile

Log Message:
update for xkeyboard-config 2.21.
prepare for libdrm data files.


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.21 -r1.22 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile

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/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.143 src/distrib/sets/lists/xbase/mi:1.144
--- src/distrib/sets/lists/xbase/mi:1.143	Mon Feb 13 06:11:01 2017
+++ src/distrib/sets/lists/xbase/mi	Tue Aug 29 07:53:54 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.143 2017/02/13 06:11:01 snj Exp $
+# $NetBSD: mi,v 1.144 2017/08/29 07:53:54 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -674,6 +674,7 @@
 ./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/indigo	-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/indy		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/sony			-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/geometry/steelseries		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/sun			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/teck			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/thinkpad		-unknown-	xorg
@@ -848,7 +849,7 @@
 ./usr/X11R7/lib/X11/xkb/symbols/be			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ben			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/bg			-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/symbols/bn			-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/symbols/bn			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/br			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/brai			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/braille			-unknown-	obsolete
@@ -1695,6 +1696,7 @@
 ./usr/X11R7/share/examples/ssh-askpass/SshAskpass-default.ad	-unknown-	xorg
 ./usr/X11R7/share/examples/ssh-askpass/SshAskpass-green.ad	-unknown-	xorg
 ./usr/X11R7/share/examples/ssh-askpass/SshAskpass-motif.ad	-unknown-	xorg
+./usr/X11R7/share/libdrmbase-x11-root	xorg
 ./usr/X11R7/share/pciidsbase-x11-root	xorg
 ./usr/X11R7/share/xcb	base-x11-root	xorg
 ./usr/libdata/debug/usr/X11R7base-sys-usr	xorg

Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.21 src/etc/mtree/NetBSD.dist.Xorg:1.22
--- src/etc/mtree/NetBSD.dist.Xorg:1.21	Mon Feb 13 04:23:19 2017
+++ src/etc/mtree/NetBSD.dist.Xorg	Tue Aug 29 07:53:54 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.Xorg,v 1.21 2017/02/13 04:23:19 snj Exp $
+#	$NetBSD: NetBSD.dist.Xorg,v 1.22 2017/08/29 07:53:54 mrg Exp $
 ./usr/X11R7
 ./usr/X11R7/bin
 ./usr/X11R7/include
@@ -172,6 +172,7 @@
 ./usr/X11R7/share/aclocal
 ./usr/X11R7/share/examples
 ./usr/X11R7/share/examples/ssh-askpass
+./usr/X11R7/share/libdrm
 ./usr/X11R7/share/pciids
 ./usr/X11R7/share/xcb
 ./usr/libdata/debug/usr/X11R7

Index: src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.5 src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.6
--- src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.5	Mon Feb 13 06:11:01 2017
+++ src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile	Tue Aug 29 07:53:54 2017
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.5 2017/02/13 06:11:01 snj Exp $
+#	$NetBSD: Makefile,v 1.6 2017/08/29 07:53:54 mrg Exp $
 
 .include 
 
 XKBNAME=	geometry
 FILES=		README amiga ataritt chicony dell everex fujitsu hhk hp \
 		keytronic kinesis macintosh microsoft nec nokia northgate \
-		pc sanwa sony sun teck thinkpad typematrix winbook
+		pc sanwa sony steelseries sun teck thinkpad typematrix winbook
 
 SUBDIR=		digital_vndr sgi_vndr
 

Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.12 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.13
--- src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.12	Mon Feb 13 06:11:01 2017
+++ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile	Tue Aug 29 07:53:54 2017
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.12 2017/02/13 06:11:01 snj Exp $
+#	$NetBSD: Makefile,v 1.13 2017/08/29 07:53:54 mrg Exp $
 
 .include 
 
 XKBNAME=	symbols
 
 FILES=	af al altwin am apl ara at au az \
-	ba bd be bg bn br brai bt bw by \
+	ba bd be bg br brai bt bw by \
 	ca capslock cd ch cm cn compose ctrl cz \
 	de dk dz \
 	ee empty epo es et eu eurosign \

CVS commit: xsrc/external/mit/xkeyboard-config/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 29 07:46:43 UTC 2017

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
Makefile.in at in lk
Removed Files:
xsrc/external/mit/xkeyboard-config/dist/symbols: bn

Log Message:
merge xkeyboard-config 2.21.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xkeyboard-config/dist/symbols/at
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xkeyboard-config/dist/symbols/bn
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xkeyboard-config/dist/symbols/lk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.13 xsrc/external/mit/xkeyboard-config/dist/configure:1.14
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.13	Mon Feb 13 02:33:21 2017
+++ xsrc/external/mit/xkeyboard-config/dist/configure	Tue Aug 29 07:46:43 2017
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.20.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.21.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.20'
-PACKAGE_STRING='xkeyboard-config 2.20'
+PACKAGE_VERSION='2.21'
+PACKAGE_STRING='xkeyboard-config 2.21'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1325,7 +1325,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xkeyboard-config 2.20 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.21 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1396,7 +1396,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 2.20:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.21:";;
esac
   cat <<\_ACEOF
 
@@ -1511,7 +1511,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xkeyboard-config configure 2.20
+xkeyboard-config configure 2.21
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1654,7 +1654,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xkeyboard-config $as_me 2.20, which was
+It was created by xkeyboard-config $as_me 2.21, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2519,7 +2519,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xkeyboard-config'
- VERSION='2.20'
+ VERSION='2.21'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7406,7 +7406,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xkeyboard-config $as_me 2.20, which was
+This file was extended by xkeyboard-config $as_me 2.21, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES= $CONFIG_FILES
@@ -7463,7 +7463,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/&/g'`"
 ac_cs_version="\\
-xkeyboard-config config.status 2.20
+xkeyboard-config config.status 2.21
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.11 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.12
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.11	Tue Nov 22 19:45:29 2016
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am	Tue Aug 29 07:46:43 2017
@@ -5,7 +5,7 @@ symbols_DATA = \
 af al am apl \
 ara at au az \
 ba bd be \
-bg bn br brai \
+bg br brai \
 bt bw by \
 ca cd ch \
 cm cn cz \

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.13 

CVS import: xsrc/external/mit/xkeyboard-config/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 29 07:43:58 UTC 2017

Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv20141

Log Message:
initial import of xkeyboard-config-2.21

Status:

Vendor Tag: xorg
Release Tags:   xkeyboard-config-2-21

U xsrc/external/mit/xkeyboard-config/dist/install-sh
U xsrc/external/mit/xkeyboard-config/dist/README
U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4
U xsrc/external/mit/xkeyboard-config/dist/compile
U xsrc/external/mit/xkeyboard-config/dist/Makefile.am
U xsrc/external/mit/xkeyboard-config/dist/config.rpath
U xsrc/external/mit/xkeyboard-config/dist/AUTHORS
U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in
C xsrc/external/mit/xkeyboard-config/dist/configure
U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS
U xsrc/external/mit/xkeyboard-config/dist/TODO
U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in
U xsrc/external/mit/xkeyboard-config/dist/NEWS
U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in
U xsrc/external/mit/xkeyboard-config/dist/Makefile.in
U xsrc/external/mit/xkeyboard-config/dist/config.sub
U xsrc/external/mit/xkeyboard-config/dist/COPYING
U xsrc/external/mit/xkeyboard-config/dist/missing
U xsrc/external/mit/xkeyboard-config/dist/config.guess
U xsrc/external/mit/xkeyboard-config/dist/configure.ac
U xsrc/external/mit/xkeyboard-config/dist/ChangeLog
U xsrc/external/mit/xkeyboard-config/dist/autogen.sh
U xsrc/external/mit/xkeyboard-config/dist/symbols/gb
U xsrc/external/mit/xkeyboard-config/dist/symbols/eu
U xsrc/external/mit/xkeyboard-config/dist/symbols/tw
U xsrc/external/mit/xkeyboard-config/dist/symbols/uz
U xsrc/external/mit/xkeyboard-config/dist/symbols/tg
U xsrc/external/mit/xkeyboard-config/dist/symbols/ara
C xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
U xsrc/external/mit/xkeyboard-config/dist/symbols/capslock
U xsrc/external/mit/xkeyboard-config/dist/symbols/inet
U xsrc/external/mit/xkeyboard-config/dist/symbols/se
U xsrc/external/mit/xkeyboard-config/dist/symbols/fr
U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign
U xsrc/external/mit/xkeyboard-config/dist/symbols/iq
U xsrc/external/mit/xkeyboard-config/dist/symbols/typo
U xsrc/external/mit/xkeyboard-config/dist/symbols/by
U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl
U xsrc/external/mit/xkeyboard-config/dist/symbols/az
U xsrc/external/mit/xkeyboard-config/dist/symbols/br
U xsrc/external/mit/xkeyboard-config/dist/symbols/cm
U xsrc/external/mit/xkeyboard-config/dist/symbols/de
U xsrc/external/mit/xkeyboard-config/dist/symbols/kz
U xsrc/external/mit/xkeyboard-config/dist/symbols/tj
U xsrc/external/mit/xkeyboard-config/dist/symbols/empty
U xsrc/external/mit/xkeyboard-config/dist/symbols/level3
U xsrc/external/mit/xkeyboard-config/dist/symbols/us
U xsrc/external/mit/xkeyboard-config/dist/symbols/es
U xsrc/external/mit/xkeyboard-config/dist/symbols/latam
U xsrc/external/mit/xkeyboard-config/dist/symbols/apl
U xsrc/external/mit/xkeyboard-config/dist/symbols/ph
U xsrc/external/mit/xkeyboard-config/dist/symbols/it
U xsrc/external/mit/xkeyboard-config/dist/symbols/bd
U xsrc/external/mit/xkeyboard-config/dist/symbols/tr
U xsrc/external/mit/xkeyboard-config/dist/symbols/cn
U xsrc/external/mit/xkeyboard-config/dist/symbols/gh
U xsrc/external/mit/xkeyboard-config/dist/symbols/ua
U xsrc/external/mit/xkeyboard-config/dist/symbols/et
U xsrc/external/mit/xkeyboard-config/dist/symbols/bt
U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl
U xsrc/external/mit/xkeyboard-config/dist/symbols/kg
U xsrc/external/mit/xkeyboard-config/dist/symbols/is
U xsrc/external/mit/xkeyboard-config/dist/symbols/ee
U xsrc/external/mit/xkeyboard-config/dist/symbols/tz
U xsrc/external/mit/xkeyboard-config/dist/symbols/am
U xsrc/external/mit/xkeyboard-config/dist/symbols/ma
U xsrc/external/mit/xkeyboard-config/dist/symbols/si
U xsrc/external/mit/xkeyboard-config/dist/symbols/ge
U xsrc/external/mit/xkeyboard-config/dist/symbols/id
U xsrc/external/mit/xkeyboard-config/dist/symbols/cz
U xsrc/external/mit/xkeyboard-config/dist/symbols/za
U xsrc/external/mit/xkeyboard-config/dist/symbols/au
U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad
U xsrc/external/mit/xkeyboard-config/dist/symbols/ca
U xsrc/external/mit/xkeyboard-config/dist/symbols/shift
U xsrc/external/mit/xkeyboard-config/dist/symbols/mt
U xsrc/external/mit/xkeyboard-config/dist/symbols/gr
U xsrc/external/mit/xkeyboard-config/dist/symbols/ru
U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc
U xsrc/external/mit/xkeyboard-config/dist/symbols/compose
U xsrc/external/mit/xkeyboard-config/dist/symbols/mm
U xsrc/external/mit/xkeyboard-config/dist/symbols/fi
U xsrc/external/mit/xkeyboard-config/dist/symbols/af
U xsrc/external/mit/xkeyboard-config/dist/symbols/hr
C xsrc/external/mit/xkeyboard-config/dist/symbols/at
U 

CVS commit: src/external/mit/xorg/lib/libdrm_amdgpu

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 29 07:12:13 UTC 2017

Modified Files:
src/external/mit/xorg/lib/libdrm_amdgpu: Makefile

Log Message:
update for libdrm 2.4.83.  the amdgpu.ids file isn't installed yet
(some odd FILES issue?) but this isn't a used driver yet anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libdrm_amdgpu/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/libdrm_amdgpu/Makefile
diff -u src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.2 src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.3
--- src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.2	Thu Aug 18 13:46:58 2016
+++ src/external/mit/xorg/lib/libdrm_amdgpu/Makefile	Tue Aug 29 07:12:13 2017
@@ -1,4 +1,4 @@
-#  $NetBSD: Makefile,v 1.2 2016/08/18 13:46:58 christos Exp $
+#  $NetBSD: Makefile,v 1.3 2017/08/29 07:12:13 mrg Exp $
 
 .include 
 
@@ -7,6 +7,7 @@ LIB=	drm_amdgpu
 .PATH: ${X11SRCDIR.drm}/amdgpu
 
 SRCS= \
+	amdgpu_asic_id.c \
 	amdgpu_bo.c \
 	amdgpu_cs.c \
 	amdgpu_device.c \
@@ -15,9 +16,14 @@ SRCS= \
 	util_hash.c \
 	util_hash_table.c
 
+LIBDRMDATADIR=	${X11ROOTDIR}/share/libdrm
+IDS_NENT!=	egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' ${X11SRCDIR.drm}/data/amdgpu.ids
+
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm} \
 		-DHAVE_SYS_SYSCTL_H
+CPPFLAGS+=	-DAMDGPU_ASIC_ID_TABLE=\"${LIBDRMDATADIR}/amdgpu.ids\" \
+		-DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(IDS_NENT)
 
 LIBDPLIBS=	drm	${.CURDIR}/../libdrm
 
@@ -26,6 +32,11 @@ PKGDIST=	drm
 
 COPTS.amdgpu_cs.c+= -Wno-stack-protector
 
+#FILES=		amdgpu.ids
+#FILESDIR=	${LIBDRMDATADIR}
+
+.PATH:  ${X11SRCDIR.libdrm}/data
+
 .include "../libdrm/Makefile.defines"
 
 .include 

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Aug 29 06:49:07 UTC 2017

Modified Files:
src/sys/dev/usb [nick-nhusb]: umass.c

Log Message:
Typo


To generate a diff of this commit:
cvs rdiff -u -r1.149.2.21 -r1.149.2.22 src/sys/dev/usb/umass.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.149.2.21 src/sys/dev/usb/umass.c:1.149.2.22
--- src/sys/dev/usb/umass.c:1.149.2.21	Mon Aug 28 17:52:28 2017
+++ src/sys/dev/usb/umass.c	Tue Aug 29 06:49:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass.c,v 1.149.2.21 2017/08/28 17:52:28 skrll Exp $	*/
+/*	$NetBSD: umass.c,v 1.149.2.22 2017/08/29 06:49:07 skrll Exp $	*/
 
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.149.2.21 2017/08/28 17:52:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.149.2.22 2017/08/29 06:49:07 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -679,7 +679,7 @@ umass_attach(device_t parent, device_t s
 	}
 
 	/*
-	 * Record buffer pinters for data transfer (it's huge), command and
+	 * Record buffer pointers for data transfer (it's huge), command and
 	 * status data here
 	 */
 	switch (sc->sc_wire) {

CVS commit: src/sys/dev/ic

[Tetsuya Isaki]

Module Name:src
Committed By:   isaki
Date:   Tue Aug 29 06:38:49 UTC 2017

Modified Files:
src/sys/dev/ic: am7930.c

Log Message:
Fix two typos.  pfil -> rfil for recording.
One was introduced a month ago and the other was 12 years ago.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/ic/am7930.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/ic/am7930.c
diff -u src/sys/dev/ic/am7930.c:1.56 src/sys/dev/ic/am7930.c:1.57
--- src/sys/dev/ic/am7930.c:1.56	Thu Jul 27 23:39:37 2017
+++ src/sys/dev/ic/am7930.c	Tue Aug 29 06:38:49 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: am7930.c,v 1.56 2017/07/27 23:39:37 nat Exp $	*/
+/*	$NetBSD: am7930.c,v 1.57 2017/08/29 06:38:49 isaki Exp $	*/
 
 /*
  * Copyright (c) 1995 Rolf Grossmann
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: am7930.c,v 1.56 2017/07/27 23:39:37 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am7930.c,v 1.57 2017/08/29 06:38:49 isaki Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -265,9 +265,9 @@ am7930_set_params(void *addr, int setmod
 			hw = *r;
 			hw.encoding = AUDIO_ENCODING_NONE;
 			hw.precision = 8;
-			pfil->append(pfil, null_filter, );
+			rfil->append(rfil, null_filter, );
 			hw.precision *= sc->sc_glue->factor;
-			pfil->append(rfil, sc->sc_glue->input_conv, );
+			rfil->append(rfil, sc->sc_glue->input_conv, );
 		}
 		if (r->encoding == AUDIO_ENCODING_SLINEAR) {
 			hw = *r;

CVS import: xsrc/external/mit/libdrm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 29 06:30:20 UTC 2017

Update of /cvsroot/xsrc/external/mit/libdrm/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv9477

Log Message:
initial import of libdrm-2.4.83

Status:

Vendor Tag: xorg
Release Tags:   libdrm-2-4-83

U xsrc/external/mit/libdrm/dist/xf86drmMode.h
U xsrc/external/mit/libdrm/dist/Makefile.am
U xsrc/external/mit/libdrm/dist/configure
U xsrc/external/mit/libdrm/dist/configure.ac
U xsrc/external/mit/libdrm/dist/aclocal.m4
U xsrc/external/mit/libdrm/dist/libsync.h
C xsrc/external/mit/libdrm/dist/xf86drm.h
U xsrc/external/mit/libdrm/dist/Makefile.sources
U xsrc/external/mit/libdrm/dist/Makefile.in
U xsrc/external/mit/libdrm/dist/xf86drmHash.c
U xsrc/external/mit/libdrm/dist/config.h.in
U xsrc/external/mit/libdrm/dist/libdrm.pc.in
U xsrc/external/mit/libdrm/dist/README
C xsrc/external/mit/libdrm/dist/xf86drm.c
U xsrc/external/mit/libdrm/dist/util_double_list.h
U xsrc/external/mit/libdrm/dist/xf86drmHash.h
U xsrc/external/mit/libdrm/dist/xf86drmRandom.c
U xsrc/external/mit/libdrm/dist/xf86drmRandom.h
U xsrc/external/mit/libdrm/dist/xf86drmSL.c
C xsrc/external/mit/libdrm/dist/xf86drmMode.c
U xsrc/external/mit/libdrm/dist/xf86atomic.h
U xsrc/external/mit/libdrm/dist/libdrm_macros.h
U xsrc/external/mit/libdrm/dist/libdrm_lists.h
U xsrc/external/mit/libdrm/dist/util_math.h
U xsrc/external/mit/libdrm/dist/build-aux/config.guess
U xsrc/external/mit/libdrm/dist/build-aux/compile
U xsrc/external/mit/libdrm/dist/build-aux/config.sub
U xsrc/external/mit/libdrm/dist/build-aux/depcomp
U xsrc/external/mit/libdrm/dist/build-aux/install-sh
U xsrc/external/mit/libdrm/dist/build-aux/ltmain.sh
U xsrc/external/mit/libdrm/dist/build-aux/missing
U xsrc/external/mit/libdrm/dist/build-aux/test-driver
U xsrc/external/mit/libdrm/dist/include/drm/drm_fourcc.h
C xsrc/external/mit/libdrm/dist/include/drm/drm.h
U xsrc/external/mit/libdrm/dist/include/drm/nouveau_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/drm_mode.h
U xsrc/external/mit/libdrm/dist/include/drm/drm_sarea.h
U xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/mach64_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/mga_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/virtgpu_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/qxl_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/r128_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/radeon_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/amdgpu_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/savage_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/sis_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/tegra_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/vc4_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/via_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/vmwgfx_drm.h
U xsrc/external/mit/libdrm/dist/include/drm/README
U xsrc/external/mit/libdrm/dist/m4/lt~obsolete.m4
U xsrc/external/mit/libdrm/dist/m4/libtool.m4
U xsrc/external/mit/libdrm/dist/m4/ltoptions.m4
U xsrc/external/mit/libdrm/dist/m4/ltsugar.m4
U xsrc/external/mit/libdrm/dist/m4/ltversion.m4
U xsrc/external/mit/libdrm/dist/libkms/Makefile.sources
U xsrc/external/mit/libdrm/dist/libkms/Makefile.am
U xsrc/external/mit/libdrm/dist/libkms/libkms.h
U xsrc/external/mit/libdrm/dist/libkms/Makefile.in
U xsrc/external/mit/libdrm/dist/libkms/kms-symbol-check
U xsrc/external/mit/libdrm/dist/libkms/libkms.pc.in
U xsrc/external/mit/libdrm/dist/libkms/internal.h
U xsrc/external/mit/libdrm/dist/libkms/linux.c
U xsrc/external/mit/libdrm/dist/libkms/dumb.c
U xsrc/external/mit/libdrm/dist/libkms/api.c
U xsrc/external/mit/libdrm/dist/libkms/vmwgfx.c
U xsrc/external/mit/libdrm/dist/libkms/intel.c
U xsrc/external/mit/libdrm/dist/libkms/nouveau.c
U xsrc/external/mit/libdrm/dist/libkms/radeon.c
U xsrc/external/mit/libdrm/dist/libkms/exynos.c
U xsrc/external/mit/libdrm/dist/vc4/vc4_qpu_defines.h
U xsrc/external/mit/libdrm/dist/vc4/Makefile.am
U xsrc/external/mit/libdrm/dist/vc4/vc4_packet.h
U xsrc/external/mit/libdrm/dist/vc4/Makefile.sources
U xsrc/external/mit/libdrm/dist/vc4/Makefile.in
U xsrc/external/mit/libdrm/dist/vc4/libdrm_vc4.pc.in
U xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.h
U xsrc/external/mit/libdrm/dist/intel/Makefile.am
U xsrc/external/mit/libdrm/dist/intel/intel_debug.h
U xsrc/external/mit/libdrm/dist/intel/intel_aub.h
U xsrc/external/mit/libdrm/dist/intel/Makefile.sources
U xsrc/external/mit/libdrm/dist/intel/Makefile.in
U xsrc/external/mit/libdrm/dist/intel/uthash.h
U xsrc/external/mit/libdrm/dist/intel/mm.c
U xsrc/external/mit/libdrm/dist/intel/libdrm_intel.pc.in
U xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.c
U xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_priv.h
U xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_fake.c
C xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
U xsrc/external/mit/libdrm/dist/intel/intel_decode.c
U xsrc/external/mit/libdrm/dist/intel/intel_chipset.h
U 

CVS commit: xsrc/external/mit/libdrm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 29 06:31:24 UTC 2017

Modified Files:
xsrc/external/mit/libdrm/dist: xf86drm.c xf86drm.h xf86drmMode.c
xsrc/external/mit/libdrm/dist/include/drm: drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/radeon: radeon_surface.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
Removed Files:
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu_asic_id.h
xsrc/external/mit/libdrm/dist/tests/amdgpu: uvd_messages.h

Log Message:
merge libdrm-2.4.83.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libdrm/dist/include/drm/drm.h
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/tests/amdgpu/uvd_messages.h
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.14 xsrc/external/mit/libdrm/dist/xf86drm.c:1.15
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.14	Sat Mar  4 23:22:48 2017
+++ xsrc/external/mit/libdrm/dist/xf86drm.c	Tue Aug 29 06:31:24 2017
@@ -867,8 +867,6 @@ drmVersionPtr drmGetVersion(int fd)
 drmVersionPtr retval;
 drm_version_t *version = drmMalloc(sizeof(*version));
 
-memclear(*version);
-
 if (drmIoctl(fd, DRM_IOCTL_VERSION, version)) {
 drmFreeKernelVersion(version);
 return NULL;
@@ -995,8 +993,10 @@ char *drmGetBusid(int fd)
 if (drmIoctl(fd, DRM_IOCTL_GET_UNIQUE, ))
 return NULL;
 u.unique = drmMalloc(u.unique_len + 1);
-if (drmIoctl(fd, DRM_IOCTL_GET_UNIQUE, ))
+if (drmIoctl(fd, DRM_IOCTL_GET_UNIQUE, )) {
+drmFree(u.unique);
 return NULL;
+}
 u.unique[u.unique_len] = '\0';
 
 return u.unique;
@@ -1524,14 +1524,12 @@ drm_context_t *drmGetReservedContextList
 
 if (!(list   = drmMalloc(res.count * sizeof(*list
 return NULL;
-if (!(retval = drmMalloc(res.count * sizeof(*retval {
-drmFree(list);
-return NULL;
-}
+if (!(retval = drmMalloc(res.count * sizeof(*retval
+goto err_free_list;
 
 res.contexts = list;
 if (drmIoctl(fd, DRM_IOCTL_RES_CTX, ))
-return NULL;
+goto err_free_context;
 
 for (i = 0; i < res.count; i++)
 retval[i] = list[i].handle;
@@ -1539,6 +1537,12 @@ drm_context_t *drmGetReservedContextList
 
 *count = res.count;
 return retval;
+
+err_free_list:
+drmFree(list);
+err_free_context:
+drmFree(retval);
+return NULL;
 }
 
 void drmFreeReservedContextList(drm_context_t *pt)
@@ -3024,32 +3028,32 @@ static int drmParsePciBusInfo(int maj, i
 #endif
 }
 
-static int drmCompareBusInfo(drmDevicePtr a, drmDevicePtr b)
+int drmDevicesEqual(drmDevicePtr a, drmDevicePtr b)
 {
 if (a == NULL || b == NULL)
-return -1;
+return 0;
 
 if (a->bustype != b->bustype)
-return -1;
+return 0;
 
 switch (a->bustype) {
 case DRM_BUS_PCI:
-return memcmp(a->businfo.pci, b->businfo.pci, sizeof(drmPciBusInfo));
+return memcmp(a->businfo.pci, b->businfo.pci, sizeof(drmPciBusInfo)) == 0;
 
 case DRM_BUS_USB:
-return memcmp(a->businfo.usb, b->businfo.usb, sizeof(drmUsbBusInfo));
+return memcmp(a->businfo.usb, b->businfo.usb, sizeof(drmUsbBusInfo)) == 0;
 
 case DRM_BUS_PLATFORM:
-return memcmp(a->businfo.platform, b->businfo.platform, sizeof(drmPlatformBusInfo));
+return memcmp(a->businfo.platform, b->businfo.platform, sizeof(drmPlatformBusInfo)) == 0;
 
 case DRM_BUS_HOST1X:
-return memcmp(a->businfo.host1x, b->businfo.host1x, sizeof(drmHost1xBusInfo));
+return memcmp(a->businfo.host1x, b->businfo.host1x, sizeof(drmHost1xBusInfo)) == 0;
 
 default:
 break;
 }
 
-return -1;
+return 0;
 }
 
 static int drmGetNodeType(const char *name)
@@ -3664,7 +3668,7 @@ static void drmFoldDuplicatedDevices(drm
 
 for (i = 0; i < count; i++) {
 for (j = i + 1; j < count; j++) {
-if (drmCompareBusInfo(local_devices[i], local_devices[j]) == 0) {
+if (drmDevicesEqual(local_devices[i], local_devices[j])) {
 local_devices[i]->available_nodes |= local_devices[j]->available_nodes;
 node_type = 

CVS commit: src/sys/arch/arm/include/arm32

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Aug 29 06:28:27 UTC 2017

Modified Files:
src/sys/arch/arm/include/arm32: pmap.h

Log Message:
Revert the *_PROT_RO_* define changes and do all the work in the *_PROT()
macros for RO kernel pages.

cats boots again - no idea how it slipped through my testing previously


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/arm/include/arm32/pmap.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.151 src/sys/arch/arm/include/arm32/pmap.h:1.152
--- src/sys/arch/arm/include/arm32/pmap.h:1.151	Tue Jul 11 20:42:17 2017
+++ src/sys/arch/arm/include/arm32/pmap.h	Tue Aug 29 06:28:26 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.151 2017/07/11 20:42:17 skrll Exp $	*/
+/*	$NetBSD: pmap.h,v 1.152 2017/08/29 06:28:26 skrll Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -728,12 +728,12 @@ extern void (*pmap_zero_page_func)(paddr
  */
 #define	L1_S_PROT_U_generic	(L1_S_AP(AP_U))
 #define	L1_S_PROT_W_generic	(L1_S_AP(AP_W))
-#define	L1_S_PROT_RO_generic	(L1_S_AP(AP_R))	/* AP_W == AP_R */
+#define	L1_S_PROT_RO_generic	(0)
 #define	L1_S_PROT_MASK_generic	(L1_S_PROT_U|L1_S_PROT_W|L1_S_PROT_RO)
 
 #define	L1_S_PROT_U_xscale	(L1_S_AP(AP_U))
 #define	L1_S_PROT_W_xscale	(L1_S_AP(AP_W))
-#define	L1_S_PROT_RO_xscale	(L1_S_AP(AP_R))	/* AP_W == AP_R */
+#define	L1_S_PROT_RO_xscale	(0)
 #define	L1_S_PROT_MASK_xscale	(L1_S_PROT_U|L1_S_PROT_W|L1_S_PROT_RO)
 
 #define	L1_S_PROT_U_armv6	(L1_S_AP(AP_R) | L1_S_AP(AP_U))
@@ -754,12 +754,12 @@ extern void (*pmap_zero_page_func)(paddr
 
 #define	L2_L_PROT_U_generic	(L2_AP(AP_U))
 #define	L2_L_PROT_W_generic	(L2_AP(AP_W))
-#define	L2_L_PROT_RO_generic	(L2_AP(AP_R))
+#define	L2_L_PROT_RO_generic	(0)
 #define	L2_L_PROT_MASK_generic	(L2_L_PROT_U|L2_L_PROT_W|L2_L_PROT_RO)
 
 #define	L2_L_PROT_U_xscale	(L2_AP(AP_U))
 #define	L2_L_PROT_W_xscale	(L2_AP(AP_W))
-#define	L2_L_PROT_RO_xscale	(L2_AP(AP_R))
+#define	L2_L_PROT_RO_xscale	(0)
 #define	L2_L_PROT_MASK_xscale	(L2_L_PROT_U|L2_L_PROT_W|L2_L_PROT_RO)
 
 #define	L2_L_PROT_U_armv6n	(L2_AP0(AP_R) | L2_AP0(AP_U))
@@ -780,12 +780,12 @@ extern void (*pmap_zero_page_func)(paddr
 
 #define	L2_S_PROT_U_generic	(L2_AP(AP_U))
 #define	L2_S_PROT_W_generic	(L2_AP(AP_W))
-#define	L2_S_PROT_RO_generic	(L2_AP(AP_R))
+#define	L2_S_PROT_RO_generic	(0)
 #define	L2_S_PROT_MASK_generic	(L2_S_PROT_U|L2_S_PROT_W|L2_S_PROT_RO)
 
 #define	L2_S_PROT_U_xscale	(L2_AP0(AP_U))
 #define	L2_S_PROT_W_xscale	(L2_AP0(AP_W))
-#define	L2_S_PROT_RO_xscale	(L2_AP(AP_R))
+#define	L2_S_PROT_RO_xscale	(0)
 #define	L2_S_PROT_MASK_xscale	(L2_S_PROT_U|L2_S_PROT_W|L2_S_PROT_RO)
 
 #define	L2_S_PROT_U_armv6n	(L2_AP0(AP_R) | L2_AP0(AP_U))
@@ -1028,31 +1028,44 @@ extern void (*pmap_zero_page_func)(paddr
 #define l1pte_set_writable(pte)	(((pte) & ~L1_S_PROT_RO) | L1_S_PROT_W)
 #define l1pte_set_readonly(pte)	(((pte) & ~L1_S_PROT_W) | L1_S_PROT_RO)
 
-#define l2pte_set_writable(pte)	(L2_S_PROT_W == L2_S_PROT_RO ? \
-((pte) | L2_S_PROT_W) : (((pte) & ~L2_S_PROT_RO) | L2_S_PROT_W))
-
-#define l2pte_set_readonly(pte)	(L2_S_PROT_W == L2_S_PROT_RO ? \
-((pte) & ~L2_S_PROT_RO) : (((pte) & ~L2_S_PROT_W) | L2_S_PROT_RO))
+#define l2pte_set_writable(pte)	(((pte) & ~L2_S_PROT_RO) | L2_S_PROT_W)
+#define l2pte_set_readonly(pte)	(((pte) & ~L2_S_PROT_W) | L2_S_PROT_RO)
 
 #define l2pte_writable_p(pte)	(((pte) & L2_S_PROT_W) == L2_S_PROT_W && \
- (L2_S_PROT_W == L2_S_PROT_RO || \
+ (L2_S_PROT_RO == 0 || \
   ((pte) & L2_S_PROT_RO) != L2_S_PROT_RO))
 
 /*
  * These macros return various bits based on kernel/user and protection.
  * Note that the compiler will usually fold these at compile time.
  */
-#define	L1_S_PROT(ku, pr)	ku) == PTE_USER) ? L1_S_PROT_U : 0) | \
-	(((pr) & VM_PROT_WRITE) ? L1_S_PROT_W :  \
-	(L1_S_PROT_W == L1_S_PROT_RO ? 0 : L1_S_PROT_RO)))
-
-#define	L2_L_PROT(ku, pr)	ku) == PTE_USER) ? L2_L_PROT_U : 0) | \
-	(((pr) & VM_PROT_WRITE) ? L2_L_PROT_W :  \
-	(L2_L_PROT_W == L2_L_PROT_RO ? 0 : L2_L_PROT_RO)))
-
-#define	L2_S_PROT(ku, pr)	ku) == PTE_USER) ? L2_S_PROT_U : 0) | \
-	(((pr) & VM_PROT_WRITE) ? L2_S_PROT_W :  \
-	(L2_S_PROT_W == L2_S_PROT_RO ? 0 : L2_S_PROT_RO)))
+
+#define	L1_S_PROT(ku, pr)	(	   \
+	(((ku) == PTE_USER) ? 		   \
+	L1_S_PROT_U | (((pr) & VM_PROT_WRITE) ? L1_S_PROT_W : 0)	   \
+	:    \
+	(((L1_S_PROT_RO && 		   \
+		((pr) & (VM_PROT_READ | VM_PROT_WRITE)) == VM_PROT_READ) ? \
+		L1_S_PROT_RO : L1_S_PROT_W)))			   \
+)
+
+#define	L2_L_PROT(ku, pr)	(	   \
+	(((ku) == PTE_USER) ?		   \
+	L2_L_PROT_U | (((pr) & VM_PROT_WRITE) ? L2_L_PROT_W : 0)	   \
+	:   \
+	(((L2_L_PROT_RO && 		   \
+		((pr) & (VM_PROT_READ | VM_PROT_WRITE)) == VM_PROT_READ) ? \
+		L2_L_PROT_RO :