From owner-svn-src-head@freebsd.org Sun Feb 25 14:29:44 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 250DAF3086D; Sun, 25 Feb 2018 14:29:44 +0000 (UTC) (envelope-from asomers@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 C93A37EBB7; Sun, 25 Feb 2018 14:29:43 +0000 (UTC) (envelope-from asomers@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 BFBC761F1; Sun, 25 Feb 2018 14:29:43 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1PEThKe035305; Sun, 25 Feb 2018 14:29:43 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1PEThjY035303; Sun, 25 Feb 2018 14:29:43 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802251429.w1PEThjY035303@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 25 Feb 2018 14:29:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329984 - in head: cddl/contrib/opensolaris/lib/libzpool/common sys/cddl/compat/opensolaris/sys X-SVN-Group: head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in head: cddl/contrib/opensolaris/lib/libzpool/common sys/cddl/compat/opensolaris/sys X-SVN-Commit-Revision: 329984 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.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: Sun, 25 Feb 2018 14:29:44 -0000 Author: asomers Date: Sun Feb 25 14:29:43 2018 New Revision: 329984 URL: https://svnweb.freebsd.org/changeset/base/329984 Log: Don't declare __assfail as static It gets called by dmu_buf_init_user, which is inline but not static. So it needs global linkage itself. Reported by: GCC-6 MFC after: 17 days X-MFC-With: 329722 Modified: head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c head/sys/cddl/compat/opensolaris/sys/assfail.h Modified: head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c ============================================================================== --- head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Sun Feb 25 13:20:32 2018 (r329983) +++ head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Sun Feb 25 14:29:43 2018 (r329984) @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include Modified: head/sys/cddl/compat/opensolaris/sys/assfail.h ============================================================================== --- head/sys/cddl/compat/opensolaris/sys/assfail.h Sun Feb 25 13:20:32 2018 (r329983) +++ head/sys/cddl/compat/opensolaris/sys/assfail.h Sun Feb 25 14:29:43 2018 (r329984) @@ -48,7 +48,9 @@ void assfail3(const char *, uintmax_t, const char *, u #ifndef HAVE_ASSFAIL extern int aok; -static __inline int +__inline int __assfail(const char *expr, const char *file, int line); + +__inline int __assfail(const char *expr, const char *file, int line) {