svn commit: r325384 - in projects/runtime-coverage: . contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/asn1 cry...

Ngie Cooper ngie at FreeBSD.org
Sat Nov 4 07:05:26 UTC 2017


Author: ngie
Date: Sat Nov  4 07:05:21 2017
New Revision: 325384
URL: https://svnweb.freebsd.org/changeset/base/325384

Log:
  MFhead at r325383

Added:
  projects/runtime-coverage/contrib/bmake/VERSION
     - copied unchanged from r325383, head/contrib/bmake/VERSION
  projects/runtime-coverage/crypto/openssl/crypto/asn1/asn1_int.h
     - copied unchanged from r325383, head/crypto/openssl/crypto/asn1/asn1_int.h
  projects/runtime-coverage/crypto/openssl/doc/crypto/EVP_PKEY_meth_new.pod
     - copied unchanged from r325383, head/crypto/openssl/doc/crypto/EVP_PKEY_meth_new.pod
  projects/runtime-coverage/crypto/openssl/doc/crypto/X509_check_private_key.pod
     - copied unchanged from r325383, head/crypto/openssl/doc/crypto/X509_check_private_key.pod
  projects/runtime-coverage/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_servername_callback.pod
     - copied unchanged from r325383, head/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_servername_callback.pod
  projects/runtime-coverage/crypto/openssl/doc/ssl/SSL_export_keying_material.pod
     - copied unchanged from r325383, head/crypto/openssl/doc/ssl/SSL_export_keying_material.pod
  projects/runtime-coverage/release/arm64/PINE64.conf
     - copied unchanged from r325383, head/release/arm64/PINE64.conf
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_meth_new.3
     - copied unchanged from r325383, head/secure/lib/libcrypto/man/EVP_PKEY_meth_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/X509_check_private_key.3
     - copied unchanged from r325383, head/secure/lib/libcrypto/man/X509_check_private_key.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_export_keying_material.3
     - copied unchanged from r325383, head/secure/lib/libssl/man/SSL_export_keying_material.3
  projects/runtime-coverage/share/monetdef/it_CH.ISO8859-15.src
     - copied unchanged from r325383, head/share/monetdef/it_CH.ISO8859-15.src
  projects/runtime-coverage/share/msgdef/he_IL.UTF-8.src
     - copied unchanged from r325383, head/share/msgdef/he_IL.UTF-8.src
  projects/runtime-coverage/share/numericdef/it_CH.ISO8859-15.src
     - copied unchanged from r325383, head/share/numericdef/it_CH.ISO8859-15.src
  projects/runtime-coverage/sys/contrib/ena-com/ena_defs/
     - copied from r325383, head/sys/contrib/ena-com/ena_defs/
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/fm_ncsw.c
     - copied unchanged from r325383, head/sys/contrib/ncsw/Peripherals/FM/fm_ncsw.c
  projects/runtime-coverage/sys/contrib/ncsw/etc/ncsw_list.c
     - copied unchanged from r325383, head/sys/contrib/ncsw/etc/ncsw_list.c
  projects/runtime-coverage/sys/dev/iicbus/rtc8583.c
     - copied unchanged from r325383, head/sys/dev/iicbus/rtc8583.c
  projects/runtime-coverage/tools/build/options/WITHOUT_AUTO_OBJ
     - copied unchanged from r325383, head/tools/build/options/WITHOUT_AUTO_OBJ
  projects/runtime-coverage/tools/build/options/WITHOUT_UNIFIED_OBJDIR
     - copied unchanged from r325383, head/tools/build/options/WITHOUT_UNIFIED_OBJDIR
  projects/runtime-coverage/tools/build/options/WITH_UNIFIED_OBJDIR
     - copied unchanged from r325383, head/tools/build/options/WITH_UNIFIED_OBJDIR
  projects/runtime-coverage/tools/tools/fetchbench/
     - copied from r325383, head/tools/tools/fetchbench/
Deleted:
  projects/runtime-coverage/crypto/openssl/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod
  projects/runtime-coverage/share/man/man7/adding_user.7
  projects/runtime-coverage/share/numericdef/fr_CH.ISO8859-15.src
  projects/runtime-coverage/share/numericdef/fr_CH.UTF-8.src
  projects/runtime-coverage/sys/contrib/ncsw/Peripherals/FM/fm.c
  projects/runtime-coverage/sys/contrib/ncsw/etc/list.c
Modified:
  projects/runtime-coverage/Makefile
  projects/runtime-coverage/Makefile.inc1
  projects/runtime-coverage/Makefile.libcompat
  projects/runtime-coverage/ObsoleteFiles.inc
  projects/runtime-coverage/UPDATING
  projects/runtime-coverage/contrib/bmake/ChangeLog
  projects/runtime-coverage/contrib/bmake/FILES
  projects/runtime-coverage/contrib/bmake/Makefile
  projects/runtime-coverage/contrib/bmake/Makefile.config.in
  projects/runtime-coverage/contrib/bmake/bsd.after-import.mk
  projects/runtime-coverage/contrib/bmake/configure
  projects/runtime-coverage/contrib/bmake/configure.in
  projects/runtime-coverage/contrib/bmake/machine.sh
  projects/runtime-coverage/contrib/bmake/main.c
  projects/runtime-coverage/contrib/bmake/make-bootstrap.sh.in
  projects/runtime-coverage/contrib/bmake/meta.c
  projects/runtime-coverage/contrib/bmake/mk/ChangeLog
  projects/runtime-coverage/contrib/bmake/mk/autoconf.mk
  projects/runtime-coverage/contrib/bmake/mk/dirdeps.mk
  projects/runtime-coverage/contrib/bmake/mk/dpadd.mk
  projects/runtime-coverage/contrib/bmake/mk/gendirdeps.mk
  projects/runtime-coverage/contrib/bmake/mk/install-mk
  projects/runtime-coverage/contrib/bmake/mk/meta.autodep.mk
  projects/runtime-coverage/contrib/bmake/mk/meta.stage.mk
  projects/runtime-coverage/contrib/bmake/mk/sys.clean-env.mk
  projects/runtime-coverage/contrib/bmake/mk/whats.mk
  projects/runtime-coverage/contrib/bmake/os.sh
  projects/runtime-coverage/contrib/bmake/unit-tests/dotwait.exp
  projects/runtime-coverage/contrib/bmake/unit-tests/dotwait.mk
  projects/runtime-coverage/crypto/openssl/CHANGES
  projects/runtime-coverage/crypto/openssl/INSTALL
  projects/runtime-coverage/crypto/openssl/Makefile
  projects/runtime-coverage/crypto/openssl/NEWS
  projects/runtime-coverage/crypto/openssl/README
  projects/runtime-coverage/crypto/openssl/apps/ca.c
  projects/runtime-coverage/crypto/openssl/apps/s_client.c
  projects/runtime-coverage/crypto/openssl/apps/s_server.c
  projects/runtime-coverage/crypto/openssl/apps/speed.c
  projects/runtime-coverage/crypto/openssl/apps/spkac.c
  projects/runtime-coverage/crypto/openssl/apps/srp.c
  projects/runtime-coverage/crypto/openssl/apps/tsget
  projects/runtime-coverage/crypto/openssl/crypto/asn1/Makefile
  projects/runtime-coverage/crypto/openssl/crypto/asn1/a_bitstr.c
  projects/runtime-coverage/crypto/openssl/crypto/asn1/tasn_fre.c
  projects/runtime-coverage/crypto/openssl/crypto/asn1/tasn_new.c
  projects/runtime-coverage/crypto/openssl/crypto/asn1/x_name.c
  projects/runtime-coverage/crypto/openssl/crypto/asn1/x_pkey.c
  projects/runtime-coverage/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl
  projects/runtime-coverage/crypto/openssl/crypto/bn/bn_exp.c
  projects/runtime-coverage/crypto/openssl/crypto/bn/bn_lib.c
  projects/runtime-coverage/crypto/openssl/crypto/bn/bn_mont.c
  projects/runtime-coverage/crypto/openssl/crypto/bn/bn_mul.c
  projects/runtime-coverage/crypto/openssl/crypto/bn/bn_x931p.c
  projects/runtime-coverage/crypto/openssl/crypto/cryptlib.c
  projects/runtime-coverage/crypto/openssl/crypto/dh/Makefile
  projects/runtime-coverage/crypto/openssl/crypto/dh/dh.h
  projects/runtime-coverage/crypto/openssl/crypto/dh/dh_kdf.c
  projects/runtime-coverage/crypto/openssl/crypto/dh/dh_pmeth.c
  projects/runtime-coverage/crypto/openssl/crypto/dsa/dsa_ameth.c
  projects/runtime-coverage/crypto/openssl/crypto/dsa/dsa_gen.c
  projects/runtime-coverage/crypto/openssl/crypto/dsa/dsa_ossl.c
  projects/runtime-coverage/crypto/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl
  projects/runtime-coverage/crypto/openssl/crypto/ec/ecp_mont.c
  projects/runtime-coverage/crypto/openssl/crypto/ec/ecp_nistp224.c
  projects/runtime-coverage/crypto/openssl/crypto/ec/ecp_nistp256.c
  projects/runtime-coverage/crypto/openssl/crypto/ec/ecp_nistp521.c
  projects/runtime-coverage/crypto/openssl/crypto/ecdh/ech_lib.c
  projects/runtime-coverage/crypto/openssl/crypto/ecdsa/ecs_lib.c
  projects/runtime-coverage/crypto/openssl/crypto/ecdsa/ecs_ossl.c
  projects/runtime-coverage/crypto/openssl/crypto/err/err.c
  projects/runtime-coverage/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c
  projects/runtime-coverage/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c
  projects/runtime-coverage/crypto/openssl/crypto/evp/evp.h
  projects/runtime-coverage/crypto/openssl/crypto/evp/evp_key.c
  projects/runtime-coverage/crypto/openssl/crypto/evp/pmeth_lib.c
  projects/runtime-coverage/crypto/openssl/crypto/ex_data.c
  projects/runtime-coverage/crypto/openssl/crypto/lhash/lhash.c
  projects/runtime-coverage/crypto/openssl/crypto/ocsp/ocsp_vfy.c
  projects/runtime-coverage/crypto/openssl/crypto/opensslv.h
  projects/runtime-coverage/crypto/openssl/crypto/pem/pem_lib.c
  projects/runtime-coverage/crypto/openssl/crypto/pem/pem_pk8.c
  projects/runtime-coverage/crypto/openssl/crypto/pem/pem_pkey.c
  projects/runtime-coverage/crypto/openssl/crypto/pkcs12/p12_kiss.c
  projects/runtime-coverage/crypto/openssl/crypto/rsa/rsa_ameth.c
  projects/runtime-coverage/crypto/openssl/crypto/rsa/rsa_oaep.c
  projects/runtime-coverage/crypto/openssl/crypto/rsa/rsa_pk1.c
  projects/runtime-coverage/crypto/openssl/crypto/rsa/rsa_pmeth.c
  projects/runtime-coverage/crypto/openssl/crypto/ui/ui_lib.c
  projects/runtime-coverage/crypto/openssl/crypto/whrlpool/wp_dgst.c
  projects/runtime-coverage/crypto/openssl/crypto/x509/by_dir.c
  projects/runtime-coverage/crypto/openssl/crypto/x509/by_file.c
  projects/runtime-coverage/crypto/openssl/crypto/x509v3/pcy_tree.c
  projects/runtime-coverage/crypto/openssl/crypto/x509v3/v3_addr.c
  projects/runtime-coverage/crypto/openssl/crypto/x509v3/v3_genn.c
  projects/runtime-coverage/crypto/openssl/crypto/x509v3/v3_ncons.c
  projects/runtime-coverage/crypto/openssl/crypto/x86_64cpuid.pl
  projects/runtime-coverage/crypto/openssl/doc/apps/asn1parse.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/ca.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/ciphers.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/cms.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/crl.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/crl2pkcs7.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/dgst.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/dhparam.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/dsa.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/dsaparam.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/ec.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/ecparam.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/enc.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/errstr.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/gendsa.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/genpkey.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/genrsa.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/nseq.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/ocsp.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/passwd.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/pkcs12.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/pkcs7.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/pkcs8.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/pkey.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/pkeyparam.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/pkeyutl.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/rand.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/req.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/rsa.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/rsautl.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/s_client.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/s_server.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/s_time.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/sess_id.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/smime.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/speed.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/spkac.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/ts.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/tsget.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/verify.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/version.pod
  projects/runtime-coverage/crypto/openssl/doc/apps/x509.pod
  projects/runtime-coverage/crypto/openssl/doc/crypto/BN_bn2bin.pod
  projects/runtime-coverage/crypto/openssl/doc/crypto/BN_new.pod
  projects/runtime-coverage/crypto/openssl/doc/crypto/EVP_EncryptInit.pod
  projects/runtime-coverage/crypto/openssl/doc/crypto/RSA_padding_add_PKCS1_type_1.pod
  projects/runtime-coverage/crypto/openssl/doc/crypto/RSA_public_encrypt.pod
  projects/runtime-coverage/crypto/openssl/doc/crypto/hmac.pod
  projects/runtime-coverage/crypto/openssl/doc/ssl/SSL_set_connect_state.pod
  projects/runtime-coverage/crypto/openssl/ssl/s23_clnt.c
  projects/runtime-coverage/crypto/openssl/ssl/s3_pkt.c
  projects/runtime-coverage/crypto/openssl/ssl/s3_srvr.c
  projects/runtime-coverage/crypto/openssl/ssl/ssl_ciph.c
  projects/runtime-coverage/crypto/openssl/ssl/ssl_lib.c
  projects/runtime-coverage/crypto/openssl/ssl/ssl_sess.c
  projects/runtime-coverage/crypto/openssl/ssl/ssltest.c
  projects/runtime-coverage/crypto/openssl/ssl/tls1.h
  projects/runtime-coverage/crypto/openssl/util/copy-if-different.pl
  projects/runtime-coverage/crypto/openssl/util/copy.pl
  projects/runtime-coverage/crypto/openssl/util/libeay.num
  projects/runtime-coverage/crypto/openssl/util/mk1mf.pl
  projects/runtime-coverage/etc/defaults/bluetooth.device.conf
  projects/runtime-coverage/etc/devd/usb.conf
  projects/runtime-coverage/etc/mtree/BSD.tests.dist
  projects/runtime-coverage/etc/rc.d/bluetooth
  projects/runtime-coverage/gnu/usr.bin/cc/cc_tools/Makefile
  projects/runtime-coverage/lib/libc/gen/tls.c
  projects/runtime-coverage/lib/libc/stdio/gets.c
  projects/runtime-coverage/lib/libcxxrt/Version.map
  projects/runtime-coverage/lib/libmt/mtlib.c
  projects/runtime-coverage/lib/libpathconv/Makefile
  projects/runtime-coverage/release/arm/BANANAPI.conf
  projects/runtime-coverage/release/arm/BEAGLEBONE.conf
  projects/runtime-coverage/release/arm/CUBIEBOARD.conf
  projects/runtime-coverage/release/arm/CUBIEBOARD2.conf
  projects/runtime-coverage/release/arm/CUBOX-HUMMINGBOARD.conf
  projects/runtime-coverage/release/arm/GUMSTIX.conf
  projects/runtime-coverage/release/arm/PANDABOARD.conf
  projects/runtime-coverage/release/arm/RPI-B.conf
  projects/runtime-coverage/release/arm/RPI2.conf
  projects/runtime-coverage/release/arm/WANDBOARD.conf
  projects/runtime-coverage/release/arm64/RPI3.conf
  projects/runtime-coverage/release/release.sh
  projects/runtime-coverage/release/tools/ec2.conf
  projects/runtime-coverage/release/tools/vmimage.subr
  projects/runtime-coverage/secure/lib/libcrypto/Makefile.inc
  projects/runtime-coverage/secure/lib/libcrypto/Makefile.man
  projects/runtime-coverage/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S
  projects/runtime-coverage/secure/lib/libcrypto/amd64/x86_64-mont5.S
  projects/runtime-coverage/secure/lib/libcrypto/amd64/x86_64cpuid.S
  projects/runtime-coverage/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ASN1_STRING_length.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ASN1_STRING_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ASN1_TIME_set.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ASN1_generate_nconf.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_ctrl.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_f_base64.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_f_buffer.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_f_cipher.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_f_md.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_f_null.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_f_ssl.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_find_type.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_new_CMS.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_push.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_read.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_s_accept.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_s_bio.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_s_connect.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_s_fd.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_s_file.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_s_mem.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_s_null.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_s_socket.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_set_callback.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BIO_should_retry.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_BLINDING_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_CTX_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_CTX_start.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_add.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_add_word.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_bn2bin.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_cmp.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_copy.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_generate_prime.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_mod_inverse.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_num_bytes.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_rand.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_set_bit.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_swap.3
  projects/runtime-coverage/secure/lib/libcrypto/man/BN_zero.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_add0_cert.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_add1_signer.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_compress.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_decrypt.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_encrypt.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_final.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_get0_type.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_sign.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_sign_receipt.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_uncompress.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_verify.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CMS_verify_receipt.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CONF_modules_free.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CONF_modules_load_file.3
  projects/runtime-coverage/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DH_generate_key.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DH_generate_parameters.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DH_get_ex_new_index.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DH_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DH_set_method.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DH_size.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DSA_SIG_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DSA_do_sign.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DSA_dup_DH.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DSA_generate_key.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DSA_generate_parameters.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DSA_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DSA_set_method.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DSA_sign.3
  projects/runtime-coverage/secure/lib/libcrypto/man/DSA_size.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EC_GFp_simple_method.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EC_GROUP_copy.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EC_GROUP_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EC_KEY_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EC_POINT_add.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EC_POINT_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ERR_GET_LIB.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ERR_clear_error.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ERR_error_string.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ERR_get_error.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ERR_load_strings.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ERR_print_errors.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ERR_put_error.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ERR_remove_state.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ERR_set_mark.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_BytesToKey.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_DigestInit.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_DigestSignInit.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_EncodeInit.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_EncryptInit.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_OpenInit.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_cmp.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_derive.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_keygen.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_print_private.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_sign.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_verify.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_SealInit.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_SignInit.3
  projects/runtime-coverage/secure/lib/libcrypto/man/EVP_VerifyInit.3
  projects/runtime-coverage/secure/lib/libcrypto/man/OBJ_nid2obj.3
  projects/runtime-coverage/secure/lib/libcrypto/man/OPENSSL_Applink.3
  projects/runtime-coverage/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
  projects/runtime-coverage/secure/lib/libcrypto/man/OPENSSL_config.3
  projects/runtime-coverage/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
  projects/runtime-coverage/secure/lib/libcrypto/man/OPENSSL_instrument_bus.3
  projects/runtime-coverage/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
  projects/runtime-coverage/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
  projects/runtime-coverage/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3
  projects/runtime-coverage/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3
  projects/runtime-coverage/secure/lib/libcrypto/man/PKCS12_create.3
  projects/runtime-coverage/secure/lib/libcrypto/man/PKCS12_parse.3
  projects/runtime-coverage/secure/lib/libcrypto/man/PKCS7_decrypt.3
  projects/runtime-coverage/secure/lib/libcrypto/man/PKCS7_encrypt.3
  projects/runtime-coverage/secure/lib/libcrypto/man/PKCS7_sign.3
  projects/runtime-coverage/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3
  projects/runtime-coverage/secure/lib/libcrypto/man/PKCS7_verify.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RAND_add.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RAND_bytes.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RAND_cleanup.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RAND_egd.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RAND_load_file.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RAND_set_rand_method.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RSA_blinding_on.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RSA_check_key.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RSA_generate_key.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RSA_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RSA_print.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RSA_private_encrypt.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RSA_public_encrypt.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RSA_set_method.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RSA_sign.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
  projects/runtime-coverage/secure/lib/libcrypto/man/RSA_size.3
  projects/runtime-coverage/secure/lib/libcrypto/man/SMIME_read_CMS.3
  projects/runtime-coverage/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
  projects/runtime-coverage/secure/lib/libcrypto/man/SMIME_write_CMS.3
  projects/runtime-coverage/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
  projects/runtime-coverage/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
  projects/runtime-coverage/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
  projects/runtime-coverage/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
  projects/runtime-coverage/secure/lib/libcrypto/man/X509_NAME_print_ex.3
  projects/runtime-coverage/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3
  projects/runtime-coverage/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3
  projects/runtime-coverage/secure/lib/libcrypto/man/X509_STORE_CTX_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3
  projects/runtime-coverage/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
  projects/runtime-coverage/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
  projects/runtime-coverage/secure/lib/libcrypto/man/X509_check_host.3
  projects/runtime-coverage/secure/lib/libcrypto/man/X509_new.3
  projects/runtime-coverage/secure/lib/libcrypto/man/X509_verify_cert.3
  projects/runtime-coverage/secure/lib/libcrypto/man/bio.3
  projects/runtime-coverage/secure/lib/libcrypto/man/blowfish.3
  projects/runtime-coverage/secure/lib/libcrypto/man/bn.3
  projects/runtime-coverage/secure/lib/libcrypto/man/bn_internal.3
  projects/runtime-coverage/secure/lib/libcrypto/man/buffer.3
  projects/runtime-coverage/secure/lib/libcrypto/man/crypto.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_DHparams.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_ECPKParameters.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_ECPrivateKey.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_PrivateKey.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_X509.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_X509_CRL.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_X509_NAME.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_X509_REQ.3
  projects/runtime-coverage/secure/lib/libcrypto/man/d2i_X509_SIG.3
  projects/runtime-coverage/secure/lib/libcrypto/man/des.3
  projects/runtime-coverage/secure/lib/libcrypto/man/dh.3
  projects/runtime-coverage/secure/lib/libcrypto/man/dsa.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ec.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ecdsa.3
  projects/runtime-coverage/secure/lib/libcrypto/man/engine.3
  projects/runtime-coverage/secure/lib/libcrypto/man/err.3
  projects/runtime-coverage/secure/lib/libcrypto/man/evp.3
  projects/runtime-coverage/secure/lib/libcrypto/man/hmac.3
  projects/runtime-coverage/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3
  projects/runtime-coverage/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
  projects/runtime-coverage/secure/lib/libcrypto/man/lh_stats.3
  projects/runtime-coverage/secure/lib/libcrypto/man/lhash.3
  projects/runtime-coverage/secure/lib/libcrypto/man/md5.3
  projects/runtime-coverage/secure/lib/libcrypto/man/mdc2.3
  projects/runtime-coverage/secure/lib/libcrypto/man/pem.3
  projects/runtime-coverage/secure/lib/libcrypto/man/rand.3
  projects/runtime-coverage/secure/lib/libcrypto/man/rc4.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ripemd.3
  projects/runtime-coverage/secure/lib/libcrypto/man/rsa.3
  projects/runtime-coverage/secure/lib/libcrypto/man/sha.3
  projects/runtime-coverage/secure/lib/libcrypto/man/threads.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ui.3
  projects/runtime-coverage/secure/lib/libcrypto/man/ui_compat.3
  projects/runtime-coverage/secure/lib/libcrypto/man/x509.3
  projects/runtime-coverage/secure/lib/libssl/Makefile.man
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CIPHER_get_name.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CONF_CTX_new.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CONF_CTX_set1_prefix.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CONF_CTX_set_flags.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CONF_CTX_set_ssl_ctx.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CONF_cmd.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CONF_cmd_argv.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_add1_chain_cert.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_add_session.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_ctrl.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_free.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_get0_param.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_new.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_sess_number.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_sessions.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set1_curves.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set1_verify_cert_store.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_cert_cb.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_custom_cli_ext.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_mode.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_options.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_timeout.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_tlsext_servername_callback.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_set_verify.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_use_certificate.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_CTX_use_serverinfo.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_SESSION_free.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_SESSION_get_time.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_accept.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_alert_type_string.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_check_chain.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_clear.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_connect.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_do_handshake.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_free.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_SSL_CTX.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_ciphers.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_client_CA_list.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_current_cipher.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_default_timeout.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_error.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_ex_new_index.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_fd.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_peer_certificate.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_psk_identity.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_rbio.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_session.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_verify_result.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_get_version.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_library_init.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_load_client_CA_file.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_new.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_pending.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_read.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_rstate_string.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_session_reused.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_set_bio.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_set_connect_state.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_set_fd.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_set_session.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_set_shutdown.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_set_verify_result.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_shutdown.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_state_string.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_want.3
  projects/runtime-coverage/secure/lib/libssl/man/SSL_write.3
  projects/runtime-coverage/secure/lib/libssl/man/d2i_SSL_SESSION.3
  projects/runtime-coverage/secure/lib/libssl/man/ssl.3
  projects/runtime-coverage/secure/usr.bin/openssl/Makefile.man
  projects/runtime-coverage/secure/usr.bin/openssl/man/CA.pl.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/asn1parse.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/c_rehash.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/ca.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/ciphers.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/cms.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/crl.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/crl2pkcs7.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/dgst.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/dhparam.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/dsa.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/dsaparam.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/ec.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/ecparam.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/enc.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/errstr.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/gendsa.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/genpkey.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/genrsa.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/nseq.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/ocsp.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/openssl.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/passwd.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/pkcs12.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/pkcs7.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/pkcs8.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/pkey.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/pkeyparam.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/pkeyutl.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/rand.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/req.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/rsa.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/rsautl.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/s_client.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/s_server.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/s_time.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/sess_id.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/smime.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/speed.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/spkac.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/ts.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/tsget.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/verify.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/version.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/x509.1
  projects/runtime-coverage/secure/usr.bin/openssl/man/x509v3_config.1
  projects/runtime-coverage/share/colldef/Makefile
  projects/runtime-coverage/share/colldef/af_ZA.UTF-8.src
  projects/runtime-coverage/share/colldef/am_ET.UTF-8.src
  projects/runtime-coverage/share/colldef/ar_SA.UTF-8.src
  projects/runtime-coverage/share/colldef/be_BY.UTF-8.src
  projects/runtime-coverage/share/colldef/ca_AD.UTF-8.src
  projects/runtime-coverage/share/colldef/cs_CZ.ISO8859-2.src
  projects/runtime-coverage/share/colldef/cs_CZ.UTF-8.src
  projects/runtime-coverage/share/colldef/da_DK.ISO8859-1.src
  projects/runtime-coverage/share/colldef/da_DK.ISO8859-15.src
  projects/runtime-coverage/share/colldef/da_DK.UTF-8.src
  projects/runtime-coverage/share/colldef/el_GR.UTF-8.src
  projects/runtime-coverage/share/colldef/en_US.UTF-8.src
  projects/runtime-coverage/share/colldef/es_MX.UTF-8.src
  projects/runtime-coverage/share/colldef/et_EE.UTF-8.src
  projects/runtime-coverage/share/colldef/fi_FI.UTF-8.src
  projects/runtime-coverage/share/colldef/fr_CA.UTF-8.src
  projects/runtime-coverage/share/colldef/he_IL.UTF-8.src
  projects/runtime-coverage/share/colldef/hi_IN.UTF-8.src
  projects/runtime-coverage/share/colldef/hr_HR.ISO8859-2.src
  projects/runtime-coverage/share/colldef/hu_HU.ISO8859-2.src
  projects/runtime-coverage/share/colldef/hu_HU.UTF-8.src
  projects/runtime-coverage/share/colldef/hy_AM.UTF-8.src
  projects/runtime-coverage/share/colldef/is_IS.UTF-8.src
  projects/runtime-coverage/share/colldef/ja_JP.UTF-8.src
  projects/runtime-coverage/share/colldef/ja_JP.eucJP.src
  projects/runtime-coverage/share/colldef/kk_KZ.UTF-8.src
  projects/runtime-coverage/share/colldef/ko_KR.UTF-8.src
  projects/runtime-coverage/share/colldef/lt_LT.UTF-8.src
  projects/runtime-coverage/share/colldef/lv_LV.UTF-8.src
  projects/runtime-coverage/share/colldef/nb_NO.ISO8859-1.src
  projects/runtime-coverage/share/colldef/nb_NO.ISO8859-15.src
  projects/runtime-coverage/share/colldef/nn_NO.ISO8859-1.src
  projects/runtime-coverage/share/colldef/nn_NO.ISO8859-15.src
  projects/runtime-coverage/share/colldef/nn_NO.UTF-8.src
  projects/runtime-coverage/share/colldef/pl_PL.UTF-8.src
  projects/runtime-coverage/share/colldef/ro_RO.UTF-8.src
  projects/runtime-coverage/share/colldef/ru_RU.UTF-8.src
  projects/runtime-coverage/share/colldef/se_NO.UTF-8.src
  projects/runtime-coverage/share/colldef/sk_SK.ISO8859-2.src
  projects/runtime-coverage/share/colldef/sk_SK.UTF-8.src
  projects/runtime-coverage/share/colldef/sl_SI.UTF-8.src
  projects/runtime-coverage/share/colldef/sr_RS.ISO8859-2.src
  projects/runtime-coverage/share/colldef/sr_RS.ISO8859-5.src
  projects/runtime-coverage/share/colldef/sr_RS.UTF-8.src
  projects/runtime-coverage/share/colldef/sr_RS.UTF-8 at latin.src
  projects/runtime-coverage/share/colldef/sv_SE.UTF-8.src
  projects/runtime-coverage/share/colldef/tr_TR.UTF-8.src
  projects/runtime-coverage/share/colldef/uk_UA.UTF-8.src
  projects/runtime-coverage/share/colldef/zh_CN.GB18030.src
  projects/runtime-coverage/share/colldef/zh_CN.GB2312.src
  projects/runtime-coverage/share/colldef/zh_CN.GBK.src
  projects/runtime-coverage/share/colldef/zh_CN.UTF-8.src
  projects/runtime-coverage/share/colldef/zh_CN.eucCN.src
  projects/runtime-coverage/share/colldef/zh_TW.Big5.src
  projects/runtime-coverage/share/colldef/zh_TW.UTF-8.src
  projects/runtime-coverage/share/ctypedef/Makefile
  projects/runtime-coverage/share/ctypedef/en_US.UTF-8.src
  projects/runtime-coverage/share/ctypedef/ja_JP.eucJP.src
  projects/runtime-coverage/share/man/man4/man4.powerpc/Makefile
  projects/runtime-coverage/share/man/man4/man4.powerpc/dtsec.4
  projects/runtime-coverage/share/man/man5/src.conf.5
  projects/runtime-coverage/share/man/man7/Makefile
  projects/runtime-coverage/share/man/man7/ascii.7
  projects/runtime-coverage/share/man/man7/build.7
  projects/runtime-coverage/share/man/man7/tuning.7
  projects/runtime-coverage/share/man/man9/crypto.9
  projects/runtime-coverage/share/misc/committers-ports.dot
  projects/runtime-coverage/share/mk/bsd.obj.mk
  projects/runtime-coverage/share/mk/bsd.subdir.mk
  projects/runtime-coverage/share/mk/local.dirdeps.mk
  projects/runtime-coverage/share/mk/local.meta.sys.mk
  projects/runtime-coverage/share/mk/src.sys.env.mk
  projects/runtime-coverage/share/mk/src.sys.mk
  projects/runtime-coverage/share/mk/src.sys.obj.mk
  projects/runtime-coverage/share/mk/sys.mk
  projects/runtime-coverage/share/monetdef/Makefile
  projects/runtime-coverage/share/monetdef/fr_CH.ISO8859-15.src
  projects/runtime-coverage/share/monetdef/fr_CH.UTF-8.src
  projects/runtime-coverage/share/monetdef/hy_AM.ARMSCII-8.src
  projects/runtime-coverage/share/monetdef/hy_AM.UTF-8.src
  projects/runtime-coverage/share/monetdef/it_CH.UTF-8.src
  projects/runtime-coverage/share/monetdef/pt_BR.UTF-8.src
  projects/runtime-coverage/share/monetdef/sl_SI.UTF-8.src
  projects/runtime-coverage/share/msgdef/Makefile
  projects/runtime-coverage/share/numericdef/Makefile
  projects/runtime-coverage/share/numericdef/it_CH.UTF-8.src
  projects/runtime-coverage/sys/amd64/amd64/fpu.c
  projects/runtime-coverage/sys/amd64/amd64/machdep.c
  projects/runtime-coverage/sys/amd64/amd64/pmap.c
  projects/runtime-coverage/sys/amd64/amd64/vm_machdep.c
  projects/runtime-coverage/sys/amd64/vmm/vmm_instruction_emul.c
  projects/runtime-coverage/sys/arm/arm/pmap-v6.c
  projects/runtime-coverage/sys/arm64/arm64/gic_v3.c
  projects/runtime-coverage/sys/arm64/arm64/gicv3_its.c
  projects/runtime-coverage/sys/boot/common/disk.c
  projects/runtime-coverage/sys/boot/efi/libefi/efipart.c
  projects/runtime-coverage/sys/boot/i386/loader/Makefile
  projects/runtime-coverage/sys/boot/libsa/Makefile
  projects/runtime-coverage/sys/boot/libsa32/Makefile
  projects/runtime-coverage/sys/boot/zfs/zfs.c
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/in6.h
  projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/io.h
  projects/runtime-coverage/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/runtime-coverage/sys/conf/files
  projects/runtime-coverage/sys/conf/kern.pre.mk
  projects/runtime-coverage/sys/contrib/ena-com/ena_com.c
  projects/runtime-coverage/sys/contrib/ena-com/ena_com.h
  projects/runtime-coverage/sys/contrib/ena-com/ena_eth_com.c
  projects/runtime-coverage/sys/contrib/ena-com/ena_eth_com.h
  projects/runtime-coverage/sys/contrib/ena-com/ena_plat.h
  projects/runtime-coverage/sys/dev/dpaa/fman.c
  projects/runtime-coverage/sys/dev/dpaa/fman.h
  projects/runtime-coverage/sys/dev/dpaa/fman_mdio.c
  projects/runtime-coverage/sys/dev/dpaa/if_dtsec.c
  projects/runtime-coverage/sys/dev/dpaa/if_dtsec.h
  projects/runtime-coverage/sys/dev/dpaa/if_dtsec_fdt.c
  projects/runtime-coverage/sys/dev/ena/ena.c
  projects/runtime-coverage/sys/dev/ena/ena.h
  projects/runtime-coverage/sys/dev/ena/ena_sysctl.c
  projects/runtime-coverage/sys/dev/evdev/evdev.c
  projects/runtime-coverage/sys/dev/evdev/evdev.h
  projects/runtime-coverage/sys/dev/evdev/evdev_utils.c
  projects/runtime-coverage/sys/dev/hpt27xx/hpt27xx_config.c
  projects/runtime-coverage/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
  projects/runtime-coverage/sys/dev/hptnr/hptnr_config.c
  projects/runtime-coverage/sys/dev/hptnr/hptnr_osm_bsd.c
  projects/runtime-coverage/sys/dev/hwpmc/hwpmc_logging.c
  projects/runtime-coverage/sys/dev/hwpmc/hwpmc_mod.c
  projects/runtime-coverage/sys/dev/ipmi/ipmi.c
  projects/runtime-coverage/sys/dev/mpr/mpr_mapping.c
  projects/runtime-coverage/sys/dev/syscons/sysmouse.c
  projects/runtime-coverage/sys/dev/usb/wlan/if_rsu.c
  projects/runtime-coverage/sys/dev/vt/vt_sysmouse.c
  projects/runtime-coverage/sys/fs/cuse/cuse.c
  projects/runtime-coverage/sys/fs/cuse/cuse_ioctl.h
  projects/runtime-coverage/sys/geom/geom_slice.c
  projects/runtime-coverage/sys/i386/i386/machdep.c
  projects/runtime-coverage/sys/i386/i386/vm_machdep.c
  projects/runtime-coverage/sys/i386/isa/npx.c
  projects/runtime-coverage/sys/kern/init_main.c
  projects/runtime-coverage/sys/kern/kern_loginclass.c
  projects/runtime-coverage/sys/kern/kern_proc.c
  projects/runtime-coverage/sys/kern/kern_resource.c
  projects/runtime-coverage/sys/kern/vfs_cache.c
  projects/runtime-coverage/sys/mips/mediatek/mtk_pinctrl.c
  projects/runtime-coverage/sys/mips/mediatek/mtk_pinctrl.h
  projects/runtime-coverage/sys/net/if_epair.c
  projects/runtime-coverage/sys/net/iflib.c
  projects/runtime-coverage/sys/netinet/sctp_output.c
  projects/runtime-coverage/sys/netinet/sctp_pcb.c
  projects/runtime-coverage/sys/netinet/sctp_pcb.h
  projects/runtime-coverage/sys/netinet/sctp_structs.h
  projects/runtime-coverage/sys/netinet/sctp_usrreq.c
  projects/runtime-coverage/sys/netinet/sctputil.c
  projects/runtime-coverage/sys/netinet6/sctp6_usrreq.c
  projects/runtime-coverage/sys/netipsec/ipsec.c
  projects/runtime-coverage/sys/netipsec/ipsec.h
  projects/runtime-coverage/sys/netipsec/key.c
  projects/runtime-coverage/sys/netipsec/xform_ah.c
  projects/runtime-coverage/sys/netipsec/xform_esp.c
  projects/runtime-coverage/sys/opencrypto/crypto.c
  projects/runtime-coverage/sys/opencrypto/cryptodev.h
  projects/runtime-coverage/sys/powerpc/booke/locore.S
  projects/runtime-coverage/sys/powerpc/booke/trap_subr.S
  projects/runtime-coverage/sys/powerpc/conf/MPC85XX
  projects/runtime-coverage/sys/powerpc/conf/MPC85XXSPE
  projects/runtime-coverage/sys/powerpc/conf/QORIQ64
  projects/runtime-coverage/sys/powerpc/conf/dpaa/files.dpaa
  projects/runtime-coverage/sys/powerpc/include/psl.h
  projects/runtime-coverage/sys/powerpc/mpc85xx/lbc.c
  projects/runtime-coverage/sys/powerpc/powerpc/genassym.c
  projects/runtime-coverage/sys/sys/pmclog.h
  projects/runtime-coverage/targets/pseudo/bootstrap-tools/Makefile
  projects/runtime-coverage/targets/pseudo/tests/Makefile.depend
  projects/runtime-coverage/targets/pseudo/userland/Makefile.depend
  projects/runtime-coverage/tools/build/options/makeman
  projects/runtime-coverage/tools/tools/build_option_survey/option_survey.sh
  projects/runtime-coverage/tools/tools/locale/etc/charmaps.xml
  projects/runtime-coverage/tools/tools/locale/etc/common.UTF-8.src
  projects/runtime-coverage/tools/tools/locale/etc/final-maps/map.UTF-8
  projects/runtime-coverage/tools/tools/syscall_timing/syscall_timing.c
  projects/runtime-coverage/usr.bin/bmake/Makefile
  projects/runtime-coverage/usr.bin/bmake/Makefile.config
  projects/runtime-coverage/usr.bin/bmake/config.h
  projects/runtime-coverage/usr.bin/mt/mt.1
  projects/runtime-coverage/usr.bin/patch/patch.c
  projects/runtime-coverage/usr.sbin/adduser/adduser.8
  projects/runtime-coverage/usr.sbin/pmcstat/Makefile
Directory Properties:
  projects/runtime-coverage/   (props changed)
  projects/runtime-coverage/contrib/bmake/   (props changed)
  projects/runtime-coverage/crypto/openssl/   (props changed)
  projects/runtime-coverage/gnu/usr.bin/cc/cc_tools/   (props changed)
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/   (props changed)
  projects/runtime-coverage/sys/contrib/ena-com/   (props changed)

Modified: projects/runtime-coverage/Makefile
==============================================================================
--- projects/runtime-coverage/Makefile	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/Makefile	Sat Nov  4 07:05:21 2017	(r325384)
@@ -122,6 +122,7 @@
 TGTS=	all all-man buildenv buildenvvars buildkernel buildworld \
 	check check-old check-old-dirs check-old-files check-old-libs \
 	checkdpadd checkworld clean cleandepend cleandir cleanworld \
+	cleanuniverse \
 	delete-old delete-old-dirs delete-old-files delete-old-libs \
 	depend distribute distributekernel distributekernel.debug \
 	distributeworld distrib-dirs distribution doxygen \

Modified: projects/runtime-coverage/Makefile.inc1
==============================================================================
--- projects/runtime-coverage/Makefile.inc1	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/Makefile.inc1	Sat Nov  4 07:05:21 2017	(r325384)
@@ -78,18 +78,11 @@ MK_CLANG_BOOTSTRAP=	no
 MK_GCC_BOOTSTRAP=	no
 .endif
 
-MAKEOBJDIRPREFIX?=	/usr/obj
-.if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING)
-OBJTREE=	${MAKEOBJDIRPREFIX}
-.else
-OBJTREE=	${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
-.endif
-
 # Pull in compiler metadata from buildworld/toolchain if possible to avoid
 # running CC from bsd.compiler.mk.
 .if make(installworld) || make(install) || make(distributeworld) || \
     make(stageworld)
-.-include "${OBJTREE}${.CURDIR}/compiler-metadata.mk"
+.-include "${OBJTOP}/compiler-metadata.mk"
 .endif
 
 # Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early.
@@ -308,7 +301,7 @@ CLEANDIR=	cleandir
 
 .if defined(WORLDFAST)
 NO_CLEAN=	t
-NO_OBJ=		t
+NO_OBJWALK=	t
 .endif
 
 .if ${MK_META_MODE} == "yes"
@@ -319,11 +312,11 @@ NO_OBJ=		t
 NO_CLEAN=	t
 .endif
 .endif
-.if defined(NO_OBJ) || ${MK_AUTO_OBJ} == "yes"
-NO_OBJ=		t
+.if defined(NO_OBJWALK) || ${MK_AUTO_OBJ} == "yes"
+NO_OBJWALK=	t
 NO_KERNELOBJ=	t
 .endif
-.if !defined(NO_OBJ)
+.if !defined(NO_OBJWALK)
 _obj=		obj
 .endif
 
@@ -450,7 +443,7 @@ BUILD_ARCH!=	uname -p
 .error To cross-build, set TARGET_ARCH.
 .endif
 .endif
-WORLDTMP=	${OBJTREE}${.CURDIR}/tmp
+WORLDTMP?=	${OBJTOP}/tmp
 BPATH=		${CCACHE_WRAPPER_PATH_PFX}${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin
 XPATH=		${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin
 STRICTTMPPATH=	${BPATH}:${XPATH}
@@ -508,7 +501,7 @@ MINIMUM_SUPPORTED_OSREL?= 900044
 MINIMUM_SUPPORTED_REL?= 9.1
 
 # Common environment for world related stages
-CROSSENV+=	MAKEOBJDIRPREFIX=${OBJTREE} \
+CROSSENV+=	\
 		MACHINE_ARCH=${TARGET_ARCH} \
 		MACHINE=${TARGET} \
 		CPUTYPE=${TARGET_CPUTYPE}
@@ -528,6 +521,8 @@ BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
 # need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile
 BSARGS= 	DESTDIR= \
+		OBJTOP='${WORLDTMP}/obj-tools' \
+		OBJROOT='$${OBJTOP}/' \
 		BOOTSTRAPPING=${OSRELDATE} \
 		BWPHASE=${.TARGET:C,^_,,} \
 		SSP_CFLAGS= \
@@ -538,12 +533,12 @@ BSARGS= 	DESTDIR= \
 		MK_LLDB=no MK_TESTS=no \
 		MK_INCLUDES=yes
 
-BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
+BMAKE=		\
 		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		${BSARGS}
 
 # build-tools stage
-TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
+TMAKE=		\
 		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		DESTDIR= \
@@ -557,7 +552,8 @@ TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		MK_LLDB=no MK_TESTS=no
 
 # cross-tools stage
-XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
+# TOOLS_PREFIX set in BMAKE
+XMAKE=		${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		MK_GDB=no MK_LLD_IS_LD=${MK_LLD_BOOTSTRAP} MK_TESTS=no
 
@@ -565,9 +561,11 @@ XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
 KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${BPATH}:${PATH} \
 		WORLDTMP=${WORLDTMP}
-KTMAKE=		TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
+KTMAKE=		TOOLS_PREFIX=${WORLDTMP} \
 		${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		DESTDIR= \
+		OBJTOP='${WORLDTMP}/obj-kernel-tools' \
+		OBJROOT='$${OBJTOP}/' \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		MK_COVERAGE=no MK_HTML=no -DNO_LINT MK_MAN=no \
@@ -670,10 +668,10 @@ LIBCOMPAT= SOFT
 META_MODE_BAD_ABI_VERS+=	1200031
 
 .if !defined(OBJDIR_HOST_OSRELDATE)
-.if exists(${OBJTREE}${.CURDIR}/host-osreldate.h)
+.if exists(${OBJTOP}/host-osreldate.h)
 OBJDIR_HOST_OSRELDATE!=	\
     awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
-    ${OBJTREE}${.CURDIR}/host-osreldate.h
+    ${OBJTOP}/host-osreldate.h
 .elif exists(${WORLDTMP}/usr/include/osreldate.h)
 OBJDIR_HOST_OSRELDATE=	0
 .endif
@@ -778,36 +776,36 @@ _cleanobj_fast_depend_hack: .PHONY
 # 20160829  r305012  ptrace
 # 20170624  r320278  fstat fstatat fstatfs getdirentries getfsstat statfs
 .for f in fstat fstatat fstatfs getdirentries getfsstat ptrace statfs           
-.if exists(${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o)
+.if exists(${OBJTOP}/lib/libc/.depend.${f}.o)
 	@if egrep -qw '${f}\.[sS]' \
-	    ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o; then \
+	    ${OBJTOP}/lib/libc/.depend.${f}.o; then \
 		echo Removing stale dependencies for ${f} syscall wrappers; \
-		rm -f ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \
-		   ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*}; \
+		rm -f ${OBJTOP}/lib/libc/.depend.${f}.* \
+		   ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \
 	fi
 .endif
 .endfor
 # 20170607 remove stale dependencies for utimens* wrappers removed in r319663
 .for f in futimens utimensat
-.if exists(${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o)
+.if exists(${OBJTOP}/lib/libc/.depend.${f}.o)
 	@if egrep -q '/${f}.c' \
-	    ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o; then \
+	    ${OBJTOP}/lib/libc/.depend.${f}.o; then \
 		echo Removing stale dependencies for ${f} syscall wrappers; \
-		rm -f ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \
-		   ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*}; \
+		rm -f ${OBJTOP}/lib/libc/.depend.${f}.* \
+		   ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \
 	fi
 .endif
 .endfor
 # 20170523 remove stale generated asm files for functions which are no longer
 # syscalls after r302092 (pipe) and r318736 (others)
 .for f in getdents lstat mknod pipe stat
-.if exists(${OBJTREE}${.CURDIR}/lib/libc/${f}.s) || \
-    exists(${OBJTREE}${.CURDIR}/lib/libc/${f}.S)
+.if exists(${OBJTOP}/lib/libc/${f}.s) || \
+    exists(${OBJTOP}/lib/libc/${f}.S)
 	@echo Removing stale generated ${f} syscall files
-	@rm -f ${OBJTREE}${.CURDIR}/lib/libc/${f}.* \
-	    ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \
-	    ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/${f}.*} \
-	    ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*}
+	@rm -f ${OBJTOP}/lib/libc/${f}.* \
+	    ${OBJTOP}/lib/libc/.depend.${f}.* \
+	    ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/${f}.*} \
+	    ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}
 .endif
 .endfor
 
@@ -834,6 +832,8 @@ _worldtmp: .PHONY
 .endfor
 .endif	# ${USING_SYSTEM_COMPILER} == "yes"
 .endif	# !defined(NO_CLEAN)
+	@mkdir -p ${WORLDTMP}
+	@touch ${WORLDTMP}/${.TARGET}
 
 .for _dir in \
     lib lib/casper usr legacy/bin legacy/usr
@@ -899,7 +899,7 @@ _cross-tools:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 3: cross tools"
 	@echo "--------------------------------------------------------------"
-	@rm -f ${OBJTREE}${.CURDIR}/compiler-metadata.mk
+	@rm -f ${OBJTOP}/compiler-metadata.mk
 	${_+_}cd ${.CURDIR}; ${XMAKE} cross-tools
 	${_+_}cd ${.CURDIR}; ${XMAKE} kernel-tools
 _build-metadata:
@@ -943,7 +943,7 @@ WMAKE_TGTS+=	_sanity_check _worldtmp _legacy
 WMAKE_TGTS+=	_bootstrap-tools
 .endif
 WMAKE_TGTS+=	_cleanobj
-.if !defined(NO_OBJ)
+.if !defined(NO_OBJWALK)
 WMAKE_TGTS+=	_obj
 .endif
 WMAKE_TGTS+=	_build-tools _cross-tools
@@ -996,7 +996,11 @@ buildenv: .PHONY
 
 TOOLCHAIN_TGTS=	${WMAKE_TGTS:Neverything:Nbuild${libcompat}}
 toolchain: ${TOOLCHAIN_TGTS} .PHONY
-kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries} .PHONY
+KERNEL_TOOLCHAIN_TGTS=	${TOOLCHAIN_TGTS:N_obj:N_cleanobj:N_includes:N_libraries}
+.if make(kernel-toolchain)
+.ORDER: ${KERNEL_TOOLCHAIN_TGTS}
+.endif
+kernel-toolchain: ${KERNEL_TOOLCHAIN_TGTS} .PHONY
 
 #
 # installcheck
@@ -1067,7 +1071,7 @@ __installcheck_UGID: .PHONY
     (empty(DESTDIR) || ${DESTDIR} == "/") && empty(BYPASS_INSTALLCHECK_SH)
 _installcheck_world: __installcheck_sh_check
 __installcheck_sh_check: .PHONY
-	@if [ "`${OBJTREE}${.CURDIR}/rescue/rescue/rescue sh -c 'echo OK'`" != \
+	@if [ "`${OBJTOP}/rescue/rescue/rescue sh -c 'echo OK'`" != \
 	    OK ]; then \
 		echo "rescue/sh check failed, installation aborted" >&2; \
 		false; \
@@ -1333,7 +1337,7 @@ INSTKERNNAME?=	kernel
 
 KERNSRCDIR?=	${.CURDIR}/sys
 KRNLCONFDIR=	${KERNSRCDIR}/${TARGET}/conf
-KRNLOBJDIR=	${OBJTREE}${KERNSRCDIR}
+KRNLOBJDIR=	${OBJTOP}${KERNSRCDIR:C,^${.CURDIR},,}
 KERNCONFDIR?=	${KRNLCONFDIR}
 
 BUILDKERNELS=
@@ -1541,9 +1545,9 @@ stagekernel: .PHONY
 	${_+_}${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel
 
 PORTSDIR?=	/usr/ports
-WSTAGEDIR?=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/worldstage
-KSTAGEDIR?=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kernelstage
-REPODIR?=	${MAKEOBJDIRPREFIX}${.CURDIR}/repo
+WSTAGEDIR?=	${OBJTOP}/worldstage
+KSTAGEDIR?=	${OBJTOP}/kernelstage
+REPODIR?=	${OBJROOT}repo
 PKGSIGNKEY?=	# empty
 
 .ORDER:		stage-packages create-packages
@@ -1805,11 +1809,11 @@ legacy: .PHONY
 .for _tool in tools/build ${_elftoolchain_libs}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,all,install)"; \
 	    cd ${.CURDIR}/${_tool}; \
-	    if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \
-	    ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \
+	    if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \
+	    ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy includes; \
 	    ${MAKE} DIRPRFX=${_tool}/ MK_INCLUDES=no all; \
 	    ${MAKE} DIRPRFX=${_tool}/ MK_INCLUDES=no \
-	        DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
+	        DESTDIR=${WORLDTMP}/legacy install
 .endfor
 
 #
@@ -1951,9 +1955,9 @@ bootstrap-tools: .PHONY
 ${_bt}-${_tool}: .PHONY .MAKE
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
-		if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \
+		if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \
 		${MAKE} DIRPRFX=${_tool}/ all; \
-		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
+		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy install
 
 bootstrap-tools: ${_bt}-${_tool}
 .endfor
@@ -1978,6 +1982,12 @@ _rescue=rescue/rescue
 _tcsh=bin/csh
 .endif
 
+# kernel-toolchain skips _cleanobj, so handle cleaning up previous
+# build-tools directories if needed.
+.if !defined(NO_CLEAN) && make(kernel-toolchain)
+_bt_clean=	${CLEANDIR}
+.endif
+
 .for _tool in \
     ${_tcsh} \
     bin/sh \
@@ -1990,31 +2000,24 @@ _tcsh=bin/csh
     lib/libmagic \
     usr.bin/mkesdb_static \
     usr.bin/mkcsmapper_static \
-    usr.bin/vi/catalog
+    usr.bin/vi/catalog \
+    ${_gcc_tools}
 build-tools_${_tool}: .PHONY
-	${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \
+	${_+_}@${ECHODIR} "===> ${_tool} (${_bt_clean:D${_bt_clean},}obj,build-tools)"; \
 		cd ${.CURDIR}/${_tool}; \
-		if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \
+		if [ -n "${_bt_clean}" ]; then ${MAKE} DIRPRFX=${_tool}/ ${_bt_clean}; fi; \
+		if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \
 		${MAKE} DIRPRFX=${_tool}/ build-tools
 build-tools: build-tools_${_tool}
 .endfor
-.for _tool in \
-    ${_gcc_tools}
-build-tools_${_tool}: .PHONY
-	${_+_}@${ECHODIR} "===> ${_tool} (obj,all)"; \
-		cd ${.CURDIR}/${_tool}; \
-		if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \
-		${MAKE} DIRPRFX=${_tool}/ all
-build-tools: build-tools_${_tool}
-.endfor
 
 #
 # kernel-tools: Build kernel-building tools
 #
 kernel-tools: .PHONY
-	mkdir -p ${MAKEOBJDIRPREFIX}/usr
+	mkdir -p ${WORLDTMP}/usr
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
-	    -p ${MAKEOBJDIRPREFIX}/usr >/dev/null
+	    -p ${WORLDTMP}/usr >/dev/null
 
 #
 # cross-tools: All the tools needed to build the rest of the system after
@@ -2088,9 +2091,9 @@ cross-tools: .MAKE .PHONY
     ${_usb_tools}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
-		if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \
+		if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \
 		${MAKE} DIRPRFX=${_tool}/ all; \
-		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
+		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP} install
 .endfor
 
 #
@@ -2101,7 +2104,8 @@ cross-tools: .MAKE .PHONY
 # already built.  It then installs the static tools to NXBDESTDIR for Poudriere
 # to pickup.
 #
-NXBOBJDIR=	${MAKEOBJDIRPREFIX}/nxb/${TARGET}.${TARGET_ARCH}
+NXBOBJROOT=	${OBJROOT}${MACHINE}.${MACHINE_ARCH}/nxb/
+NXBOBJTOP=	${NXBOBJROOT}${TARGET}.${TARGET_ARCH}
 NXTP?=		/nxb-bin
 .if ${NXTP:N/*}
 .error NXTP variable should be an absolute path
@@ -2182,11 +2186,9 @@ NXBDIRS+=	gnu/usr.bin/cc
 NXBDIRS+=	gnu/usr.bin/binutils
 .endif
 
-NXBMAKEENV+= \
-	MAKEOBJDIRPREFIX=${NXBOBJDIR:Q}
-
 NXBMAKEARGS+= \
-	OBJTREE=${NXBOBJDIR:Q} \
+	OBJTOP=${NXBOBJTOP:Q} \
+	OBJROOT=${NXBOBJROOT:Q} \
 	-DNO_SHARED \
 	-DNO_CPU_CFLAGS \
 	-DNO_PIC \
@@ -2230,7 +2232,7 @@ native-xtools: .PHONY
 	# needed build tools are built.
 	${_+_}cd ${.CURDIR}; ${NXBTMAKE} _includes MK_CLANG=no MK_GCC=no
 	${_+_}cd ${.CURDIR}; ${NXBTMAKE} _libraries MK_CLANG=no MK_GCC=no
-.if !defined(NO_OBJ)
+.if !defined(NO_OBJWALK)
 	${_+_}cd ${.CURDIR}; ${NXBMAKE} SUBDIR_OVERRIDE="${NXBDIRS:M*}" _obj
 .endif
 	${_+_}cd ${.CURDIR}; ${NXBMAKE} SUBDIR_OVERRIDE="${NXBDIRS:M*}" \
@@ -2515,7 +2517,7 @@ ${_lib}__PL: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,all,install)"; \
 		cd ${.CURDIR}/${_lib}; \
-		if [ -z "${NO_OBJ}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \
+		if [ -z "${NO_OBJWALK}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \
 		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
 		    DIRPRFX=${_lib}/ all; \
 		${MAKE} MK_COVERAGE=no MK_TESTS=no MK_PROFILE=no -DNO_PIC \
@@ -2528,7 +2530,7 @@ ${_lib}__L: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,all,install)"; \
 		cd ${.CURDIR}/${_lib}; \
-		if [ -z "${NO_OBJ}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \
+		if [ -z "${NO_OBJWALK}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all; \
 		${MAKE} MK_COVERAGE=no MK_TESTS=no DIRPRFX=${_lib}/ install
 .endif
@@ -2768,14 +2770,21 @@ builddtb: .PHONY
 # in this makefile.  We don't do a cleandir walk if MK_AUTO_OBJ is yes
 # since it is not possible for files to land in the wrong place.
 #
-BW_CANONICALOBJDIR:=${OBJTREE}${.CURDIR}
-cleanworld: .PHONY
-.if exists(${BW_CANONICALOBJDIR}/)
-	-rm -rf ${BW_CANONICALOBJDIR}/*
+.if make(cleanworld)
+BW_CANONICALOBJDIR:=${OBJTOP}/
+.elif make(cleanuniverse)
+BW_CANONICALOBJDIR:=${OBJROOT}
+.if ${MK_UNIFIED_OBJDIR} == "no"
+.error ${.TARGETS} only supported with WITH_UNIFIED_OBJDIR enabled.
+.endif
+.endif
+cleanworld cleanuniverse: .PHONY
+.if !empty(BW_CANONICALOBJDIR) && exists(${BW_CANONICALOBJDIR})
+	-rm -rf ${BW_CANONICALOBJDIR}*
 	-chflags -R 0 ${BW_CANONICALOBJDIR}
-	rm -rf ${BW_CANONICALOBJDIR}/*
+	rm -rf ${BW_CANONICALOBJDIR}*
 .endif
-.if ${MK_AUTO_OBJ} == "no"
+.if make(cleanworld) && ${MK_AUTO_OBJ} == "no"
 .if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR}
 	#   To be safe in this case, fall back to a 'make cleandir'
 	${_+_}@cd ${.CURDIR}; ${MAKE} cleandir
@@ -2800,10 +2809,16 @@ XDTP?=/usr/${XDDIR}
 .error XDTP variable should be an absolute path
 .endif
 
-CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
+CDBOBJROOT=	${OBJROOT}${MACHINE}.${MACHINE_ARCH}/xdev/
+CDBOBJTOP=	${CDBOBJROOT}${XDDIR}
+CDBENV= \
 	INSTALL="sh ${.CURDIR}/tools/install.sh"
 CDENV= ${CDBENV} \
 	TOOLS_PREFIX=${XDTP}
+CDMAKEARGS= \
+	OBJTOP=${CDBOBJTOP:Q} \
+	OBJROOT=${CDBOBJROOT:Q}
+CD2MAKEARGS= ${CDMAKEARGS}
 
 .if ${WANT_COMPILER_TYPE} == gcc || \
     (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc)
@@ -2825,9 +2840,10 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${
 	CPP="${CPP} ${CD2CFLAGS}" \
 	MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}
 
-CDTMP=	${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
-CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
-CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN}
+CDTMP=	${OBJTOP}/${XDDIR}/tmp
+CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${CDMAKEARGS} ${NOFUN}
+CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} \
+	${MAKE} ${CD2MAKEARGS} ${NOFUN}
 .if ${MK_META_MODE} != "no"
 # Don't rebuild build-tools targets during normal build.
 CD2MAKE+=	BUILD_TOOLS_META=.NOMETA
@@ -2852,21 +2868,21 @@ _xb-bootstrap-tools: .PHONY
     ${_yacc}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \
 	cd ${.CURDIR}/${_tool}; \
-	if [ -z "${NO_OBJ}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ obj; fi; \
+	if [ -z "${NO_OBJWALK}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ obj; fi; \
 	${CDMAKE} DIRPRFX=${_tool}/ all; \
 	${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install
 .endfor
 
 _xb-build-tools: .PHONY
 	${_+_}@cd ${.CURDIR}; \
-	${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools
+	${CDBENV} ${MAKE} ${CDMAKEARGS} -f Makefile.inc1 ${NOFUN} build-tools
 
 XDEVDIRS= \
+    ${_clang_libs} \
     ${_lld} \
     ${_binutils} \
     ${_elftctools} \
     usr.bin/ar \
-    ${_clang_libs} \
     ${_clang} \
     ${_gcc}
 
@@ -2874,7 +2890,7 @@ _xb-cross-tools: .PHONY
 .for _tool in ${XDEVDIRS}
 	${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,all)"; \
 	cd ${.CURDIR}/${_tool}; \
-	if [ -z "${NO_OBJ}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ obj; fi; \
+	if [ -z "${NO_OBJWALK}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ obj; fi; \
 	${CDMAKE} DIRPRFX=${_tool}/ all
 .endfor
 
@@ -2909,7 +2925,7 @@ _xi-cross-tools: .PHONY
 .endfor
 
 _xi-includes: .PHONY
-.if !defined(NO_OBJ)
+.if !defined(NO_OBJWALK)
 	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 _obj \
 		DESTDIR=${XDDESTDIR}
 .endif

Modified: projects/runtime-coverage/Makefile.libcompat
==============================================================================
--- projects/runtime-coverage/Makefile.libcompat	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/Makefile.libcompat	Sat Nov  4 07:05:21 2017	(r325384)
@@ -70,7 +70,7 @@ LIBSOFTWMAKEFLAGS=        -DCOMPAT_SOFTFP
 # Generic code for each type.
 # Set defaults based on type.
 libcompat=	${LIBCOMPAT:tl}
-_LIBCOMPAT_MAKEVARS=	_OBJTREE TMP CPUFLAGS CFLAGS CXXFLAGS WMAKEENV \
+_LIBCOMPAT_MAKEVARS=	_OBJTOP TMP CPUFLAGS CFLAGS CXXFLAGS WMAKEENV \
 			WMAKEFLAGS WMAKE
 .for _var in ${_LIBCOMPAT_MAKEVARS}
 .if !empty(LIB${LIBCOMPAT}${_var})
@@ -79,8 +79,8 @@ LIBCOMPAT${_var}?=	${LIB${LIBCOMPAT}${_var}}
 .endfor
 
 # Shared flags
-LIBCOMPAT_OBJTREE?=	${OBJTREE}${.CURDIR}/obj-lib${libcompat}
-LIBCOMPATTMP?=		${LIBCOMPAT_OBJTREE}/tmp
+LIBCOMPAT_OBJTOP?=	${OBJTOP}/obj-lib${libcompat}
+LIBCOMPATTMP?=		${LIBCOMPAT_OBJTOP}/tmp
 
 LIBCOMPATCFLAGS+=	${LIBCOMPATCPUFLAGS} \
 			-L${LIBCOMPATTMP}/usr/lib${libcompat} \
@@ -107,7 +107,9 @@ LIBCOMPATCXXFLAGS+=	-isystem ${LIBCOMPATTMP}/usr/inclu
 .endif
 
 # Yes, the flags are redundant.
-LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} \
+LIBCOMPATWMAKEENV+= \
+		OBJTOP=${LIBCOMPAT_OBJTOP} \
+		OBJROOT='$${OBJTOP}/' \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
 		SYSROOT=${LIBCOMPATTMP} \
@@ -184,7 +186,9 @@ build${libcompat}: .PHONY
 	${_+_}cd ${.CURDIR}/${_dir}; \
 	    WORLDTMP=${WORLDTMP} \
 	    MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
-	    MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \
+	    OBJTOP=${LIBCOMPAT_OBJTOP} \
+	    OBJROOT='$${OBJTOP}/' \
+	    ${MAKE} SSP_CFLAGS= DESTDIR= \
 	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 	    build-tools
 .endfor

Modified: projects/runtime-coverage/ObsoleteFiles.inc
==============================================================================
--- projects/runtime-coverage/ObsoleteFiles.inc	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/ObsoleteFiles.inc	Sat Nov  4 07:05:21 2017	(r325384)
@@ -38,6 +38,10 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20171031: Removal of obsolete man files
+OLD_FILES+=usr/share/man/man7/adding_user.7.gz
+# 20171031: Disconnected libpathconv tests
+OLD_DIRS+=usr/tests/lib/libpathconv
 # 20171017: Removal of mbpool(9)
 OLD_FILES+=usr/include/sys/mbpool.h
 OLD_FILES+=usr/share/man/man9/mbpool.9.gz

Modified: projects/runtime-coverage/UPDATING
==============================================================================
--- projects/runtime-coverage/UPDATING	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/UPDATING	Sat Nov  4 07:05:21 2017	(r325384)
@@ -51,6 +51,25 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20171102:
+	Building in a FreeBSD src checkout will automatically create object
+	directories now rather than store files in the current directory if
+	'make obj' was not ran.  Calling 'make obj' is no longer necesarry.
+	This feature can be disabled by setting WITHOUT_AUTO_OBJ=yes in
+	/etc/src-env.conf (not /etc/src.conf), or passing the option in the
+	environment.
+
+20171101:
+	The default MAKEOBJDIR has changed from /usr/obj/<srcdir> for native
+	builds, and /usr/obj/<arch>/<srcdir> for cross-builds, to a unified
+	/usr/obj/<srcdir>/<arch>.  This behavior can be changed to the old
+	format by setting WITHOUT_UNIFIED_OBJDIR=yes in /etc/src-env.conf,
+	the environment, or with -DWITHOUT_UNIFIED_OBJDIR when building.
+	The UNIFIED_OBJDIR option is a transitional feature that will be
+	removed for 12.0 release; please migrate to the new format for any
+	tools by looking up the OBJDIR used by 'make -V .OBJDIR' means rather
+	than hardcoding paths.
+
 20171028:
 	The native-xtools target no longer installs the files by default to the
 	OBJDIR.  Use the native-xtools-install target with a DESTDIR to install

Modified: projects/runtime-coverage/contrib/bmake/ChangeLog
==============================================================================
--- projects/runtime-coverage/contrib/bmake/ChangeLog	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/ChangeLog	Sat Nov  4 07:05:21 2017	(r325384)
@@ -1,3 +1,36 @@
+2017-10-28  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* VERSION: 20171028
+	  Merge with NetBSD make, pick up
+	  o main.c: ignore empty MAKEOBJDIR
+
+	* Makefile.config.in:
+	  make @prefix@ @machine*@ and @default_sys_path@ defaults.
+
+2017-10-05  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* VERSION: 20171005
+
+	* unit-tests/dotwait.mk: redirect stderr through pipe for more
+	  consistent result on some platforms.
+
+2017-08-13  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* machine.sh: entry for AIX
+
+2017-08-12  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* VERSION (_MAKE_VERSION): Move the setting of _MAKE_VERSION
+	  to a file that can be included by configure as well as make.
+	  This allows configure to set set _MAKE_VERSION in make-bootstrap.sh
+
+2017-08-10  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (_MAKE_VERSION): 20170810
+	  Merge with NetBSD make, pick up
+	  o meta.c: if target is in subdir we only need subdir name in
+	    meta_name.
+
 2017-07-20  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* Makefile (_MAKE_VERSION): 20170720

Modified: projects/runtime-coverage/contrib/bmake/FILES
==============================================================================
--- projects/runtime-coverage/contrib/bmake/FILES	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/FILES	Sat Nov  4 07:05:21 2017	(r325384)
@@ -5,6 +5,7 @@ Makefile.config.in
 PSD.doc/Makefile
 PSD.doc/tutorial.ms
 README
+VERSION
 aclocal.m4
 arch.c
 bmake.1

Modified: projects/runtime-coverage/contrib/bmake/Makefile
==============================================================================
--- projects/runtime-coverage/contrib/bmake/Makefile	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/Makefile	Sat Nov  4 07:05:21 2017	(r325384)
@@ -1,8 +1,5 @@
-#	$Id: Makefile,v 1.95 2017/07/20 19:36:13 sjg Exp $
+#	$Id: Makefile,v 1.99 2017/08/13 20:12:53 sjg Exp $
 
-# Base version on src date
-_MAKE_VERSION= 20170720
-
 PROG=	bmake
 
 SRCS= \
@@ -58,6 +55,8 @@ SRCS+= \
 	lstReplace.c \
 	lstSucc.c
 
+.-include "VERSION"
+
 # this file gets generated by configure
 .-include "Makefile.config"
 
@@ -192,11 +191,13 @@ MANDIR= ${MANDIR.bmake:U${SHAREDIR}/man}
 ${OBJS}: config.h
 .endif
 
+# start-delete2 for bsd.after-import.mk
+
 # make sure that MAKE_VERSION gets updated.
-main.o: ${SRCS} ${MAKEFILE}
+main.o: ${SRCS} ${.CURDIR}/VERSION
 
-# start-delete2 for bsd.after-import.mk
 .if ${MK_AUTOCONF_MK} == "yes"
+CONFIGURE_DEPS += ${.CURDIR}/VERSION
 .include <autoconf.mk>
 .endif
 SHARE_MK?=${SHAREDIR}/mk

Modified: projects/runtime-coverage/contrib/bmake/Makefile.config.in
==============================================================================
--- projects/runtime-coverage/contrib/bmake/Makefile.config.in	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/Makefile.config.in	Sat Nov  4 07:05:21 2017	(r325384)
@@ -1,11 +1,13 @@
 # things set by configure
 
-prefix= @prefix@
+_MAKE_VERSION=@_MAKE_VERSION@
+
+prefix?= @prefix@
 srcdir= @srcdir@
 CC?= @CC@
-MACHINE= @machine@
-MACHINE_ARCH= @machine_arch@
-DEFAULT_SYS_PATH= @default_sys_path@
+MACHINE?= @machine@
+MACHINE_ARCH?= @machine_arch@
+DEFAULT_SYS_PATH?= @default_sys_path@
 
 CPPFLAGS+= @CPPFLAGS@
 CFLAGS+= ${CPPFLAGS} @DEFS@
@@ -17,4 +19,3 @@ FILEMON_H= @filemon_h@
 BMAKE_PATH_MAX?= @bmake_path_max@
 # used if MAXPATHLEN not defined
 CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX}
-

Copied: projects/runtime-coverage/contrib/bmake/VERSION (from r325383, head/contrib/bmake/VERSION)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/runtime-coverage/contrib/bmake/VERSION	Sat Nov  4 07:05:21 2017	(r325384, copy of r325383, head/contrib/bmake/VERSION)
@@ -0,0 +1,2 @@
+# keep this compatible with sh and make
+_MAKE_VERSION=20171028

Modified: projects/runtime-coverage/contrib/bmake/bsd.after-import.mk
==============================================================================
--- projects/runtime-coverage/contrib/bmake/bsd.after-import.mk	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/bsd.after-import.mk	Sat Nov  4 07:05:21 2017	(r325384)
@@ -1,4 +1,4 @@
-# $Id: bsd.after-import.mk,v 1.12 2014/02/14 23:45:49 sjg Exp $
+# $Id: bsd.after-import.mk,v 1.13 2017/08/13 00:56:10 sjg Exp $
 
 # This makefile is for use when integrating bmake into a BSD build
 # system.  Use this makefile after importing bmake.
@@ -56,6 +56,7 @@ bootstrap:	${BMAKE_SRC}/boot-strap ${MAKEFILE}
 
 # Makefiles need a little more tweaking than say config.h
 MAKEFILE_SED = 	sed -e '/^MACHINE/d' \
+	-e '/include.*VERSION/d' \
 	-e '/^PROG/ { s,=,?=,;s,bmake,$${.CURDIR:T},; }' \
 	-e 's,^.-include,.sinclude,' \
 	-e '/^\..*include  *</ { s,<,<bsd.,;/autoconf/d; }' \

Modified: projects/runtime-coverage/contrib/bmake/configure
==============================================================================
Binary file (source and/or target). No diff available.

Modified: projects/runtime-coverage/contrib/bmake/configure.in
==============================================================================
--- projects/runtime-coverage/contrib/bmake/configure.in	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/configure.in	Sat Nov  4 07:05:21 2017	(r325384)
@@ -1,11 +1,11 @@
 dnl
 dnl RCSid:
-dnl	$Id: configure.in,v 1.57 2016/06/07 00:49:44 sjg Exp $
+dnl	$Id: configure.in,v 1.58 2017/08/13 00:56:10 sjg Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script
 dnl
 AC_PREREQ(2.50)
-AC_INIT([bmake], [20160606], [sjg at NetBSD.org])
+AC_INIT([bmake], [20170812], [sjg at NetBSD.org])
 AC_CONFIG_HEADERS(config.h)
 
 dnl make srcdir absolute
@@ -14,6 +14,9 @@ case "$srcdir" in
 *) srcdir=`cd $srcdir && pwd`;;
 esac
 
+dnl get _MAKE_VERSION
+. $srcdir/VERSION
+
 dnl
 AC_ARG_WITH(defshell,
 [  --with-defshell=SHELL  use SHELL by default - must be sh compatible, use sh or ksh to pick the internal definitions],
@@ -386,6 +389,7 @@ AC_SUBST(GCC)
 AC_SUBST(diff_u)
 AC_SUBST(use_meta)
 AC_SUBST(filemon_h)
+AC_SUBST(_MAKE_VERSION)
 AC_OUTPUT(makefile Makefile.config make-bootstrap.sh unit-tests/Makefile)
 
 cat <<EOF

Modified: projects/runtime-coverage/contrib/bmake/machine.sh
==============================================================================
--- projects/runtime-coverage/contrib/bmake/machine.sh	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/machine.sh	Sat Nov  4 07:05:21 2017	(r325384)
@@ -2,7 +2,7 @@
 # derrived from /etc/rc_d/os.sh
 
 # RCSid:
-#	$Id: machine.sh,v 1.17 2015/05/05 00:10:54 sjg Exp $
+#	$Id: machine.sh,v 1.18 2017/08/13 19:11:28 sjg Exp $
 #
 #	@(#) Copyright (c) 1994-2002 Simon J. Gerraty
 #
@@ -44,6 +44,12 @@ Which() {
 }
 
 case $OS in
+AIX)	# from http://gnats.netbsd.org/29386
+	OSMAJOR=`uname -v`
+	OSMINOR=`uname -r`
+	MACHINE=$OS$OSMAJOR.$OSMINOR
+	MACHINE_ARCH=`bootinfo -T`
+	;;
 OpenBSD)
 	MACHINE=$OS$OSMAJOR.$machine
 	arch=`Which arch /usr/bin:/usr/ucb:$PATH`

Modified: projects/runtime-coverage/contrib/bmake/main.c
==============================================================================
--- projects/runtime-coverage/contrib/bmake/main.c	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/main.c	Sat Nov  4 07:05:21 2017	(r325384)
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.272 2017/06/19 19:58:24 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.273 2017/10/28 21:54:54 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.272 2017/06/19 19:58:24 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.273 2017/10/28 21:54:54 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.272 2017/06/19 19:58:24 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.273 2017/10/28 21:54:54 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -792,7 +792,8 @@ Main_SetVarObjdir(const char *var, const char *suffix)
 {
 	char *p, *path, *xpath;
 
-	if ((path = Var_Value(var, VAR_CMD, &p)) == NULL)
+	if ((path = Var_Value(var, VAR_CMD, &p)) == NULL ||
+	    *path == '\0')
 		return FALSE;
 
 	/* expand variable substitutions */

Modified: projects/runtime-coverage/contrib/bmake/make-bootstrap.sh.in
==============================================================================
--- projects/runtime-coverage/contrib/bmake/make-bootstrap.sh.in	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/make-bootstrap.sh.in	Sat Nov  4 07:05:21 2017	(r325384)
@@ -13,7 +13,7 @@ esac
 CC="@CC@"
 CFLAGS="@CFLAGS@ -I. -I${srcdir} @DEFS@ @CPPFLAGS@ -DMAKE_NATIVE ${XDEFS} -DBMAKE_PATH_MAX=@bmake_path_max@"
 
-MAKE_VERSION=`sed -n '/^_MAKE_VERSION=/s,.*=[^0-9]*,,p' $srcdir/Makefile`
+MAKE_VERSION=@_MAKE_VERSION@
 
 MDEFS="-DMAKE_VERSION=\"$MAKE_VERSION\" \
 -D at force_machine@MACHINE=\"@machine@\" -DMACHINE_ARCH=\"@machine_arch@\" \

Modified: projects/runtime-coverage/contrib/bmake/meta.c
==============================================================================
--- projects/runtime-coverage/contrib/bmake/meta.c	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/meta.c	Sat Nov  4 07:05:21 2017	(r325384)
@@ -1,4 +1,4 @@
-/*      $NetBSD: meta.c,v 1.68 2017/07/09 04:54:00 sjg Exp $ */
+/*      $NetBSD: meta.c,v 1.69 2017/08/10 21:07:48 sjg Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -250,6 +250,8 @@ meta_name(char *mname, size_t mnamelen,
     char *rp;
     char *cp;
     char *tp;
+    char *dtp;
+    size_t ldname;
 
     /*
      * Weed out relative paths from the target file name.
@@ -286,10 +288,15 @@ meta_name(char *mname, size_t mnamelen,
     }
     /* on some systems dirname may modify its arg */
     tp = bmake_strdup(tname);
-    if (strcmp(dname, dirname(tp)) == 0)
+    dtp = dirname(tp);
+    if (strcmp(dname, dtp) == 0)
 	snprintf(mname, mnamelen, "%s.meta", tname);
     else {
-	snprintf(mname, mnamelen, "%s/%s.meta", dname, tname);
+	ldname = strlen(dname);
+	if (strncmp(dname, dtp, ldname) == 0 && dtp[ldname] == '/')
+	    snprintf(mname, mnamelen, "%s/%s.meta", dname, &tname[ldname+1]);
+	else
+	    snprintf(mname, mnamelen, "%s/%s.meta", dname, tname);
 
 	/*
 	 * Replace path separators in the file name after the

Modified: projects/runtime-coverage/contrib/bmake/mk/ChangeLog
==============================================================================
--- projects/runtime-coverage/contrib/bmake/mk/ChangeLog	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/mk/ChangeLog	Sat Nov  4 07:05:21 2017	(r325384)
@@ -1,3 +1,21 @@
+2017-10-25  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Allow for host32 on rare occasions.
+
+2017-10-18  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* install-mk (MK_VERSION): 20171018
+
+	* whats.mk: include what_thing in what_uuid to avoid problem
+	  when building multiple apps in the same directory.
+
+2017-08-12  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* install-mk (MK_VERSION): 20170812
+
+	* autoconf.mk: Use CONFIGURE_DEPS so Makefile can
+	  add dependencies for config.recheck and config.gen
+
 2017-06-30  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* install-mk (MK_VERSION): 20170630

Modified: projects/runtime-coverage/contrib/bmake/mk/autoconf.mk
==============================================================================
--- projects/runtime-coverage/contrib/bmake/mk/autoconf.mk	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/mk/autoconf.mk	Sat Nov  4 07:05:21 2017	(r325384)
@@ -1,4 +1,4 @@
-# $Id: autoconf.mk,v 1.8 2012/11/19 05:37:48 sjg Exp $
+# $Id: autoconf.mk,v 1.9 2017/08/13 20:03:13 sjg Exp $
 #
 #	@(#) Copyright (c) 1996-2009, Simon J. Gerraty
 #
@@ -15,8 +15,10 @@
 
 .NOPATH:	config.h config.status
 
+CONFIGURE_DEPS += ${.CURDIR}/config.h.in ${.CURDIR}/configure
+
 .if !target(config.h)
-config.h:	${.CURDIR}/config.h.in config.status
+config.h:	${CONFIGURE_DEPS} config.status
 	./config.status
 .endif
 
@@ -28,11 +30,11 @@ config.status:	config.recheck
 config.status:  config.gen
 .endif
 
-config.recheck: config.h.in ${.CURDIR}/configure
+config.recheck: ${CONFIGURE_DEPS}
 	./config.status --recheck
 	@touch $@
 
-config.gen: config.h.in ${.CURDIR}/configure
+config.gen: ${CONFIGURE_DEPS}
 	CC="${CC} ${CCMODE}" ${.CURDIR}/configure --no-create ${CONFIGURE_ARGS}
 	@touch $@ config.recheck
 

Modified: projects/runtime-coverage/contrib/bmake/mk/dirdeps.mk
==============================================================================
--- projects/runtime-coverage/contrib/bmake/mk/dirdeps.mk	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/mk/dirdeps.mk	Sat Nov  4 07:05:21 2017	(r325384)
@@ -1,4 +1,4 @@
-# $Id: dirdeps.mk,v 1.89 2017/05/17 17:41:47 sjg Exp $
+# $Id: dirdeps.mk,v 1.90 2017/10/25 23:44:20 sjg Exp $
 
 # Copyright (c) 2010-2013, Juniper Networks, Inc.
 # All rights reserved.
@@ -536,9 +536,13 @@ _machines := ${DEP_MACHINE}
 # this is the machine list we actually use below
 _machines := ${_only_machines}
 
-.if defined(HOSTPROG) || ${DEP_MACHINE} == "host"
+.if defined(HOSTPROG) || ${DEP_MACHINE:Nhost*} == ""
 # we need to build this guy's dependencies for host as well.
+.if ${DEP_MACHINE:Nhost*} == ""
+_machines += ${DEP_MACHINE}
+.else
 _machines += host
+.endif
 .endif
 
 _machines := ${_machines:O:u}

Modified: projects/runtime-coverage/contrib/bmake/mk/dpadd.mk
==============================================================================
--- projects/runtime-coverage/contrib/bmake/mk/dpadd.mk	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/mk/dpadd.mk	Sat Nov  4 07:05:21 2017	(r325384)
@@ -1,4 +1,4 @@
-# $Id: dpadd.mk,v 1.23 2017/02/13 16:46:01 sjg Exp $
+# $Id: dpadd.mk,v 1.24 2017/10/25 23:44:20 sjg Exp $
 #
 #	@(#) Copyright (c) 2004, Simon J. Gerraty
 #
@@ -195,7 +195,7 @@ __dpadd_incs += ${__dpadd_libs:O:u:@s@${SRC_LIBS_${s:T
 __dpadd_last_incs += ${__dpadd_libs:u:@x@${INCLUDES_LAST_${x:T:R}}@}
 __dpadd_last_incs += ${__dpadd_libs:O:u:@s@${SRC_LIBS_${s:T:R}:U}@:@x@${INCLUDES_LAST_${x:T:R}}@}
 
-.if defined(HOSTPROG) || ${MACHINE} == "host"
+.if defined(HOSTPROG) || ${MACHINE:Nhost*} == ""
 # we want any -I/usr/* last
 __dpadd_last_incs := \
 	${__dpadd_last_incs:N-I/usr/*} \

Modified: projects/runtime-coverage/contrib/bmake/mk/gendirdeps.mk
==============================================================================
--- projects/runtime-coverage/contrib/bmake/mk/gendirdeps.mk	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/mk/gendirdeps.mk	Sat Nov  4 07:05:21 2017	(r325384)
@@ -1,4 +1,4 @@
-# $Id: gendirdeps.mk,v 1.33 2016/10/11 22:37:28 sjg Exp $
+# $Id: gendirdeps.mk,v 1.34 2017/10/26 00:46:26 sjg Exp $
 
 # Copyright (c) 2010-2013, Juniper Networks, Inc.
 # All rights reserved.
@@ -194,7 +194,7 @@ dpadd_dir_list += ${f:H:tA}
 .endfor
 .if !empty(ddep_list)
 ddeps != cat ${ddep_list:O:u} | ${META2DEPS_FILTER} ${_skip_gendirdeps} \
-        sed 's,//*$$,,;s,\.${HOST_TARGET}$$,.host,;s,\.${MACHINE}$$,,'
+        sed 's,//*$$,,;s,\.${HOST_TARGET:Uhost}$$,.host,;s,\.${HOST_TARGET32:Uhost32}$$,.host32,;s,\.${MACHINE}$$,,'
 
 .if ${DEBUG_GENDIRDEPS:Uno:@x@${RELDIR:M$x}@} != ""
 .info ${RELDIR}: raw_dir_list='${dir_list}'

Modified: projects/runtime-coverage/contrib/bmake/mk/install-mk
==============================================================================
--- projects/runtime-coverage/contrib/bmake/mk/install-mk	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/mk/install-mk	Sat Nov  4 07:05:21 2017	(r325384)
@@ -55,7 +55,7 @@
 #       Simon J. Gerraty <sjg at crufty.net>
 
 # RCSid:
-#	$Id: install-mk,v 1.148 2017/06/30 23:46:15 sjg Exp $
+#	$Id: install-mk,v 1.150 2017/10/19 03:50:51 sjg Exp $
 #
 #	@(#) Copyright (c) 1994 Simon J. Gerraty
 #
@@ -70,7 +70,7 @@
 #	sjg at crufty.net
 #
 
-MK_VERSION=20170630
+MK_VERSION=20171018
 OWNER=
 GROUP=
 MODE=444

Modified: projects/runtime-coverage/contrib/bmake/mk/meta.autodep.mk
==============================================================================
--- projects/runtime-coverage/contrib/bmake/mk/meta.autodep.mk	Sat Nov  4 06:19:46 2017	(r325383)
+++ projects/runtime-coverage/contrib/bmake/mk/meta.autodep.mk	Sat Nov  4 07:05:21 2017	(r325384)
@@ -1,4 +1,4 @@
-# $Id: meta.autodep.mk,v 1.45 2016/06/03 17:22:32 sjg Exp $
+# $Id: meta.autodep.mk,v 1.46 2017/10/25 23:44:20 sjg Exp $
 
 #

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-projects mailing list