CVS commit: src/external/gpl3/gdb/dist/gdb

2020-12-09 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Thu Dec 10 07:27:37 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gdb: arm-nbsd-tdep.c

Log Message:
Fix armeb; CORE_ADDR is uint64_t but 2nd argument of raw_supply() is
expected to be the same size as PC. Therefore, PC was always read as
zero for big-endian.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c

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/gdb/dist/gdb/arm-nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c:1.7 src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c:1.8
--- src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c:1.7	Sat Dec  5 22:14:44 2020
+++ src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c	Thu Dec 10 07:27:37 2020
@@ -72,7 +72,7 @@ arm_nbsd_supply_gregset (const struct re
 
   if (regnum == -1 || regnum == ARM_PC_REGNUM)
 {
-  CORE_ADDR r_pc = gdbarch_addr_bits_remove (regcache->arch (), gregset->pc);
+  uint32_t r_pc = gdbarch_addr_bits_remove (regcache->arch (), gregset->pc);
   regcache->raw_supply (ARM_PC_REGNUM, (char *) _pc);
 }
 



CVS commit: src/external/gpl3/gdb/dist/gdb

2020-12-09 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Thu Dec 10 07:27:37 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gdb: arm-nbsd-tdep.c

Log Message:
Fix armeb; CORE_ADDR is uint64_t but 2nd argument of raw_supply() is
expected to be the same size as PC. Therefore, PC was always read as
zero for big-endian.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c

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



CVS commit: src/external/gpl3/gdb/dist/gdb

2020-12-09 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Thu Dec 10 07:14:58 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gdb: nbsd-nat.c

Log Message:
Fix arm, for which PT_STEP is defined but unimplemented.

XXX
Stop exposing PT_STEP to userland for arm?


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c

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/gdb/dist/gdb/nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.19 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.20
--- src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.19	Sat Dec  5 22:14:44 2020
+++ src/external/gpl3/gdb/dist/gdb/nbsd-nat.c	Thu Dec 10 07:14:58 2020
@@ -458,7 +458,7 @@ nbsd_nat_target::info_proc (const char *
   return true;
 }
 
-#ifdef PT_STEP
+#if defined(PT_STEP) && !defined(__arm__)
 /* Resume execution of a specified PTID, that points to a process or a thread
within a process.  If one thread is specified, all other threads are
suspended.  If STEP is nonzero, single-step it.  If SIGNAL is nonzero,
@@ -530,7 +530,7 @@ nbsd_resume(nbsd_nat_target *target, pti
 void
 nbsd_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signal)
 {
-#ifdef PT_STEP
+#if defined(PT_STEP) && !defined(__arm__)
   if (minus_one_ptid != ptid)
 nbsd_resume (this, ptid, step, signal);
   else



CVS commit: src/external/gpl3/gdb/dist/gdb

2020-12-09 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Thu Dec 10 07:14:58 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gdb: nbsd-nat.c

Log Message:
Fix arm, for which PT_STEP is defined but unimplemented.

XXX
Stop exposing PT_STEP to userland for arm?


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c

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



CVS commit: src/sys/dev/pci

2020-12-09 Thread Shoichi YAMAGUCHI
Module Name:src
Committed By:   yamaguchi
Date:   Thu Dec 10 04:03:00 UTC 2020

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

Log Message:
Add a string literal for IAVF_VC_OP_CONFIG_RSS_LUT


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/if_iavf.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/if_iavf.c
diff -u src/sys/dev/pci/if_iavf.c:1.10 src/sys/dev/pci/if_iavf.c:1.11
--- src/sys/dev/pci/if_iavf.c:1.10	Thu Dec 10 04:00:11 2020
+++ src/sys/dev/pci/if_iavf.c	Thu Dec 10 04:03:00 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_iavf.c,v 1.10 2020/12/10 04:00:11 yamaguchi Exp $	*/
+/*	$NetBSD: if_iavf.c,v 1.11 2020/12/10 04:03:00 yamaguchi Exp $	*/
 
 /*
  * Copyright (c) 2013-2015, Intel Corporation
@@ -75,7 +75,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_iavf.c,v 1.10 2020/12/10 04:00:11 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iavf.c,v 1.11 2020/12/10 04:03:00 yamaguchi Exp $");
 
 #include 
 #include 
@@ -3783,6 +3783,8 @@ iavf_aq_vc_opcode_str(const struct ixl_a
 		return "EVENT";
 	case IAVF_VC_OP_CONFIG_RSS_KEY:
 		return "CONFIG_RSS_KEY";
+	case IAVF_VC_OP_CONFIG_RSS_LUT:
+		return "CONFIG_RSS_LUT";
 	case IAVF_VC_OP_GET_RSS_HENA_CAPS:
 		return "GET_RS_HENA_CAPS";
 	case IAVF_VC_OP_SET_RSS_HENA:



CVS commit: src/sys/dev/pci

2020-12-09 Thread Shoichi YAMAGUCHI
Module Name:src
Committed By:   yamaguchi
Date:   Thu Dec 10 04:03:00 UTC 2020

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

Log Message:
Add a string literal for IAVF_VC_OP_CONFIG_RSS_LUT


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/if_iavf.c

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



CVS commit: src/sys/dev/pci

2020-12-09 Thread Shoichi YAMAGUCHI
Module Name:src
Committed By:   yamaguchi
Date:   Thu Dec 10 04:00:11 UTC 2020

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

Log Message:
remove unnecessary lock acquire and release


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/if_iavf.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/if_iavf.c
diff -u src/sys/dev/pci/if_iavf.c:1.9 src/sys/dev/pci/if_iavf.c:1.10
--- src/sys/dev/pci/if_iavf.c:1.9	Thu Dec 10 03:58:35 2020
+++ src/sys/dev/pci/if_iavf.c	Thu Dec 10 04:00:11 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_iavf.c,v 1.9 2020/12/10 03:58:35 yamaguchi Exp $	*/
+/*	$NetBSD: if_iavf.c,v 1.10 2020/12/10 04:00:11 yamaguchi Exp $	*/
 
 /*
  * Copyright (c) 2013-2015, Intel Corporation
@@ -75,7 +75,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_iavf.c,v 1.9 2020/12/10 03:58:35 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iavf.c,v 1.10 2020/12/10 04:00:11 yamaguchi Exp $");
 
 #include 
 #include 
@@ -4842,9 +4842,6 @@ iavf_config_rss_lut(struct iavf_softc *s
 	uint8_t *lut, v;
 	int rv, i;
 
-	mutex_enter(>sc_adminq_lock);
-	mutex_exit(>sc_adminq_lock);
-
 	aqb = iavf_aqb_get(sc, >sc_atq_idle);
 	if (aqb == NULL)
 		return -1;



CVS commit: src/sys/dev/pci

2020-12-09 Thread Shoichi YAMAGUCHI
Module Name:src
Committed By:   yamaguchi
Date:   Thu Dec 10 04:00:11 UTC 2020

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

Log Message:
remove unnecessary lock acquire and release


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/if_iavf.c

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



CVS commit: src/sys/dev/pci

2020-12-09 Thread Shoichi YAMAGUCHI
Module Name:src
Committed By:   yamaguchi
Date:   Thu Dec 10 03:58:35 UTC 2020

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

Log Message:
Fix a wrong value about HENA configuration


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/if_iavf.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/if_iavf.c
diff -u src/sys/dev/pci/if_iavf.c:1.8 src/sys/dev/pci/if_iavf.c:1.9
--- src/sys/dev/pci/if_iavf.c:1.8	Tue Dec  8 07:53:20 2020
+++ src/sys/dev/pci/if_iavf.c	Thu Dec 10 03:58:35 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_iavf.c,v 1.8 2020/12/08 07:53:20 yamaguchi Exp $	*/
+/*	$NetBSD: if_iavf.c,v 1.9 2020/12/10 03:58:35 yamaguchi Exp $	*/
 
 /*
  * Copyright (c) 2013-2015, Intel Corporation
@@ -75,7 +75,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_iavf.c,v 1.8 2020/12/08 07:53:20 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iavf.c,v 1.9 2020/12/10 03:58:35 yamaguchi Exp $");
 
 #include 
 #include 
@@ -4767,9 +4767,9 @@ iavf_config_hena(struct iavf_softc *sc)
 
 	caps = IXL_AQB_KVA(aqb);
 	if (sc->sc_mac_type == I40E_MAC_X722_VF)
-		*caps = IXL_RSS_HENA_DEFAULT_XL710;
-	else
 		*caps = IXL_RSS_HENA_DEFAULT_X722;
+	else
+		*caps = IXL_RSS_HENA_DEFAULT_XL710;
 
 	memset(, 0, sizeof(iaq));
 	iaq.iaq_flags = htole16(IXL_AQ_BUF | IXL_AQ_RD);



CVS commit: src/sys/dev/pci

2020-12-09 Thread Shoichi YAMAGUCHI
Module Name:src
Committed By:   yamaguchi
Date:   Thu Dec 10 03:58:35 UTC 2020

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

Log Message:
Fix a wrong value about HENA configuration


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/if_iavf.c

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



CVS commit: src/doc

2020-12-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Dec 10 00:36:23 UTC 2020

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
New OpenSSL


To generate a diff of this commit:
cvs rdiff -u -r1.1767 -r1.1768 src/doc/3RDPARTY
cvs rdiff -u -r1.2764 -r1.2765 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1767 src/doc/3RDPARTY:1.1768
--- src/doc/3RDPARTY:1.1767	Sat Dec  5 11:23:08 2020
+++ src/doc/3RDPARTY	Wed Dec  9 19:36:22 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1767 2020/12/05 16:23:08 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1768 2020/12/10 00:36:22 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1113,8 +1113,8 @@ markus is very cooperative about it):
 - adjust the DEFAULT_PKCS11_WHITELIST for ssh-agent
 
 Package:	OpenSSL
-Version:	1.0.2o/1.1.1g
-Current Vers:	1.0.2t/1.1.1g
+Version:	1.0.2o/1.1.1i
+Current Vers:	1.0.2t/1.1.1i
 Maintainer:	The OpenSSL Project
 Archive Site:	ftp://ftp.openssl.org/source/
 Home Page:	http://www.openssl.org/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2764 src/doc/CHANGES:1.2765
--- src/doc/CHANGES:1.2764	Mon Dec  7 05:59:26 2020
+++ src/doc/CHANGES	Wed Dec  9 19:36:23 2020
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2764 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2765 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -314,3 +314,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 	OpenSSH: Import 8.4. [christos 20201204]
 	pkg_install: Updated to 20201205. [wiz 20201205]
 	acpicpu(4): Add support for Arm CPUs. [jmcneill 20201207]
+	OpenSSL: Imported 1.1.1i. [christos 20201209]



CVS commit: src/doc

2020-12-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Dec 10 00:36:23 UTC 2020

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
New OpenSSL


To generate a diff of this commit:
cvs rdiff -u -r1.1767 -r1.1768 src/doc/3RDPARTY
cvs rdiff -u -r1.2764 -r1.2765 src/doc/CHANGES

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



CVS commit: src/crypto/external/bsd/openssl

2020-12-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Dec 10 00:33:14 UTC 2020

Modified Files:
src/crypto/external/bsd/openssl/dist: CHANGES Configure NEWS README
e_os.h
src/crypto/external/bsd/openssl/dist/apps: ca.c s_client.c
src/crypto/external/bsd/openssl/dist/crypto/aes/asm:
aesni-sha1-x86_64.pl
src/crypto/external/bsd/openssl/dist/crypto/asn1: tasn_dec.c tasn_enc.c
src/crypto/external/bsd/openssl/dist/crypto/bn: bn_lib.c
src/crypto/external/bsd/openssl/dist/crypto/conf: conf_def.c
src/crypto/external/bsd/openssl/dist/crypto/ec: ec_ameth.c ec_asn1.c
ec_key.c ec_lib.c
src/crypto/external/bsd/openssl/dist/crypto/engine: eng_lib.c
src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c
src/crypto/external/bsd/openssl/dist/crypto/modes: gcm128.c
src/crypto/external/bsd/openssl/dist/crypto/rand: rand_unix.c
randfile.c
src/crypto/external/bsd/openssl/dist/crypto/sha/asm: sha1-x86_64.pl
src/crypto/external/bsd/openssl/dist/crypto/ui: ui_openssl.c
src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c
src/crypto/external/bsd/openssl/dist/include/openssl: bn.h
src/crypto/external/bsd/openssl/dist/ssl: s3_lib.c ssl_lib.c ssl_sess.c
t1_lib.c
src/crypto/external/bsd/openssl/dist/test: ectest.c rsa_test.c
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64:
aesv8-armx.S chacha-armv8.S poly1305-armv8.S sha1-armv8.S
sha512-armv8.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aesv8-armx.S
chacha-armv8.S ecp_nistz256-armv4.S poly1305-armv8.S sha1-armv8.S
sha512-armv8.S
src/crypto/external/bsd/openssl/lib/libcrypto/man: ADMISSIONS.3
ASN1_INTEGER_get_int64.3 ASN1_ITEM_lookup.3 ASN1_OBJECT_new.3
ASN1_STRING_TABLE_add.3 ASN1_STRING_length.3 ASN1_STRING_new.3
ASN1_STRING_print_ex.3 ASN1_TIME_set.3 ASN1_TYPE_get.3
ASN1_generate_nconf.3 ASYNC_WAIT_CTX_new.3 ASYNC_start_job.3
BF_encrypt.3 BIO_ADDR.3 BIO_ADDRINFO.3 BIO_connect.3 BIO_ctrl.3
BIO_f_base64.3 BIO_f_buffer.3 BIO_f_cipher.3 BIO_f_md.3
BIO_f_null.3 BIO_f_ssl.3 BIO_find_type.3 BIO_get_data.3
BIO_get_ex_new_index.3 BIO_meth_new.3 BIO_new.3 BIO_new_CMS.3
BIO_parse_hostserv.3 BIO_printf.3 BIO_push.3 BIO_read.3
BIO_s_accept.3 BIO_s_bio.3 BIO_s_connect.3 BIO_s_fd.3 BIO_s_file.3
BIO_s_mem.3 BIO_s_null.3 BIO_s_socket.3 BIO_set_callback.3
BIO_should_retry.3 BN_BLINDING_new.3 BN_CTX_new.3 BN_CTX_start.3
BN_add.3 BN_add_word.3 BN_bn2bin.3 BN_cmp.3 BN_copy.3
BN_generate_prime.3 BN_mod_inverse.3 BN_mod_mul_montgomery.3
BN_mod_mul_reciprocal.3 BN_new.3 BN_num_bytes.3 BN_rand.3
BN_security_bits.3 BN_set_bit.3 BN_swap.3 BN_zero.3 BUF_MEM_new.3
CMS_add0_cert.3 CMS_add1_recipient_cert.3 CMS_add1_signer.3
CMS_compress.3 CMS_decrypt.3 CMS_encrypt.3 CMS_final.3
CMS_get0_RecipientInfos.3 CMS_get0_SignerInfos.3 CMS_get0_type.3
CMS_get1_ReceiptRequest.3 CMS_sign.3 CMS_sign_receipt.3
CMS_uncompress.3 CMS_verify.3 CMS_verify_receipt.3
CONF_modules_free.3 CONF_modules_load_file.3
CRYPTO_THREAD_run_once.3 CRYPTO_get_ex_new_index.3
CTLOG_STORE_get0_log_by_id.3 CTLOG_STORE_new.3 CTLOG_new.3
CT_POLICY_EVAL_CTX_new.3 DEFINE_STACK_OF.3 DES_random_key.3
DH_generate_key.3 DH_generate_parameters.3 DH_get0_pqg.3
DH_get_1024_160.3 DH_meth_new.3 DH_new.3 DH_new_by_nid.3
DH_set_method.3 DH_size.3 DSA_SIG_new.3 DSA_do_sign.3 DSA_dup_DH.3
DSA_generate_key.3 DSA_generate_parameters.3 DSA_get0_pqg.3
DSA_meth_new.3 DSA_new.3 DSA_set_method.3 DSA_sign.3 DSA_size.3
DTLS_get_data_mtu.3 DTLS_set_timer_cb.3 DTLSv1_listen.3
ECDSA_SIG_new.3 ECPKParameters_print.3 EC_GFp_simple_method.3
EC_GROUP_copy.3 EC_GROUP_new.3 EC_KEY_get_enc_flags.3 EC_KEY_new.3
EC_POINT_add.3 EC_POINT_new.3 ENGINE_add.3 ERR_GET_LIB.3
ERR_clear_error.3 ERR_error_string.3 ERR_get_error.3
ERR_load_crypto_strings.3 ERR_load_strings.3 ERR_print_errors.3
ERR_put_error.3 ERR_remove_state.3 ERR_set_mark.3 EVP_BytesToKey.3
EVP_CIPHER_CTX_get_cipher_data.3 EVP_CIPHER_meth_new.3
EVP_DigestInit.3 EVP_DigestSignInit.3 EVP_DigestVerifyInit.3
EVP_EncodeInit.3 EVP_EncryptInit.3 EVP_MD_meth_new.3 EVP_OpenInit.3
EVP_PKEY_ASN1_METHOD.3 EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_new.3
EVP_PKEY_CTX_set1_pbe_pass.3 EVP_PKEY_CTX_set_hkdf_md.3
EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 EVP_PKEY_CTX_set_scrypt_N.3
EVP_PKEY_CTX_set_tls1_prf_md.3 

CVS commit: src/crypto/external/bsd/openssl

2020-12-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Dec 10 00:33:14 UTC 2020

Modified Files:
src/crypto/external/bsd/openssl/dist: CHANGES Configure NEWS README
e_os.h
src/crypto/external/bsd/openssl/dist/apps: ca.c s_client.c
src/crypto/external/bsd/openssl/dist/crypto/aes/asm:
aesni-sha1-x86_64.pl
src/crypto/external/bsd/openssl/dist/crypto/asn1: tasn_dec.c tasn_enc.c
src/crypto/external/bsd/openssl/dist/crypto/bn: bn_lib.c
src/crypto/external/bsd/openssl/dist/crypto/conf: conf_def.c
src/crypto/external/bsd/openssl/dist/crypto/ec: ec_ameth.c ec_asn1.c
ec_key.c ec_lib.c
src/crypto/external/bsd/openssl/dist/crypto/engine: eng_lib.c
src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c
src/crypto/external/bsd/openssl/dist/crypto/modes: gcm128.c
src/crypto/external/bsd/openssl/dist/crypto/rand: rand_unix.c
randfile.c
src/crypto/external/bsd/openssl/dist/crypto/sha/asm: sha1-x86_64.pl
src/crypto/external/bsd/openssl/dist/crypto/ui: ui_openssl.c
src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c
src/crypto/external/bsd/openssl/dist/include/openssl: bn.h
src/crypto/external/bsd/openssl/dist/ssl: s3_lib.c ssl_lib.c ssl_sess.c
t1_lib.c
src/crypto/external/bsd/openssl/dist/test: ectest.c rsa_test.c
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64:
aesv8-armx.S chacha-armv8.S poly1305-armv8.S sha1-armv8.S
sha512-armv8.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aesv8-armx.S
chacha-armv8.S ecp_nistz256-armv4.S poly1305-armv8.S sha1-armv8.S
sha512-armv8.S
src/crypto/external/bsd/openssl/lib/libcrypto/man: ADMISSIONS.3
ASN1_INTEGER_get_int64.3 ASN1_ITEM_lookup.3 ASN1_OBJECT_new.3
ASN1_STRING_TABLE_add.3 ASN1_STRING_length.3 ASN1_STRING_new.3
ASN1_STRING_print_ex.3 ASN1_TIME_set.3 ASN1_TYPE_get.3
ASN1_generate_nconf.3 ASYNC_WAIT_CTX_new.3 ASYNC_start_job.3
BF_encrypt.3 BIO_ADDR.3 BIO_ADDRINFO.3 BIO_connect.3 BIO_ctrl.3
BIO_f_base64.3 BIO_f_buffer.3 BIO_f_cipher.3 BIO_f_md.3
BIO_f_null.3 BIO_f_ssl.3 BIO_find_type.3 BIO_get_data.3
BIO_get_ex_new_index.3 BIO_meth_new.3 BIO_new.3 BIO_new_CMS.3
BIO_parse_hostserv.3 BIO_printf.3 BIO_push.3 BIO_read.3
BIO_s_accept.3 BIO_s_bio.3 BIO_s_connect.3 BIO_s_fd.3 BIO_s_file.3
BIO_s_mem.3 BIO_s_null.3 BIO_s_socket.3 BIO_set_callback.3
BIO_should_retry.3 BN_BLINDING_new.3 BN_CTX_new.3 BN_CTX_start.3
BN_add.3 BN_add_word.3 BN_bn2bin.3 BN_cmp.3 BN_copy.3
BN_generate_prime.3 BN_mod_inverse.3 BN_mod_mul_montgomery.3
BN_mod_mul_reciprocal.3 BN_new.3 BN_num_bytes.3 BN_rand.3
BN_security_bits.3 BN_set_bit.3 BN_swap.3 BN_zero.3 BUF_MEM_new.3
CMS_add0_cert.3 CMS_add1_recipient_cert.3 CMS_add1_signer.3
CMS_compress.3 CMS_decrypt.3 CMS_encrypt.3 CMS_final.3
CMS_get0_RecipientInfos.3 CMS_get0_SignerInfos.3 CMS_get0_type.3
CMS_get1_ReceiptRequest.3 CMS_sign.3 CMS_sign_receipt.3
CMS_uncompress.3 CMS_verify.3 CMS_verify_receipt.3
CONF_modules_free.3 CONF_modules_load_file.3
CRYPTO_THREAD_run_once.3 CRYPTO_get_ex_new_index.3
CTLOG_STORE_get0_log_by_id.3 CTLOG_STORE_new.3 CTLOG_new.3
CT_POLICY_EVAL_CTX_new.3 DEFINE_STACK_OF.3 DES_random_key.3
DH_generate_key.3 DH_generate_parameters.3 DH_get0_pqg.3
DH_get_1024_160.3 DH_meth_new.3 DH_new.3 DH_new_by_nid.3
DH_set_method.3 DH_size.3 DSA_SIG_new.3 DSA_do_sign.3 DSA_dup_DH.3
DSA_generate_key.3 DSA_generate_parameters.3 DSA_get0_pqg.3
DSA_meth_new.3 DSA_new.3 DSA_set_method.3 DSA_sign.3 DSA_size.3
DTLS_get_data_mtu.3 DTLS_set_timer_cb.3 DTLSv1_listen.3
ECDSA_SIG_new.3 ECPKParameters_print.3 EC_GFp_simple_method.3
EC_GROUP_copy.3 EC_GROUP_new.3 EC_KEY_get_enc_flags.3 EC_KEY_new.3
EC_POINT_add.3 EC_POINT_new.3 ENGINE_add.3 ERR_GET_LIB.3
ERR_clear_error.3 ERR_error_string.3 ERR_get_error.3
ERR_load_crypto_strings.3 ERR_load_strings.3 ERR_print_errors.3
ERR_put_error.3 ERR_remove_state.3 ERR_set_mark.3 EVP_BytesToKey.3
EVP_CIPHER_CTX_get_cipher_data.3 EVP_CIPHER_meth_new.3
EVP_DigestInit.3 EVP_DigestSignInit.3 EVP_DigestVerifyInit.3
EVP_EncodeInit.3 EVP_EncryptInit.3 EVP_MD_meth_new.3 EVP_OpenInit.3
EVP_PKEY_ASN1_METHOD.3 EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_new.3
EVP_PKEY_CTX_set1_pbe_pass.3 EVP_PKEY_CTX_set_hkdf_md.3
EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 EVP_PKEY_CTX_set_scrypt_N.3
EVP_PKEY_CTX_set_tls1_prf_md.3 

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

2020-12-09 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Dec  9 15:28:38 UTC 2020

Modified Files:
src/sys/arch/arm/footbridge: footbridge_intr.h

Log Message:
Remove  include and assume users already include that.
Removes an include cycle when including  via:
ys/time.h, sys/timevar.h, sys/mutex.h, sys/intr.h on top of this
file, and sys/param.h, uvm/uvm_param.h, sys/resourcevar.h below.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/footbridge/footbridge_intr.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/footbridge/footbridge_intr.h
diff -u src/sys/arch/arm/footbridge/footbridge_intr.h:1.20 src/sys/arch/arm/footbridge/footbridge_intr.h:1.21
--- src/sys/arch/arm/footbridge/footbridge_intr.h:1.20	Fri Jun  1 21:22:43 2018
+++ src/sys/arch/arm/footbridge/footbridge_intr.h	Wed Dec  9 15:28:38 2020
@@ -1,4 +1,4 @@
-/* 	$NetBSD: footbridge_intr.h,v 1.20 2018/06/01 21:22:43 mrg Exp $	*/
+/* 	$NetBSD: footbridge_intr.h,v 1.21 2020/12/09 15:28:38 martin Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -46,7 +46,6 @@ typedef struct {
 
 #include 
 #endif
-#include 
 #include 
 #include 
 



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

2020-12-09 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Dec  9 15:28:38 UTC 2020

Modified Files:
src/sys/arch/arm/footbridge: footbridge_intr.h

Log Message:
Remove  include and assume users already include that.
Removes an include cycle when including  via:
ys/time.h, sys/timevar.h, sys/mutex.h, sys/intr.h on top of this
file, and sys/param.h, uvm/uvm_param.h, sys/resourcevar.h below.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/footbridge/footbridge_intr.h

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



CVS commit: src/sys/dev/pci

2020-12-09 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Wed Dec  9 14:21:09 UTC 2020

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

Log Message:
xhci_pci: avoid potential double free of interrupt handles

Found by Kouichi Hashikawa in PR 55855.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/xhci_pci.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/xhci_pci.c
diff -u src/sys/dev/pci/xhci_pci.c:1.25 src/sys/dev/pci/xhci_pci.c:1.26
--- src/sys/dev/pci/xhci_pci.c:1.25	Tue Oct 27 13:50:57 2020
+++ src/sys/dev/pci/xhci_pci.c	Wed Dec  9 14:21:09 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhci_pci.c,v 1.25 2020/10/27 13:50:57 skrll Exp $	*/
+/*	$NetBSD: xhci_pci.c,v 1.26 2020/12/09 14:21:09 jakllsch Exp $	*/
 /*	OpenBSD: xhci_pci.c,v 1.4 2014/07/12 17:38:51 yuo Exp	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.25 2020/10/27 13:50:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.26 2020/12/09 14:21:09 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_xhci_pci.h"
@@ -222,7 +222,7 @@ xhci_pci_attach(device_t parent, device_
 	xhci_intr, sc, device_xname(sc->sc_dev));
 	if (psc->sc_ih == NULL) {
 		pci_intr_release(pc, psc->sc_pihp, 1);
-		psc->sc_ih = NULL;
+		psc->sc_pihp = NULL;
 		aprint_error_dev(self, "couldn't establish interrupt");
 		if (intrstr != NULL)
 			aprint_error(" at %s", intrstr);



CVS commit: src/sys/dev/pci

2020-12-09 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Wed Dec  9 14:21:09 UTC 2020

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

Log Message:
xhci_pci: avoid potential double free of interrupt handles

Found by Kouichi Hashikawa in PR 55855.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/xhci_pci.c

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



CVS commit: src/sys/arch/sparc/sparc

2020-12-09 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Wed Dec  9 11:35:44 UTC 2020

Modified Files:
src/sys/arch/sparc/sparc: pmap.c

Log Message:
Add "memory" constraint on wrpsr, lost in previous.


To generate a diff of this commit:
cvs rdiff -u -r1.368 -r1.369 src/sys/arch/sparc/sparc/pmap.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/sparc/sparc/pmap.c
diff -u src/sys/arch/sparc/sparc/pmap.c:1.368 src/sys/arch/sparc/sparc/pmap.c:1.369
--- src/sys/arch/sparc/sparc/pmap.c:1.368	Wed Dec  9 04:02:20 2020
+++ src/sys/arch/sparc/sparc/pmap.c	Wed Dec  9 11:35:44 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.368 2020/12/09 04:02:20 uwe Exp $ */
+/*	$NetBSD: pmap.c,v 1.369 2020/12/09 11:35:44 uwe Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -56,7 +56,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.368 2020/12/09 04:02:20 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.369 2020/12/09 11:35:44 uwe Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -653,7 +653,8 @@ sp_tlb_flush(int va, int ctx, int lvl)
 	 * XXX: Add to asm.h?  We can use this in cache.c too.
 	 */
 	opsr = getpsr();	/* KDASSERT(opsr & PSR_ET); */
-	__asm volatile ("wr %0, %1, %%psr" :: "r"(opsr), "n"(PSR_ET));
+	__asm volatile ("wr %0, %1, %%psr"
+			:: "r"(opsr), "n"(PSR_ET) : "memory");
 	__asm volatile ("nop; nop;nop");
 
 	octx = getcontext4m();	/* save context */



CVS commit: src/sys/arch/sparc/sparc

2020-12-09 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Wed Dec  9 11:35:44 UTC 2020

Modified Files:
src/sys/arch/sparc/sparc: pmap.c

Log Message:
Add "memory" constraint on wrpsr, lost in previous.


To generate a diff of this commit:
cvs rdiff -u -r1.368 -r1.369 src/sys/arch/sparc/sparc/pmap.c

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



CVS commit: src/sys/arch/aarch64/aarch64

2020-12-09 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Dec  9 08:51:05 UTC 2020

Modified Files:
src/sys/arch/aarch64/aarch64: aarch64_machdep.c

Log Message:
Remove unnecessary aarch64_dcache_wbinv_all now that pmapboot_enter does
dsb(ish)


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/aarch64/aarch64/aarch64_machdep.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/aarch64/aarch64/aarch64_machdep.c
diff -u src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.54 src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.55
--- src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.54	Tue Nov 10 07:51:19 2020
+++ src/sys/arch/aarch64/aarch64/aarch64_machdep.c	Wed Dec  9 08:51:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: aarch64_machdep.c,v 1.54 2020/11/10 07:51:19 skrll Exp $ */
+/* $NetBSD: aarch64_machdep.c,v 1.55 2020/12/09 08:51:05 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.54 2020/11/10 07:51:19 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.55 2020/12/09 08:51:05 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_cpuoptions.h"
@@ -166,7 +166,6 @@ cpu_kernel_vm_init(uint64_t memory_start
 		pmapboot_enter_range(AARCH64_PA_TO_KVA(start), start,
 		end - start, dmattr, printf);
 	}
-	aarch64_dcache_wbinv_all();
 
 	/* Disable translation table walks using TTBR0 */
 	uint64_t tcr = reg_tcr_el1_read();



CVS commit: src/sys/arch/aarch64/aarch64

2020-12-09 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Dec  9 08:51:05 UTC 2020

Modified Files:
src/sys/arch/aarch64/aarch64: aarch64_machdep.c

Log Message:
Remove unnecessary aarch64_dcache_wbinv_all now that pmapboot_enter does
dsb(ish)


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/aarch64/aarch64/aarch64_machdep.c

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



CVS commit: src/usr.bin/make/unit-tests

2020-12-09 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Wed Dec  9 08:20:56 UTC 2020

Modified Files:
src/usr.bin/make/unit-tests: opt-jobs-no-action.exp
opt-jobs-no-action.mk

Log Message:
make(1): clean up test output of opt-jobs-no-action


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/opt-jobs-no-action.exp
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/opt-jobs-no-action.mk

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

Modified files:

Index: src/usr.bin/make/unit-tests/opt-jobs-no-action.exp
diff -u src/usr.bin/make/unit-tests/opt-jobs-no-action.exp:1.4 src/usr.bin/make/unit-tests/opt-jobs-no-action.exp:1.5
--- src/usr.bin/make/unit-tests/opt-jobs-no-action.exp:1.4	Wed Dec  9 08:18:35 2020
+++ src/usr.bin/make/unit-tests/opt-jobs-no-action.exp	Wed Dec  9 08:20:56 2020
@@ -1,3 +1,4 @@
+begin explain
 # .echoOff
 # .errOnOrEcho
 echo "false regular"
@@ -12,7 +13,7 @@ echo "false regular"
 false ignore-errors
 echo run despite the -n option
 run despite the -n option
-echo
+end explain
 
 begin combined
 

Index: src/usr.bin/make/unit-tests/opt-jobs-no-action.mk
diff -u src/usr.bin/make/unit-tests/opt-jobs-no-action.mk:1.6 src/usr.bin/make/unit-tests/opt-jobs-no-action.mk:1.7
--- src/usr.bin/make/unit-tests/opt-jobs-no-action.mk:1.6	Wed Dec  9 08:18:35 2020
+++ src/usr.bin/make/unit-tests/opt-jobs-no-action.mk	Wed Dec  9 08:20:56 2020
@@ -1,4 +1,4 @@
-# $NetBSD: opt-jobs-no-action.mk,v 1.6 2020/12/09 08:18:35 rillig Exp $
+# $NetBSD: opt-jobs-no-action.mk,v 1.7 2020/12/09 08:20:56 rillig Exp $
 #
 # Tests for the combination of the options -j and -n, which prints the
 # commands instead of actually running them.
@@ -34,11 +34,13 @@
 	ignore="\# .errOffOrExecIgnore\n""%s\n" \
 	errout="\# .errExit\n""{ %s \n} || exit $$?\n"
 
-all: documented combined
-.ORDER: documented combined
+all: explained combined
+.ORDER: explained combined
 
 # Explain the most basic cases in detail.
-documented: .PHONY
+explained: .PHONY
+	@+echo hide-from-output 'begin explain'
+
 	# The following command is regular, it is printed twice:
 	# - first using the template shell.errOnOrEcho,
 	# - then using the template shell.errExit.
@@ -59,7 +61,8 @@ documented: .PHONY
 	# '!silent' in Compat_RunCommand.
 	+echo run despite the -n option
 
-	@+echo
+	@+echo hide-from-output 'end explain'
+	@+echo hide-from-output
 
 
 # Test all combinations of the 3 RunFlags.



CVS commit: src/usr.bin/make/unit-tests

2020-12-09 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Wed Dec  9 08:20:56 UTC 2020

Modified Files:
src/usr.bin/make/unit-tests: opt-jobs-no-action.exp
opt-jobs-no-action.mk

Log Message:
make(1): clean up test output of opt-jobs-no-action


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/opt-jobs-no-action.exp
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/opt-jobs-no-action.mk

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



CVS commit: src/usr.bin/make/unit-tests

2020-12-09 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Wed Dec  9 08:18:35 UTC 2020

Modified Files:
src/usr.bin/make/unit-tests: Makefile opt-jobs-no-action.exp
opt-jobs-no-action.mk

Log Message:
make(1): remove noise from test output of opt-jobs-no-action


To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/opt-jobs-no-action.exp
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/opt-jobs-no-action.mk

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

Modified files:

Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.242 src/usr.bin/make/unit-tests/Makefile:1.243
--- src/usr.bin/make/unit-tests/Makefile:1.242	Wed Dec  9 07:57:52 2020
+++ src/usr.bin/make/unit-tests/Makefile	Wed Dec  9 08:18:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.242 2020/12/09 07:57:52 rillig Exp $
+# $NetBSD: Makefile,v 1.243 2020/12/09 08:18:35 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -476,10 +476,8 @@ SED_CMDS.opt-debug-jobs+=	-e 's,JobFinis
 SED_CMDS.opt-debug-jobs+=	-e 's,Command: ${.SHELL:T},Command: ,'
 # The "-q" may be there or not, see jobs.c, variable shells.
 SED_CMDS.opt-debug-jobs+=	-e 's,^\(.Command: \) -q,\1,'
-SED_CMDS.opt-no-action-runflags= \
-	-e '/^echo hide-from-output/d' \
-	-e 's,hide-from-output ,,' \
-	-e 's,hide-from-output,,'
+SED_CMDS.opt-jobs-no-action=	${STD_SED_CMDS.hide-from-output}
+SED_CMDS.opt-no-action-runflags= ${STD_SED_CMDS.hide-from-output}
 # For Compat_RunCommand, useShell == FALSE.
 SED_CMDS.sh-dots=		-e 's,^.*\.\.\.:.*,,'
 # For Compat_RunCommand, useShell == TRUE.
@@ -529,6 +527,13 @@ STD_SED_CMDS.dg1+=	-e 's,^\(\.MAKE\.[A-Z
 STD_SED_CMDS.dg1+=	-e 's,^\(MACHINE[_ARCH]* *=\) .*,\1 ,'
 STD_SED_CMDS.dg1+=	-e 's,^\(MAKE *=\) .*,\1 ,'
 
+# Reduce the noise for tests running with the -n option, since there is no
+# other way to suppress the echoing of the commands.
+STD_SED_CMDS.hide-from-output= \
+	-e '/^echo hide-from-output/d' \
+	-e 's,hide-from-output ,,' \
+	-e 's,hide-from-output,,'
+
 # End of the configuration helpers section.
 
 .MAIN: all

Index: src/usr.bin/make/unit-tests/opt-jobs-no-action.exp
diff -u src/usr.bin/make/unit-tests/opt-jobs-no-action.exp:1.3 src/usr.bin/make/unit-tests/opt-jobs-no-action.exp:1.4
--- src/usr.bin/make/unit-tests/opt-jobs-no-action.exp:1.3	Wed Dec  9 07:24:52 2020
+++ src/usr.bin/make/unit-tests/opt-jobs-no-action.exp	Wed Dec  9 08:18:35 2020
@@ -14,11 +14,8 @@ echo run despite the -n option
 run despite the -n option
 echo
 
-echo 'begin combined'
 begin combined
-echo
 
-echo silent=no always=no ignerr=no
 silent=no always=no ignerr=no
 # .echoOff
 # .errOnOrEcho
@@ -27,53 +24,37 @@ echo "echo running"
 { echo running 
 } || exit $?
 # .echoOn
-echo
 
-echo silent=no always=no ignerr=yes
 silent=no always=no ignerr=yes
 echo running; false
-echo
 
-echo silent=no always=yes ignerr=no
 silent=no always=yes ignerr=no
 echo running
 running
-echo
 
-echo silent=no always=yes ignerr=yes
 silent=no always=yes ignerr=yes
 echo running; false
 running
 *** Error code 1 (ignored)
-echo
 
-echo silent=yes always=no ignerr=no
 silent=yes always=no ignerr=no
 # .errExit
 { echo running 
 } || exit $?
 # .echoOn
-echo
 
-echo silent=yes always=no ignerr=yes
 silent=yes always=no ignerr=yes
 echo running; false
 # .echoOn
-echo
 
-echo silent=yes always=yes ignerr=no
 silent=yes always=yes ignerr=no
 echo running
 running
-echo
 
-echo silent=yes always=yes ignerr=yes
 silent=yes always=yes ignerr=yes
 echo running; false
 running
 *** Error code 1 (ignored)
-echo
 
-echo 'end combined'
 end combined
 exit status 0

Index: src/usr.bin/make/unit-tests/opt-jobs-no-action.mk
diff -u src/usr.bin/make/unit-tests/opt-jobs-no-action.mk:1.5 src/usr.bin/make/unit-tests/opt-jobs-no-action.mk:1.6
--- src/usr.bin/make/unit-tests/opt-jobs-no-action.mk:1.5	Wed Dec  9 08:15:45 2020
+++ src/usr.bin/make/unit-tests/opt-jobs-no-action.mk	Wed Dec  9 08:18:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: opt-jobs-no-action.mk,v 1.5 2020/12/09 08:15:45 rillig Exp $
+# $NetBSD: opt-jobs-no-action.mk,v 1.6 2020/12/09 08:18:35 rillig Exp $
 #
 # Tests for the combination of the options -j and -n, which prints the
 # commands instead of actually running them.
@@ -77,8 +77,8 @@ IGNERR.yes=	-echo running; false
 combined: combined-begin
 
 combined-begin: .PHONY
-	@+echo 'begin combined'
-	@+echo
+	@+echo hide-from-output 'begin combined'
+	@+echo hide-from-output
 
 .for silent in no yes
 .  for always in no yes
@@ -86,9 +86,9 @@ combined-begin: .PHONY
 .  for target in combined-silent-${silent}-always-${always}-ignerr-${ignerr}
 combined: .WAIT ${target} .WAIT
 ${target}: .PHONY
-	@+echo silent=${silent} always=${always} ignerr=${ignerr}
+	@+echo hide-from-output silent=${silent} always=${always} ignerr=${ignerr}
 	

CVS commit: src/usr.bin/make/unit-tests

2020-12-09 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Wed Dec  9 08:18:35 UTC 2020

Modified Files:
src/usr.bin/make/unit-tests: Makefile opt-jobs-no-action.exp
opt-jobs-no-action.mk

Log Message:
make(1): remove noise from test output of opt-jobs-no-action


To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/opt-jobs-no-action.exp
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/opt-jobs-no-action.mk

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



CVS commit: src/usr.bin/make/unit-tests

2020-12-09 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Wed Dec  9 08:15:45 UTC 2020

Modified Files:
src/usr.bin/make/unit-tests: opt-jobs-no-action.mk

Log Message:
make(1): split the -j -n test into separate targets

The manual page says that in -j mode when the shell does not have ErrCtl
(and none of the default shells has that), the command prefix '-'
"affects the entire job", but this seems to be wrong.  At least, there
is no change in the output from before, when all commands had been in
the same target.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/opt-jobs-no-action.mk

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

Modified files:

Index: src/usr.bin/make/unit-tests/opt-jobs-no-action.mk
diff -u src/usr.bin/make/unit-tests/opt-jobs-no-action.mk:1.4 src/usr.bin/make/unit-tests/opt-jobs-no-action.mk:1.5
--- src/usr.bin/make/unit-tests/opt-jobs-no-action.mk:1.4	Wed Dec  9 07:57:52 2020
+++ src/usr.bin/make/unit-tests/opt-jobs-no-action.mk	Wed Dec  9 08:15:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: opt-jobs-no-action.mk,v 1.4 2020/12/09 07:57:52 rillig Exp $
+# $NetBSD: opt-jobs-no-action.mk,v 1.5 2020/12/09 08:15:45 rillig Exp $
 #
 # Tests for the combination of the options -j and -n, which prints the
 # commands instead of actually running them.
@@ -74,16 +74,26 @@ ALWAYS.yes=	+
 IGNERR.no=	echo running
 IGNERR.yes=	-echo running; false
 #
-combined:
-	@+echo 'begin $@'
+combined: combined-begin
+
+combined-begin: .PHONY
+	@+echo 'begin combined'
 	@+echo
+
 .for silent in no yes
 .  for always in no yes
 .for ignerr in no yes
+.  for target in combined-silent-${silent}-always-${always}-ignerr-${ignerr}
+combined: .WAIT ${target} .WAIT
+${target}: .PHONY
 	@+echo silent=${silent} always=${always} ignerr=${ignerr}
 	${SILENT.${silent}}${ALWAYS.${always}}${IGNERR.${ignerr}}
 	@+echo
+.  endfor
 .endfor
 .  endfor
 .endfor
-	@+echo 'end $@'
+
+combined: combined-end
+combined-end: .PHONY
+	@+echo 'end combined'



CVS commit: src/usr.bin/make/unit-tests

2020-12-09 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Wed Dec  9 08:15:45 UTC 2020

Modified Files:
src/usr.bin/make/unit-tests: opt-jobs-no-action.mk

Log Message:
make(1): split the -j -n test into separate targets

The manual page says that in -j mode when the shell does not have ErrCtl
(and none of the default shells has that), the command prefix '-'
"affects the entire job", but this seems to be wrong.  At least, there
is no change in the output from before, when all commands had been in
the same target.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/opt-jobs-no-action.mk

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