From nobody Fri Aug 15 21:27:36 2025 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 4c3ZvZ2TGGz64KY6; Fri, 15 Aug 2025 21:27:38 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c3ZvX3KZSz3Xqk; Fri, 15 Aug 2025 21:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755293258; 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=MyurFsyxNMBQriDGG2y74yHW0Kc4ogBgkAz6oMjf/lk=; b=c3PzIZfVjmvf6FHdy6qtv2VsZm8PKyyouLjdM9BJKMPWFGwDlclbFF2D5//Npi4U02ZyBq bQFSmw4T0M+kw6V0eE3CXdiTyF3BSvs9BTjzKSRgzvGy2l2F2r97iIoeMs7EDVrZ2zo13H KivP2U5YUZe7IznA92JciwD6ErbfP9/nrixAzCZLmYuFh61KcAX8LRn+WnbiyeY7MqD+ZQ fa20/Z+AeLwo7T1vZC9YlxgHH9n0S4chwLdu2YnFhUKMt7wOAK6qU+K6NNeQ58pgJque0x IH3MatOx1hy7ZMrncOuESZPEO1x61+eKqZUFKO1NIqxyZ+YptIdKzycGYeOeMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755293258; 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=MyurFsyxNMBQriDGG2y74yHW0Kc4ogBgkAz6oMjf/lk=; b=fEgR4wKNhJKV/OJVhp54Es7nxETulOfKnI5Yp0U5hmWlunU5G7fS/iE6y5082w0zIzHd1R 85/LKwZpMcmNNKdq81dCc4CJXy/Efaz611cu1/b2clTZiSeRn/Z74yqpN17xk1g5evbSjz MBtF2s7XTnQljvgGrKAJeju1CqyZ8uC9iw0Jad1QCgCIlyzi9ovmE9gRdjUXL7/ovo363b MI3vAPLMHrzXNGiLjctBU/8DZs1F1Md+sTxyKyyxIsSNMuQLonVuFqrowVHAXqpd2xavAb u7SAfclRWf/trhmvhj4g6Ewxhmgp3Mv0TIvBicVlI3xJlcnEP+mOsTfwsu0Gsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755293258; a=rsa-sha256; cv=none; b=SHCX5FHBfhzts7aNoVBXaCsYWXR5BCn4dMFiEICdxe4lIa+iQcuhwNuZPGvOW1JidTGCXI VStNNXEVSBzvX3kfV4UJP2OEOh3Px8Ga9+WVQp3lnU4cpsAn5ij57/OHuPv9RmruamlM3V 1gdvngxjvt0jWa+cCPs+Xl2pB1XtTGwszBnIel4ASd5CIeMPGDH8DMKAMiBleoz0/WN8EO /CEHsonnXC6ts6RUDiPuG1P8fFxTYNA/GCuOnT6eBRqjnWrSIGpR6JDLOz4euEYibK8uXr GWU0IhfBN87QgQ6mbo6yoZonv1b8lzVbD7OSm8CnJE3kyesuh/RY/z2ClRy31Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c3ZvX2thrzvX6; Fri, 15 Aug 2025 21:27:36 +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 57FLRa1C086453; Fri, 15 Aug 2025 21:27:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57FLRa0k086450; Fri, 15 Aug 2025 21:27:36 GMT (envelope-from git) Date: Fri, 15 Aug 2025 21:27:36 GMT Message-Id: <202508152127.57FLRa0k086450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6371645df7b0 - main - jemalloc: Add JEMALLOC_PRIVATE_NAMESPACE for the libc namespace 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6371645df7b098e3125cce92b3e46f55291ed71c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6371645df7b098e3125cce92b3e46f55291ed71c commit 6371645df7b098e3125cce92b3e46f55291ed71c Author: Warner Losh AuthorDate: 2025-08-15 21:23:33 +0000 Commit: Warner Losh CommitDate: 2025-08-15 21:24:39 +0000 jemalloc: Add JEMALLOC_PRIVATE_NAMESPACE for the libc namespace Gate the namespace dance on this define. This allows us to bootstrap new versions of jemalloc more easily. One of the steps of import is building to find what symbols need to be private. When we do that, we don't want to do this dance. No functional change. Sponsored by: Netflix --- contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h | 2 ++ contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h b/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h index a0e4f5af0124..163efbf44248 100644 --- a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h +++ b/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h @@ -1,8 +1,10 @@ #ifndef JEMALLOC_INTERNAL_DECLS_H #define JEMALLOC_INTERNAL_DECLS_H +#ifndef JEMALLOC_NO_PRIVATE_NAMESPACE #include "libc_private.h" #include "namespace.h" +#endif #include #ifdef _WIN32 diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in b/contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in index 53e30dc4b59b..f821c19746b8 100644 --- a/contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in +++ b/contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in @@ -8,8 +8,10 @@ #include #endif +#ifndef JEMALLOC_PRIVATE_NAMESPACE #include "un-namespace.h" #include "libc_private.h" +#endif #define JEMALLOC_NO_DEMANGLE #ifdef JEMALLOC_JET