svn commit: r361434 - head/lib/libprocstat

Andriy Gapon avg at FreeBSD.org
Sun May 24 14:54:22 UTC 2020


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;


More information about the svn-src-all mailing list