From owner-dev-commits-src-main@freebsd.org Sun Jan 3 19:26:54 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 13E834DB105; Sun, 3 Jan 2021 19:26:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D87zy01Xkz3rJY; Sun, 3 Jan 2021 19:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DFE2F4F2E; Sun, 3 Jan 2021 19:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 103JQrrY099723; Sun, 3 Jan 2021 19:26:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 103JQrMw099722; Sun, 3 Jan 2021 19:26:53 GMT (envelope-from git) Date: Sun, 3 Jan 2021 19:26:53 GMT Message-Id: <202101031926.103JQrMw099722@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Conrad Meyer Subject: git: 98689d0ffb0a - main - libprivatezstd: Restrict symbol visibility similar to upstream MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98689d0ffb0a0e218d3b32201df59be9fa771830 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2021 19:26:54 -0000 The branch main has been updated by cem: URL: https://cgit.FreeBSD.org/src/commit/?id=98689d0ffb0a0e218d3b32201df59be9fa771830 commit 98689d0ffb0a0e218d3b32201df59be9fa771830 Author: Conrad Meyer AuthorDate: 2021-01-03 19:26:01 +0000 Commit: Conrad Meyer CommitDate: 2021-01-03 19:26:46 +0000 libprivatezstd: Restrict symbol visibility similar to upstream We have to relax three symbols to dynamically link zstd(1), but the rest are the same. --- lib/libzstd/Makefile | 2 +- sys/contrib/zstd/lib/common/xxhash.h | 3 +++ sys/contrib/zstd/lib/dictBuilder/zdict.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/libzstd/Makefile b/lib/libzstd/Makefile index dcf6cd3c0281..5f7cd8248d88 100644 --- a/lib/libzstd/Makefile +++ b/lib/libzstd/Makefile @@ -36,7 +36,7 @@ SRCS= entropy_common.c \ WARNS?= 2 INCS= zstd.h CFLAGS+= -I${ZSTDDIR}/lib -I${ZSTDDIR}/lib/common -DXXH_NAMESPACE=ZSTD_ \ - -DZSTD_MULTITHREAD=1 + -DZSTD_MULTITHREAD=1 -fvisibility=hidden LIBADD= pthread PRIVATELIB= yes diff --git a/sys/contrib/zstd/lib/common/xxhash.h b/sys/contrib/zstd/lib/common/xxhash.h index eceb55d5e071..ff1fafe4cd22 100644 --- a/sys/contrib/zstd/lib/common/xxhash.h +++ b/sys/contrib/zstd/lib/common/xxhash.h @@ -141,6 +141,9 @@ typedef unsigned int XXH32_hash_t; typedef unsigned long long XXH64_hash_t; XXH_PUBLIC_API XXH32_hash_t XXH32 (const void* input, size_t length, unsigned int seed); +/* Begin FreeBSD - This symbol is needed by dll-linked CLI zstd(1). */ +__attribute__((visibility ("default"))) +/* End FreeBSD */ XXH_PUBLIC_API XXH64_hash_t XXH64 (const void* input, size_t length, unsigned long long seed); /*! diff --git a/sys/contrib/zstd/lib/dictBuilder/zdict.c b/sys/contrib/zstd/lib/dictBuilder/zdict.c index 79c522ef3679..057ff3f16da4 100644 --- a/sys/contrib/zstd/lib/dictBuilder/zdict.c +++ b/sys/contrib/zstd/lib/dictBuilder/zdict.c @@ -968,6 +968,9 @@ static size_t ZDICT_addEntropyTablesFromBuffer_advanced( } /* Hidden declaration for dbio.c */ +/* Begin FreeBSD - This symbol is needed by dll-linked CLI zstd(1). */ +ZSTDLIB_API +/* End FreeBSD */ size_t ZDICT_trainFromBuffer_unsafe_legacy( void* dictBuffer, size_t maxDictSize, const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,