From owner-svn-src-projects@freebsd.org Sun Sep 23 02:16:49 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A639810AA821 for ; Sun, 23 Sep 2018 02:16:49 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9288C438; Sun, 23 Sep 2018 02:16:49 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3985124449; Sun, 23 Sep 2018 02:16:49 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8N2GnlL007771; Sun, 23 Sep 2018 02:16:49 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8N2GmYk007766; Sun, 23 Sep 2018 02:16:48 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201809230216.w8N2GmYk007766@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 23 Sep 2018 02:16:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338895 - in projects/nfsv42/sys/fs: nfs nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/nfsv42/sys/fs: nfs nfsserver X-SVN-Commit-Revision: 338895 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Sep 2018 02:16:50 -0000 Author: rmacklem Date: Sun Sep 23 02:16:47 2018 New Revision: 338895 URL: https://svnweb.freebsd.org/changeset/base/338895 Log: Add the IO Advise operation to the NFSv4.2 server. At this time, it only handles WILLNEED and DONTNEED, since those are the ones handled by VOP_ADVISE(). Modified: projects/nfsv42/sys/fs/nfs/nfs_commonsubs.c projects/nfsv42/sys/fs/nfs/nfs_var.h projects/nfsv42/sys/fs/nfs/nfsproto.h projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c projects/nfsv42/sys/fs/nfsserver/nfs_nfsdsocket.c Modified: projects/nfsv42/sys/fs/nfs/nfs_commonsubs.c ============================================================================== --- projects/nfsv42/sys/fs/nfs/nfs_commonsubs.c Sat Sep 22 23:02:45 2018 (r338894) +++ projects/nfsv42/sys/fs/nfs/nfs_commonsubs.c Sun Sep 23 02:16:47 2018 (r338895) @@ -170,7 +170,7 @@ struct nfsv4_opflag nfsv4_opflag[NFSV42_NOPS] = { { 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* Copy */ { 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* Copy Notify */ { 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* Deallocate */ - { 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* IO Advise */ + { 0, 1, 0, 1, LK_SHARED, 1, 0 }, /* IO Advise */ { 0, 1, 0, 1, LK_EXCLUSIVE, 1, 0 }, /* Layout Error */ { 0, 1, 0, 1, LK_EXCLUSIVE, 1, 0 }, /* Layout Stats */ { 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 }, /* Offload Cancel */ Modified: projects/nfsv42/sys/fs/nfs/nfs_var.h ============================================================================== --- projects/nfsv42/sys/fs/nfs/nfs_var.h Sat Sep 22 23:02:45 2018 (r338894) +++ projects/nfsv42/sys/fs/nfs/nfs_var.h Sun Sep 23 02:16:47 2018 (r338895) @@ -277,6 +277,8 @@ int nfsrvd_layoutcommit(struct nfsrv_descript *, int, vnode_t, NFSPROC_T *, struct nfsexstuff *); int nfsrvd_layoutreturn(struct nfsrv_descript *, int, vnode_t, NFSPROC_T *, struct nfsexstuff *); +int nfsrvd_ioadvise(struct nfsrv_descript *, int, + vnode_t, NFSPROC_T *, struct nfsexstuff *); int nfsrvd_layouterror(struct nfsrv_descript *, int, vnode_t, NFSPROC_T *, struct nfsexstuff *); int nfsrvd_layoutstats(struct nfsrv_descript *, int, Modified: projects/nfsv42/sys/fs/nfs/nfsproto.h ============================================================================== --- projects/nfsv42/sys/fs/nfs/nfsproto.h Sat Sep 22 23:02:45 2018 (r338894) +++ projects/nfsv42/sys/fs/nfs/nfsproto.h Sun Sep 23 02:16:47 2018 (r338895) @@ -835,6 +835,24 @@ struct nfsv3_sattr { u_int32_t sa_mtimetype; nfstime3 sa_mtime; }; + +/* + * IO Advise hint bits for NFSv4.2. + * Since these go on the wire as a bitmap, the NFSATTRBIT macros are + * used to manipulate these bits. + */ +#define NFSV4IOHINT_NORMAL 0 +#define NFSV4IOHINT_SEQUENTIAL 1 +#define NFSV4IOHINT_SEQUENTIALBACK 2 +#define NFSV4IOHINT_RANDOM 3 +#define NFSV4IOHINT_WILLNEED 4 +#define NFSV4IOHINT_WILLNEEDOPTUN 5 +#define NFSV4IOHINT_DONTNEED 6 +#define NFSV4IOHINT_NOREUSE 7 +#define NFSV4IOHINT_READ 8 +#define NFSV4IOHINT_WRITE 9 +#define NFSV4IOHINT_INITPROXIMITY 10 + #endif /* _KERNEL */ /* Modified: projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c ============================================================================== --- projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c Sat Sep 22 23:02:45 2018 (r338894) +++ projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c Sun Sep 23 02:16:47 2018 (r338895) @@ -4783,6 +4783,93 @@ nfsmout: } /* + * nfsv4 io_advise service + */ +APPLESTATIC int +nfsrvd_ioadvise(struct nfsrv_descript *nd, __unused int isdgram, + vnode_t vp, NFSPROC_T *p, struct nfsexstuff *exp) +{ + uint32_t *tl; + nfsv4stateid_t stateid; + nfsattrbit_t hints; + int error = 0, ret; + off_t offset, len; + + if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) { + nd->nd_repstat = NFSERR_WRONGSEC; + goto nfsmout; + } + NFSM_DISSECT(tl, uint32_t *, NFSX_STATEID + 2 * NFSX_HYPER); + stateid.seqid = fxdr_unsigned(uint32_t, *tl++); + NFSBCOPY(tl, stateid.other, NFSX_STATEIDOTHER); + tl += (NFSX_STATEIDOTHER / NFSX_UNSIGNED); + offset = fxdr_hyper(tl); tl += 2; + len = fxdr_hyper(tl); tl += 2; + error = nfsrv_getattrbits(nd, &hints, NULL, NULL); + if (error != 0) + goto nfsmout; + /* + * For the special stateid of other all 0s and seqid == 1, set + * the stateid to the current stateid, if it is set. + */ + if (stateid.seqid == 1 && stateid.other[0] == 0 && + stateid.other[1] == 0 && stateid.other[2] == 0) { + if ((nd->nd_flag & ND_CURSTATEID) != 0) { + stateid = nd->nd_curstateid; + stateid.seqid = 0; + } else { + nd->nd_repstat = NFSERR_BADSTATEID; + goto nfsmout; + } + } + + if (offset < 0) { + nd->nd_repstat = NFSERR_INVAL; + goto nfsmout; + } + if (len < 0) + len = 0; + + /* + * For now, we can only handle WILLNEED and DONTNEED and don't use + * the stateid. + */ + if ((NFSISSET_ATTRBIT(&hints, NFSV4IOHINT_WILLNEED) && + !NFSISSET_ATTRBIT(&hints, NFSV4IOHINT_DONTNEED)) || + (NFSISSET_ATTRBIT(&hints, NFSV4IOHINT_DONTNEED) && + !NFSISSET_ATTRBIT(&hints, NFSV4IOHINT_WILLNEED))) { + NFSVOPUNLOCK(vp, 0); + if (NFSISSET_ATTRBIT(&hints, NFSV4IOHINT_WILLNEED)) { + ret = VOP_ADVISE(vp, offset, len, POSIX_FADV_WILLNEED); + NFSZERO_ATTRBIT(&hints); + if (ret == 0) + NFSSETBIT_ATTRBIT(&hints, NFSV4IOHINT_WILLNEED); + else + NFSSETBIT_ATTRBIT(&hints, NFSV4IOHINT_NORMAL); + } else { + ret = VOP_ADVISE(vp, offset, len, POSIX_FADV_DONTNEED); + NFSZERO_ATTRBIT(&hints); + if (ret == 0) + NFSSETBIT_ATTRBIT(&hints, NFSV4IOHINT_DONTNEED); + else + NFSSETBIT_ATTRBIT(&hints, NFSV4IOHINT_NORMAL); + } + vrele(vp); + } else { + NFSZERO_ATTRBIT(&hints); + NFSSETBIT_ATTRBIT(&hints, NFSV4IOHINT_NORMAL); + vput(vp); + } + nfsrv_putattrbit(nd, &hints); + NFSEXITCODE2(error, nd); + return (error); +nfsmout: + vput(vp); + NFSEXITCODE2(error, nd); + return (error); +} + +/* * nfsv4 getdeviceinfo service */ APPLESTATIC int Modified: projects/nfsv42/sys/fs/nfsserver/nfs_nfsdsocket.c ============================================================================== --- projects/nfsv42/sys/fs/nfsserver/nfs_nfsdsocket.c Sat Sep 22 23:02:45 2018 (r338894) +++ projects/nfsv42/sys/fs/nfsserver/nfs_nfsdsocket.c Sun Sep 23 02:16:47 2018 (r338895) @@ -202,7 +202,7 @@ int (*nfsrv4_ops0[NFSV42_NOPS])(struct nfsrv_descript nfsrvd_notsupp, nfsrvd_notsupp, nfsrvd_notsupp, - nfsrvd_notsupp, + nfsrvd_ioadvise, nfsrvd_layouterror, nfsrvd_layoutstats, nfsrvd_notsupp, From owner-svn-src-projects@freebsd.org Sun Sep 23 02:51:55 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7631D10AB223 for ; Sun, 23 Sep 2018 02:51:55 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2C1308D278; Sun, 23 Sep 2018 02:51:55 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 270D924987; Sun, 23 Sep 2018 02:51:55 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8N2ptCM027096; Sun, 23 Sep 2018 02:51:55 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8N2ptcp027095; Sun, 23 Sep 2018 02:51:55 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201809230251.w8N2ptcp027095@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Sun, 23 Sep 2018 02:51:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338896 - projects/openssl111/crypto/openssl/crypto X-SVN-Group: projects X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: projects/openssl111/crypto/openssl/crypto X-SVN-Commit-Revision: 338896 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Sep 2018 02:51:55 -0000 Author: jkim Date: Sun Sep 23 02:51:54 2018 New Revision: 338896 URL: https://svnweb.freebsd.org/changeset/base/338896 Log: Add a hack to build on ARMv4 and ARMv5. Modified: projects/openssl111/crypto/openssl/crypto/threads_pthread.c Modified: projects/openssl111/crypto/openssl/crypto/threads_pthread.c ============================================================================== --- projects/openssl111/crypto/openssl/crypto/threads_pthread.c Sun Sep 23 02:16:47 2018 (r338895) +++ projects/openssl111/crypto/openssl/crypto/threads_pthread.c Sun Sep 23 02:51:54 2018 (r338896) @@ -157,7 +157,8 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPT int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock) { -# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) +# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && \ + !(defined(__arm__) && __ARM_ARCH < 6) if (__atomic_is_lock_free(sizeof(*val), val)) { *ret = __atomic_add_fetch(val, amount, __ATOMIC_ACQ_REL); return 1; From owner-svn-src-projects@freebsd.org Mon Sep 24 00:53:58 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0601109EFCF for ; Mon, 24 Sep 2018 00:53:58 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BDFC89F79; Mon, 24 Sep 2018 00:53:58 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 40E6C1256A; Mon, 24 Sep 2018 00:53:58 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8O0rwCP008276; Mon, 24 Sep 2018 00:53:58 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8O0rwaV008275; Mon, 24 Sep 2018 00:53:58 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201809240053.w8O0rwaV008275@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 24 Sep 2018 00:53:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338900 - projects/nfsv42/sys/fs/nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfsv42/sys/fs/nfsserver X-SVN-Commit-Revision: 338900 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Sep 2018 00:53:58 -0000 Author: rmacklem Date: Mon Sep 24 00:53:57 2018 New Revision: 338900 URL: https://svnweb.freebsd.org/changeset/base/338900 Log: Add a sanity check for v_type == VREG to the NFSv4.2 IO Advise operation. Modified: projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c Modified: projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c ============================================================================== --- projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c Sun Sep 23 19:00:06 2018 (r338899) +++ projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c Mon Sep 24 00:53:57 2018 (r338900) @@ -4829,6 +4829,13 @@ nfsrvd_ioadvise(struct nfsrv_descript *nd, __unused in } if (len < 0) len = 0; + if (vp->v_type != VREG) { + if (vp->v_type == VDIR) + nd->nd_repstat = NFSERR_ISDIR; + else + nd->nd_repstat = NFSERR_WRONGTYPE; + goto nfsmout; + } /* * For now, we can only handle WILLNEED and DONTNEED and don't use From owner-svn-src-projects@freebsd.org Mon Sep 24 16:48:55 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B077710B1DD8 for ; Mon, 24 Sep 2018 16:48:55 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 62FDB89630; Mon, 24 Sep 2018 16:48:55 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 43E731C009; Mon, 24 Sep 2018 16:48:55 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8OGmtPl098418; Mon, 24 Sep 2018 16:48:55 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8OGmt9Q098417; Mon, 24 Sep 2018 16:48:55 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201809241648.w8OGmt9Q098417@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 24 Sep 2018 16:48:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338911 - projects/openssl111/contrib/libevent X-SVN-Group: projects X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: projects/openssl111/contrib/libevent X-SVN-Commit-Revision: 338911 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Sep 2018 16:48:55 -0000 Author: emaste Date: Mon Sep 24 16:48:54 2018 New Revision: 338911 URL: https://svnweb.freebsd.org/changeset/base/338911 Log: Copy libevent sources to contrib To replace the libevent embedded in ntp, for OpenSSL 1.1.1 compat. Added: projects/openssl111/contrib/libevent/ - copied from r338910, vendor/libevent/dist/ From owner-svn-src-projects@freebsd.org Mon Sep 24 17:51:57 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7221B10B36C8 for ; Mon, 24 Sep 2018 17:51:57 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2834C8C175; Mon, 24 Sep 2018 17:51:57 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 233801CB30; Mon, 24 Sep 2018 17:51:57 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8OHpvXt032121; Mon, 24 Sep 2018 17:51:57 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8OHpv2E032120; Mon, 24 Sep 2018 17:51:57 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201809241751.w8OHpv2E032120@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 24 Sep 2018 17:51:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338915 - projects/openssl111/usr.sbin/ntp/libntpevent X-SVN-Group: projects X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: projects/openssl111/usr.sbin/ntp/libntpevent X-SVN-Commit-Revision: 338915 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Sep 2018 17:51:57 -0000 Author: emaste Date: Mon Sep 24 17:51:56 2018 New Revision: 338915 URL: https://svnweb.freebsd.org/changeset/base/338915 Log: Switch ntp's embedded libevent to 2.1.18 For OpenSSL 1.1.1 compatibility. Sponsored by: The FreeBSD Foundation. Modified: projects/openssl111/usr.sbin/ntp/libntpevent/Makefile Modified: projects/openssl111/usr.sbin/ntp/libntpevent/Makefile ============================================================================== --- projects/openssl111/usr.sbin/ntp/libntpevent/Makefile Mon Sep 24 17:41:29 2018 (r338914) +++ projects/openssl111/usr.sbin/ntp/libntpevent/Makefile Mon Sep 24 17:51:56 2018 (r338915) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${SRCTOP}/contrib/ntp/sntp/libevent +.PATH: ${SRCTOP}/contrib/libevent LIB= ntpevent INTERNALLIB= @@ -26,7 +26,7 @@ NTP_ATOMIC=noatomic .endif CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ - -I${SRCTOP}/contrib/ntp/sntp/libevent/include \ + -I${SRCTOP}/contrib/libevent/include \ -I${.CURDIR}/ CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H From owner-svn-src-projects@freebsd.org Tue Sep 25 17:41:48 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D79D310B706F for ; Tue, 25 Sep 2018 17:41:48 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8EF7F7A785; Tue, 25 Sep 2018 17:41:48 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 89DC13AD6; Tue, 25 Sep 2018 17:41:48 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8PHfm0s065631; Tue, 25 Sep 2018 17:41:48 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8PHfm8x065630; Tue, 25 Sep 2018 17:41:48 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201809251741.w8PHfm8x065630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 25 Sep 2018 17:41:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338926 - projects/openssl111/contrib/libevent X-SVN-Group: projects X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: projects/openssl111/contrib/libevent X-SVN-Commit-Revision: 338926 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Sep 2018 17:41:49 -0000 Author: emaste Date: Tue Sep 25 17:41:48 2018 New Revision: 338926 URL: https://svnweb.freebsd.org/changeset/base/338926 Log: libevent: eliminate in-tree usage of arc4random_addrandom Apply r338059 to newly-added libevent 2.1.18. Sponsored by: The FreeBSD Foundation Modified: projects/openssl111/contrib/libevent/evutil_rand.c Modified: projects/openssl111/contrib/libevent/evutil_rand.c ============================================================================== --- projects/openssl111/contrib/libevent/evutil_rand.c Tue Sep 25 15:25:42 2018 (r338925) +++ projects/openssl111/contrib/libevent/evutil_rand.c Tue Sep 25 17:41:48 2018 (r338926) @@ -195,8 +195,6 @@ evutil_secure_rng_get_bytes(void *buf, size_t n) void evutil_secure_rng_add_bytes(const char *buf, size_t n) { - arc4random_addrandom((unsigned char*)buf, - n>(size_t)INT_MAX ? INT_MAX : (int)n); } void From owner-svn-src-projects@freebsd.org Tue Sep 25 21:12:37 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53A19108E4E8 for ; Tue, 25 Sep 2018 21:12:37 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 06A6481914; Tue, 25 Sep 2018 21:12:37 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 019D45E83; Tue, 25 Sep 2018 21:12:37 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8PLCawi078248; Tue, 25 Sep 2018 21:12:36 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8PLCa50078246; Tue, 25 Sep 2018 21:12:36 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201809252112.w8PLCa50078246@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 25 Sep 2018 21:12:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338933 - in projects/openssl111/secure: lib/libcrypto lib/libssl usr.bin/openssl X-SVN-Group: projects X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: in projects/openssl111/secure: lib/libcrypto lib/libssl usr.bin/openssl X-SVN-Commit-Revision: 338933 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Sep 2018 21:12:37 -0000 Author: jkim Date: Tue Sep 25 21:12:36 2018 New Revision: 338933 URL: https://svnweb.freebsd.org/changeset/base/338933 Log: Regen Makefile.depend. Modified: projects/openssl111/secure/lib/libcrypto/Makefile.depend projects/openssl111/secure/lib/libssl/Makefile.depend projects/openssl111/secure/usr.bin/openssl/Makefile.depend Modified: projects/openssl111/secure/lib/libcrypto/Makefile.depend ============================================================================== --- projects/openssl111/secure/lib/libcrypto/Makefile.depend Tue Sep 25 20:07:58 2018 (r338932) +++ projects/openssl111/secure/lib/libcrypto/Makefile.depend Tue Sep 25 21:12:36 2018 (r338933) @@ -9,7 +9,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/msun \ + lib/libthr \ .include Modified: projects/openssl111/secure/lib/libssl/Makefile.depend ============================================================================== --- projects/openssl111/secure/lib/libssl/Makefile.depend Tue Sep 25 20:07:58 2018 (r338932) +++ projects/openssl111/secure/lib/libssl/Makefile.depend Tue Sep 25 21:12:36 2018 (r338933) @@ -4,12 +4,12 @@ DIRDEPS = \ gnu/lib/csu \ include \ - include/arpa \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ secure/lib/libcrypto \ + secure/lib/libcrypto/openssl.amd64 \ .include Modified: projects/openssl111/secure/usr.bin/openssl/Makefile.depend ============================================================================== --- projects/openssl111/secure/usr.bin/openssl/Makefile.depend Tue Sep 25 20:07:58 2018 (r338932) +++ projects/openssl111/secure/usr.bin/openssl/Makefile.depend Tue Sep 25 21:12:36 2018 (r338933) @@ -11,6 +11,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/msun \ secure/lib/libcrypto \ + secure/lib/libcrypto/openssl.amd64 \ secure/lib/libssl \ From owner-svn-src-projects@freebsd.org Tue Sep 25 22:14:53 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 480A31091C2B for ; Tue, 25 Sep 2018 22:14:53 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E670E837F2; Tue, 25 Sep 2018 22:14:52 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E17EE6867; Tue, 25 Sep 2018 22:14:52 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8PMEq0A009173; Tue, 25 Sep 2018 22:14:52 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8PMEqWZ009172; Tue, 25 Sep 2018 22:14:52 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201809252214.w8PMEqWZ009172@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 25 Sep 2018 22:14:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338934 - projects/openssl111/secure/lib/libcrypto X-SVN-Group: projects X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: projects/openssl111/secure/lib/libcrypto X-SVN-Commit-Revision: 338934 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Sep 2018 22:14:53 -0000 Author: jkim Date: Tue Sep 25 22:14:52 2018 New Revision: 338934 URL: https://svnweb.freebsd.org/changeset/base/338934 Log: Fix CLEANFILES. Modified: projects/openssl111/secure/lib/libcrypto/Makefile Modified: projects/openssl111/secure/lib/libcrypto/Makefile ============================================================================== --- projects/openssl111/secure/lib/libcrypto/Makefile Tue Sep 25 21:12:36 2018 (r338933) +++ projects/openssl111/secure/lib/libcrypto/Makefile Tue Sep 25 22:14:52 2018 (r338934) @@ -428,7 +428,7 @@ ACFLAGS+= -Wa,--noexecstack SRCS+= buildinf.h openssl/opensslconf.h CLEANDIRS= openssl -CLEANFILES= ${GENINCS} opensslconf.h.tmp +CLEANFILES= buildinf.h opensslconf.h opensslconf.h.tmp buildinf.h: ( echo "/*"; \ From owner-svn-src-projects@freebsd.org Tue Sep 25 22:15:47 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DADE71091C72 for ; Tue, 25 Sep 2018 22:15:47 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8AD4E838F9; Tue, 25 Sep 2018 22:15:47 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 83BBA6868; Tue, 25 Sep 2018 22:15:47 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8PMFlVp009271; Tue, 25 Sep 2018 22:15:47 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8PMFlxq009270; Tue, 25 Sep 2018 22:15:47 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201809252215.w8PMFlxq009270@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 25 Sep 2018 22:15:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338935 - projects/openssl111/secure/lib/libcrypto X-SVN-Group: projects X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: projects/openssl111/secure/lib/libcrypto X-SVN-Commit-Revision: 338935 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Sep 2018 22:15:48 -0000 Author: jkim Date: Tue Sep 25 22:15:47 2018 New Revision: 338935 URL: https://svnweb.freebsd.org/changeset/base/338935 Log: Make it more meta mode friendly. Modified: projects/openssl111/secure/lib/libcrypto/Makefile Modified: projects/openssl111/secure/lib/libcrypto/Makefile ============================================================================== --- projects/openssl111/secure/lib/libcrypto/Makefile Tue Sep 25 22:14:52 2018 (r338934) +++ projects/openssl111/secure/lib/libcrypto/Makefile Tue Sep 25 22:15:47 2018 (r338935) @@ -425,7 +425,7 @@ CFLAGS+= -I${.OBJDIR} ACFLAGS+= -Wa,--noexecstack .endif -SRCS+= buildinf.h openssl/opensslconf.h +SRCS+= buildinf.h CLEANDIRS= openssl CLEANFILES= buildinf.h opensslconf.h opensslconf.h.tmp @@ -440,9 +440,12 @@ buildinf.h: echo "static const char compiler_flags[] = \"compiler: ${COMPILER_TYPE}\";" ) \ > ${.TARGET} -openssl/opensslconf.h: opensslconf.h +beforedepend: openssl_opensslconf.h +beforebuild: openssl_opensslconf.h + +openssl_opensslconf.h: opensslconf.h mkdir -p openssl - ln -fs ${.OBJDIR}/${.ALLSRC} ${.TARGET} + ln -fs ${.OBJDIR}/${.ALLSRC} openssl/${.ALLSRC} opensslconf.h: opensslconf.h.in .if defined(ASM_${MACHINE_CPUARCH}) From owner-svn-src-projects@freebsd.org Tue Sep 25 22:21:37 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 974461091DA9 for ; Tue, 25 Sep 2018 22:21:37 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D00383C5B; Tue, 25 Sep 2018 22:21:37 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4812669AF; Tue, 25 Sep 2018 22:21:37 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8PMLb1L013367; Tue, 25 Sep 2018 22:21:37 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8PMLabO013366; Tue, 25 Sep 2018 22:21:36 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201809252221.w8PMLabO013366@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 25 Sep 2018 22:21:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338936 - in projects/openssl111/secure: lib/libssl usr.bin/openssl X-SVN-Group: projects X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: in projects/openssl111/secure: lib/libssl usr.bin/openssl X-SVN-Commit-Revision: 338936 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Sep 2018 22:21:37 -0000 Author: jkim Date: Tue Sep 25 22:21:36 2018 New Revision: 338936 URL: https://svnweb.freebsd.org/changeset/base/338936 Log: Remove MD dirdeps from Makefile.depend. It can't be right. :-( Modified: projects/openssl111/secure/lib/libssl/Makefile.depend projects/openssl111/secure/usr.bin/openssl/Makefile.depend Modified: projects/openssl111/secure/lib/libssl/Makefile.depend ============================================================================== --- projects/openssl111/secure/lib/libssl/Makefile.depend Tue Sep 25 22:15:47 2018 (r338935) +++ projects/openssl111/secure/lib/libssl/Makefile.depend Tue Sep 25 22:21:36 2018 (r338936) @@ -9,7 +9,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ secure/lib/libcrypto \ - secure/lib/libcrypto/openssl.amd64 \ .include Modified: projects/openssl111/secure/usr.bin/openssl/Makefile.depend ============================================================================== --- projects/openssl111/secure/usr.bin/openssl/Makefile.depend Tue Sep 25 22:15:47 2018 (r338935) +++ projects/openssl111/secure/usr.bin/openssl/Makefile.depend Tue Sep 25 22:21:36 2018 (r338936) @@ -11,7 +11,6 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/msun \ secure/lib/libcrypto \ - secure/lib/libcrypto/openssl.amd64 \ secure/lib/libssl \ From owner-svn-src-projects@freebsd.org Thu Sep 27 20:00:14 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA18510B7A01 for ; Thu, 27 Sep 2018 20:00:13 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6D56C74676; Thu, 27 Sep 2018 20:00:13 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 49D8E2A78; Thu, 27 Sep 2018 20:00:13 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8RK0DQq016580; Thu, 27 Sep 2018 20:00:13 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8RK07k3016551; Thu, 27 Sep 2018 20:00:07 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201809272000.w8RK07k3016551@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 27 Sep 2018 20:00:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338988 - in projects/clang700-import: . contrib/bmake contrib/libarchive contrib/libarchive/libarchive contrib/libarchive/libarchive/test contrib/libarchive/test_utils contrib/mdocml c... X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in projects/clang700-import: . contrib/bmake contrib/libarchive contrib/libarchive/libarchive contrib/libarchive/libarchive/test contrib/libarchive/test_utils contrib/mdocml crypto/openssh etc gnu/usr... X-SVN-Commit-Revision: 338988 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Sep 2018 20:00:14 -0000 Author: dim Date: Thu Sep 27 20:00:07 2018 New Revision: 338988 URL: https://svnweb.freebsd.org/changeset/base/338988 Log: Merge ^/head r338731 through r338987. Added: - copied from r338987, head/contrib/mandoc/ projects/clang700-import/lib/lib80211/regdomain.xml - copied unchanged from r338987, head/lib/lib80211/regdomain.xml projects/clang700-import/lib/libalias/libalias/libalias.conf - copied unchanged from r338987, head/lib/libalias/libalias/libalias.conf projects/clang700-import/lib/libc/posix1e/mac.conf - copied unchanged from r338987, head/lib/libc/posix1e/mac.conf projects/clang700-import/lib/libc/rpc/netconfig - copied unchanged from r338987, head/lib/libc/rpc/netconfig projects/clang700-import/lib/libc/rpc/rpc - copied unchanged from r338987, head/lib/libc/rpc/rpc projects/clang700-import/lib/libopie/opieaccess - copied unchanged from r338987, head/lib/libopie/opieaccess projects/clang700-import/lib/libsmb/nsmb.conf - copied unchanged from r338987, head/lib/libsmb/nsmb.conf projects/clang700-import/lib/libwrap/hosts.allow - copied unchanged from r338987, head/lib/libwrap/hosts.allow projects/clang700-import/libexec/rtld-elf/libmap.conf - copied unchanged from r338987, head/libexec/rtld-elf/libmap.conf projects/clang700-import/sbin/bsdlabel/disktab - copied unchanged from r338987, head/sbin/bsdlabel/disktab projects/clang700-import/share/man/man4/iflib.4 - copied unchanged from r338987, head/share/man/man4/iflib.4 projects/clang700-import/tools/build/options/WITH_HYPERV - copied unchanged from r338987, head/tools/build/options/WITH_HYPERV projects/clang700-import/usr.bin/tip/tip/phones - copied unchanged from r338987, head/usr.bin/tip/tip/phones projects/clang700-import/usr.bin/tip/tip/remote - copied unchanged from r338987, head/usr.bin/tip/tip/remote projects/clang700-import/usr.sbin/amd/amd/amd.map - copied unchanged from r338987, head/usr.sbin/amd/amd/amd.map projects/clang700-import/usr.sbin/lpr/lpd/hosts.lpd - copied unchanged from r338987, head/usr.sbin/lpr/lpd/hosts.lpd projects/clang700-import/usr.sbin/lpr/lpd/printcap - copied unchanged from r338987, head/usr.sbin/lpr/lpd/printcap Directory Properties: projects/clang700-import/contrib/mandoc/ (props changed) Replaced: projects/clang700-import/sbin/dhclient/dhclient.conf - copied unchanged from r338987, head/sbin/dhclient/dhclient.conf Deleted: projects/clang700-import/contrib/mdocml/ projects/clang700-import/etc/amd.map projects/clang700-import/etc/dhclient.conf projects/clang700-import/etc/disktab projects/clang700-import/etc/hosts.allow projects/clang700-import/etc/hosts.lpd projects/clang700-import/etc/libalias.conf projects/clang700-import/etc/libmap.conf projects/clang700-import/etc/mac.conf projects/clang700-import/etc/netconfig projects/clang700-import/etc/nsmb.conf projects/clang700-import/etc/opieaccess projects/clang700-import/etc/phones projects/clang700-import/etc/printcap projects/clang700-import/etc/regdomain.xml projects/clang700-import/etc/remote projects/clang700-import/etc/rpc Modified: projects/clang700-import/UPDATING projects/clang700-import/contrib/bmake/make.1 projects/clang700-import/contrib/libarchive/README.md projects/clang700-import/contrib/libarchive/libarchive/archive_acl.c projects/clang700-import/contrib/libarchive/libarchive/archive_cryptor.c projects/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_ar.c projects/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_zip.c projects/clang700-import/contrib/libarchive/libarchive/test/test_sparse_basic.c projects/clang700-import/contrib/libarchive/test_utils/test_main.c projects/clang700-import/crypto/openssh/ssh.c projects/clang700-import/crypto/openssh/sshd.c projects/clang700-import/crypto/openssh/version.h projects/clang700-import/etc/Makefile projects/clang700-import/gnu/usr.bin/binutils/as/config.h projects/clang700-import/gnu/usr.bin/binutils/ld/config.h projects/clang700-import/gnu/usr.bin/binutils/libbinutils/config.h projects/clang700-import/gnu/usr.bin/binutils/libiberty/config.h projects/clang700-import/gnu/usr.bin/cc/libiberty/config.h projects/clang700-import/gnu/usr.bin/gdb/arch/amd64/config.h projects/clang700-import/gnu/usr.bin/gdb/arch/arm/config.h projects/clang700-import/gnu/usr.bin/gdb/arch/i386/config.h projects/clang700-import/gnu/usr.bin/gdb/arch/mips/config.h projects/clang700-import/gnu/usr.bin/gdb/arch/powerpc/config.h projects/clang700-import/gnu/usr.bin/gdb/arch/powerpc64/config.h projects/clang700-import/gnu/usr.bin/gdb/arch/sparc64/config.h projects/clang700-import/include/time.h projects/clang700-import/lib/lib80211/Makefile projects/clang700-import/lib/libalias/libalias/Makefile projects/clang700-import/lib/libc/Makefile projects/clang700-import/lib/libc/amd64/string/bcmp.S projects/clang700-import/lib/libc/amd64/string/memcmp.S projects/clang700-import/lib/libc/posix1e/Makefile.inc projects/clang700-import/lib/libc/rpc/Makefile.inc projects/clang700-import/lib/libopie/Makefile projects/clang700-import/lib/libsmb/Makefile projects/clang700-import/lib/libwrap/Makefile projects/clang700-import/libexec/rtld-elf/Makefile projects/clang700-import/libexec/rtld-elf/libmap.c projects/clang700-import/libexec/rtld-elf/powerpc/rtld_machdep.h projects/clang700-import/libexec/rtld-elf/rtld.c projects/clang700-import/release/scripts/pkg-stage.sh projects/clang700-import/sbin/bsdlabel/Makefile projects/clang700-import/sbin/devd/devd.cc projects/clang700-import/sbin/devd/devd.hh projects/clang700-import/sbin/dhclient/Makefile projects/clang700-import/sbin/ifconfig/ifipsec.c projects/clang700-import/sbin/init/rc.d/ldconfig projects/clang700-import/sbin/ipfw/ipfw.8 projects/clang700-import/sbin/ipfw/ipfw2.c projects/clang700-import/sbin/sysctl/sysctl.8 projects/clang700-import/secure/usr.bin/openssl/Makefile projects/clang700-import/share/man/man4/Makefile projects/clang700-import/share/man/man4/bnxt.4 projects/clang700-import/share/man/man4/cxgbe.4 projects/clang700-import/share/man/man4/ddb.4 projects/clang700-import/share/man/man4/em.4 projects/clang700-import/share/man/man5/make.conf.5 projects/clang700-import/share/man/man5/msdosfs.5 projects/clang700-import/share/man/man5/src.conf.5 projects/clang700-import/share/man/man9/iflib.9 projects/clang700-import/share/mk/bsd.dirs.mk projects/clang700-import/share/mk/bsd.progs.mk projects/clang700-import/share/mk/bsd.subdir.mk projects/clang700-import/share/mk/bsd.sys.mk projects/clang700-import/share/mk/src.opts.mk projects/clang700-import/stand/lua/password.lua projects/clang700-import/sys/amd64/amd64/copyout.c projects/clang700-import/sys/amd64/amd64/pmap.c projects/clang700-import/sys/amd64/amd64/support.S projects/clang700-import/sys/amd64/amd64/trap.c projects/clang700-import/sys/amd64/include/pmap.h projects/clang700-import/sys/amd64/include/vmm.h projects/clang700-import/sys/amd64/vmm/intel/vmx.c projects/clang700-import/sys/amd64/vmm/vmm.c projects/clang700-import/sys/arm64/arm64/identcpu.c projects/clang700-import/sys/arm64/arm64/machdep.c projects/clang700-import/sys/arm64/arm64/undefined.c projects/clang700-import/sys/arm64/include/undefined.h projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/clang700-import/sys/conf/files projects/clang700-import/sys/conf/files.arm projects/clang700-import/sys/conf/files.arm64 projects/clang700-import/sys/conf/files.i386 projects/clang700-import/sys/conf/files.mips projects/clang700-import/sys/conf/files.powerpc projects/clang700-import/sys/conf/files.riscv projects/clang700-import/sys/conf/files.sparc64 projects/clang700-import/sys/conf/kern.pre.mk projects/clang700-import/sys/conf/newvers.sh projects/clang700-import/sys/crypto/ccp/ccp.c projects/clang700-import/sys/dev/aac/aac_pci.c projects/clang700-import/sys/dev/aacraid/aacraid_pci.c projects/clang700-import/sys/dev/adlink/adlink.c projects/clang700-import/sys/dev/ae/if_ae.c projects/clang700-import/sys/dev/age/if_age.c projects/clang700-import/sys/dev/ahci/ahci_pci.c projects/clang700-import/sys/dev/alc/if_alc.c projects/clang700-import/sys/dev/ale/if_ale.c projects/clang700-import/sys/dev/amdsmn/amdsmn.c projects/clang700-import/sys/dev/amdtemp/amdtemp.c projects/clang700-import/sys/dev/amr/amr_pci.c projects/clang700-import/sys/dev/an/if_an_pci.c projects/clang700-import/sys/dev/bce/if_bce.c projects/clang700-import/sys/dev/bfe/if_bfe.c projects/clang700-import/sys/dev/bge/if_bge.c projects/clang700-import/sys/dev/bwi/if_bwi_pci.c projects/clang700-import/sys/dev/bwn/if_bwn_pci.c projects/clang700-import/sys/dev/bxe/bxe.c projects/clang700-import/sys/dev/cas/if_cas.c projects/clang700-import/sys/dev/ciss/ciss.c projects/clang700-import/sys/dev/cxgb/cxgb_main.c projects/clang700-import/sys/dev/cxgbe/adapter.h projects/clang700-import/sys/dev/cxgbe/common/common.h projects/clang700-import/sys/dev/cxgbe/common/t4_hw.c projects/clang700-import/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/clang700-import/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/clang700-import/sys/dev/cxgbe/firmware/t6fw_cfg.txt projects/clang700-import/sys/dev/cxgbe/osdep.h projects/clang700-import/sys/dev/cxgbe/t4_filter.c projects/clang700-import/sys/dev/cxgbe/t4_l2t.c projects/clang700-import/sys/dev/cxgbe/t4_l2t.h projects/clang700-import/sys/dev/cxgbe/t4_main.c projects/clang700-import/sys/dev/cxgbe/tom/t4_cpl_io.c projects/clang700-import/sys/dev/dc/if_dc.c projects/clang700-import/sys/dev/drm2/drm_os_freebsd.c projects/clang700-import/sys/dev/drm2/i915/i915_drv.c projects/clang700-import/sys/dev/drm2/i915/intel_ringbuffer.c projects/clang700-import/sys/dev/drm2/radeon/radeon_drv.c projects/clang700-import/sys/dev/e1000/if_em.c projects/clang700-import/sys/dev/ed/if_ed_pci.c projects/clang700-import/sys/dev/ena/ena.c projects/clang700-import/sys/dev/et/if_et.c projects/clang700-import/sys/dev/ffec/if_ffec.c projects/clang700-import/sys/dev/fxp/if_fxp.c projects/clang700-import/sys/dev/gem/if_gem_pci.c projects/clang700-import/sys/dev/ida/ida_pci.c projects/clang700-import/sys/dev/intpm/intpm.c projects/clang700-import/sys/dev/ioat/ioat.c projects/clang700-import/sys/dev/ipw/if_ipw.c projects/clang700-import/sys/dev/iwn/if_iwn.c projects/clang700-import/sys/dev/ixgbe/if_ix.c projects/clang700-import/sys/dev/ixgbe/if_ixv.c projects/clang700-import/sys/dev/ixl/if_ixl.c projects/clang700-import/sys/dev/ixl/if_ixlv.c projects/clang700-import/sys/dev/mfi/mfi_pci.c projects/clang700-import/sys/dev/mpr/mpr_pci.c projects/clang700-import/sys/dev/mps/mps_pci.c projects/clang700-import/sys/dev/mvs/mvs_pci.c projects/clang700-import/sys/dev/my/if_my.c projects/clang700-import/sys/dev/ncr/ncr.c projects/clang700-import/sys/dev/ntb/ntb_hw/ntb_hw_intel.c projects/clang700-import/sys/dev/oce/oce_if.c projects/clang700-import/sys/dev/ofw/ofw_bus_subr.h projects/clang700-import/sys/dev/pccard/pccardvar.h projects/clang700-import/sys/dev/pccbb/pccbb_pci.c projects/clang700-import/sys/dev/pci/pcireg.h projects/clang700-import/sys/dev/pci/pcivar.h projects/clang700-import/sys/dev/pcn/if_pcn.c projects/clang700-import/sys/dev/puc/puc_pci.c projects/clang700-import/sys/dev/ral/if_ral_pci.c projects/clang700-import/sys/dev/rl/if_rl.c projects/clang700-import/sys/dev/spibus/spi.h projects/clang700-import/sys/dev/uart/uart_bus_pccard.c projects/clang700-import/sys/dev/uart/uart_bus_pci.c projects/clang700-import/sys/dev/usb/usbdi.h projects/clang700-import/sys/dev/xl/if_xl.c projects/clang700-import/sys/geom/raid/tr_raid0.c projects/clang700-import/sys/i386/i386/npx.c projects/clang700-import/sys/i386/i386/pmap.c projects/clang700-import/sys/i386/i386/trap.c projects/clang700-import/sys/i386/i386/vm_machdep.c projects/clang700-import/sys/i386/include/pmap.h projects/clang700-import/sys/isa/isavar.h projects/clang700-import/sys/kern/kern_context.c projects/clang700-import/sys/kern/kern_descrip.c projects/clang700-import/sys/kern/kern_malloc.c projects/clang700-import/sys/kern/subr_vmem.c projects/clang700-import/sys/kern/sys_generic.c projects/clang700-import/sys/kern/vfs_lookup.c projects/clang700-import/sys/kern/vfs_syscalls.c projects/clang700-import/sys/net/if_var.h projects/clang700-import/sys/net/if_vlan.c projects/clang700-import/sys/net/iflib.c projects/clang700-import/sys/net/iflib.h projects/clang700-import/sys/netinet/ip_encap.h projects/clang700-import/sys/netinet/sctp_auth.c projects/clang700-import/sys/netinet/sctp_auth.h projects/clang700-import/sys/netinet/sctp_input.c projects/clang700-import/sys/netinet/sctp_output.c projects/clang700-import/sys/netinet/sctputil.c projects/clang700-import/sys/netinet/tcp_syncache.c projects/clang700-import/sys/netinet6/icmp6.c projects/clang700-import/sys/netinet6/in6_pcb.c projects/clang700-import/sys/netinet6/udp6_usrreq.c projects/clang700-import/sys/netipsec/key.c projects/clang700-import/sys/netipsec/key.h projects/clang700-import/sys/netipsec/subr_ipsec.c projects/clang700-import/sys/netipsec/xform.h projects/clang700-import/sys/opencrypto/cryptosoft.c projects/clang700-import/sys/opencrypto/cryptosoft.h projects/clang700-import/sys/powerpc/ofw/ofw_machdep.c projects/clang700-import/sys/riscv/include/fpe.h projects/clang700-import/sys/riscv/riscv/machdep.c projects/clang700-import/sys/riscv/riscv/pmap.c projects/clang700-import/sys/riscv/riscv/swtch.S projects/clang700-import/sys/riscv/riscv/trap.c projects/clang700-import/sys/sys/malloc.h projects/clang700-import/sys/sys/module.h projects/clang700-import/sys/sys/racct.h projects/clang700-import/sys/sys/signalvar.h projects/clang700-import/sys/sys/user.h projects/clang700-import/sys/sys/vmmeter.h projects/clang700-import/sys/ufs/ffs/ffs_softdep.c projects/clang700-import/sys/ufs/ufs/ufs_quota.c projects/clang700-import/sys/ufs/ufs/ufs_vfsops.c projects/clang700-import/sys/ufs/ufs/ufs_vnops.c projects/clang700-import/sys/vm/swap_pager.c projects/clang700-import/sys/vm/uma_core.c projects/clang700-import/sys/vm/vm_domainset.c projects/clang700-import/sys/vm/vm_glue.c projects/clang700-import/sys/vm/vm_init.c projects/clang700-import/sys/vm/vm_kern.c projects/clang700-import/sys/vm/vm_kern.h projects/clang700-import/sys/vm/vm_mmap.c projects/clang700-import/sys/vm/vm_page.c projects/clang700-import/sys/vm/vm_phys.c projects/clang700-import/sys/x86/acpica/srat.c projects/clang700-import/sys/x86/iommu/intel_utils.c projects/clang700-import/tools/build/mk/OptionalObsoleteFiles.inc projects/clang700-import/usr.bin/bmake/Makefile.config projects/clang700-import/usr.bin/locate/locate/Makefile projects/clang700-import/usr.bin/mail/Makefile projects/clang700-import/usr.bin/mandoc/Makefile projects/clang700-import/usr.bin/tip/tip/Makefile projects/clang700-import/usr.sbin/amd/amd/Makefile projects/clang700-import/usr.sbin/bsdinstall/scripts/config projects/clang700-import/usr.sbin/bsdinstall/scripts/hardening projects/clang700-import/usr.sbin/chown/chown.c projects/clang700-import/usr.sbin/cxgbetool/cxgbetool.8 projects/clang700-import/usr.sbin/cxgbetool/cxgbetool.c projects/clang700-import/usr.sbin/kldxref/kldxref.c projects/clang700-import/usr.sbin/lpr/lpd/Makefile projects/clang700-import/usr.sbin/pmccontrol/pmccontrol.c Directory Properties: projects/clang700-import/ (props changed) projects/clang700-import/contrib/bmake/ (props changed) projects/clang700-import/contrib/libarchive/ (props changed) projects/clang700-import/crypto/openssh/ (props changed) projects/clang700-import/gnu/usr.bin/binutils/ (props changed) projects/clang700-import/gnu/usr.bin/gdb/ (props changed) projects/clang700-import/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/clang700-import/UPDATING ============================================================================== --- projects/clang700-import/UPDATING Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/UPDATING Thu Sep 27 20:00:07 2018 (r338988) @@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20180913: + Reproducible build mode is now on by default, in preparation for + FreeBSD 12.0. This eliminates build metadata such as the user, + host, and time from the kernel (and uname), unless the working tree + corresponds to a modified checkout from a version control system. + The previous behavior can be obtained by setting the /etc/src.conf + knob WITHOUT_REPRODUCIBLE_BUILD. + 20180826: The Yarrow CSPRNG has been removed from the kernel as it has not been supported by its designers since at least 2003. Fortuna has been the @@ -170,6 +178,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: need to be rebuilt. r335018 did a __FreeBSD_version bump for this. 20180530: + As of r334391 lld is the default amd64 system linker; it is installed + as /usr/bin/ld. Kernel build workarounds (see 20180510 entry) are no + longer necessary. + +20180530: The kernel / userland interface for devinfo changed, so you'll need a new kernel and userland as a pair for it to work (rebuilding lib/libdevinfo is all that's required). devinfo and devmatch will @@ -195,6 +208,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: way requires LD=ld.lld on the command line (or LD=/usr/local/bin/ld for binutils port/package). lld will soon be default, and this requirement will go away. + + NOTE: As of r334391 lld is the default system linker on amd64, and no + workaround is necessary. 20180508: The nxge(4) driver has been removed. This driver was for PCI-X 10g Modified: projects/clang700-import/contrib/bmake/make.1 ============================================================================== --- projects/clang700-import/contrib/bmake/make.1 Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/bmake/make.1 Thu Sep 27 20:00:07 2018 (r338988) @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd June 22, 2017 +.Dd September 27, 2018 .Dt MAKE 1 .Os .Sh NAME @@ -796,7 +796,7 @@ Tells whether to pass the descriptors of the job token queue even if the target is not tagged with .Ic .MAKE -The default is +The default is .Ql Pa yes for backwards compatability with .Fx 9.0 @@ -2385,7 +2385,8 @@ Basic use of suffix rules (for files only in the curre not trying to chain transformations together, etc.) is also reasonably portable. .Sh SEE ALSO -.Xr mkdep 1 +.Xr mkdep 1 , +.Xr style.Makefile 5 .Sh HISTORY A .Nm Modified: projects/clang700-import/contrib/libarchive/README.md ============================================================================== --- projects/clang700-import/contrib/libarchive/README.md Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/libarchive/README.md Thu Sep 27 20:00:07 2018 (r338988) @@ -78,7 +78,6 @@ Currently, the library automatically detects and reads * POSIX pax interchange format * POSIX octet-oriented cpio * SVR4 ASCII cpio - * POSIX octet-oriented cpio * Binary cpio (big-endian or little-endian) * ISO9660 CD-ROM images (with optional Rockridge or Joliet extensions) * ZIP archives (with uncompressed or "deflate" compressed entries, including support for encrypted Zip archives) Modified: projects/clang700-import/contrib/libarchive/libarchive/archive_acl.c ============================================================================== --- projects/clang700-import/contrib/libarchive/libarchive/archive_acl.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/libarchive/libarchive/archive_acl.c Thu Sep 27 20:00:07 2018 (r338988) @@ -2058,6 +2058,12 @@ next_field(const char **p, const char **start, } *sep = **p; + /* If the field is only whitespace, bail out now. */ + if (**p == '\0') { + *end = *p; + return; + } + /* Trim trailing whitespace to locate end of field. */ *end = *p - 1; while (**end == ' ' || **end == '\t' || **end == '\n') { Modified: projects/clang700-import/contrib/libarchive/libarchive/archive_cryptor.c ============================================================================== --- projects/clang700-import/contrib/libarchive/libarchive/archive_cryptor.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/libarchive/libarchive/archive_cryptor.c Thu Sep 27 20:00:07 2018 (r338988) @@ -316,7 +316,14 @@ aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *k memcpy(ctx->key, key, key_len); memset(ctx->nonce, 0, sizeof(ctx->nonce)); ctx->encr_pos = AES_BLOCK_SIZE; +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + if (!EVP_CIPHER_CTX_reset(ctx->ctx)) { + EVP_CIPHER_CTX_free(ctx->ctx); + ctx->ctx = NULL; + } +#else EVP_CIPHER_CTX_init(ctx->ctx); +#endif return 0; } Modified: projects/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_ar.c ============================================================================== --- projects/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_ar.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_ar.c Thu Sep 27 20:00:07 2018 (r338988) @@ -459,6 +459,7 @@ ar_parse_common_header(struct ar *ar, struct archive_e uint64_t n; /* Copy remaining header */ + archive_entry_set_filetype(entry, AE_IFREG); archive_entry_set_mtime(entry, (time_t)ar_atol10(h + AR_date_offset, AR_date_size), 0L); archive_entry_set_uid(entry, Modified: projects/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_zip.c ============================================================================== --- projects/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_zip.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_zip.c Thu Sep 27 20:00:07 2018 (r338988) @@ -2708,6 +2708,11 @@ slurp_central_directory(struct archive_read *a, struct return ARCHIVE_FATAL; zip_entry = calloc(1, sizeof(struct zip_entry)); + if (zip_entry == NULL) { + archive_set_error(&a->archive, ENOMEM, + "Can't allocate zip entry"); + return ARCHIVE_FATAL; + } zip_entry->next = zip->zip_entries; zip_entry->flags |= LA_FROM_CENTRAL_DIRECTORY; zip->zip_entries = zip_entry; Modified: projects/clang700-import/contrib/libarchive/libarchive/test/test_sparse_basic.c ============================================================================== --- projects/clang700-import/contrib/libarchive/libarchive/test/test_sparse_basic.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/libarchive/libarchive/test/test_sparse_basic.c Thu Sep 27 20:00:07 2018 (r338988) @@ -422,6 +422,7 @@ verify_sparse_file(struct archive *a, const char *path assert(sparse->type == END); assertEqualInt(expected_offset, archive_entry_size(ae)); + failure(path); assertEqualInt(holes_seen, expected_holes); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); @@ -457,6 +458,7 @@ verify_sparse_file2(struct archive *a, const char *pat /* Verify the number of holes only, not its offset nor its * length because those alignments are deeply dependence on * its filesystem. */ + failure(path); assertEqualInt(blocks, archive_entry_sparse_count(ae)); archive_entry_free(ae); } Modified: projects/clang700-import/contrib/libarchive/test_utils/test_main.c ============================================================================== --- projects/clang700-import/contrib/libarchive/test_utils/test_main.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/libarchive/test_utils/test_main.c Thu Sep 27 20:00:07 2018 (r338988) @@ -2166,7 +2166,7 @@ void assertVersion(const char *prog, const char *base) /* Skip arbitrary third-party version numbers. */ while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || - isalnum(*q))) { + isalnum((unsigned char)*q))) { ++q; --s; } Modified: projects/clang700-import/crypto/openssh/ssh.c ============================================================================== --- projects/clang700-import/crypto/openssh/ssh.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/crypto/openssh/ssh.c Thu Sep 27 20:00:07 2018 (r338988) @@ -811,10 +811,10 @@ main(int ac, char **av) *options.version_addendum != '\0') fprintf(stderr, "%s %s, %s\n", SSH_RELEASE, options.version_addendum, - OPENSSL_VERSION); + OPENSSL_VERSION_STRING); else fprintf(stderr, "%s, %s\n", SSH_RELEASE, - OPENSSL_VERSION); + OPENSSL_VERSION_STRING); if (opt == 'V') exit(0); break; @@ -1078,7 +1078,7 @@ main(int ac, char **av) if (debug_flag) /* version_addendum is always NULL at this point */ - logit("%s, %s", SSH_RELEASE, OPENSSL_VERSION); + logit("%s, %s", SSH_RELEASE, OPENSSL_VERSION_STRING); /* Parse the configuration files */ process_config_files(host_arg, pw, 0); Modified: projects/clang700-import/crypto/openssh/sshd.c ============================================================================== --- projects/clang700-import/crypto/openssh/sshd.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/crypto/openssh/sshd.c Thu Sep 27 20:00:07 2018 (r338988) @@ -939,10 +939,10 @@ usage(void) if (options.version_addendum && *options.version_addendum != '\0') fprintf(stderr, "%s %s, %s\n", SSH_RELEASE, - options.version_addendum, OPENSSL_VERSION); + options.version_addendum, OPENSSL_VERSION_STRING); else fprintf(stderr, "%s, %s\n", - SSH_RELEASE, OPENSSL_VERSION); + SSH_RELEASE, OPENSSL_VERSION_STRING); fprintf(stderr, "usage: sshd [-46DdeiqTt] [-C connection_spec] [-c host_cert_file]\n" " [-E log_file] [-f config_file] [-g login_grace_time]\n" Modified: projects/clang700-import/crypto/openssh/version.h ============================================================================== --- projects/clang700-import/crypto/openssh/version.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/crypto/openssh/version.h Thu Sep 27 20:00:07 2018 (r338988) @@ -9,7 +9,7 @@ #define SSH_VERSION_FREEBSD "FreeBSD-20180909" #ifdef WITH_OPENSSL -#define OPENSSL_VERSION SSLeay_version(SSLEAY_VERSION) +#define OPENSSL_VERSION_STRING SSLeay_version(SSLEAY_VERSION) #else -#define OPENSSL_VERSION "without OpenSSL" +#define OPENSSL_VERSION_STRING "without OpenSSL" #endif Modified: projects/clang700-import/etc/Makefile ============================================================================== --- projects/clang700-import/etc/Makefile Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/etc/Makefile Thu Sep 27 20:00:07 2018 (r338988) @@ -13,52 +13,18 @@ SUBDIR+=sendmail .endif BIN1= \ - dhclient.conf \ - disktab \ group \ - hosts.allow \ - libalias.conf \ - libmap.conf \ login.access \ - mac.conf \ - netconfig \ - phones \ rc.bsdextended \ rc.firewall \ - remote \ - rpc \ termcap.small # NB: keep these sorted by MK_* knobs -.if ${MK_AMD} != "no" -BIN1+= amd.map -.endif - -.if ${MK_LOCATE} != "no" -BIN1+= ${SRCTOP}/usr.bin/locate/locate/locate.rc -.endif - -.if ${MK_LPR} != "no" -BIN1+= hosts.lpd printcap -.endif - -.if ${MK_MAIL} != "no" -BIN1+= ${SRCTOP}/usr.bin/mail/misc/mail.rc -.endif - -.if ${MK_OPENSSL} != "no" -SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf -.endif - .if ${MK_SENDMAIL} != "no" BIN1+= rc.sendmail .endif -.if ${MK_WIRELESS} != "no" -BIN1+= regdomain.xml -.endif - .if ${MK_SENDMAIL} == "no" ETCMAIL=mailer.conf aliases .else @@ -99,7 +65,7 @@ distribution: ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${BIN1} ${DESTDIR}/etc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ - master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; + master.passwd ${DESTDIR}/etc; .if ${MK_TCSH} == "no" sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd @@ -124,10 +90,6 @@ distribution: .if ${MK_SENDMAIL} != "no" ${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution .endif -.if ${MK_OPENSSL} != "no" - cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${SSL} ${DESTDIR}/etc/ssl -.endif .if ${MK_KERBEROS} != "no" cd ${.CURDIR}/root; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ @@ -235,7 +197,7 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY etc-examples: ${META_DEPS} cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${BIN1} ${BIN2} nsmb.conf opieaccess \ + ${BIN1} ${BIN2} \ ${DESTDIR}${SHAREDIR}/examples/etc .include Modified: projects/clang700-import/gnu/usr.bin/binutils/as/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/binutils/as/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/binutils/as/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -69,7 +69,7 @@ /* #undef HAVE_REMOVE */ /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define to 1 if you have the header file. */ #define HAVE_STDARG_H 1 Modified: projects/clang700-import/gnu/usr.bin/binutils/ld/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/binutils/ld/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/binutils/ld/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -65,7 +65,7 @@ #define HAVE_REALPATH 1 /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 Modified: projects/clang700-import/gnu/usr.bin/binutils/libbinutils/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/binutils/libbinutils/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/binutils/libbinutils/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -104,7 +104,7 @@ #define HAVE_MKSTEMP 1 /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define to 1 if you have the `setmode' function. */ #define HAVE_SETMODE 1 Modified: projects/clang700-import/gnu/usr.bin/binutils/libiberty/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/binutils/libiberty/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/binutils/libiberty/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -188,7 +188,7 @@ #define HAVE_RINDEX 1 /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 Modified: projects/clang700-import/gnu/usr.bin/cc/libiberty/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/cc/libiberty/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/cc/libiberty/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -187,7 +187,7 @@ #define HAVE_RINDEX 1 /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 Modified: projects/clang700-import/gnu/usr.bin/gdb/arch/amd64/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/gdb/arch/amd64/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/gdb/arch/amd64/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Modified: projects/clang700-import/gnu/usr.bin/gdb/arch/arm/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/gdb/arch/arm/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/gdb/arch/arm/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -239,7 +239,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Modified: projects/clang700-import/gnu/usr.bin/gdb/arch/i386/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/gdb/arch/i386/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/gdb/arch/i386/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Modified: projects/clang700-import/gnu/usr.bin/gdb/arch/mips/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/gdb/arch/mips/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/gdb/arch/mips/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Modified: projects/clang700-import/gnu/usr.bin/gdb/arch/powerpc/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/gdb/arch/powerpc/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/gdb/arch/powerpc/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Modified: projects/clang700-import/gnu/usr.bin/gdb/arch/powerpc64/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/gdb/arch/powerpc64/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/gdb/arch/powerpc64/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Modified: projects/clang700-import/gnu/usr.bin/gdb/arch/sparc64/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/gdb/arch/sparc64/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/gdb/arch/sparc64/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Modified: projects/clang700-import/include/time.h ============================================================================== --- projects/clang700-import/include/time.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/include/time.h Thu Sep 27 20:00:07 2018 (r338988) @@ -207,9 +207,13 @@ time_t posix2time(time_t t); #include #endif +#if defined(__BSD_VISIBLE) || __ISO_C_VISIBLE >= 2011 || \ + (defined(cplusplus) && cplusplus >= 201703) +#include /* ISO/IEC 9899:201x 7.27.2.5 The timespec_get function */ #define TIME_UTC 1 /* time elapsed since epoch */ int timespec_get(struct timespec *ts, int base); +#endif __END_DECLS Modified: projects/clang700-import/lib/lib80211/Makefile ============================================================================== --- projects/clang700-import/lib/lib80211/Makefile Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/lib/lib80211/Makefile Thu Sep 27 20:00:07 2018 (r338988) @@ -1,5 +1,6 @@ # $FreeBSD$ +CONFS= regdomain.xml PACKAGE=lib${LIB} LIB= 80211 SHLIBDIR?= /lib Copied: projects/clang700-import/lib/lib80211/regdomain.xml (from r338987, head/lib/lib80211/regdomain.xml) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang700-import/lib/lib80211/regdomain.xml Thu Sep 27 20:00:07 2018 (r338988, copy of r338987, head/lib/lib80211/regdomain.xml) @@ -0,0 +1,1943 @@ + + + + + + + + + + + DEBUG + 0x1ff + + + + FCC + 0x10 + + + + + 30 + IEEE80211_CHAN_B + + + + + + 30 + IEEE80211_CHAN_G + + + + + + 17 + + + + 23 + + + + 23 + IEEE80211_CHAN_PASSIVE + + + + + + 30 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT20 + + + + 30 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT40 + + + + + + 17 + IEEE80211_CHAN_HT20 + + + + 17 + IEEE80211_CHAN_HT40 + + + + 23 + IEEE80211_CHAN_HT20 + + + + 23 + IEEE80211_CHAN_HT40 + + + + + + + + FCC3 + 0x3a + + + + 30 + IEEE80211_CHAN_B + + + + + + 30 + IEEE80211_CHAN_G + + + + + + 17 + + + + 23 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + + + 30 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT20 + + + + 30 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT40 + + + + + + 17 + IEEE80211_CHAN_HT20 + + + + 17 + IEEE80211_CHAN_HT40 + + + + 23 + IEEE80211_CHAN_HT20 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_HT20 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_HT20 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_HT20 + + + + 23 + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + + + + + FCC4 + 0x12 + + + + 30 + IEEE80211_CHAN_B + + + + + + 30 + IEEE80211_CHAN_G + + + + + + 23 + + + + 27 + + + + 30 + + + + + + 30 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT20 + + + + 30 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT40 + + + + + + JAPAN + 0x40 + + + + + 23 + IEEE80211_CHAN_B + + + + 23 + IEEE80211_CHAN_B + + + + + + 23 + IEEE80211_CHAN_G + + + + + + 23 + + + + 23 + + + + 23 + + + + 23 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + + + 23 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT20 + + + + 23 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT40 + + + + + + 23 + IEEE80211_CHAN_HT20 + + + + 23 + IEEE80211_CHAN_HT40 + + + + 23 + IEEE80211_CHAN_HT20 + + + + 23 + IEEE80211_CHAN_HT40 + + + + 23 + IEEE80211_CHAN_HT20 + + + + 23 + IEEE80211_CHAN_HT40 + + + + 23 + IEEE80211_CHAN_HT20 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_HT20 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + + + ETSI + 0x30 + + + + 30 + IEEE80211_CHAN_B + + + + + + 30 + IEEE80211_CHAN_G + + + + + + 17 + + + + 24 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + + + 30 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT20 + + + + 30 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT40 + + + + + + 17 + IEEE80211_CHAN_HT20 + + + + 17 + IEEE80211_CHAN_HT40 + + + + 24 + IEEE80211_CHAN_HT20 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 24 + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_HT20 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + 23 + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_PASSIVE + IEEE80211_CHAN_DFS + + + + + + + + ETSI2 + 0x32 + + + + 30 + IEEE80211_CHAN_B + + + + + + 30 + IEEE80211_CHAN_G + + + + + + 17 + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sat Sep 29 15:17:18 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4406910A3829 for ; Sat, 29 Sep 2018 15:17:18 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EC2B87D997; Sat, 29 Sep 2018 15:17:17 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E2F8125285; Sat, 29 Sep 2018 15:17:17 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8TFHH4A054690; Sat, 29 Sep 2018 15:17:17 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8TFHHgF054688; Sat, 29 Sep 2018 15:17:17 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201809291517.w8TFHHgF054688@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 29 Sep 2018 15:17:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r339014 - in projects/clang700-import: contrib/compiler-rt/lib/fuzzer contrib/compiler-rt/lib/fuzzer/afl contrib/compiler-rt/lib/fuzzer/dataflow contrib/compiler-rt/lib/fuzzer/scripts c... X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in projects/clang700-import: contrib/compiler-rt/lib/fuzzer contrib/compiler-rt/lib/fuzzer/afl contrib/compiler-rt/lib/fuzzer/dataflow contrib/compiler-rt/lib/fuzzer/scripts contrib/compiler-rt/lib/fu... X-SVN-Commit-Revision: 339014 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Sep 2018 15:17:18 -0000 Author: dim Date: Sat Sep 29 15:17:17 2018 New Revision: 339014 URL: https://svnweb.freebsd.org/changeset/base/339014 Log: Add compiler-rt's libFuzzer, not connected to buildworld yet. For now, the libraries can be built and installed using: cd /usr/src/lib/libclang_rt/fuzzer && \ make obj && \ make depend && \ make && \ sudo make install cd /usr/src/lib/libclang_rt/fuzzer_no_main && \ make obj && \ make depend && \ make && \ sudo make install See https://llvm.org/docs/LibFuzzer.html for more information. Added: - copied from r338988, vendor/compiler-rt/dist/lib/fuzzer/ projects/clang700-import/lib/libclang_rt/fuzzer/ projects/clang700-import/lib/libclang_rt/fuzzer/Makefile (contents, props changed) projects/clang700-import/lib/libclang_rt/fuzzer_no_main/ projects/clang700-import/lib/libclang_rt/fuzzer_no_main/Makefile (contents, props changed) Directory Properties: projects/clang700-import/contrib/compiler-rt/lib/fuzzer/ (props changed) Deleted: projects/clang700-import/contrib/compiler-rt/lib/fuzzer/CMakeLists.txt projects/clang700-import/contrib/compiler-rt/lib/fuzzer/afl/ projects/clang700-import/contrib/compiler-rt/lib/fuzzer/build.sh projects/clang700-import/contrib/compiler-rt/lib/fuzzer/dataflow/ projects/clang700-import/contrib/compiler-rt/lib/fuzzer/scripts/ projects/clang700-import/contrib/compiler-rt/lib/fuzzer/standalone/ projects/clang700-import/contrib/compiler-rt/lib/fuzzer/tests/ Added: projects/clang700-import/lib/libclang_rt/fuzzer/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang700-import/lib/libclang_rt/fuzzer/Makefile Sat Sep 29 15:17:17 2018 (r339014) @@ -0,0 +1,33 @@ +# $FreeBSD$ + +.include + +LIB= clang_rt.fuzzer-${CRTARCH} + +SRCS+= fuzzer/FuzzerCrossOver.cpp +SRCS+= fuzzer/FuzzerDataFlowTrace.cpp +SRCS+= fuzzer/FuzzerDriver.cpp +SRCS+= fuzzer/FuzzerExtFunctionsDlsym.cpp +SRCS+= fuzzer/FuzzerExtFunctionsDlsymWin.cpp +SRCS+= fuzzer/FuzzerExtFunctionsWeak.cpp +SRCS+= fuzzer/FuzzerExtraCounters.cpp +SRCS+= fuzzer/FuzzerIO.cpp +SRCS+= fuzzer/FuzzerIOPosix.cpp +SRCS+= fuzzer/FuzzerIOWindows.cpp +SRCS+= fuzzer/FuzzerLoop.cpp +SRCS+= fuzzer/FuzzerMain.cpp +SRCS+= fuzzer/FuzzerMerge.cpp +SRCS+= fuzzer/FuzzerMutate.cpp +SRCS+= fuzzer/FuzzerSHA1.cpp +SRCS+= fuzzer/FuzzerShmemFuchsia.cpp +SRCS+= fuzzer/FuzzerShmemPosix.cpp +SRCS+= fuzzer/FuzzerShmemWindows.cpp +SRCS+= fuzzer/FuzzerTracePC.cpp +SRCS+= fuzzer/FuzzerUtil.cpp +SRCS+= fuzzer/FuzzerUtilDarwin.cpp +SRCS+= fuzzer/FuzzerUtilFuchsia.cpp +SRCS+= fuzzer/FuzzerUtilLinux.cpp +SRCS+= fuzzer/FuzzerUtilPosix.cpp +SRCS+= fuzzer/FuzzerUtilWindows.cpp + +.include Added: projects/clang700-import/lib/libclang_rt/fuzzer_no_main/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang700-import/lib/libclang_rt/fuzzer_no_main/Makefile Sat Sep 29 15:17:17 2018 (r339014) @@ -0,0 +1,32 @@ +# $FreeBSD$ + +.include + +LIB= clang_rt.fuzzer_no_main-${CRTARCH} + +SRCS+= fuzzer/FuzzerCrossOver.cpp +SRCS+= fuzzer/FuzzerDataFlowTrace.cpp +SRCS+= fuzzer/FuzzerDriver.cpp +SRCS+= fuzzer/FuzzerExtFunctionsDlsym.cpp +SRCS+= fuzzer/FuzzerExtFunctionsDlsymWin.cpp +SRCS+= fuzzer/FuzzerExtFunctionsWeak.cpp +SRCS+= fuzzer/FuzzerExtraCounters.cpp +SRCS+= fuzzer/FuzzerIO.cpp +SRCS+= fuzzer/FuzzerIOPosix.cpp +SRCS+= fuzzer/FuzzerIOWindows.cpp +SRCS+= fuzzer/FuzzerLoop.cpp +SRCS+= fuzzer/FuzzerMerge.cpp +SRCS+= fuzzer/FuzzerMutate.cpp +SRCS+= fuzzer/FuzzerSHA1.cpp +SRCS+= fuzzer/FuzzerShmemFuchsia.cpp +SRCS+= fuzzer/FuzzerShmemPosix.cpp +SRCS+= fuzzer/FuzzerShmemWindows.cpp +SRCS+= fuzzer/FuzzerTracePC.cpp +SRCS+= fuzzer/FuzzerUtil.cpp +SRCS+= fuzzer/FuzzerUtilDarwin.cpp +SRCS+= fuzzer/FuzzerUtilFuchsia.cpp +SRCS+= fuzzer/FuzzerUtilLinux.cpp +SRCS+= fuzzer/FuzzerUtilPosix.cpp +SRCS+= fuzzer/FuzzerUtilWindows.cpp + +.include From owner-svn-src-projects@freebsd.org Sat Sep 29 15:18:23 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D82C810A384B for ; Sat, 29 Sep 2018 15:18:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 81D5F7DA83; Sat, 29 Sep 2018 15:18:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 79FDC25286; Sat, 29 Sep 2018 15:18:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8TFIMwF054811; Sat, 29 Sep 2018 15:18:22 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8TFIJx3054793; Sat, 29 Sep 2018 15:18:19 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201809291518.w8TFIJx3054793@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 29 Sep 2018 15:18:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r339015 - in projects/clang700-import: lib/libc/amd64/string lib/libusb sbin/init/rc.d sys/amd64/amd64 sys/arm64/arm64 sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/compat/freebsd3... X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in projects/clang700-import: lib/libc/amd64/string lib/libusb sbin/init/rc.d sys/amd64/amd64 sys/arm64/arm64 sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/compat/freebsd32 sys/conf sys/dev/pci sy... X-SVN-Commit-Revision: 339015 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Sep 2018 15:18:23 -0000 Author: dim Date: Sat Sep 29 15:18:18 2018 New Revision: 339015 URL: https://svnweb.freebsd.org/changeset/base/339015 Log: Merge ^/head r338988 through r339014. Modified: projects/clang700-import/lib/libc/amd64/string/bcopy.S projects/clang700-import/lib/libusb/libusb10_io.c projects/clang700-import/sbin/init/rc.d/ldconfig projects/clang700-import/sys/amd64/amd64/pmap.c projects/clang700-import/sys/amd64/amd64/support.S projects/clang700-import/sys/arm64/arm64/identcpu.c projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c projects/clang700-import/sys/compat/freebsd32/freebsd32_ioctl.c projects/clang700-import/sys/compat/freebsd32/freebsd32_ioctl.h projects/clang700-import/sys/compat/freebsd32/freebsd32_syscall.h projects/clang700-import/sys/compat/freebsd32/freebsd32_syscalls.c projects/clang700-import/sys/compat/freebsd32/freebsd32_sysent.c projects/clang700-import/sys/compat/freebsd32/syscalls.master projects/clang700-import/sys/conf/newvers.sh projects/clang700-import/sys/dev/pci/pci_user.c projects/clang700-import/sys/dev/sdhci/sdhci_acpi.c projects/clang700-import/sys/kern/init_sysent.c projects/clang700-import/sys/kern/syscalls.c projects/clang700-import/sys/kern/syscalls.master projects/clang700-import/sys/net/if.c projects/clang700-import/sys/net/if_tap.c projects/clang700-import/sys/net/if_tun.c projects/clang700-import/sys/net/if_var.h projects/clang700-import/sys/netinet/sctp_output.c projects/clang700-import/sys/sys/syscall.h projects/clang700-import/sys/vm/vm_fault.c Directory Properties: projects/clang700-import/ (props changed) projects/clang700-import/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/clang700-import/lib/libc/amd64/string/bcopy.S ============================================================================== --- projects/clang700-import/lib/libc/amd64/string/bcopy.S Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/lib/libc/amd64/string/bcopy.S Sat Sep 29 15:18:18 2018 (r339015) @@ -60,7 +60,6 @@ ENTRY(bcopy) subq %rsi,%r8 cmpq %rcx,%r8 /* overlapping? */ jb 1f - cld /* nope, copy forwards. */ shrq $3,%rcx /* copy by words */ rep movsq Modified: projects/clang700-import/lib/libusb/libusb10_io.c ============================================================================== --- projects/clang700-import/lib/libusb/libusb10_io.c Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/lib/libusb/libusb10_io.c Sat Sep 29 15:18:18 2018 (r339015) @@ -312,6 +312,9 @@ libusb_wait_for_event(libusb_context *ctx, struct time if (tv == NULL) { pthread_cond_wait(&ctx->ctx_cond, &ctx->ctx_lock); + /* try to grab polling of actual events, if any */ + if (ctx->ctx_handler == NO_THREAD) + ctx->ctx_handler = pthread_self(); return (0); } err = clock_gettime(CLOCK_MONOTONIC, &ts); @@ -330,6 +333,9 @@ libusb_wait_for_event(libusb_context *ctx, struct time } err = pthread_cond_timedwait(&ctx->ctx_cond, &ctx->ctx_lock, &ts); + /* try to grab polling of actual events, if any */ + if (ctx->ctx_handler == NO_THREAD) + ctx->ctx_handler = pthread_self(); if (err == ETIMEDOUT) return (1); Modified: projects/clang700-import/sbin/init/rc.d/ldconfig ============================================================================== --- projects/clang700-import/sbin/init/rc.d/ldconfig Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sbin/init/rc.d/ldconfig Sat Sep 29 15:18:18 2018 (r339015) @@ -41,7 +41,7 @@ ldconfig_start() ${ldconfig} -elf ${_ins} ${_LDC} case `sysctl -n hw.machine_arch` in - amd64|powerpc64) + amd64|mips64|powerpc64) for i in ${ldconfig_local32_dirs}; do if [ -d "${i}" ]; then _files=`find ${i} -type f` Modified: projects/clang700-import/sys/amd64/amd64/pmap.c ============================================================================== --- projects/clang700-import/sys/amd64/amd64/pmap.c Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sys/amd64/amd64/pmap.c Sat Sep 29 15:18:18 2018 (r339015) @@ -1807,7 +1807,6 @@ pmap_invalidate_page(pmap_t pmap, vm_offset_t va) ("pmap_invalidate_page: invalid type %d", pmap->pm_type)); sched_pin(); - smp_masked_invlpg(pmap_invalidate_cpu_mask(pmap), va, pmap); if (pmap == kernel_pmap) { invlpg(va); } else { @@ -1815,6 +1814,7 @@ pmap_invalidate_page(pmap_t pmap, vm_offset_t va) invlpg(va); pmap_invalidate_page_mode(pmap, va); } + smp_masked_invlpg(pmap_invalidate_cpu_mask(pmap), va, pmap); sched_unpin(); } @@ -1910,7 +1910,6 @@ pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm ("pmap_invalidate_range: invalid type %d", pmap->pm_type)); sched_pin(); - smp_masked_invlpg_range(pmap_invalidate_cpu_mask(pmap), sva, eva, pmap); if (pmap == kernel_pmap) { for (addr = sva; addr < eva; addr += PAGE_SIZE) invlpg(addr); @@ -1921,6 +1920,7 @@ pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm } pmap_invalidate_range_mode(pmap, sva, eva); } + smp_masked_invlpg_range(pmap_invalidate_cpu_mask(pmap), sva, eva, pmap); sched_unpin(); } @@ -2021,8 +2021,8 @@ pmap_invalidate_all(pmap_t pmap) ("pmap_invalidate_all: invalid type %d", pmap->pm_type)); sched_pin(); - smp_masked_invltlb(pmap_invalidate_cpu_mask(pmap), pmap); pmap_invalidate_all_mode(pmap); + smp_masked_invltlb(pmap_invalidate_cpu_mask(pmap), pmap); sched_unpin(); } Modified: projects/clang700-import/sys/amd64/amd64/support.S ============================================================================== --- projects/clang700-import/sys/amd64/amd64/support.S Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sys/amd64/amd64/support.S Sat Sep 29 15:18:18 2018 (r339015) @@ -1097,7 +1097,7 @@ copyinstr_toolong_smap: copyinstr_toolong: /* rdx is zero - return ENAMETOOLONG or EFAULT */ movq $VM_MAXUSER_ADDRESS,%rax - cmpq %rax,%rsi + cmpq %rax,%rdi jae cpystrflt movl $ENAMETOOLONG,%eax jmp cpystrflt_x Modified: projects/clang700-import/sys/arm64/arm64/identcpu.c ============================================================================== --- projects/clang700-import/sys/arm64/arm64/identcpu.c Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sys/arm64/arm64/identcpu.c Sat Sep 29 15:18:18 2018 (r339015) @@ -186,6 +186,32 @@ struct mrs_field { #define MRS_FIELD_END { .type = MRS_INVALID, } +static struct mrs_field id_aa64isar0_fields[] = { + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR0_DP_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR0_SM4_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR0_SM3_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR0_SHA3_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR0_RDM_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR0_ATOMIC_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR0_CRC32_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR0_SHA2_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR0_SHA1_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR0_AES_SHIFT), + MRS_FIELD_END, +}; + +static struct mrs_field id_aa64isar1_fields[] = { + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR1_GPI_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR1_GPA_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR1_LRCPC_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR1_FCMA_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR1_JSCVT_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR1_API_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR1_APA_SHIFT), + MRS_FIELD(false, MRS_LOWER, ID_AA64ISAR1_DPB_SHIFT), + MRS_FIELD_END, +}; + static struct mrs_field id_aa64pfr0_fields[] = { MRS_FIELD(false, MRS_EXACT, ID_AA64PFR0_SVE_SHIFT), MRS_FIELD(false, MRS_EXACT, ID_AA64PFR0_RAS_SHIFT), @@ -218,6 +244,18 @@ struct mrs_user_reg { }; static struct mrs_user_reg user_regs[] = { + { /* id_aa64isar0_el1 */ + .CRm = 6, + .Op2 = 0, + .offset = __offsetof(struct cpu_desc, id_aa64isar0), + .fields = id_aa64isar0_fields, + }, + { /* id_aa64isar1_el1 */ + .CRm = 6, + .Op2 = 1, + .offset = __offsetof(struct cpu_desc, id_aa64isar1), + .fields = id_aa64isar1_fields, + }, { /* id_aa64pfr0_el1 */ .CRm = 4, .Op2 = 0, Modified: projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c ============================================================================== --- projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Sat Sep 29 15:18:18 2018 (r339015) @@ -958,6 +958,15 @@ vdev_queue_change_io_priority(zio_t *zio, zio_priority vdev_queue_t *vq = &zio->io_vd->vdev_queue; avl_tree_t *tree; + /* + * ZIO_PRIORITY_NOW is used by the vdev cache code and the aggregate zio + * code to issue IOs without adding them to the vdev queue. In this + * case, the zio is already going to be issued as quickly as possible + * and so it doesn't need any reprioitization to help. + */ + if (zio->io_priority == ZIO_PRIORITY_NOW) + return; + ASSERT3U(zio->io_priority, <, ZIO_PRIORITY_NUM_QUEUEABLE); ASSERT3U(priority, <, ZIO_PRIORITY_NUM_QUEUEABLE); Modified: projects/clang700-import/sys/compat/freebsd32/freebsd32_ioctl.c ============================================================================== --- projects/clang700-import/sys/compat/freebsd32/freebsd32_ioctl.c Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sys/compat/freebsd32/freebsd32_ioctl.c Sat Sep 29 15:18:18 2018 (r339015) @@ -58,9 +58,6 @@ __FBSDID("$FreeBSD$"); CTASSERT(sizeof(struct ioc_read_toc_entry32) == 8); CTASSERT(sizeof(struct mem_range_op32) == 12); -CTASSERT(sizeof(struct pci_conf_io32) == 36); -CTASSERT(sizeof(struct pci_match_conf32) == 44); -CTASSERT(sizeof(struct pci_conf32) == 44); static int freebsd32_ioctl_ioc_read_toc(struct thread *td, @@ -148,108 +145,6 @@ freebsd32_ioctl_memrange(struct thread *td, } static int -freebsd32_ioctl_pciocgetconf(struct thread *td, - struct freebsd32_ioctl_args *uap, struct file *fp) -{ - struct pci_conf_io pci; - struct pci_conf_io32 pci32; - struct pci_match_conf32 pmc32; - struct pci_match_conf32 *pmc32p; - struct pci_match_conf pmc; - struct pci_match_conf *pmcp; - struct pci_conf32 pc32; - struct pci_conf32 *pc32p; - struct pci_conf pc; - struct pci_conf *pcp; - u_int32_t i; - u_int32_t npat_to_convert; - u_int32_t nmatch_to_convert; - vm_offset_t addr; - int error; - - if ((error = copyin(uap->data, &pci32, sizeof(pci32))) != 0) - return (error); - - CP(pci32, pci, num_patterns); - CP(pci32, pci, offset); - CP(pci32, pci, generation); - - npat_to_convert = pci32.pat_buf_len / sizeof(struct pci_match_conf32); - pci.pat_buf_len = npat_to_convert * sizeof(struct pci_match_conf); - pci.patterns = NULL; - nmatch_to_convert = pci32.match_buf_len / sizeof(struct pci_conf32); - pci.match_buf_len = nmatch_to_convert * sizeof(struct pci_conf); - pci.matches = NULL; - - if ((error = copyout_map(td, &addr, pci.pat_buf_len)) != 0) - goto cleanup; - pci.patterns = (struct pci_match_conf *)addr; - if ((error = copyout_map(td, &addr, pci.match_buf_len)) != 0) - goto cleanup; - pci.matches = (struct pci_conf *)addr; - - npat_to_convert = min(npat_to_convert, pci.num_patterns); - - for (i = 0, pmc32p = (struct pci_match_conf32 *)PTRIN(pci32.patterns), - pmcp = pci.patterns; - i < npat_to_convert; i++, pmc32p++, pmcp++) { - if ((error = copyin(pmc32p, &pmc32, sizeof(pmc32))) != 0) - goto cleanup; - CP(pmc32,pmc,pc_sel); - strlcpy(pmc.pd_name, pmc32.pd_name, sizeof(pmc.pd_name)); - CP(pmc32,pmc,pd_unit); - CP(pmc32,pmc,pc_vendor); - CP(pmc32,pmc,pc_device); - CP(pmc32,pmc,pc_class); - CP(pmc32,pmc,flags); - if ((error = copyout(&pmc, pmcp, sizeof(pmc))) != 0) - goto cleanup; - } - - if ((error = fo_ioctl(fp, PCIOCGETCONF, (caddr_t)&pci, - td->td_ucred, td)) != 0) - goto cleanup; - - nmatch_to_convert = min(nmatch_to_convert, pci.num_matches); - - for (i = 0, pcp = pci.matches, - pc32p = (struct pci_conf32 *)PTRIN(pci32.matches); - i < nmatch_to_convert; i++, pcp++, pc32p++) { - if ((error = copyin(pcp, &pc, sizeof(pc))) != 0) - goto cleanup; - CP(pc,pc32,pc_sel); - CP(pc,pc32,pc_hdr); - CP(pc,pc32,pc_subvendor); - CP(pc,pc32,pc_subdevice); - CP(pc,pc32,pc_vendor); - CP(pc,pc32,pc_device); - CP(pc,pc32,pc_class); - CP(pc,pc32,pc_subclass); - CP(pc,pc32,pc_progif); - CP(pc,pc32,pc_revid); - strlcpy(pc32.pd_name, pc.pd_name, sizeof(pc32.pd_name)); - CP(pc,pc32,pd_unit); - if ((error = copyout(&pc32, pc32p, sizeof(pc32))) != 0) - goto cleanup; - } - - CP(pci, pci32, num_matches); - CP(pci, pci32, offset); - CP(pci, pci32, generation); - CP(pci, pci32, status); - - error = copyout(&pci32, uap->data, sizeof(pci32)); - -cleanup: - if (pci.patterns) - copyout_unmap(td, (vm_offset_t)pci.patterns, pci.pat_buf_len); - if (pci.matches) - copyout_unmap(td, (vm_offset_t)pci.matches, pci.match_buf_len); - - return (error); -} - -static int freebsd32_ioctl_barmmap(struct thread *td, struct freebsd32_ioctl_args *uap, struct file *fp) { @@ -380,10 +275,6 @@ freebsd32_ioctl(struct thread *td, struct freebsd32_io case MEMRANGE_GET32: /* FALLTHROUGH */ case MEMRANGE_SET32: error = freebsd32_ioctl_memrange(td, uap, fp); - break; - - case PCIOCGETCONF_32: - error = freebsd32_ioctl_pciocgetconf(td, uap, fp); break; case SG_IO_32: Modified: projects/clang700-import/sys/compat/freebsd32/freebsd32_ioctl.h ============================================================================== --- projects/clang700-import/sys/compat/freebsd32/freebsd32_ioctl.h Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sys/compat/freebsd32/freebsd32_ioctl.h Sat Sep 29 15:18:18 2018 (r339015) @@ -56,45 +56,6 @@ struct mem_range_op32 int mo_arg[2]; }; -struct pci_conf32 { - struct pcisel pc_sel; /* domain+bus+slot+function */ - u_int8_t pc_hdr; /* PCI header type */ - u_int16_t pc_subvendor; /* card vendor ID */ - u_int16_t pc_subdevice; /* card device ID, assigned by - card vendor */ - u_int16_t pc_vendor; /* chip vendor ID */ - u_int16_t pc_device; /* chip device ID, assigned by - chip vendor */ - u_int8_t pc_class; /* chip PCI class */ - u_int8_t pc_subclass; /* chip PCI subclass */ - u_int8_t pc_progif; /* chip PCI programming interface */ - u_int8_t pc_revid; /* chip revision ID */ - char pd_name[PCI_MAXNAMELEN + 1]; /* device name */ - u_int32_t pd_unit; /* device unit number */ -}; - -struct pci_match_conf32 { - struct pcisel pc_sel; /* domain+bus+slot+function */ - char pd_name[PCI_MAXNAMELEN + 1]; /* device name */ - u_int32_t pd_unit; /* Unit number */ - u_int16_t pc_vendor; /* PCI Vendor ID */ - u_int16_t pc_device; /* PCI Device ID */ - u_int8_t pc_class; /* PCI class */ - u_int32_t flags; /* Matching expression */ -}; - -struct pci_conf_io32 { - u_int32_t pat_buf_len; /* pattern buffer length */ - u_int32_t num_patterns; /* number of patterns */ - caddr_t32 patterns; /* struct pci_match_conf ptr */ - u_int32_t match_buf_len; /* match buffer length */ - u_int32_t num_matches; /* number of matches returned */ - caddr_t32 matches; /* struct pci_conf ptr */ - u_int32_t offset; /* offset into device list */ - u_int32_t generation; /* device list generation */ - u_int32_t status; /* request status */ -}; - struct pci_bar_mmap32 { uint32_t pbm_map_base; uint32_t pbm_map_length; @@ -110,7 +71,6 @@ struct pci_bar_mmap32 { #define FIODGNAME_32 _IOW('f', 120, struct fiodgname_arg32) #define MEMRANGE_GET32 _IOWR('m', 50, struct mem_range_op32) #define MEMRANGE_SET32 _IOW('m', 51, struct mem_range_op32) -#define PCIOCGETCONF_32 _IOWR('p', 5, struct pci_conf_io32) #define SG_IO_32 _IOWR(SGIOC, 0x85, struct sg_io_hdr32) #define PCIOCBARMMAP_32 _IOWR('p', 8, struct pci_bar_mmap32) Modified: projects/clang700-import/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- projects/clang700-import/sys/compat/freebsd32/freebsd32_syscall.h Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sys/compat/freebsd32/freebsd32_syscall.h Sat Sep 29 15:18:18 2018 (r339015) @@ -171,6 +171,10 @@ #define FREEBSD32_SYS_setgid 181 #define FREEBSD32_SYS_setegid 182 #define FREEBSD32_SYS_seteuid 183 + /* 184 is obsolete lfs_bmapv */ + /* 185 is obsolete lfs_markv */ + /* 186 is obsolete lfs_segclean */ + /* 187 is obsolete lfs_segwait */ #define FREEBSD32_SYS_freebsd11_freebsd32_stat 188 #define FREEBSD32_SYS_freebsd11_freebsd32_fstat 189 #define FREEBSD32_SYS_freebsd11_freebsd32_lstat 190 @@ -194,6 +198,7 @@ #define FREEBSD32_SYS_freebsd7_freebsd32_semctl 220 #define FREEBSD32_SYS_semget 221 #define FREEBSD32_SYS_semop 222 + /* 223 is obsolete semconfig */ #define FREEBSD32_SYS_freebsd7_freebsd32_msgctl 224 #define FREEBSD32_SYS_msgget 225 #define FREEBSD32_SYS_freebsd32_msgsnd 226 @@ -300,12 +305,24 @@ #define FREEBSD32_SYS_getresgid 361 #define FREEBSD32_SYS_kqueue 362 #define FREEBSD32_SYS_freebsd11_freebsd32_kevent 363 + /* 364 is obsolete __cap_get_proc */ + /* 365 is obsolete __cap_set_proc */ + /* 366 is obsolete __cap_get_fd */ + /* 367 is obsolete __cap_get_file */ + /* 368 is obsolete __cap_set_fd */ + /* 369 is obsolete __cap_set_file */ #define FREEBSD32_SYS_extattr_set_fd 371 #define FREEBSD32_SYS_extattr_get_fd 372 #define FREEBSD32_SYS_extattr_delete_fd 373 #define FREEBSD32_SYS___setugid 374 + /* 375 is obsolete nfsclnt */ #define FREEBSD32_SYS_eaccess 376 #define FREEBSD32_SYS_freebsd32_nmount 378 + /* 379 is obsolete kse_exit */ + /* 380 is obsolete kse_wakeup */ + /* 381 is obsolete kse_create */ + /* 382 is obsolete kse_thr_interrupt */ + /* 383 is obsolete kse_release */ #define FREEBSD32_SYS_kenv 390 #define FREEBSD32_SYS_lchflags 391 #define FREEBSD32_SYS_uuidgen 392 @@ -343,6 +360,7 @@ #define FREEBSD32_SYS_extattr_list_fd 437 #define FREEBSD32_SYS_extattr_list_file 438 #define FREEBSD32_SYS_extattr_list_link 439 + /* 440 is obsolete kse_switchin */ #define FREEBSD32_SYS_freebsd32_ksem_timedwait 441 #define FREEBSD32_SYS_freebsd32_thr_suspend 442 #define FREEBSD32_SYS_thr_wake 443 @@ -455,6 +473,8 @@ #define FREEBSD32_SYS_freebsd32_ppoll 545 #define FREEBSD32_SYS_freebsd32_futimens 546 #define FREEBSD32_SYS_freebsd32_utimensat 547 + /* 548 is obsolete numa_getaffinity */ + /* 549 is obsolete numa_setaffinity */ #define FREEBSD32_SYS_fdatasync 550 #define FREEBSD32_SYS_freebsd32_fstat 551 #define FREEBSD32_SYS_freebsd32_fstatat 552 Modified: projects/clang700-import/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- projects/clang700-import/sys/compat/freebsd32/freebsd32_syscalls.c Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sys/compat/freebsd32/freebsd32_syscalls.c Sat Sep 29 15:18:18 2018 (r339015) @@ -193,10 +193,10 @@ const char *freebsd32_syscallnames[] = { "setgid", /* 181 = setgid */ "setegid", /* 182 = setegid */ "seteuid", /* 183 = seteuid */ - "#184", /* 184 = lfs_bmapv */ - "#185", /* 185 = lfs_markv */ - "#186", /* 186 = lfs_segclean */ - "#187", /* 187 = lfs_segwait */ + "obs_lfs_bmapv", /* 184 = obsolete lfs_bmapv */ + "obs_lfs_markv", /* 185 = obsolete lfs_markv */ + "obs_lfs_segclean", /* 186 = obsolete lfs_segclean */ + "obs_lfs_segwait", /* 187 = obsolete lfs_segwait */ "compat11.freebsd32_stat", /* 188 = freebsd11 freebsd32_stat */ "compat11.freebsd32_fstat", /* 189 = freebsd11 freebsd32_fstat */ "compat11.freebsd32_lstat", /* 190 = freebsd11 freebsd32_lstat */ @@ -232,7 +232,7 @@ const char *freebsd32_syscallnames[] = { "compat7.freebsd32_semctl", /* 220 = freebsd7 freebsd32_semctl */ "semget", /* 221 = semget */ "semop", /* 222 = semop */ - "#223", /* 223 = semconfig */ + "obs_semconfig", /* 223 = obsolete semconfig */ "compat7.freebsd32_msgctl", /* 224 = freebsd7 freebsd32_msgctl */ "msgget", /* 225 = msgget */ "freebsd32_msgsnd", /* 226 = freebsd32_msgsnd */ @@ -373,26 +373,26 @@ const char *freebsd32_syscallnames[] = { "getresgid", /* 361 = getresgid */ "kqueue", /* 362 = kqueue */ "compat11.freebsd32_kevent", /* 363 = freebsd11 freebsd32_kevent */ - "#364", /* 364 = __cap_get_proc */ - "#365", /* 365 = __cap_set_proc */ - "#366", /* 366 = __cap_get_fd */ - "#367", /* 367 = __cap_get_file */ - "#368", /* 368 = __cap_set_fd */ - "#369", /* 369 = __cap_set_file */ + "obs___cap_get_proc", /* 364 = obsolete __cap_get_proc */ + "obs___cap_set_proc", /* 365 = obsolete __cap_set_proc */ + "obs___cap_get_fd", /* 366 = obsolete __cap_get_fd */ + "obs___cap_get_file", /* 367 = obsolete __cap_get_file */ + "obs___cap_set_fd", /* 368 = obsolete __cap_set_fd */ + "obs___cap_set_file", /* 369 = obsolete __cap_set_file */ "#370", /* 370 = nosys */ "extattr_set_fd", /* 371 = extattr_set_fd */ "extattr_get_fd", /* 372 = extattr_get_fd */ "extattr_delete_fd", /* 373 = extattr_delete_fd */ "__setugid", /* 374 = __setugid */ - "#375", /* 375 = nfsclnt */ + "obs_nfsclnt", /* 375 = obsolete nfsclnt */ "eaccess", /* 376 = eaccess */ "#377", /* 377 = afs_syscall */ "freebsd32_nmount", /* 378 = freebsd32_nmount */ - "#379", /* 379 = kse_exit */ - "#380", /* 380 = kse_wakeup */ - "#381", /* 381 = kse_create */ - "#382", /* 382 = kse_thr_interrupt */ - "#383", /* 383 = kse_release */ + "obs_kse_exit", /* 379 = obsolete kse_exit */ + "obs_kse_wakeup", /* 380 = obsolete kse_wakeup */ + "obs_kse_create", /* 381 = obsolete kse_create */ + "obs_kse_thr_interrupt", /* 382 = obsolete kse_thr_interrupt */ + "obs_kse_release", /* 383 = obsolete kse_release */ "#384", /* 384 = __mac_get_proc */ "#385", /* 385 = __mac_set_proc */ "#386", /* 386 = __mac_get_fd */ @@ -449,7 +449,7 @@ const char *freebsd32_syscallnames[] = { "extattr_list_fd", /* 437 = extattr_list_fd */ "extattr_list_file", /* 438 = extattr_list_file */ "extattr_list_link", /* 439 = extattr_list_link */ - "#440", /* 440 = kse_switchin */ + "obs_kse_switchin", /* 440 = obsolete kse_switchin */ "freebsd32_ksem_timedwait", /* 441 = freebsd32_ksem_timedwait */ "freebsd32_thr_suspend", /* 442 = freebsd32_thr_suspend */ "thr_wake", /* 443 = thr_wake */ @@ -580,8 +580,8 @@ const char *freebsd32_syscallnames[] = { "freebsd32_ppoll", /* 545 = freebsd32_ppoll */ "freebsd32_futimens", /* 546 = freebsd32_futimens */ "freebsd32_utimensat", /* 547 = freebsd32_utimensat */ - "#548", /* 548 = numa_getaffinity */ - "#549", /* 549 = numa_setaffinity */ + "obs_numa_getaffinity", /* 548 = obsolete numa_getaffinity */ + "obs_numa_setaffinity", /* 549 = obsolete numa_setaffinity */ "fdatasync", /* 550 = fdatasync */ "freebsd32_fstat", /* 551 = freebsd32_fstat */ "freebsd32_fstatat", /* 552 = freebsd32_fstatat */ Modified: projects/clang700-import/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- projects/clang700-import/sys/compat/freebsd32/freebsd32_sysent.c Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sys/compat/freebsd32/freebsd32_sysent.c Sat Sep 29 15:18:18 2018 (r339015) @@ -240,10 +240,10 @@ struct sysent freebsd32_sysent[] = { { AS(setgid_args), (sy_call_t *)sys_setgid, AUE_SETGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 181 = setgid */ { AS(setegid_args), (sy_call_t *)sys_setegid, AUE_SETEGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 182 = setegid */ { AS(seteuid_args), (sy_call_t *)sys_seteuid, AUE_SETEUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 183 = seteuid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 184 = lfs_bmapv */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 185 = lfs_markv */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 186 = lfs_segclean */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 187 = lfs_segwait */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 184 = obsolete lfs_bmapv */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 185 = obsolete lfs_markv */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 186 = obsolete lfs_segclean */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 187 = obsolete lfs_segwait */ { compat11(AS(freebsd11_freebsd32_stat_args),freebsd32_stat), AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 188 = freebsd11 freebsd32_stat */ { compat11(AS(freebsd11_freebsd32_fstat_args),freebsd32_fstat), AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 189 = freebsd11 freebsd32_fstat */ { compat11(AS(freebsd11_freebsd32_lstat_args),freebsd32_lstat), AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 190 = freebsd11 freebsd32_lstat */ @@ -279,7 +279,7 @@ struct sysent freebsd32_sysent[] = { { 0, (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 220 = freebsd7 freebsd32_semctl */ { AS(semget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 221 = semget */ { AS(semop_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 222 = semop */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 223 = semconfig */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 223 = obsolete semconfig */ { 0, (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 224 = freebsd7 freebsd32_msgctl */ { AS(msgget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 225 = msgget */ { AS(freebsd32_msgsnd_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 226 = freebsd32_msgsnd */ @@ -420,26 +420,26 @@ struct sysent freebsd32_sysent[] = { { AS(getresgid_args), (sy_call_t *)sys_getresgid, AUE_GETRESGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 361 = getresgid */ { 0, (sy_call_t *)sys_kqueue, AUE_KQUEUE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 362 = kqueue */ { compat11(AS(freebsd11_freebsd32_kevent_args),freebsd32_kevent), AUE_KEVENT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 363 = freebsd11 freebsd32_kevent */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 364 = __cap_get_proc */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 365 = __cap_set_proc */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 366 = __cap_get_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 367 = __cap_get_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 368 = __cap_set_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 369 = __cap_set_file */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 364 = obsolete __cap_get_proc */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 365 = obsolete __cap_set_proc */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 366 = obsolete __cap_get_fd */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 367 = obsolete __cap_get_file */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 368 = obsolete __cap_set_fd */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 369 = obsolete __cap_set_file */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 370 = nosys */ { AS(extattr_set_fd_args), (sy_call_t *)sys_extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 371 = extattr_set_fd */ { AS(extattr_get_fd_args), (sy_call_t *)sys_extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 372 = extattr_get_fd */ { AS(extattr_delete_fd_args), (sy_call_t *)sys_extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 373 = extattr_delete_fd */ { AS(__setugid_args), (sy_call_t *)sys___setugid, AUE_SETUGID, NULL, 0, 0, 0, SY_THR_STATIC }, /* 374 = __setugid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 375 = nfsclnt */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 375 = obsolete nfsclnt */ { AS(eaccess_args), (sy_call_t *)sys_eaccess, AUE_EACCESS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 376 = eaccess */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 377 = afs_syscall */ { AS(freebsd32_nmount_args), (sy_call_t *)freebsd32_nmount, AUE_NMOUNT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 378 = freebsd32_nmount */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 379 = kse_exit */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 380 = kse_wakeup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 381 = kse_create */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 382 = kse_thr_interrupt */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 383 = kse_release */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 379 = obsolete kse_exit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 380 = obsolete kse_wakeup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 381 = obsolete kse_create */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 382 = obsolete kse_thr_interrupt */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 383 = obsolete kse_release */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 384 = __mac_get_proc */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 385 = __mac_set_proc */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 386 = __mac_get_fd */ @@ -496,7 +496,7 @@ struct sysent freebsd32_sysent[] = { { AS(extattr_list_fd_args), (sy_call_t *)sys_extattr_list_fd, AUE_EXTATTR_LIST_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 437 = extattr_list_fd */ { AS(extattr_list_file_args), (sy_call_t *)sys_extattr_list_file, AUE_EXTATTR_LIST_FILE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 438 = extattr_list_file */ { AS(extattr_list_link_args), (sy_call_t *)sys_extattr_list_link, AUE_EXTATTR_LIST_LINK, NULL, 0, 0, 0, SY_THR_STATIC }, /* 439 = extattr_list_link */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 440 = kse_switchin */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 440 = obsolete kse_switchin */ { AS(freebsd32_ksem_timedwait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 441 = freebsd32_ksem_timedwait */ { AS(freebsd32_thr_suspend_args), (sy_call_t *)freebsd32_thr_suspend, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 442 = freebsd32_thr_suspend */ { AS(thr_wake_args), (sy_call_t *)sys_thr_wake, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 443 = thr_wake */ @@ -627,8 +627,8 @@ struct sysent freebsd32_sysent[] = { { AS(freebsd32_ppoll_args), (sy_call_t *)freebsd32_ppoll, AUE_POLL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 545 = freebsd32_ppoll */ { AS(freebsd32_futimens_args), (sy_call_t *)freebsd32_futimens, AUE_FUTIMES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 546 = freebsd32_futimens */ { AS(freebsd32_utimensat_args), (sy_call_t *)freebsd32_utimensat, AUE_FUTIMESAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 547 = freebsd32_utimensat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 548 = numa_getaffinity */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 549 = numa_setaffinity */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 548 = obsolete numa_getaffinity */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 549 = obsolete numa_setaffinity */ { AS(fdatasync_args), (sy_call_t *)sys_fdatasync, AUE_FSYNC, NULL, 0, 0, 0, SY_THR_STATIC }, /* 550 = fdatasync */ { AS(freebsd32_fstat_args), (sy_call_t *)freebsd32_fstat, AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 551 = freebsd32_fstat */ { AS(freebsd32_fstatat_args), (sy_call_t *)freebsd32_fstatat, AUE_FSTATAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 552 = freebsd32_fstatat */ Modified: projects/clang700-import/sys/compat/freebsd32/syscalls.master ============================================================================== --- projects/clang700-import/sys/compat/freebsd32/syscalls.master Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sys/compat/freebsd32/syscalls.master Sat Sep 29 15:18:18 2018 (r339015) @@ -343,10 +343,10 @@ 181 AUE_SETGID NOPROTO { int setgid(gid_t gid); } 182 AUE_SETEGID NOPROTO { int setegid(gid_t egid); } 183 AUE_SETEUID NOPROTO { int seteuid(uid_t euid); } -184 AUE_NULL UNIMPL lfs_bmapv -185 AUE_NULL UNIMPL lfs_markv -186 AUE_NULL UNIMPL lfs_segclean -187 AUE_NULL UNIMPL lfs_segwait +184 AUE_NULL OBSOL lfs_bmapv +185 AUE_NULL OBSOL lfs_markv +186 AUE_NULL OBSOL lfs_segclean +187 AUE_NULL OBSOL lfs_segwait 188 AUE_STAT COMPAT11 { int freebsd32_stat(char *path, \ struct freebsd11_stat32 *ub); } 189 AUE_FSTAT COMPAT11 { int freebsd32_fstat(int fd, \ @@ -414,7 +414,7 @@ int semflg); } 222 AUE_SEMOP NOSTD|NOPROTO { int semop(int semid, \ struct sembuf *sops, u_int nsops); } -223 AUE_NULL UNIMPL semconfig +223 AUE_NULL OBSOL semconfig 224 AUE_MSGCTL COMPAT7|NOSTD { int freebsd32_msgctl( \ int msqid, int cmd, \ struct msqid_ds32_old *buf); } @@ -662,12 +662,12 @@ struct kevent32_freebsd11 *eventlist, \ int nevents, \ const struct timespec32 *timeout); } -364 AUE_NULL UNIMPL __cap_get_proc -365 AUE_NULL UNIMPL __cap_set_proc -366 AUE_NULL UNIMPL __cap_get_fd -367 AUE_NULL UNIMPL __cap_get_file -368 AUE_NULL UNIMPL __cap_set_fd -369 AUE_NULL UNIMPL __cap_set_file +364 AUE_NULL OBSOL __cap_get_proc +365 AUE_NULL OBSOL __cap_set_proc +366 AUE_NULL OBSOL __cap_get_fd +367 AUE_NULL OBSOL __cap_get_file +368 AUE_NULL OBSOL __cap_set_fd +369 AUE_NULL OBSOL __cap_set_file 370 AUE_NULL UNIMPL nosys 371 AUE_EXTATTR_SET_FD NOPROTO { ssize_t extattr_set_fd(int fd, \ int attrnamespace, const char *attrname, \ @@ -679,16 +679,16 @@ int attrnamespace, \ const char *attrname); } 374 AUE_SETUGID NOPROTO { int __setugid(int flag); } -375 AUE_NULL UNIMPL nfsclnt +375 AUE_NULL OBSOL nfsclnt 376 AUE_EACCESS NOPROTO { int eaccess(char *path, int amode); } 377 AUE_NULL UNIMPL afs_syscall 378 AUE_NMOUNT STD { int freebsd32_nmount(struct iovec32 *iovp, \ unsigned int iovcnt, int flags); } -379 AUE_NULL UNIMPL kse_exit -380 AUE_NULL UNIMPL kse_wakeup -381 AUE_NULL UNIMPL kse_create -382 AUE_NULL UNIMPL kse_thr_interrupt -383 AUE_NULL UNIMPL kse_release +379 AUE_NULL OBSOL kse_exit +380 AUE_NULL OBSOL kse_wakeup +381 AUE_NULL OBSOL kse_create +382 AUE_NULL OBSOL kse_thr_interrupt +383 AUE_NULL OBSOL kse_release 384 AUE_NULL UNIMPL __mac_get_proc 385 AUE_NULL UNIMPL __mac_set_proc 386 AUE_NULL UNIMPL __mac_get_fd @@ -787,7 +787,7 @@ 439 AUE_EXTATTR_LIST_LINK NOPROTO { ssize_t extattr_list_link( \ const char *path, int attrnamespace, \ void *data, size_t nbytes); } -440 AUE_NULL UNIMPL kse_switchin +440 AUE_NULL OBSOL kse_switchin 441 AUE_SEMWAIT NOSTD { int freebsd32_ksem_timedwait(semid_t id, \ const struct timespec32 *abstime); } 442 AUE_NULL STD { int freebsd32_thr_suspend( \ @@ -1074,8 +1074,8 @@ 547 AUE_FUTIMESAT STD { int freebsd32_utimensat(int fd, \ char *path, \ struct timespec *times, int flag); } -548 AUE_NULL UNIMPL numa_getaffinity -549 AUE_NULL UNIMPL numa_setaffinity +548 AUE_NULL OBSOL numa_getaffinity +549 AUE_NULL OBSOL numa_setaffinity 550 AUE_FSYNC NOPROTO { int fdatasync(int fd); } 551 AUE_FSTAT STD { int freebsd32_fstat(int fd, \ struct stat32 *ub); } Modified: projects/clang700-import/sys/conf/newvers.sh ============================================================================== --- projects/clang700-import/sys/conf/newvers.sh Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sys/conf/newvers.sh Sat Sep 29 15:18:18 2018 (r339015) @@ -46,7 +46,7 @@ TYPE="FreeBSD" REVISION="12.0" -BRANCH="ALPHA7" +BRANCH="ALPHA8" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: projects/clang700-import/sys/dev/pci/pci_user.c ============================================================================== --- projects/clang700-import/sys/dev/pci/pci_user.c Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sys/dev/pci/pci_user.c Sat Sep 29 15:18:18 2018 (r339015) @@ -66,6 +66,49 @@ __FBSDID("$FreeBSD$"); #include "pcib_if.h" #include "pci_if.h" +#ifdef COMPAT_FREEBSD32 +struct pci_conf32 { + struct pcisel pc_sel; /* domain+bus+slot+function */ + u_int8_t pc_hdr; /* PCI header type */ + u_int16_t pc_subvendor; /* card vendor ID */ + u_int16_t pc_subdevice; /* card device ID, assigned by + card vendor */ + u_int16_t pc_vendor; /* chip vendor ID */ + u_int16_t pc_device; /* chip device ID, assigned by + chip vendor */ + u_int8_t pc_class; /* chip PCI class */ + u_int8_t pc_subclass; /* chip PCI subclass */ + u_int8_t pc_progif; /* chip PCI programming interface */ + u_int8_t pc_revid; /* chip revision ID */ + char pd_name[PCI_MAXNAMELEN + 1]; /* device name */ + u_int32_t pd_unit; /* device unit number */ +}; + +struct pci_match_conf32 { + struct pcisel pc_sel; /* domain+bus+slot+function */ + char pd_name[PCI_MAXNAMELEN + 1]; /* device name */ + u_int32_t pd_unit; /* Unit number */ + u_int16_t pc_vendor; /* PCI Vendor ID */ + u_int16_t pc_device; /* PCI Device ID */ + u_int8_t pc_class; /* PCI class */ + u_int32_t flags; /* Matching expression */ +}; + +struct pci_conf_io32 { + u_int32_t pat_buf_len; /* pattern buffer length */ + u_int32_t num_patterns; /* number of patterns */ + u_int32_t patterns; /* struct pci_match_conf ptr */ + u_int32_t match_buf_len; /* match buffer length */ + u_int32_t num_matches; /* number of matches returned */ + u_int32_t matches; /* struct pci_conf ptr */ + u_int32_t offset; /* offset into device list */ + u_int32_t generation; /* device list generation */ + u_int32_t status; /* request status */ +}; + +#define PCIOCGETCONF32 _IOC_NEWTYPE(PCIOCGETCONF, struct pci_conf_io32) +#endif + /* * This is the user interface to PCI configuration space. */ @@ -175,6 +218,73 @@ pci_conf_match_native(struct pci_match_conf *matches, return(1); } +#ifdef COMPAT_FREEBSD32 +static int +pci_conf_match32(struct pci_match_conf32 *matches, int num_matches, + struct pci_conf *match_buf) +{ + int i; + + if ((matches == NULL) || (match_buf == NULL) || (num_matches <= 0)) + return(1); + + for (i = 0; i < num_matches; i++) { + /* + * I'm not sure why someone would do this...but... + */ + if (matches[i].flags == PCI_GETCONF_NO_MATCH) + continue; + + /* + * Look at each of the match flags. If it's set, do the + * comparison. If the comparison fails, we don't have a + * match, go on to the next item if there is one. + */ + if (((matches[i].flags & PCI_GETCONF_MATCH_DOMAIN) != 0) + && (match_buf->pc_sel.pc_domain != + matches[i].pc_sel.pc_domain)) + continue; + + if (((matches[i].flags & PCI_GETCONF_MATCH_BUS) != 0) + && (match_buf->pc_sel.pc_bus != matches[i].pc_sel.pc_bus)) + continue; + + if (((matches[i].flags & PCI_GETCONF_MATCH_DEV) != 0) + && (match_buf->pc_sel.pc_dev != matches[i].pc_sel.pc_dev)) + continue; + + if (((matches[i].flags & PCI_GETCONF_MATCH_FUNC) != 0) + && (match_buf->pc_sel.pc_func != matches[i].pc_sel.pc_func)) + continue; + + if (((matches[i].flags & PCI_GETCONF_MATCH_VENDOR) != 0) + && (match_buf->pc_vendor != matches[i].pc_vendor)) + continue; + + if (((matches[i].flags & PCI_GETCONF_MATCH_DEVICE) != 0) + && (match_buf->pc_device != matches[i].pc_device)) + continue; + + if (((matches[i].flags & PCI_GETCONF_MATCH_CLASS) != 0) + && (match_buf->pc_class != matches[i].pc_class)) + continue; + + if (((matches[i].flags & PCI_GETCONF_MATCH_UNIT) != 0) + && (match_buf->pd_unit != matches[i].pd_unit)) + continue; + + if (((matches[i].flags & PCI_GETCONF_MATCH_NAME) != 0) + && (strncmp(matches[i].pd_name, match_buf->pd_name, + sizeof(match_buf->pd_name)) != 0)) + continue; + + return(0); + } + + return(1); +} +#endif /* COMPAT_FREEBSD32 */ + #if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \ defined(COMPAT_FREEBSD6) #define PRE7_COMPAT @@ -259,20 +369,6 @@ struct pci_match_conf_old32 { pci_getconf_flags_old flags; /* Matching expression */ }; -struct pci_conf_io32 { - uint32_t pat_buf_len; /* pattern buffer length */ - uint32_t num_patterns; /* number of patterns */ - uint32_t patterns; /* pattern buffer - (struct pci_match_conf_old32 *) */ - uint32_t match_buf_len; /* match buffer length */ - uint32_t num_matches; /* number of matches returned */ - uint32_t matches; /* match buffer - (struct pci_conf_old32 *) */ - uint32_t offset; /* offset into device list */ - uint32_t generation; /* device list generation */ - pci_getconf_status status; /* request status */ -}; - #define PCIOCGETCONF_OLD32 _IOWR('p', 1, struct pci_conf_io32) #endif /* COMPAT_FREEBSD32 */ @@ -411,6 +507,9 @@ pci_conf_match_old32(struct pci_match_conf_old32 *matc union pci_conf_union { struct pci_conf pc; +#ifdef COMPAT_FREEBSD32 + struct pci_conf32 pc32; +#endif #ifdef PRE7_COMPAT struct pci_conf_old pco; #ifdef COMPAT_FREEBSD32 @@ -428,6 +527,11 @@ pci_conf_match(u_long cmd, struct pci_match_conf *matc case PCIOCGETCONF: return (pci_conf_match_native( (struct pci_match_conf *)matches, num_matches, match_buf)); +#ifdef COMPAT_FREEBSD32 + case PCIOCGETCONF32: + return (pci_conf_match32((struct pci_match_conf32 *)matches, + num_matches, match_buf)); +#endif #ifdef PRE7_COMPAT case PCIOCGETCONF_OLD: return (pci_conf_match_old( @@ -544,6 +648,10 @@ pci_match_conf_size(u_long cmd) switch (cmd) { case PCIOCGETCONF: return (sizeof(struct pci_match_conf)); +#ifdef COMPAT_FREEBSD32 + case PCIOCGETCONF32: + return (sizeof(struct pci_match_conf32)); +#endif #ifdef PRE7_COMPAT case PCIOCGETCONF_OLD: return (sizeof(struct pci_match_conf_old)); @@ -565,6 +673,10 @@ pci_conf_size(u_long cmd) switch (cmd) { case PCIOCGETCONF: return (sizeof(struct pci_conf)); +#ifdef COMPAT_FREEBSD32 + case PCIOCGETCONF32: + return (sizeof(struct pci_conf32)); +#endif #ifdef PRE7_COMPAT case PCIOCGETCONF_OLD: return (sizeof(struct pci_conf_old)); @@ -582,7 +694,7 @@ pci_conf_size(u_long cmd) static void pci_conf_io_init(struct pci_conf_io *cio, caddr_t data, u_long cmd) { -#if defined(PRE7_COMPAT) && defined(COMPAT_FREEBSD32) +#if defined(COMPAT_FREEBSD32) struct pci_conf_io32 *cio32; #endif @@ -594,8 +706,11 @@ pci_conf_io_init(struct pci_conf_io *cio, caddr_t data *cio = *(struct pci_conf_io *)data; return; -#if defined(PRE7_COMPAT) && defined(COMPAT_FREEBSD32) +#ifdef COMPAT_FREEBSD32 + case PCIOCGETCONF32: +#ifdef PRE7_COMPAT case PCIOCGETCONF_OLD32: +#endif cio32 = (struct pci_conf_io32 *)data; cio->pat_buf_len = cio32->pat_buf_len; cio->num_patterns = cio32->num_patterns; @@ -620,7 +735,7 @@ pci_conf_io_update_data(const struct pci_conf_io *cio, u_long cmd) { struct pci_conf_io *d_cio; -#if defined(PRE7_COMPAT) && defined(COMPAT_FREEBSD32) +#if defined(COMPAT_FREEBSD32) struct pci_conf_io32 *cio32; #endif @@ -636,8 +751,11 @@ pci_conf_io_update_data(const struct pci_conf_io *cio, d_cio->num_matches = cio->num_matches; return; -#if defined(PRE7_COMPAT) && defined(COMPAT_FREEBSD32) +#ifdef COMPAT_FREEBSD32 + case PCIOCGETCONF32: +#ifdef PRE7_COMPAT case PCIOCGETCONF_OLD32: +#endif cio32 = (struct pci_conf_io32 *)data; cio32->status = cio->status; @@ -664,6 +782,24 @@ pci_conf_for_copyout(const struct pci_conf *pcp, union case PCIOCGETCONF: pcup->pc = *pcp; return; + +#ifdef COMPAT_FREEBSD32 + case PCIOCGETCONF32: + pcup->pc32.pc_sel = pcp->pc_sel; + pcup->pc32.pc_hdr = pcp->pc_hdr; + pcup->pc32.pc_subvendor = pcp->pc_subvendor; + pcup->pc32.pc_subdevice = pcp->pc_subdevice; + pcup->pc32.pc_vendor = pcp->pc_vendor; + pcup->pc32.pc_device = pcp->pc_device; + pcup->pc32.pc_class = pcp->pc_class; + pcup->pc32.pc_subclass = pcp->pc_subclass; + pcup->pc32.pc_progif = pcp->pc_progif; + pcup->pc32.pc_revid = pcp->pc_revid; + strlcpy(pcup->pc32.pd_name, pcp->pd_name, + sizeof(pcup->pc32.pd_name)); + pcup->pc32.pd_unit = (uint32_t)pcp->pd_unit; + return; +#endif #ifdef PRE7_COMPAT #ifdef COMPAT_FREEBSD32 Modified: projects/clang700-import/sys/dev/sdhci/sdhci_acpi.c ============================================================================== --- projects/clang700-import/sys/dev/sdhci/sdhci_acpi.c Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sys/dev/sdhci/sdhci_acpi.c Sat Sep 29 15:18:18 2018 (r339015) @@ -79,6 +79,8 @@ static const struct sdhci_acpi_device { SDHCI_QUIRK_MMC_DDR52 | SDHCI_QUIRK_CAPS_BIT63_FOR_MMC_HS400 | SDHCI_QUIRK_PRESET_VALUE_BROKEN }, + { "AMDI0040", 0, "AMD eMMC 5.0 Controller", + SDHCI_QUIRK_32BIT_DMA_SIZE }, { NULL, 0, NULL, 0} }; @@ -87,6 +89,7 @@ static char *sdhci_ids[] = { "80860F16", "80865ACA", "80865ACC", + "AMDI0040", NULL }; Modified: projects/clang700-import/sys/kern/init_sysent.c ============================================================================== --- projects/clang700-import/sys/kern/init_sysent.c Sat Sep 29 15:17:17 2018 (r339014) +++ projects/clang700-import/sys/kern/init_sysent.c Sat Sep 29 15:18:18 2018 (r339015) @@ -233,10 +233,10 @@ struct sysent sysent[] = { { AS(setgid_args), (sy_call_t *)sys_setgid, AUE_SETGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 181 = setgid */ { AS(setegid_args), (sy_call_t *)sys_setegid, AUE_SETEGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 182 = setegid */ { AS(seteuid_args), (sy_call_t *)sys_seteuid, AUE_SETEUID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 183 = seteuid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 184 = lfs_bmapv */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 185 = lfs_markv */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 186 = lfs_segclean */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 187 = lfs_segwait */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 184 = obsolete lfs_bmapv */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 185 = obsolete lfs_markv */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 186 = obsolete lfs_segclean */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 187 = obsolete lfs_segwait */ { compat11(AS(freebsd11_stat_args),stat), AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 188 = freebsd11 stat */ { compat11(AS(freebsd11_fstat_args),fstat), AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 189 = freebsd11 fstat */ { compat11(AS(freebsd11_lstat_args),lstat), AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 190 = freebsd11 lstat */ @@ -272,7 +272,7 @@ struct sysent sysent[] = { { 0, (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 220 = freebsd7 __semctl */ { AS(semget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 221 = semget */ { AS(semop_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 222 = semop */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 223 = semconfig */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 223 = obsolete semconfig */ { 0, (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 224 = freebsd7 msgctl */ { AS(msgget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 225 = msgget */ { AS(msgsnd_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 226 = msgsnd */ @@ -413,26 +413,26 @@ struct sysent sysent[] = { { AS(getresgid_args), (sy_call_t *)sys_getresgid, AUE_GETRESGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 361 = getresgid */ { 0, (sy_call_t *)sys_kqueue, AUE_KQUEUE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 362 = kqueue */ { compat11(AS(freebsd11_kevent_args),kevent), AUE_KEVENT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 363 = freebsd11 kevent */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 364 = __cap_get_proc */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sat Sep 29 18:36:20 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 60B4410A838C for ; Sat, 29 Sep 2018 18:36:20 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0E902830B1; Sat, 29 Sep 2018 18:36:20 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DAAB127295; Sat, 29 Sep 2018 18:36:19 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8TIaJMG055864; Sat, 29 Sep 2018 18:36:19 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8TIaJX9055863; Sat, 29 Sep 2018 18:36:19 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201809291836.w8TIaJX9055863@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 29 Sep 2018 18:36:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r339018 - in projects/clang700-import/contrib/llvm/tools: clang lld X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in projects/clang700-import/contrib/llvm/tools: clang lld X-SVN-Commit-Revision: 339018 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Sep 2018 18:36:20 -0000 Author: dim Date: Sat Sep 29 18:36:19 2018 New Revision: 339018 URL: https://svnweb.freebsd.org/changeset/base/339018 Log: Fix up Subversion mergeinfo in contrib/llvm/tools/{clang,lld}. Modified: Directory Properties: projects/clang700-import/contrib/llvm/tools/clang/ (props changed) projects/clang700-import/contrib/llvm/tools/lld/ (props changed)