Date: Wed, 28 Sep 2016 19:29:02 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306412 - in projects/clang390-import: . contrib/netbsd-tests/lib/libc/gen contrib/netbsd-tests/lib/libc/sys crypto/openssl crypto/openssl/crypto crypto/openssl/crypto/engine crypto/ope... Message-ID: <201609281929.u8SJT2ah000367@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Wed Sep 28 19:29:01 2016 New Revision: 306412 URL: https://svnweb.freebsd.org/changeset/base/306412 Log: Merge ^/head r306303 through 306411. Added: projects/clang390-import/lib/libc/sys/thr_suspend.2 - copied unchanged from r306411, head/lib/libc/sys/thr_suspend.2 projects/clang390-import/lib/libc/sys/thr_wake.2 - copied unchanged from r306411, head/lib/libc/sys/thr_wake.2 projects/clang390-import/lib/libcompiler_rt/Makefile.inc - copied, changed from r306411, head/lib/libcompiler_rt/Makefile.inc projects/clang390-import/sys/arm/conf/GENERIC - copied unchanged from r306411, head/sys/arm/conf/GENERIC projects/clang390-import/sys/cddl/compat/opensolaris/kern/opensolaris_proc.c - copied unchanged from r306411, head/sys/cddl/compat/opensolaris/kern/opensolaris_proc.c projects/clang390-import/sys/powerpc/mpc85xx/fsl_diu.c - copied unchanged from r306411, head/sys/powerpc/mpc85xx/fsl_diu.c projects/clang390-import/tools/build/options/WITHOUT_DIALOG - copied unchanged from r306411, head/tools/build/options/WITHOUT_DIALOG projects/clang390-import/usr.bin/mkimg/endian.h - copied unchanged from r306411, head/usr.bin/mkimg/endian.h Modified: projects/clang390-import/Makefile.inc1 projects/clang390-import/UPDATING projects/clang390-import/contrib/netbsd-tests/lib/libc/gen/t_nice.c projects/clang390-import/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c projects/clang390-import/crypto/openssl/CHANGES projects/clang390-import/crypto/openssl/Makefile projects/clang390-import/crypto/openssl/NEWS projects/clang390-import/crypto/openssl/README projects/clang390-import/crypto/openssl/crypto/engine/eng_cryptodev.c projects/clang390-import/crypto/openssl/crypto/opensslv.h projects/clang390-import/crypto/openssl/crypto/x509/x509_vfy.c projects/clang390-import/crypto/openssl/ssl/t1_ext.c projects/clang390-import/gnu/usr.bin/Makefile projects/clang390-import/lib/Makefile projects/clang390-import/lib/libarchive/tests/Makefile projects/clang390-import/lib/libc/db/btree/bt_close.c projects/clang390-import/lib/libc/db/hash/hash_page.c projects/clang390-import/lib/libc/sys/Makefile.inc projects/clang390-import/lib/libc/sys/cap_enter.2 projects/clang390-import/lib/libc/sys/procctl.2 projects/clang390-import/lib/libcompiler_rt/Makefile projects/clang390-import/lib/msun/Makefile projects/clang390-import/lib/msun/src/s_fabs.c projects/clang390-import/lib/msun/src/s_logbl.c projects/clang390-import/lib/msun/src/s_scalbn.c projects/clang390-import/lib/msun/src/s_scalbnf.c projects/clang390-import/lib/msun/src/s_scalbnl.c projects/clang390-import/sbin/growfs/tests/legacy_test.pl projects/clang390-import/sbin/ifconfig/af_link.c projects/clang390-import/secure/lib/libcrypto/Makefile.inc projects/clang390-import/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/clang390-import/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/clang390-import/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/clang390-import/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/clang390-import/secure/lib/libcrypto/man/ASN1_TIME_set.3 projects/clang390-import/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_ctrl.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_f_base64.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_f_md.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_f_null.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_find_type.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_new.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_new_CMS.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_push.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_read.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_s_accept.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_s_bio.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_s_connect.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_s_fd.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_s_file.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_s_mem.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_s_null.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_s_socket.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_set_callback.3 projects/clang390-import/secure/lib/libcrypto/man/BIO_should_retry.3 projects/clang390-import/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/clang390-import/secure/lib/libcrypto/man/BN_CTX_new.3 projects/clang390-import/secure/lib/libcrypto/man/BN_CTX_start.3 projects/clang390-import/secure/lib/libcrypto/man/BN_add.3 projects/clang390-import/secure/lib/libcrypto/man/BN_add_word.3 projects/clang390-import/secure/lib/libcrypto/man/BN_bn2bin.3 projects/clang390-import/secure/lib/libcrypto/man/BN_cmp.3 projects/clang390-import/secure/lib/libcrypto/man/BN_copy.3 projects/clang390-import/secure/lib/libcrypto/man/BN_generate_prime.3 projects/clang390-import/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/clang390-import/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/clang390-import/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/clang390-import/secure/lib/libcrypto/man/BN_new.3 projects/clang390-import/secure/lib/libcrypto/man/BN_num_bytes.3 projects/clang390-import/secure/lib/libcrypto/man/BN_rand.3 projects/clang390-import/secure/lib/libcrypto/man/BN_set_bit.3 projects/clang390-import/secure/lib/libcrypto/man/BN_swap.3 projects/clang390-import/secure/lib/libcrypto/man/BN_zero.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_add0_cert.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_add1_signer.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_compress.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_decrypt.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_encrypt.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_final.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_get0_type.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_sign.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_sign_receipt.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_uncompress.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_verify.3 projects/clang390-import/secure/lib/libcrypto/man/CMS_verify_receipt.3 projects/clang390-import/secure/lib/libcrypto/man/CONF_modules_free.3 projects/clang390-import/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/clang390-import/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/clang390-import/secure/lib/libcrypto/man/DH_generate_key.3 projects/clang390-import/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/clang390-import/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/clang390-import/secure/lib/libcrypto/man/DH_new.3 projects/clang390-import/secure/lib/libcrypto/man/DH_set_method.3 projects/clang390-import/secure/lib/libcrypto/man/DH_size.3 projects/clang390-import/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/clang390-import/secure/lib/libcrypto/man/DSA_do_sign.3 projects/clang390-import/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/clang390-import/secure/lib/libcrypto/man/DSA_generate_key.3 projects/clang390-import/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/clang390-import/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/clang390-import/secure/lib/libcrypto/man/DSA_new.3 projects/clang390-import/secure/lib/libcrypto/man/DSA_set_method.3 projects/clang390-import/secure/lib/libcrypto/man/DSA_sign.3 projects/clang390-import/secure/lib/libcrypto/man/DSA_size.3 projects/clang390-import/secure/lib/libcrypto/man/EC_GFp_simple_method.3 projects/clang390-import/secure/lib/libcrypto/man/EC_GROUP_copy.3 projects/clang390-import/secure/lib/libcrypto/man/EC_GROUP_new.3 projects/clang390-import/secure/lib/libcrypto/man/EC_KEY_new.3 projects/clang390-import/secure/lib/libcrypto/man/EC_POINT_add.3 projects/clang390-import/secure/lib/libcrypto/man/EC_POINT_new.3 projects/clang390-import/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/clang390-import/secure/lib/libcrypto/man/ERR_clear_error.3 projects/clang390-import/secure/lib/libcrypto/man/ERR_error_string.3 projects/clang390-import/secure/lib/libcrypto/man/ERR_get_error.3 projects/clang390-import/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/clang390-import/secure/lib/libcrypto/man/ERR_load_strings.3 projects/clang390-import/secure/lib/libcrypto/man/ERR_print_errors.3 projects/clang390-import/secure/lib/libcrypto/man/ERR_put_error.3 projects/clang390-import/secure/lib/libcrypto/man/ERR_remove_state.3 projects/clang390-import/secure/lib/libcrypto/man/ERR_set_mark.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_DigestSignInit.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_EncodeInit.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_PKEY_derive.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_PKEY_sign.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_PKEY_verify.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_SealInit.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_SignInit.3 projects/clang390-import/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/clang390-import/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/clang390-import/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/clang390-import/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/clang390-import/secure/lib/libcrypto/man/OPENSSL_config.3 projects/clang390-import/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/clang390-import/secure/lib/libcrypto/man/OPENSSL_instrument_bus.3 projects/clang390-import/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/clang390-import/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/clang390-import/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 projects/clang390-import/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 projects/clang390-import/secure/lib/libcrypto/man/PKCS12_create.3 projects/clang390-import/secure/lib/libcrypto/man/PKCS12_parse.3 projects/clang390-import/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/clang390-import/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/clang390-import/secure/lib/libcrypto/man/PKCS7_sign.3 projects/clang390-import/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 projects/clang390-import/secure/lib/libcrypto/man/PKCS7_verify.3 projects/clang390-import/secure/lib/libcrypto/man/RAND_add.3 projects/clang390-import/secure/lib/libcrypto/man/RAND_bytes.3 projects/clang390-import/secure/lib/libcrypto/man/RAND_cleanup.3 projects/clang390-import/secure/lib/libcrypto/man/RAND_egd.3 projects/clang390-import/secure/lib/libcrypto/man/RAND_load_file.3 projects/clang390-import/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/clang390-import/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/clang390-import/secure/lib/libcrypto/man/RSA_check_key.3 projects/clang390-import/secure/lib/libcrypto/man/RSA_generate_key.3 projects/clang390-import/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/clang390-import/secure/lib/libcrypto/man/RSA_new.3 projects/clang390-import/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/clang390-import/secure/lib/libcrypto/man/RSA_print.3 projects/clang390-import/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/clang390-import/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/clang390-import/secure/lib/libcrypto/man/RSA_set_method.3 projects/clang390-import/secure/lib/libcrypto/man/RSA_sign.3 projects/clang390-import/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/clang390-import/secure/lib/libcrypto/man/RSA_size.3 projects/clang390-import/secure/lib/libcrypto/man/SMIME_read_CMS.3 projects/clang390-import/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/clang390-import/secure/lib/libcrypto/man/SMIME_write_CMS.3 projects/clang390-import/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/clang390-import/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/clang390-import/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/clang390-import/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/clang390-import/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/clang390-import/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 projects/clang390-import/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 projects/clang390-import/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 projects/clang390-import/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 projects/clang390-import/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 projects/clang390-import/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 projects/clang390-import/secure/lib/libcrypto/man/X509_check_host.3 projects/clang390-import/secure/lib/libcrypto/man/X509_new.3 projects/clang390-import/secure/lib/libcrypto/man/X509_verify_cert.3 projects/clang390-import/secure/lib/libcrypto/man/bio.3 projects/clang390-import/secure/lib/libcrypto/man/blowfish.3 projects/clang390-import/secure/lib/libcrypto/man/bn.3 projects/clang390-import/secure/lib/libcrypto/man/bn_internal.3 projects/clang390-import/secure/lib/libcrypto/man/buffer.3 projects/clang390-import/secure/lib/libcrypto/man/crypto.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_DHparams.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_ECPKParameters.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_ECPrivateKey.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_PrivateKey.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_X509.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/clang390-import/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/clang390-import/secure/lib/libcrypto/man/des.3 projects/clang390-import/secure/lib/libcrypto/man/dh.3 projects/clang390-import/secure/lib/libcrypto/man/dsa.3 projects/clang390-import/secure/lib/libcrypto/man/ec.3 projects/clang390-import/secure/lib/libcrypto/man/ecdsa.3 projects/clang390-import/secure/lib/libcrypto/man/engine.3 projects/clang390-import/secure/lib/libcrypto/man/err.3 projects/clang390-import/secure/lib/libcrypto/man/evp.3 projects/clang390-import/secure/lib/libcrypto/man/hmac.3 projects/clang390-import/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 projects/clang390-import/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 projects/clang390-import/secure/lib/libcrypto/man/lh_stats.3 projects/clang390-import/secure/lib/libcrypto/man/lhash.3 projects/clang390-import/secure/lib/libcrypto/man/md5.3 projects/clang390-import/secure/lib/libcrypto/man/mdc2.3 projects/clang390-import/secure/lib/libcrypto/man/pem.3 projects/clang390-import/secure/lib/libcrypto/man/rand.3 projects/clang390-import/secure/lib/libcrypto/man/rc4.3 projects/clang390-import/secure/lib/libcrypto/man/ripemd.3 projects/clang390-import/secure/lib/libcrypto/man/rsa.3 projects/clang390-import/secure/lib/libcrypto/man/sha.3 projects/clang390-import/secure/lib/libcrypto/man/threads.3 projects/clang390-import/secure/lib/libcrypto/man/ui.3 projects/clang390-import/secure/lib/libcrypto/man/ui_compat.3 projects/clang390-import/secure/lib/libcrypto/man/x509.3 projects/clang390-import/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/clang390-import/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/clang390-import/secure/lib/libssl/man/SSL_CONF_CTX_new.3 projects/clang390-import/secure/lib/libssl/man/SSL_CONF_CTX_set1_prefix.3 projects/clang390-import/secure/lib/libssl/man/SSL_CONF_CTX_set_flags.3 projects/clang390-import/secure/lib/libssl/man/SSL_CONF_CTX_set_ssl_ctx.3 projects/clang390-import/secure/lib/libssl/man/SSL_CONF_cmd.3 projects/clang390-import/secure/lib/libssl/man/SSL_CONF_cmd_argv.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_add1_chain_cert.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_free.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_get0_param.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_new.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set1_curves.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set1_verify_cert_store.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_cert_cb.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_custom_cli_ext.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 projects/clang390-import/secure/lib/libssl/man/SSL_CTX_use_serverinfo.3 projects/clang390-import/secure/lib/libssl/man/SSL_SESSION_free.3 projects/clang390-import/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/clang390-import/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/clang390-import/secure/lib/libssl/man/SSL_accept.3 projects/clang390-import/secure/lib/libssl/man/SSL_alert_type_string.3 projects/clang390-import/secure/lib/libssl/man/SSL_check_chain.3 projects/clang390-import/secure/lib/libssl/man/SSL_clear.3 projects/clang390-import/secure/lib/libssl/man/SSL_connect.3 projects/clang390-import/secure/lib/libssl/man/SSL_do_handshake.3 projects/clang390-import/secure/lib/libssl/man/SSL_free.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_ciphers.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_error.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_fd.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_psk_identity.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_rbio.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_session.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_verify_result.3 projects/clang390-import/secure/lib/libssl/man/SSL_get_version.3 projects/clang390-import/secure/lib/libssl/man/SSL_library_init.3 projects/clang390-import/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/clang390-import/secure/lib/libssl/man/SSL_new.3 projects/clang390-import/secure/lib/libssl/man/SSL_pending.3 projects/clang390-import/secure/lib/libssl/man/SSL_read.3 projects/clang390-import/secure/lib/libssl/man/SSL_rstate_string.3 projects/clang390-import/secure/lib/libssl/man/SSL_session_reused.3 projects/clang390-import/secure/lib/libssl/man/SSL_set_bio.3 projects/clang390-import/secure/lib/libssl/man/SSL_set_connect_state.3 projects/clang390-import/secure/lib/libssl/man/SSL_set_fd.3 projects/clang390-import/secure/lib/libssl/man/SSL_set_session.3 projects/clang390-import/secure/lib/libssl/man/SSL_set_shutdown.3 projects/clang390-import/secure/lib/libssl/man/SSL_set_verify_result.3 projects/clang390-import/secure/lib/libssl/man/SSL_shutdown.3 projects/clang390-import/secure/lib/libssl/man/SSL_state_string.3 projects/clang390-import/secure/lib/libssl/man/SSL_want.3 projects/clang390-import/secure/lib/libssl/man/SSL_write.3 projects/clang390-import/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/clang390-import/secure/lib/libssl/man/ssl.3 projects/clang390-import/secure/usr.bin/openssl/man/CA.pl.1 projects/clang390-import/secure/usr.bin/openssl/man/asn1parse.1 projects/clang390-import/secure/usr.bin/openssl/man/c_rehash.1 projects/clang390-import/secure/usr.bin/openssl/man/ca.1 projects/clang390-import/secure/usr.bin/openssl/man/ciphers.1 projects/clang390-import/secure/usr.bin/openssl/man/cms.1 projects/clang390-import/secure/usr.bin/openssl/man/crl.1 projects/clang390-import/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/clang390-import/secure/usr.bin/openssl/man/dgst.1 projects/clang390-import/secure/usr.bin/openssl/man/dhparam.1 projects/clang390-import/secure/usr.bin/openssl/man/dsa.1 projects/clang390-import/secure/usr.bin/openssl/man/dsaparam.1 projects/clang390-import/secure/usr.bin/openssl/man/ec.1 projects/clang390-import/secure/usr.bin/openssl/man/ecparam.1 projects/clang390-import/secure/usr.bin/openssl/man/enc.1 projects/clang390-import/secure/usr.bin/openssl/man/errstr.1 projects/clang390-import/secure/usr.bin/openssl/man/gendsa.1 projects/clang390-import/secure/usr.bin/openssl/man/genpkey.1 projects/clang390-import/secure/usr.bin/openssl/man/genrsa.1 projects/clang390-import/secure/usr.bin/openssl/man/nseq.1 projects/clang390-import/secure/usr.bin/openssl/man/ocsp.1 projects/clang390-import/secure/usr.bin/openssl/man/openssl.1 projects/clang390-import/secure/usr.bin/openssl/man/passwd.1 projects/clang390-import/secure/usr.bin/openssl/man/pkcs12.1 projects/clang390-import/secure/usr.bin/openssl/man/pkcs7.1 projects/clang390-import/secure/usr.bin/openssl/man/pkcs8.1 projects/clang390-import/secure/usr.bin/openssl/man/pkey.1 projects/clang390-import/secure/usr.bin/openssl/man/pkeyparam.1 projects/clang390-import/secure/usr.bin/openssl/man/pkeyutl.1 projects/clang390-import/secure/usr.bin/openssl/man/rand.1 projects/clang390-import/secure/usr.bin/openssl/man/req.1 projects/clang390-import/secure/usr.bin/openssl/man/rsa.1 projects/clang390-import/secure/usr.bin/openssl/man/rsautl.1 projects/clang390-import/secure/usr.bin/openssl/man/s_client.1 projects/clang390-import/secure/usr.bin/openssl/man/s_server.1 projects/clang390-import/secure/usr.bin/openssl/man/s_time.1 projects/clang390-import/secure/usr.bin/openssl/man/sess_id.1 projects/clang390-import/secure/usr.bin/openssl/man/smime.1 projects/clang390-import/secure/usr.bin/openssl/man/speed.1 projects/clang390-import/secure/usr.bin/openssl/man/spkac.1 projects/clang390-import/secure/usr.bin/openssl/man/ts.1 projects/clang390-import/secure/usr.bin/openssl/man/tsget.1 projects/clang390-import/secure/usr.bin/openssl/man/verify.1 projects/clang390-import/secure/usr.bin/openssl/man/version.1 projects/clang390-import/secure/usr.bin/openssl/man/x509.1 projects/clang390-import/secure/usr.bin/openssl/man/x509v3_config.1 projects/clang390-import/share/man/man4/ddb.4 projects/clang390-import/share/man/man4/psm.4 projects/clang390-import/share/man/man9/ifnet.9 projects/clang390-import/share/mk/bsd.README projects/clang390-import/share/mk/src.opts.mk projects/clang390-import/sys/amd64/amd64/efirt.c (contents, props changed) projects/clang390-import/sys/amd64/amd64/machdep.c projects/clang390-import/sys/amd64/amd64/pmap.c projects/clang390-import/sys/arm/nvidia/tegra_ahci.c projects/clang390-import/sys/arm/nvidia/tegra_pcie.c projects/clang390-import/sys/arm/ti/cpsw/if_cpsw.c projects/clang390-import/sys/arm/ti/cpsw/if_cpswreg.h projects/clang390-import/sys/arm/ti/cpsw/if_cpswvar.h projects/clang390-import/sys/boot/common/interp_forth.c projects/clang390-import/sys/cam/ata/ata_xpt.c projects/clang390-import/sys/cddl/compat/opensolaris/sys/proc.h projects/clang390-import/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/clang390-import/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c projects/clang390-import/sys/conf/files projects/clang390-import/sys/conf/files.powerpc projects/clang390-import/sys/ddb/db_examine.c projects/clang390-import/sys/dev/ath/ath_hal/ah.h projects/clang390-import/sys/dev/ath/ath_hal/ah_internal.h projects/clang390-import/sys/dev/ath/ath_hal/ah_regdomain.c projects/clang390-import/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h projects/clang390-import/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_freqbands.h projects/clang390-import/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h projects/clang390-import/sys/dev/atkbdc/psm.c projects/clang390-import/sys/dev/hyperv/include/vmbus.h projects/clang390-import/sys/dev/hyperv/netvsc/hv_net_vsc.c projects/clang390-import/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/clang390-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/clang390-import/sys/dev/hyperv/netvsc/hv_rndis_filter.c projects/clang390-import/sys/dev/hyperv/netvsc/hv_rndis_filter.h projects/clang390-import/sys/dev/hyperv/netvsc/if_hnvar.h projects/clang390-import/sys/dev/hyperv/vmbus/vmbus.c projects/clang390-import/sys/dev/hyperv/vmbus/vmbus_brvar.h projects/clang390-import/sys/dev/hyperv/vmbus/vmbus_chan.c projects/clang390-import/sys/dev/hyperv/vmbus/vmbus_chanvar.h projects/clang390-import/sys/dev/hyperv/vmbus/vmbus_var.h projects/clang390-import/sys/dev/pci/pci.c projects/clang390-import/sys/dev/usb/wlan/if_rsu.c projects/clang390-import/sys/i386/i386/db_disasm.c projects/clang390-import/sys/i386/i386/db_interface.c projects/clang390-import/sys/i386/i386/db_trace.c projects/clang390-import/sys/i386/i386/machdep.c projects/clang390-import/sys/i386/i386/sys_machdep.c projects/clang390-import/sys/i386/include/db_machdep.h projects/clang390-import/sys/kern/kern_descrip.c projects/clang390-import/sys/kern/kern_mutex.c projects/clang390-import/sys/mips/mips/pm_machdep.c projects/clang390-import/sys/mips/mips/trap.c projects/clang390-import/sys/modules/opensolaris/Makefile projects/clang390-import/sys/net/if_var.h projects/clang390-import/sys/netinet/sctp_bsd_addr.c projects/clang390-import/sys/netinet6/nd6_nbr.c projects/clang390-import/sys/netpfil/pf/pf_if.c projects/clang390-import/sys/powerpc/conf/MPC85XX projects/clang390-import/sys/powerpc/mpc85xx/mpc85xx.h projects/clang390-import/sys/sys/eventhandler.h projects/clang390-import/sys/sys/mouse.h projects/clang390-import/tests/sys/geom/class/eli/Makefile projects/clang390-import/tools/build/mk/OptionalObsoleteFiles.inc projects/clang390-import/usr.bin/Makefile projects/clang390-import/usr.bin/calendar/tests/Makefile projects/clang390-import/usr.bin/mkimg/apm.c projects/clang390-import/usr.bin/mkimg/bsd.c projects/clang390-import/usr.bin/mkimg/ebr.c projects/clang390-import/usr.bin/mkimg/format.c projects/clang390-import/usr.bin/mkimg/format.h projects/clang390-import/usr.bin/mkimg/gpt.c projects/clang390-import/usr.bin/mkimg/image.c projects/clang390-import/usr.bin/mkimg/mbr.c projects/clang390-import/usr.bin/mkimg/mkimg.c projects/clang390-import/usr.bin/mkimg/pc98.c projects/clang390-import/usr.bin/mkimg/qcow.c projects/clang390-import/usr.bin/mkimg/raw.c projects/clang390-import/usr.bin/mkimg/scheme.c projects/clang390-import/usr.bin/mkimg/scheme.h projects/clang390-import/usr.bin/mkimg/vhd.c projects/clang390-import/usr.bin/mkimg/vmdk.c projects/clang390-import/usr.bin/mkimg/vtoc8.c projects/clang390-import/usr.sbin/Makefile projects/clang390-import/usr.sbin/moused/moused.c Directory Properties: projects/clang390-import/ (props changed) projects/clang390-import/contrib/netbsd-tests/ (props changed) projects/clang390-import/crypto/openssl/ (props changed) projects/clang390-import/lib/libc/locale/ascii.c (props changed) projects/clang390-import/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/clang390-import/Makefile.inc1 ============================================================================== --- projects/clang390-import/Makefile.inc1 Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/Makefile.inc1 Wed Sep 28 19:29:01 2016 (r306412) @@ -2031,8 +2031,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_cddl_lib_libctf} \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_lib_libldns} \ - ${_secure_lib_libssh} ${_secure_lib_libssl} \ - gnu/lib/libdialog + ${_secure_lib_libssh} ${_secure_lib_libssl} .if ${MK_GNUCXX} != "no" _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++ @@ -2040,6 +2039,11 @@ gnu/lib/libstdc++__L: lib/msun__L gnu/lib/libsupc++__L: gnu/lib/libstdc++__L .endif +.if ${MK_DIALOG} != "no" +_prebuild_libs+= gnu/lib/libdialog +gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L +.endif + .if ${MK_LIBCPLUSPLUS} != "no" _prebuild_libs+= lib/libc++ .endif @@ -2189,8 +2193,6 @@ lib/libproc__L: gnu/lib/libsupc++__L .endif .endif -gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L - .for _lib in ${_prereq_libs} ${_lib}__PL: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) Modified: projects/clang390-import/UPDATING ============================================================================== --- projects/clang390-import/UPDATING Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/UPDATING Wed Sep 28 19:29:01 2016 (r306412) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20160924: + Relocatable object files with the extension of .So have been renamed + to use an extension of .pico instead. The purpose of this change is + to avoid a name clash with shared libraries on case-insensitive file + systems. On those file systems, foo.So is the same file as foo.so. + 20160918: GNU rcs has been turned off by default. It can (temporarily) be built again by adding WITH_RCS knob in src.conf. Modified: projects/clang390-import/contrib/netbsd-tests/lib/libc/gen/t_nice.c ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/lib/libc/gen/t_nice.c Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/contrib/netbsd-tests/lib/libc/gen/t_nice.c Wed Sep 28 19:29:01 2016 (r306412) @@ -125,7 +125,7 @@ ATF_TC_BODY(nice_priority, tc) if (pid == 0) { errno = 0; -#ifdef __FreeBSD__ +#ifdef __NetBSD__ pri = getpriority(PRIO_PROCESS, 0); #else pri2 = getpriority(PRIO_PROCESS, 0); Modified: projects/clang390-import/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c Wed Sep 28 19:29:01 2016 (r306412) @@ -55,6 +55,8 @@ run(int n, ...) for (i = 0; i < 5; i++) { #elif defined(__FreeBSD__) && defined(__aarch64__) for (i = 0; i < 7; i++) { +#elif defined(__FreeBSD__) && defined(__mips__) + for (i = 0; i < 5; i++) { #else for (i = 0; i < 9; i++) { #endif @@ -122,6 +124,10 @@ ATF_TC_BODY(setcontext_link, tc) /* FreeBSD/arm64 only permits up to 8 arguments. */ makecontext(&uc[i], (void *)run, 8, i, 0, 1, 2, 3, 4, 5, 6); +#elif defined(__FreeBSD__) && defined(__mips__) + /* FreeBSD/mips only permits up to 6 arguments. */ + makecontext(&uc[i], (void *)run, 6, i, + 0, 1, 2, 3, 4); #else makecontext(&uc[i], (void *)run, 10, i, 0, 1, 2, 3, 4, 5, 6, 7, 8); Modified: projects/clang390-import/crypto/openssl/CHANGES ============================================================================== --- projects/clang390-import/crypto/openssl/CHANGES Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/crypto/openssl/CHANGES Wed Sep 28 19:29:01 2016 (r306412) @@ -2,6 +2,18 @@ OpenSSL CHANGES _______________ + Changes between 1.0.2i and 1.0.2j [26 Sep 2016] + + *) Missing CRL sanity check + + A bug fix which included a CRL sanity check was added to OpenSSL 1.1.0 + but was omitted from OpenSSL 1.0.2i. As a result any attempt to use + CRLs in OpenSSL 1.0.2i will crash with a null pointer exception. + + This issue only affects the OpenSSL 1.0.2i + (CVE-2016-7052) + [Matt Caswell] + Changes between 1.0.2h and 1.0.2i [22 Sep 2016] *) OCSP Status Request extension unbounded memory growth Modified: projects/clang390-import/crypto/openssl/Makefile ============================================================================== --- projects/clang390-import/crypto/openssl/Makefile Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/crypto/openssl/Makefile Wed Sep 28 19:29:01 2016 (r306412) @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=1.0.2i +VERSION=1.0.2j MAJOR=1 MINOR=0.2 SHLIB_VERSION_NUMBER=1.0.0 Modified: projects/clang390-import/crypto/openssl/NEWS ============================================================================== --- projects/clang390-import/crypto/openssl/NEWS Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/crypto/openssl/NEWS Wed Sep 28 19:29:01 2016 (r306412) @@ -5,6 +5,10 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.0.2i and OpenSSL 1.0.2j [26 Sep 2016] + + o Fix Use After Free for large message sizes (CVE-2016-6309) + Major changes between OpenSSL 1.0.2h and OpenSSL 1.0.2i [22 Sep 2016] o OCSP Status Request extension unbounded memory growth (CVE-2016-6304) Modified: projects/clang390-import/crypto/openssl/README ============================================================================== --- projects/clang390-import/crypto/openssl/README Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/crypto/openssl/README Wed Sep 28 19:29:01 2016 (r306412) @@ -1,5 +1,5 @@ - OpenSSL 1.0.2i 22 Sep 2016 + OpenSSL 1.0.2j 26 Sep 2016 Copyright (c) 1998-2015 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson Modified: projects/clang390-import/crypto/openssl/crypto/engine/eng_cryptodev.c ============================================================================== --- projects/clang390-import/crypto/openssl/crypto/engine/eng_cryptodev.c Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/crypto/openssl/crypto/engine/eng_cryptodev.c Wed Sep 28 19:29:01 2016 (r306412) @@ -939,7 +939,7 @@ static int cryptodev_digest_copy(EVP_MD_ if (fstate->mac_len != 0) { if (fstate->mac_data != NULL) { dstate->mac_data = OPENSSL_malloc(fstate->mac_len); - if (dstate->ac_data == NULL) { + if (dstate->mac_data == NULL) { printf("cryptodev_digest_init: malloc failed\n"); return 0; } Modified: projects/clang390-import/crypto/openssl/crypto/opensslv.h ============================================================================== --- projects/clang390-import/crypto/openssl/crypto/opensslv.h Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/crypto/openssl/crypto/opensslv.h Wed Sep 28 19:29:01 2016 (r306412) @@ -30,11 +30,11 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x1000209fL +# define OPENSSL_VERSION_NUMBER 0x100020afL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2i-fips 22 Sep 2016" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2j-fips 26 Sep 2016" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2i-freebsd 22 Sep 2016" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2j-freebsd 26 Sep 2016" # endif # define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT Modified: projects/clang390-import/crypto/openssl/crypto/x509/x509_vfy.c ============================================================================== --- projects/clang390-import/crypto/openssl/crypto/x509/x509_vfy.c Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/crypto/openssl/crypto/x509/x509_vfy.c Wed Sep 28 19:29:01 2016 (r306412) @@ -1124,10 +1124,10 @@ static int get_crl_sk(X509_STORE_CTX *ct crl = sk_X509_CRL_value(crls, i); reasons = *preasons; crl_score = get_crl_score(ctx, &crl_issuer, &reasons, crl, x); - if (crl_score < best_score) + if (crl_score < best_score || crl_score == 0) continue; /* If current CRL is equivalent use it if it is newer */ - if (crl_score == best_score) { + if (crl_score == best_score && best_crl != NULL) { int day, sec; if (ASN1_TIME_diff(&day, &sec, X509_CRL_get_lastUpdate(best_crl), X509_CRL_get_lastUpdate(crl)) == 0) Modified: projects/clang390-import/crypto/openssl/ssl/t1_ext.c ============================================================================== --- projects/clang390-import/crypto/openssl/ssl/t1_ext.c Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/crypto/openssl/ssl/t1_ext.c Wed Sep 28 19:29:01 2016 (r306412) @@ -275,7 +275,9 @@ int SSL_extension_supported(unsigned int case TLSEXT_TYPE_ec_point_formats: case TLSEXT_TYPE_elliptic_curves: case TLSEXT_TYPE_heartbeat: +# ifndef OPENSSL_NO_NEXTPROTONEG case TLSEXT_TYPE_next_proto_neg: +# endif case TLSEXT_TYPE_padding: case TLSEXT_TYPE_renegotiate: case TLSEXT_TYPE_server_name: Modified: projects/clang390-import/gnu/usr.bin/Makefile ============================================================================== --- projects/clang390-import/gnu/usr.bin/Makefile Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/gnu/usr.bin/Makefile Wed Sep 28 19:29:01 2016 (r306412) @@ -4,7 +4,6 @@ SUBDIR= ${_binutils} \ ${_cc} \ - dialog \ diff \ diff3 \ ${_dtc} \ @@ -49,6 +48,8 @@ _gdb= gdb _cc= cc .endif +SUBDIR.${MK_DIALOG}+= dialog + SUBDIR_PARALLEL= .include <bsd.subdir.mk> Modified: projects/clang390-import/lib/Makefile ============================================================================== --- projects/clang390-import/lib/Makefile Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/lib/Makefile Wed Sep 28 19:29:01 2016 (r306412) @@ -46,7 +46,6 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ ${_libdevdctl} \ libdevinfo \ libdevstat \ - libdpv \ libdwarf \ libedit \ ${_libelftc} \ @@ -197,6 +196,8 @@ _libelftc= libelftc _libpe= libpe .endif +SUBDIR.${MK_DIALOG}+= libdpv + .if ${MK_FILE} != "no" _libmagic= libmagic .endif Modified: projects/clang390-import/lib/libarchive/tests/Makefile ============================================================================== --- projects/clang390-import/lib/libarchive/tests/Makefile Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/lib/libarchive/tests/Makefile Wed Sep 28 19:29:01 2016 (r306412) @@ -6,6 +6,8 @@ _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarc ATF_TESTS_SH+= functional_test +TEST_METADATA.functional_test+= timeout="600" + BINDIR= ${TESTSDIR} PROGS+= libarchive_test Modified: projects/clang390-import/lib/libc/db/btree/bt_close.c ============================================================================== --- projects/clang390-import/lib/libc/db/btree/bt_close.c Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/lib/libc/db/btree/bt_close.c Wed Sep 28 19:29:01 2016 (r306412) @@ -134,7 +134,8 @@ __bt_sync(const DB *dbp, u_int flags) return (RET_ERROR); } - if (F_ISSET(t, B_INMEM | B_RDONLY) || !F_ISSET(t, B_MODIFIED)) + if (F_ISSET(t, B_INMEM | B_RDONLY) || + !F_ISSET(t, B_MODIFIED | B_METADIRTY)) return (RET_SUCCESS); if (F_ISSET(t, B_METADIRTY) && bt_meta(t) == RET_ERROR) Modified: projects/clang390-import/lib/libc/db/hash/hash_page.c ============================================================================== --- projects/clang390-import/lib/libc/db/hash/hash_page.c Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/lib/libc/db/hash/hash_page.c Wed Sep 28 19:29:01 2016 (r306412) @@ -572,7 +572,9 @@ __get_page(HTAB *hashp, char *p, u_int32 int __put_page(HTAB *hashp, char *p, u_int32_t bucket, int is_bucket, int is_bitmap) { - int fd, page, size, wsize; + int fd, page, size; + ssize_t wsize; + char pbuf[MAX_BSIZE]; size = hashp->BSIZE; if ((hashp->fp == -1) && open_temp(hashp)) @@ -582,15 +584,18 @@ __put_page(HTAB *hashp, char *p, u_int32 if (hashp->LORDER != BYTE_ORDER) { int i, max; + memcpy(pbuf, p, size); if (is_bitmap) { max = hashp->BSIZE >> 2; /* divide by 4 */ for (i = 0; i < max; i++) - M_32_SWAP(((int *)p)[i]); + M_32_SWAP(((int *)pbuf)[i]); } else { - max = ((u_int16_t *)p)[0] + 2; + uint16_t *bp = (uint16_t *)(void *)pbuf; + max = bp[0] + 2; for (i = 0; i <= max; i++) - M_16_SWAP(((u_int16_t *)p)[i]); + M_16_SWAP(bp[i]); } + p = pbuf; } if (is_bucket) page = BUCKET_TO_PAGE(bucket); Modified: projects/clang390-import/lib/libc/sys/Makefile.inc ============================================================================== --- projects/clang390-import/lib/libc/sys/Makefile.inc Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/lib/libc/sys/Makefile.inc Wed Sep 28 19:29:01 2016 (r306412) @@ -322,6 +322,8 @@ MAN+= sctp_generic_recvmsg.2 \ thr_new.2 \ thr_self.2 \ thr_set_name.2 \ + thr_suspend.2 \ + thr_wake.2 \ timer_create.2 \ timer_delete.2 \ timer_settime.2 \ Modified: projects/clang390-import/lib/libc/sys/cap_enter.2 ============================================================================== --- projects/clang390-import/lib/libc/sys/cap_enter.2 Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/lib/libc/sys/cap_enter.2 Wed Sep 28 19:29:01 2016 (r306412) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 22, 2016 +.Dd September 27, 2016 .Dt CAP_ENTER 2 .Os .Sh NAME @@ -72,15 +72,15 @@ sandbox. .Sh RUN-TIME SETTINGS If the .Dv kern.trap_enocap -sysctl MIB is set to non-zero value, then for any process executing in a +sysctl MIB is set to a non-zero value, then for any process executing in a capability mode sandbox, any syscall which results in either .Er ENOTCAPABLE or .Er ECAPMODE -error, also generates the synchronous +error also generates the synchronous .Dv SIGTRAP signal to the thread on the syscall return. -On the signal delivery, the +On signal delivery, the .Va si_errno member of the .Fa siginfo Modified: projects/clang390-import/lib/libc/sys/procctl.2 ============================================================================== --- projects/clang390-import/lib/libc/sys/procctl.2 Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/lib/libc/sys/procctl.2 Wed Sep 28 19:29:01 2016 (r306412) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 22, 2016 +.Dd September 27, 2016 .Dt PROCCTL 2 .Os .Sh NAME @@ -328,14 +328,17 @@ If a debugger is attached, .Fa data is set to the pid of the debugger process. .It Dv PROC_TRAPCAP_CTL -Enable or disable, for the specified processes which are executing in a -capability mode sandbox, the synchronous -.Dv SIGTRAP -signal on return from any syscall which gives either +Controls the capability mode sandbox actions for the specified +sandboxed processes, +on a return from any syscall which gives either a .Er ENOTCAPABLE or .Er ECAPMODE error. +If the control is enabled, such errors from the syscalls cause +delivery of the synchronous +.Dv SIGTRAP +signal to the thread immediately before returning from the syscalls. .Pp Possible values for the .Fa data @@ -353,7 +356,8 @@ calls. Disable the signal delivery on capability mode access violations. Note that the global sysctl .Dv kern.trap_enocap -might still cause the signal to be delivered; see +might still cause the signal to be delivered. +See .Xr capsicum 4 . .El .Pp @@ -371,7 +375,7 @@ See .Xr capsicum 4 for more information about the capability mode. .It Dv PROC_TRAPCAP_STATUS -Returns the current status of signalling capability mode access +Return the current status of signalling capability mode access violations for the specified process. The integer value pointed to by the .Fa data Copied: projects/clang390-import/lib/libc/sys/thr_suspend.2 (from r306411, head/lib/libc/sys/thr_suspend.2) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang390-import/lib/libc/sys/thr_suspend.2 Wed Sep 28 19:29:01 2016 (r306412, copy of r306411, head/lib/libc/sys/thr_suspend.2) @@ -0,0 +1,130 @@ +.\" Copyright (c) 2016 The FreeBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" This documentation was written by +.\" Konstantin Belousov <kib@FreeBSD.org> under sponsorship +.\" from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd September 23, 2016 +.Dt THR_SUSPEND 2 +.Os +.Sh NAME +.Nm thr_suspend +.Nd suspend the calling thread +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In sys/thr.h +.Ft int +.Fn thr_suspend "struct timespec *timeout" +.Sh DESCRIPTION +.Bf -symbolic +This function is intended for implementing threading. +Normal applications should use +.Xr pthread_cond_timedwait 3 +together with +.Xr pthread_cond_broadcast 3 +for typical safe suspension with cooperation of the thread +being suspended, or +.Xr pthread_suspend_np 3 +and +.Xr pthread_resume_np 3 +in some specific situations, instead. +.Ef +.Pp +The +.Fn thr_suspend +system call puts the calling thread in a suspended state, where it is +not eligible for CPU time. +This state is exited by another thread calling +.Xr thr_wake 2 , +by expiration of the timeout specified in the +.Fa timeout +argument, +or by the delivery of a signal to the suspended thread. +.Pp +If the +.Fa timeout +argument is +.Dv NULL , +the suspended state can be only terminated by explicit +.Fn thr_wake +or signal. +.Pp +If a wake from +.Xr thr_wake 2 +was delivered before the +.Nm +call, the thread is not put into a suspended state. +Instead, the call +returns immediately without an error. +.Pp +If a thread previously called +.Xr thr_wake 2 +with its own thread identifier, which resulted in setting the internal kernel +flag to immediately abort interruptible sleeps with an +.Er EINTR +error +.Po +see +.Xr thr_wake 2 +.Pc , +the flag is cleared. +As with +.Xr thr_wake 2 +called from another thread, the next +.Nm +call does not result in suspension. +.Pp +.Sh RETURN VALUES +.Rv -std thr_suspend +.Sh ERRORS +The +.Fn thr_suspend +operation returns the following errors: +.Bl -tag -width Er +.It Bq Er EFAULT +The memory pointed to by the +.Fa timeout +argument is not valid. +.It Bq Er ETIMEDOUT +The specified timeout expired. +.It Bq Er ETIMEDOUT +The +.Fa timeout +argument specified a zero time interval. +.It Bq Er EINTR +The sleep was interrupted by a signal. +.El +.Sh SEE ALSO +.Xr ps 1 , +.Xr thr_wake 2 , +.Xr pthread_resume_np 3 , +.Xr pthread_suspend_np 3 +.Sh STANDARDS +The +.Fn thr_suspend +system call is non-standard. Copied: projects/clang390-import/lib/libc/sys/thr_wake.2 (from r306411, head/lib/libc/sys/thr_wake.2) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang390-import/lib/libc/sys/thr_wake.2 Wed Sep 28 19:29:01 2016 (r306412, copy of r306411, head/lib/libc/sys/thr_wake.2) @@ -0,0 +1,112 @@ +.\" Copyright (c) 2016 The FreeBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" This documentation was written by +.\" Konstantin Belousov <kib@FreeBSD.org> under sponsorship +.\" from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd September 23, 2016 +.Dt THR_WAKE 2 +.Os +.Sh NAME +.Nm thr_wake +.Nd wake up the suspended thread +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In sys/thr.h +.Ft int +.Fn thr_wake "long id" +.Sh DESCRIPTION +.Bf -symbolic +This function is intended for implementing threading. +Normal applications should use +.Xr pthread_cond_timedwait 3 +together with +.Xr pthread_cond_broadcast 3 +for typical safe suspension with cooperation of the thread +being suspended, or +.Xr pthread_suspend_np 3 +and +.Xr pthread_resume_np 3 +in some specific situations, instead. +.Ef +.Pp +Passing the thread identifier of the calling thread +.Po +see +.Xr thr_self 2 +.Pc +to +.Fn thr_wake +sets a thread's flag to cause the next signal-interruptible sleep +of that thread in the kernel to fail immediately with the +.Er EINTR +error. +The flag is cleared by an interruptible sleep attempt or by a call to +.Xr thr_suspend 2. +This is used by the system threading library to implement cancellation. +.Pp +If +.Fa id +is not equal to the current thread identifier, the specified thread is +woken up if suspended by the +.Xr thr_suspend +system call. +If the thread is not suspended at the time of the +.Nm +call, the wake is remembered and the next attempt of the thread to +suspend itself with the +.Xr thr_suspend 2 +results in immediate return with success. +Only one wake is remembered. +.Sh RETURN VALUES +.Rv -std thr_wake +.Sh ERRORS +The +.Fn thr_wake +operation returns these errors: +.Bl -tag -width Er +.It Bq Er ESRCH +The specified thread was not found or does not belong to the process +of the calling thread. +.El +.Sh SEE ALSO +.Xr ps 1 , +.Xr thr_self 2 +.Xr thr_suspend 2 , +.Xr pthread_cancel 3 , +.Xr pthread_resume_np 3 , +.Xr pthread_suspend_np 3 +.Sh STANDARDS +The +.Fn thr_suspend +system call is non-standard and is used by +.Lb libthr +to implement +.St -p1003.1-2001 +.Xr pthread 3 +functionality. Modified: projects/clang390-import/lib/libcompiler_rt/Makefile ============================================================================== --- projects/clang390-import/lib/libcompiler_rt/Makefile Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/lib/libcompiler_rt/Makefile Wed Sep 28 19:29:01 2016 (r306412) @@ -12,225 +12,7 @@ CFLAGS+= -fvisibility=hidden CFLAGS+= -DVISIBILITY_HIDDEN CFLAGS+= -I${SRCTOP}/contrib/libcxxrt -CRTARCH= ${MACHINE_CPUARCH:C/amd64/x86_64/} - -CRTSRC= ${SRCTOP}/contrib/compiler-rt/lib/builtins - -.PATH: ${CRTSRC}/${CRTARCH} -.PATH: ${CRTSRC} - -SRCF+= absvdi2 -SRCF+= absvsi2 -SRCF+= absvti2 -SRCF+= addvdi3 -SRCF+= addvsi3 -SRCF+= addvti3 -SRCF+= apple_versioning -SRCF+= ashldi3 -SRCF+= ashlti3 -SRCF+= ashrdi3 -SRCF+= ashrti3 -SRCF+= clear_cache -SRCF+= clzdi2 -SRCF+= clzsi2 -SRCF+= clzti2 -SRCF+= cmpdi2 -SRCF+= cmpti2 -SRCF+= ctzdi2 -SRCF+= ctzsi2 -SRCF+= ctzti2 -SRCF+= divdc3 -SRCF+= divdi3 -SRCF+= divmoddi4 -SRCF+= divmodsi4 -SRCF+= divsc3 -SRCF+= divtc3 -SRCF+= divti3 -SRCF+= divxc3 -SRCF+= enable_execute_stack -SRCF+= eprintf -SRCF+= extendhfsf2 -SRCF+= ffsdi2 -SRCF+= ffsti2 -SRCF+= fixdfdi -SRCF+= fixdfti -SRCF+= fixsfdi -SRCF+= fixsfti -SRCF+= fixunsdfdi -SRCF+= fixunsdfsi -SRCF+= fixunsdfti -SRCF+= fixunssfdi -SRCF+= fixunssfsi -SRCF+= fixunssfti -SRCF+= fixunsxfdi -SRCF+= fixunsxfsi -SRCF+= fixunsxfti -SRCF+= fixxfdi -SRCF+= fixxfti -SRCF+= floatdidf -SRCF+= floatdisf -SRCF+= floatditf -SRCF+= floatdixf -SRCF+= floatsitf -SRCF+= floattidf -SRCF+= floattisf -SRCF+= floattixf -SRCF+= floatundidf -SRCF+= floatundisf -SRCF+= floatunditf -SRCF+= floatundixf -SRCF+= floatunsidf -SRCF+= floatunsisf -SRCF+= floatuntidf -SRCF+= floatuntisf -SRCF+= floatuntixf -SRCF+= gcc_personality_v0 -SRCF+= int_util -SRCF+= lshrdi3 -SRCF+= lshrti3 -SRCF+= moddi3 -SRCF+= modti3 -SRCF+= muldc3 -SRCF+= muldi3 -SRCF+= mulodi4 -SRCF+= mulosi4 -SRCF+= muloti4 -SRCF+= mulsc3 -SRCF+= multi3 -SRCF+= mulvdi3 -SRCF+= mulvsi3 -SRCF+= mulvti3 -SRCF+= multc3 -SRCF+= mulxc3 -SRCF+= negdf2 -SRCF+= negdi2 -SRCF+= negsf2 -SRCF+= negti2 -SRCF+= negvdi2 -SRCF+= negvsi2 -SRCF+= negvti2 -SRCF+= paritydi2 -SRCF+= paritysi2 -SRCF+= parityti2 -SRCF+= popcountdi2 -SRCF+= popcountsi2 -SRCF+= popcountti2 -SRCF+= powidf2 -SRCF+= powisf2 -SRCF+= powitf2 -SRCF+= powixf2 -SRCF+= subvdi3 -SRCF+= subvsi3 -SRCF+= subvti3 -SRCF+= trampoline_setup -SRCF+= truncdfhf2 -SRCF+= truncsfhf2 -SRCF+= ucmpdi2 -SRCF+= ucmpti2 -SRCF+= udivdi3 -SRCF+= udivmoddi4 -SRCF+= udivmodsi4 -SRCF+= udivmodti4 -SRCF+= udivti3 -SRCF+= umoddi3 -SRCF+= umodti3 - -# __cpu_model support, only used on x86 -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" -SRCF+= cpu_model -.endif - -# 128-bit quad precision long double support, only used on arm64 -.if ${MACHINE_CPUARCH} == "aarch64" -SRCF+= addtf3 -SRCF+= comparetf2 -SRCF+= divtf3 -SRCF+= extenddftf2 -SRCF+= extendsftf2 -SRCF+= fixtfdi -SRCF+= fixtfsi -SRCF+= fixtfti -SRCF+= fixunstfdi -SRCF+= fixunstfsi -SRCF+= fixunstfti -SRCF+= floatunsitf -SRCF+= multf3 -SRCF+= subtf3 -SRCF+= trunctfdf2 -SRCF+= trunctfsf2 -.endif - -# These are already shipped by libc.a on arm and mips -.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" -SRCF+= adddf3 -SRCF+= addsf3 -SRCF+= divdf3 -SRCF+= divsf3 -SRCF+= extendsfdf2 -SRCF+= fixdfsi -SRCF+= fixsfsi -SRCF+= floatsidf -SRCF+= floatsisf -SRCF+= muldf3 -SRCF+= mulsf3 -SRCF+= subdf3 -SRCF+= subsf3 -SRCF+= truncdfsf2 -.endif - -.if ${MACHINE_CPUARCH} != "arm" -SRCF+= comparedf2 -SRCF+= comparesf2 -.endif - -.if ${MACHINE_CPUARCH} != "mips" -SRCF+= divsi3 -SRCF+= modsi3 -SRCF+= udivsi3 -SRCF+= umodsi3 -.endif - -# FreeBSD-specific atomic intrinsics. -.if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "armv6" -.PATH: ${SRCTOP}/sys/arm/arm - -SRCF+= stdatomic -CFLAGS+= -DEMIT_SYNC_ATOMICS -.elif ${MACHINE_CPUARCH} == "mips" -.PATH: ${SRCTOP}/sys/mips/mips - -SRCF+= stdatomic -.endif - -.for file in ${SRCF} -.if ${MACHINE_ARCH:Marmv6*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") \ - && exists(${CRTSRC}/${CRTARCH}/${file}vfp.S) -SRCS+= ${file}vfp.S -. elif exists(${CRTSRC}/${CRTARCH}/${file}.S) -SRCS+= ${file}.S -. else -SRCS+= ${file}.c -. endif -.endfor - -.if ${MACHINE_CPUARCH} == "arm" -SRCS+= aeabi_div0.c -SRCS+= aeabi_idivmod.S -SRCS+= aeabi_ldivmod.S -SRCS+= aeabi_memcmp.S -SRCS+= aeabi_memcpy.S -SRCS+= aeabi_memmove.S -SRCS+= aeabi_memset.S -SRCS+= aeabi_uidivmod.S -SRCS+= aeabi_uldivmod.S -SRCS+= bswapdi2.S -SRCS+= bswapsi2.S -SRCS+= switch16.S -SRCS+= switch32.S -SRCS+= switch8.S -SRCS+= switchu8.S -SRCS+= sync_synchronize.S -.endif +.include "Makefile.inc" .if ${MK_INSTALLLIB} != "no" SYMLINKS+= libcompiler_rt.a ${LIBDIR}/libgcc.a Copied and modified: projects/clang390-import/lib/libcompiler_rt/Makefile.inc (from r306411, head/lib/libcompiler_rt/Makefile.inc) ============================================================================== --- head/lib/libcompiler_rt/Makefile.inc Wed Sep 28 19:15:46 2016 (r306411, copy source) +++ projects/clang390-import/lib/libcompiler_rt/Makefile.inc Wed Sep 28 19:29:01 2016 (r306412) @@ -123,6 +123,11 @@ SRCF+= udivti3 SRCF+= umoddi3 SRCF+= umodti3 +# __cpu_model support, only used on x86 +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" +SRCF+= cpu_model +.endif + # 128-bit quad precision long double support, only used on arm64 .if ${MACHINE_CPUARCH} == "aarch64" SRCF+= addtf3 Modified: projects/clang390-import/lib/msun/Makefile ============================================================================== --- projects/clang390-import/lib/msun/Makefile Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/lib/msun/Makefile Wed Sep 28 19:29:01 2016 (r306412) @@ -13,11 +13,7 @@ # PACKAGE= clibs -.if ${MACHINE_CPUARCH} == "i386" -ARCH_SUBDIR= i387 -.else -ARCH_SUBDIR= ${MACHINE_CPUARCH} -.endif +ARCH_SUBDIR= ${MACHINE_CPUARCH:S/i386/i387/} .include "${ARCH_SUBDIR}/Makefile.inc" Modified: projects/clang390-import/lib/msun/src/s_fabs.c ============================================================================== --- projects/clang390-import/lib/msun/src/s_fabs.c Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/lib/msun/src/s_fabs.c Wed Sep 28 19:29:01 2016 (r306412) @@ -10,9 +10,8 @@ * ==================================================== */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * fabs(x) returns the absolute value of x. Modified: projects/clang390-import/lib/msun/src/s_logbl.c ============================================================================== --- projects/clang390-import/lib/msun/src/s_logbl.c Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/lib/msun/src/s_logbl.c Wed Sep 28 19:29:01 2016 (r306412) @@ -10,9 +10,8 @@ * ==================================================== */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <float.h> #include <limits.h> Modified: projects/clang390-import/lib/msun/src/s_scalbn.c ============================================================================== --- projects/clang390-import/lib/msun/src/s_scalbn.c Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/lib/msun/src/s_scalbn.c Wed Sep 28 19:29:01 2016 (r306412) @@ -10,9 +10,8 @@ * ==================================================== */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * scalbn (double x, int n) @@ -21,7 +20,6 @@ static char rcsid[] = "$FreeBSD$"; * exponentiation or a multiplication. */ -#include <sys/cdefs.h> #include <float.h> #include "math.h" @@ -51,10 +49,12 @@ scalbn (double x, int n) if (k > 0x7fe) return huge*copysign(huge,x); /* overflow */ if (k > 0) /* normal result */ {SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); return x;} - if (k <= -54) + if (k <= -54) { if (n > 50000) /* in case integer overflow in n+k */ return huge*copysign(huge,x); /*overflow*/ - else return tiny*copysign(tiny,x); /*underflow*/ + else + return tiny*copysign(tiny,x); /*underflow*/ + } k += 54; /* subnormal result */ SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); return x*twom54; Modified: projects/clang390-import/lib/msun/src/s_scalbnf.c ============================================================================== --- projects/clang390-import/lib/msun/src/s_scalbnf.c Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/lib/msun/src/s_scalbnf.c Wed Sep 28 19:29:01 2016 (r306412) @@ -13,11 +13,8 @@ * ==================================================== */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "math.h" #include "math_private.h" @@ -46,10 +43,12 @@ scalbnf (float x, int n) if (k > 0xfe) return huge*copysignf(huge,x); /* overflow */ if (k > 0) /* normal result */ {SET_FLOAT_WORD(x,(ix&0x807fffff)|(k<<23)); return x;} - if (k <= -25) + if (k <= -25) { if (n > 50000) /* in case integer overflow in n+k */ return huge*copysignf(huge,x); /*overflow*/ - else return tiny*copysignf(tiny,x); /*underflow*/ + else + return tiny*copysignf(tiny,x); /*underflow*/ + } k += 25; /* subnormal result */ SET_FLOAT_WORD(x,(ix&0x807fffff)|(k<<23)); return x*twom25; Modified: projects/clang390-import/lib/msun/src/s_scalbnl.c ============================================================================== --- projects/clang390-import/lib/msun/src/s_scalbnl.c Wed Sep 28 19:15:46 2016 (r306411) +++ projects/clang390-import/lib/msun/src/s_scalbnl.c Wed Sep 28 19:29:01 2016 (r306412) @@ -10,9 +10,8 @@ * ==================================================== */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * scalbnl (long double x, int n) @@ -27,7 +26,6 @@ static char rcsid[] = "$FreeBSD$"; * for scalbn(), so we don't use this routine. */ -#include <sys/cdefs.h> #include <float.h> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609281929.u8SJT2ah000367>