From owner-svn-src-head@freebsd.org Sat Mar 28 17:10:50 2020 Return-Path: Delivered-To: svn-src-head@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 ED9E52A7D99; Sat, 28 Mar 2020 17:10:50 +0000 (UTC) (envelope-from kevans@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) server-signature RSA-PSS (4096 bits) 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 48qQGd618kz4Nvy; Sat, 28 Mar 2020 17:10:49 +0000 (UTC) (envelope-from kevans@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 8198218184; Sat, 28 Mar 2020 17:00:39 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02SH0dWM090774; Sat, 28 Mar 2020 17:00:39 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02SH0cTA090771; Sat, 28 Mar 2020 17:00:38 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202003281700.02SH0cTA090771@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sat, 28 Mar 2020 17:00:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359397 - in head/cddl/contrib/opensolaris/cmd: zfs zpool X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head/cddl/contrib/opensolaris/cmd: zfs zpool X-SVN-Commit-Revision: 359397 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 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: Sat, 28 Mar 2020 17:10:51 -0000 Author: kevans Date: Sat Mar 28 17:00:38 2020 New Revision: 359397 URL: https://svnweb.freebsd.org/changeset/base/359397 Log: zfs: fix -fno-common issues A similar (or identical?) fix has already landed in OpenZFS. -fno-common will become the default in GCC10/LLVM11. MFC after: 3 days Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c head/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h ============================================================================== --- head/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h Sat Mar 28 16:26:47 2020 (r359396) +++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h Sat Mar 28 17:00:38 2020 (r359397) @@ -33,7 +33,7 @@ extern "C" { void * safe_malloc(size_t size); void nomem(void); -libzfs_handle_t *g_zfs; +extern libzfs_handle_t *g_zfs; #ifdef __cplusplus } Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Mar 28 16:26:47 2020 (r359396) +++ head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Mar 28 17:00:38 2020 (r359397) @@ -64,6 +64,8 @@ #include "statcommon.h" +libzfs_handle_t *g_zfs; + static int zpool_do_create(int, char **); static int zpool_do_destroy(int, char **); Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h ============================================================================== --- head/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h Sat Mar 28 16:26:47 2020 (r359396) +++ head/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h Sat Mar 28 17:00:38 2020 (r359397) @@ -64,7 +64,7 @@ void pool_list_free(zpool_list_t *); int pool_list_count(zpool_list_t *); void pool_list_remove(zpool_list_t *, zpool_handle_t *); -libzfs_handle_t *g_zfs; +extern libzfs_handle_t *g_zfs; #ifdef __cplusplus }