From owner-svn-src-head@freebsd.org Tue Mar 27 16:45:28 2018 Return-Path: Delivered-To: svn-src-head@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 EFAE4F693F2; Tue, 27 Mar 2018 16:45:27 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7D6CA70F44; Tue, 27 Mar 2018 16:45:27 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 7CC4310A87D; Tue, 27 Mar 2018 12:45:26 -0400 (EDT) From: John Baldwin To: Conrad Meyer Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r331602 - in head/sys/contrib/zstd: . contrib/gen_html contrib/meson contrib/seekable_format doc doc/images lib lib/common lib/compress lib/decompress lib/dictBuilder lib/legacy program... Date: Tue, 27 Mar 2018 09:41:44 -0700 Message-ID: <1800672.WX48MoC0qd@ralph.baldwin.cx> User-Agent: KMail/4.14.10 (FreeBSD/11.1-STABLE; KDE/4.14.30; amd64; ; ) In-Reply-To: <201803262355.w2QNt00j023669@repo.freebsd.org> References: <201803262355.w2QNt00j023669@repo.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Tue, 27 Mar 2018 12:45:26 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2018 16:45:28 -0000 On Monday, March 26, 2018 11:55:00 PM Conrad Meyer wrote: > Author: cem > Date: Mon Mar 26 23:54:59 2018 > New Revision: 331602 > URL: https://svnweb.freebsd.org/changeset/base/331602 > > Log: > Update to Zstandard 1.3.4 > > Includes our local patch to conditionalize use of __builtin_clz(ll) on > Clang's __has_builtin() (which is just defined to false when building with > GCC). > > The issue is tracked upstream at https://github.com/facebook/zstd/pull/884 . > Otherwise, these are vanilla Zstandard 1.3.4 files. Note that there is an existing ^/vendor/zstd tree that zstd updates should probably be committed to first and then merged over. You can probably repair this by importing 1.3.4 as normal to the vendor area following the normal instructions and then doing an 'svn merge --record-only' to update the merge info. -- John Baldwin