From owner-svn-src-head@freebsd.org Sun May 24 14:54:22 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 2B0BA32FF15; Sun, 24 May 2020 14:54:22 +0000 (UTC) (envelope-from avg@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 49VNXt0P24z48Rw; Sun, 24 May 2020 14:54:22 +0000 (UTC) (envelope-from avg@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 08B8922C0F; Sun, 24 May 2020 14:54:22 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04OEsLDt036030; Sun, 24 May 2020 14:54:21 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04OEsLJm036029; Sun, 24 May 2020 14:54:21 GMT (envelope-from avg@FreeBSD.org) Message-Id: <202005241454.04OEsLJm036029@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Sun, 24 May 2020 14:54:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361434 - head/lib/libprocstat X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/lib/libprocstat X-SVN-Commit-Revision: 361434 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.33 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, 24 May 2020 14:54:22 -0000 Author: avg Date: Sun May 24 14:54:21 2020 New Revision: 361434 URL: https://svnweb.freebsd.org/changeset/base/361434 Log: libprocstat: try to fix fallout from r361363 The revision caused libprocstat to have two undefined symbols: - __start_set_pcpu - __stop_set_pcpu probably because of __GLOBL() used in sys/pcpu.h under _KERNEL. The symbols are not accessed by anything and the linker in base does not complain about them, but some ports are failing to build. Hack around the problem by providing definitions for those symbols. Probably there is a better solution, but I could not think of it yet. Reported by: zeising MFC after: 3 days X-MFC with: r361363 Sponsored by: Panzura Modified: head/lib/libprocstat/zfs_defs.c Modified: head/lib/libprocstat/zfs_defs.c ============================================================================== --- head/lib/libprocstat/zfs_defs.c Sun May 24 10:19:26 2020 (r361433) +++ head/lib/libprocstat/zfs_defs.c Sun May 24 14:54:21 2020 (r361434) @@ -57,3 +57,7 @@ size_t sizeof_znode_t = sizeof(znode_t); size_t offsetof_z_id = offsetof(znode_t, z_id); size_t offsetof_z_size = offsetof(znode_t, z_size); size_t offsetof_z_mode = offsetof(znode_t, z_mode); + +/* Keep pcpu.h satisfied. */ +uintptr_t *__start_set_pcpu; +uintptr_t *__stop_set_pcpu;