From nobody Thu Aug 22 16:09:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WqSnF1FKXz5TBm8; Thu, 22 Aug 2024 16:09:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WqSnD6MFWz41nL; Thu, 22 Aug 2024 16:09:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724342944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qg5zW3dN1aJFi/i6Wad29NElHO2oAc1QfbGlqiT7V4Y=; b=RnXSDxh6q6DzKGw1X8geRUztJd+QrZv75tiVZqXYEgHQg5Iif4DcnbrPe6Y49nH7PeReyQ SdNpEgIQ0XstTstUhUkdmW8e5OCfimEgiSXNr9hRGA82//UHJXFmZILlz/2MD5gZjsQ9P5 IiVVDMRmugHhQhx2zmQ3ldApWPzx/N7GHQuzVY9n9rCmocSPjBF9SKBT5DmjCXxoquFBSM 5LQtm9HKzHVKQMd7xWA9d0dgcxGVyVIrFNasNE4bEfXk9Kc6X5MoEQnK6kPVBVtCE1fBBB dKEhFjd2UoFDS8+GkIBt13Dzm88LFPhMibVOo5FekB4XPXkJyE3TO2HxR9a/Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724342944; a=rsa-sha256; cv=none; b=msNPn+7pyQLMcNyJb7ms76HapBPaEzpv0WHn5vP5ueDxq+qSzX/67RsZsZWOjqaWcEOOos NquOr2QiHeWUkC0FKNALko3caywWgak6WtOCCJk9J6Y09OJ6EnxRux8uvjRx+8j8ajJoXM IMIWEDQt9m5dCHALjB5ojCTt5h5LwiJRzGKRDAHkLypOy8x2T9UulVDJTXduRd40kh7zLy YzEx1G6UkrvGQy3/60bNg0l1ADuJcw7YOscQNDDPr9yoozwY3V/ljtAHUVsMR84vMPAiwf L4kQ/c5QVWA3UAHVLnawQuAbU0O7Va5VL58DsewAqaIbfcpZx2tbnZppFgZEDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724342944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qg5zW3dN1aJFi/i6Wad29NElHO2oAc1QfbGlqiT7V4Y=; b=pqElT7cNI4pJxKV0jYfCnLbp6j94RXhemZKQheaT7EhPvWm6ocYLdg8TmChYiaMXbYmB3i 4BpYj3Ere5St7BpHvv8yEJwUzyNw3ceZ5XYIHARH/O1Z5B82gOApfZ5f6opNFLx6CDaKRj y2vb86EeXLWqd0ZVuBnAnkdKHQdo7IpIlCev3H8FTyQfCEzwaZcwXhJD1fu3739FzbXt0E 22OQls99pL8UOBeNsAZ9edPs9FzSCqR38xdXrGehRJ5Yj9H8/R6ln6wBVIaSmyu5BNK8ez hLIR/1XV9Fe/8YQe4LTK0Z9kZikIGoPkWs8jJ3XcpN7i7A+IwFcOWqLj+xMU3w== 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 4WqSnD5wy5zZkN; Thu, 22 Aug 2024 16:09:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47MG94ai077725; Thu, 22 Aug 2024 16:09:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47MG94i1077722; Thu, 22 Aug 2024 16:09:04 GMT (envelope-from git) Date: Thu, 22 Aug 2024 16:09:04 GMT Message-Id: <202408221609.47MG94i1077722@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 5680cf6dc6e2 - main - jemalloc: don't expose 3.0 compat symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5680cf6dc6e25cffa3930e9cb06f6982fcb80209 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=5680cf6dc6e25cffa3930e9cb06f6982fcb80209 commit 5680cf6dc6e25cffa3930e9cb06f6982fcb80209 Author: Brooks Davis AuthorDate: 2024-08-22 16:06:58 +0000 Commit: Brooks Davis CommitDate: 2024-08-22 16:08:24 +0000 jemalloc: don't expose 3.0 compat symbols Don't provide default linkage for jemalloc 3.0 compatability symbols. We stopped declaring these interfaces with the introduction of jemalloc 4.0 prior to FreeBSD 11.0. Any code using them would have had to declare them manually so stop declaring them and export the symbols directly for compatability. Arguably they should be x86 only as they were never declared on other Tier-1 architectures. Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D46407 --- .../jemalloc/include/jemalloc/jemalloc_FreeBSD.h | 26 +++++++++++++--------- lib/libc/stdlib/malloc/Symbol.map | 10 --------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h index 00848c0c48e3..dee4679838d8 100644 --- a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h +++ b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h @@ -118,7 +118,6 @@ extern int __isthreaded; #undef je_malloc_stats_print #undef je_allocm #undef je_rallocm -#undef je_sallocm #undef je_dallocm #undef je_nallocm #define je_malloc __malloc @@ -139,11 +138,6 @@ extern int __isthreaded; #define je_mallctlnametomib __mallctlnametomib #define je_mallctlbymib __mallctlbymib #define je_malloc_stats_print __malloc_stats_print -#define je_allocm __allocm -#define je_rallocm __rallocm -#define je_sallocm __sallocm -#define je_dallocm __dallocm -#define je_nallocm __nallocm #define open _open #define read _read #define write _write @@ -183,9 +177,19 @@ __weak_reference(__mallctl, mallctl); __weak_reference(__mallctlnametomib, mallctlnametomib); __weak_reference(__mallctlbymib, mallctlbymib); __weak_reference(__malloc_stats_print, malloc_stats_print); -__weak_reference(__allocm, allocm); -__weak_reference(__rallocm, rallocm); -__weak_reference(__sallocm, sallocm); -__weak_reference(__dallocm, dallocm); -__weak_reference(__nallocm, nallocm); +__weak_reference(je_allocm, weak_allocm); +__weak_reference(je_rallocm, weak_rallocm); +__weak_reference(je_sallocm, weak_sallocm); +__weak_reference(je_dallocm, weak_dallocm); +__weak_reference(je_nallocm, weak_nallocm); +__sym_compat(__allocm, je_allocm, FBSD_1.3); +__sym_compat(__rallocm, je_rallocm, FBSD_1.3); +__sym_compat(__sallocm, je_sallocm, FBSD_1.3); +__sym_compat(__dallocm, je_dallocm, FBSD_1.3); +__sym_compat(__nallocm, je_nallocm, FBSD_1.3); +__sym_compat(allocm, weak_allocm, FBSD_1.3); +__sym_compat(rallocm, weak_rallocm, FBSD_1.3); +__sym_compat(sallocm, weak_sallocm, FBSD_1.3); +__sym_compat(dallocm, weak_dallocm, FBSD_1.3); +__sym_compat(nallocm, weak_nallocm, FBSD_1.3); #endif diff --git a/lib/libc/stdlib/malloc/Symbol.map b/lib/libc/stdlib/malloc/Symbol.map index 15e4f9e6c69c..d3aa7f3f9988 100644 --- a/lib/libc/stdlib/malloc/Symbol.map +++ b/lib/libc/stdlib/malloc/Symbol.map @@ -23,11 +23,6 @@ FBSD_1.3 { sallocx; dallocx; nallocx; - allocm; - rallocm; - sallocm; - dallocm; - nallocm; __malloc; __calloc; __realloc; @@ -40,11 +35,6 @@ FBSD_1.3 { __sallocx; __dallocx; __nallocx; - __allocm; - __rallocm; - __sallocm; - __dallocm; - __nallocm; }; FBSD_1.4 {