From nobody Thu Apr 2 10:03:22 2026 X-Original-To: dev-commits-src-branches@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 4fmcqt6Mmfz6Y8Wl for ; Thu, 02 Apr 2026 10:03:22 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fmcqt5fw7z46jQ for ; Thu, 02 Apr 2026 10:03:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775124202; 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=ZXtRlTxk3HlJFyCElgJnhP4Xt7ZPX1HOvd9Js1bJiXA=; b=dnkMxPq3iUIbBN2waVZ1ch78QOgUgzYVo/wI3njxebKXzoyynOFMCFuvHhoRrfW5s0EDje B6VfkoJXhrZaXFXdTQHYRlf00VfYfmIQEVSrxls3EdzUSNqyR5bz858zNLsHORki1/NIgQ 4an+1frVZlPNJXm/g+LadxVBrAxDZlkyDGUbugjJ7juYo8+dJPzMurDcHNIPNzXWKWP0R3 ewD4dYCguZrxMpmGIM0auWdwFmrPiMTpKdoZvvspox6pNHYnnpnaATgBOyh8ngdqDIpFLF KGXTDaOKtRx9jOQX443khKTus/qy1f+6NqEkZJ3hEUGabooUvoWwnbii4Z/WLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775124202; a=rsa-sha256; cv=none; b=LXmW+7VUO9ofgmcZuPMOBd77lWXOMy45YlN7iNggf1hHyr7Z0l2OCm5PLGLLVJabe1oG61 ocdjEnVffC4fataoa86x6pstFNjd2kxHiBxF7gyqCRKryBsc4ZOCBg/FQ+DSe7SL790wBS 4xICU8rC3hm1FHjaUNorl2jVlP2WJ4rzisKTVbkTt+gbILMt572DqrT7V27BRxNGwfyXvZ PRgqMPnQkbGSF9I5RwB/U83Jzj89GR5pBRemUGifcvZcN9GT40at+sZ7FtZab68mJV4GTX ngMYmaRz0PFxTVi8dX0VSsY3hBCY2aGnpmMyUQH1cHT94IbYBSd6cTsiO7I9dg== 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=1775124202; 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=ZXtRlTxk3HlJFyCElgJnhP4Xt7ZPX1HOvd9Js1bJiXA=; b=WGyNV8PrSBb+yHI0pNW/lLBDIS2dGvgKI8+UfFOY1Orv21F+UFLP9BWfpQwAZc9oD/jsF4 33YpC99ek8MZPt7JOqIxil74Kn+pVx96zjBOXrQoRWJ06m8MK+C7GrAhcnmMXv06vBFNOq CvA86jik/Rbj5/yGwM2XY0PVZj4QlwDKqadntDT+x9YWwbaGQcDeHJIXR9UB378L5m+w3y u+7+dcAFNKJSbrxjB0nsSeYXBZLBGZaoKvn9VSGXR1M+mJP+N6A0gKCBj7O7M7Y+wwTm+s oGaBsAGxyjyLvWwv9JYTZK+HRsyLbzgczwRfQKCPuPypFUTjOgTMCoieN4ogfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmcqt59ZhzxS4 for ; Thu, 02 Apr 2026 10:03:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e365 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Apr 2026 10:03:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: db9fd99ba8bd - stable/13 - cross-build: Provide mempcpy when building on macOS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: db9fd99ba8bd638f64079d8f0f8a2b282c71a4df Auto-Submitted: auto-generated Date: Thu, 02 Apr 2026 10:03:22 +0000 Message-Id: <69ce3eea.3e365.1636dc1@gitrepo.freebsd.org> The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=db9fd99ba8bd638f64079d8f0f8a2b282c71a4df commit db9fd99ba8bd638f64079d8f0f8a2b282c71a4df Author: Jessica Clarke AuthorDate: 2026-03-23 16:56:09 +0000 Commit: Jessica Clarke CommitDate: 2026-04-02 10:02:04 +0000 cross-build: Provide mempcpy when building on macOS We could patch the tzcode config to not use it, but it's simple to provide an implementation of it and avoid spreading cross-build bootstrapping special cases. Fixes: ff2c98b30b57 ("tzcode: Update to 2026a") MFC after: 1 week (cherry picked from commit 47402c9422ec6c9ba76d96414f5a08bd35a9e1fd) --- tools/build/Makefile | 7 +++++++ tools/build/cross-build/include/mac/string.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index b6925688896d..92c80493139e 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -183,6 +183,13 @@ SRCS+= progname.c # Stub implementations of fflagstostr/strtofflags SRCS+= fflags.c .endif + +.if ${.MAKE.OS} == "Darwin" +# macOS currently lacks mempcpy +.PATH: ${LIBC_SRCTOP}/string +SRCS+= mempcpy.c +.endif # ${MAKE.OS} == "Darwin" + # Provide the same arc4random implementation on Linux/macOS CFLAGS.arc4random.c+= -I${SRCTOP}/sys/crypto/chacha20 -D__isthreaded=1 SRCS+= arc4random.c arc4random_uniform.c diff --git a/tools/build/cross-build/include/mac/string.h b/tools/build/cross-build/include/mac/string.h index 58464f1f9834..8a36bb1f392d 100644 --- a/tools/build/cross-build/include/mac/string.h +++ b/tools/build/cross-build/include/mac/string.h @@ -37,6 +37,8 @@ #include_next +void *(mempcpy)(void * __restrict, const void * __restrict, size_t); + /* * strchrnul is provided by macOS 15.4 and later. However, there is * no good way to detect the current host version at compile time, so