From nobody Sat Oct 10 17:43:13 2026 X-Original-To: dev-commits-src-main@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 4j2B0K2qWSz6vYG8 for ; Sat, 10 Oct 2026 17:43:13 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j2B0K1yZhz4YWw for ; Sat, 10 Oct 2026 17:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791654193; 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=dLgj7KgiSGmi60+FqnIFbFa02XUcXA0s0P09y5pTDec=; b=NCFe2M6cE5NZlUp0ur74Syj81egrT0f/RyUDBwspqMdR+frvWR4kPlI5v29vo9chZd2Z7/ U63tTiLRDl/+HYUefgL6FyAOoE4A231Ycb4BRfoIPOhmAi3wdPhQ2jZf6IMmH4RU/XaEcR PXFY6CfUUPn+7RumdtuiY7exWrWcu44QvwP9tye8q1RnNGMB2W8rAAVckziXFhIIJ3fcNv /blwmuSxrP8ne/riTzivTXp0Q/5kqEs+jQV2s+RqMk6vBc0bU3xrDnEH2w2uMYHZkg0Jaf KVSauBkUvFQyFAcjFQmnmm50IB3kfMbNNhwfSc1+niSNbxxCF88lEWYcd6icRA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791654193; b=j8bxnI7pzKtG/k0crdE7pFXcAIc9uBbBC13bGdPRoNDMAFcNsUrkO888Ox81/tJtGg6m9j Q/pSH3wkXiKYZSNBUeE17k/QzHVDx0gpJ9ETm7OoXu24sCl+pSQauG+Qe/XxGrNPvFMVbT R+ZDf3pXDBNhoatiRPkymuaUg1vmxUGqkk0uqNEGjYwScRfRIcdRf0GonxDIV0ZXwFZ1Hk yB8TIH/oqR4MaBdx5HZsCrweVV11MapuDlywEERMJA9m+8Et+lVycgfQ7gmANeOXhSNktz oZgKlm+cras3huE5LrwmsSY8fZGwoDSYfLlESoE+x8cSuPn0i7SPmDGEgDbsrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791654193; 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=dLgj7KgiSGmi60+FqnIFbFa02XUcXA0s0P09y5pTDec=; b=EpRiEvO+YXKkkjyukSLyk5iyoXwymP/BzRY8C9fkxo48utzqc3pGSPEUFe3Q6ZDICnupoE bI3VGSt+ooEEcqXI+P0Dyf+KGeuL9s/Wn1gR8HS7zsgPT5jqZezaQeblPBMH8pgcNANG1X KgkWU3qmrXs/EiDOvQgzBe7o7SyKr8k08QncDQCGOkmSDeerbOhcN6tXBAzy7Y9/eI4Qiw KS9Ik6KWqavZZ1ofh/R2EIH7gw6yb0HM0K6eAPjKefY0UKvdy4SxZ/VloY+PIuRy9Cro/d DxETgXH4kmKmYAwKijaSJtNOmOQi7WiKNeBcvO2II7G9Qj3kIek72+gPGE803Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j2B0K0jm2z14lw for ; Sat, 10 Oct 2026 17:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e8c5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 10 Oct 2026 17:43:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: e8431fae655b - main - Revert "tests/libc: use an allowlist for sbrk in NetBSD-derived tests" List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8431fae655be5f3c5b95e091e72960ff713431f Auto-Submitted: auto-generated Date: Sat, 10 Oct 2026 17:43:13 +0000 Message-Id: <6aca7931.1e8c5.780a327b@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=e8431fae655be5f3c5b95e091e72960ff713431f commit e8431fae655be5f3c5b95e091e72960ff713431f Author: Enji Cooper AuthorDate: 2026-10-10 17:43:00 +0000 Commit: Enji Cooper CommitDate: 2026-10-10 17:43:00 +0000 Revert "tests/libc: use an allowlist for sbrk in NetBSD-derived tests" Need to update the commit message. This reverts commit 36b849b5c76406bb6d9341bfb1a7f16ae5c189c9. --- contrib/netbsd-tests/lib/libc/gen/t_dir.c | 14 ++++---------- contrib/netbsd-tests/lib/libc/sys/t_mlock.c | 14 +++----------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/gen/t_dir.c b/contrib/netbsd-tests/lib/libc/gen/t_dir.c index 49800bfb3f34..53d1fce26e2d 100644 --- a/contrib/netbsd-tests/lib/libc/gen/t_dir.c +++ b/contrib/netbsd-tests/lib/libc/gen/t_dir.c @@ -38,14 +38,7 @@ #include #include -/* - * sbrk is obsolete, and libc only provides it on a subset of - * architectures. - */ -#if defined(__amd64__) || defined(__arm__) || defined(__i386__) || \ - defined(__powerpc__) -#define HAVE_SBRK -#endif + ATF_TC(seekdir_basic); ATF_TC_HEAD(seekdir_basic, tc) @@ -141,7 +134,8 @@ ATF_TC_BODY(seekdir_basic, tc) free(wasname); } -#ifdef HAVE_SBRK +/* There is no sbrk on AArch64 and RISC-V */ +#if !defined(__aarch64__) && !defined(__riscv) ATF_TC(telldir_leak); ATF_TC_HEAD(telldir_leak, tc) { @@ -191,7 +185,7 @@ ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, seekdir_basic); -#ifdef HAVE_SBRK +#if !defined(__aarch64__) && !defined(__riscv) ATF_TP_ADD_TC(tp, telldir_leak); #endif diff --git a/contrib/netbsd-tests/lib/libc/sys/t_mlock.c b/contrib/netbsd-tests/lib/libc/sys/t_mlock.c index b081c60bbecc..d9ffbe366a04 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_mlock.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_mlock.c @@ -46,15 +46,6 @@ __RCSID("$NetBSD: t_mlock.c,v 1.6 2016/08/09 12:02:44 kre Exp $"); #include #include -/* - * sbrk is obsolete, and libc only provides it on a subset of - * architectures. - */ -#if defined(__amd64__) || defined(__arm__) || defined(__i386__) || \ - defined(__powerpc__) -#define HAVE_SBRK -#endif - #ifdef __FreeBSD__ #include #define _KMEMUSER @@ -112,7 +103,7 @@ ATF_TC_BODY(mlock_err, tc) unsigned long vmin = 0; size_t len = sizeof(vmin); #endif -#ifdef HAVE_SBRK +#if !defined(__aarch64__) && !defined(__riscv) void *invalid_ptr; #endif void *buf; @@ -168,7 +159,8 @@ ATF_TC_BODY(mlock_err, tc) #endif (void)free(buf); -#ifdef HAVE_SBRK +/* There is no sbrk on AArch64 and RISC-V */ +#if !defined(__aarch64__) && !defined(__riscv) /* * Try to create a pointer to an unmapped page - first after current * brk will likely do.