From nobody Fri Jul 14 04:13:06 2023 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 4R2J424wfVz4mn3D; Fri, 14 Jul 2023 04:13:06 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2J4240qsz40Wx; Fri, 14 Jul 2023 04:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689307986; 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=sDE3reVU6W5ToAz/bKr+HCiURl3i9DcWsP1bHPnicBQ=; b=SxYCgKfp3ejtQB3qIONdiuqBvrMFp3W0PNwkqrIG/fXlGoiNA6j/DQAqe6RyK5ZRZqWQEk aQCuYnWhaUSVNVRIQym4WRiGYsaC0yVVKAr/WtZuYwOkukUOKUbri39HNa4Xl38NhwsEGt 4R6YhkWNr6ebYUZhJheJzaZu3C2m4Q4CcyQTXpkn9N0svbLvAOE1f4vQDgoFbS2oXn5OSP tM0dXQ30khvt8vCGHVyRIBsGaOcvQI3H2ngyjQd9MPfJ0c0bv9dUIPrhyLPBgVh5JHRfGz BQwisPKRf1onykLhxRy5Via4vAwQfZi8JWWudvYRgJDHV+f2cU+Ge6mkAJtmYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689307986; 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=sDE3reVU6W5ToAz/bKr+HCiURl3i9DcWsP1bHPnicBQ=; b=nKd1Sqmy3hkjt0Y65vyJuplv5VU0Ancslw702cXDP6+F0pmCyh8RM20XmQ8TszcaGx9Hg3 Mlh0YK/ySkg3RoMdRXJSl+DR2b1lBjVPfr/2bTbGDP112UtkwZlwc5tPdBfsI/hvyuD+J4 n0vns612ZJFRL3i6zLs3xgv2KAFJXsXwjowXwYBuEfcLOwnd+SH5xsuz5mUHmO5uyVdlR6 ZarLOEDUQTLKYDPQy495JL8rkxdeuKQySj4Oaoyb8N5Qq0TWiPOHq/IcPmTdnYWJId6QJ7 fjNy6mGvjf9j/KQIlaM1KOS+Stx97LY8sIVUQDQ95xABPP4JiHCa+9+jSVgVAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689307986; a=rsa-sha256; cv=none; b=nAM2rzbzhz6thh/cwrJUvuJESQxTaWOVe6kfetp/yxLwc9tmMF2JFpOGqcL4wfolV9cOWN 8+1JxdwAzEgZOizU90eUDOEwzX4QDXchYNvvCQUb57zyGIvn7vg4lcbIw+ZKxu/s0hfcmB I4Kfv/pECaljI7FQburki0Bn28KcQ2yqSW4O5FZG7VZGyevbVyiRsIaoGvOJ8vxs8UepkR lnmEpavpLD4U4H+sKLf9zF5U8E2VEyG+IwiGhbZboJCmvzOJ/IgfDFWgFLRPIRyZf3Bt1s oUKtejnaVjbFqa9PGzZKsPcMTn/kic+IvBGjOxgLjf4X+VeSAfaXqCfKYnJ1EQ== 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 4R2J423432z1JC6; Fri, 14 Jul 2023 04:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36E4D6BS085927; Fri, 14 Jul 2023 04:13:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E4D6dg085926; Fri, 14 Jul 2023 04:13:06 GMT (envelope-from git) Date: Fri, 14 Jul 2023 04:13:06 GMT Message-Id: <202307140413.36E4D6dg085926@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f0404eb39e87 - stable/13 - libthr: Add src.conf variable WITHOUT_PTHREADS_ASSERTIONS 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f0404eb39e877425d70b4ba0da530f67d9c36771 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f0404eb39e877425d70b4ba0da530f67d9c36771 commit f0404eb39e877425d70b4ba0da530f67d9c36771 Author: Greg Becker AuthorDate: 2023-07-07 00:30:02 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-13 01:29:17 +0000 libthr: Add src.conf variable WITHOUT_PTHREADS_ASSERTIONS (cherry picked from commit 642cd511028b8839db2c89a44cf7807d80664f38) --- lib/libthr/Makefile | 2 ++ lib/libthr/thread/thr_mutex.c | 2 +- share/mk/src.opts.mk | 1 + tools/build/options/WITHOUT_PTHREADS_ASSERTIONS | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index 0b550d995241..dff8905a1670 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -45,8 +45,10 @@ SYMBOL_MAPS=${.CURDIR}/pthread.map MAN= libthr.3 +.if ${MK_PTHREADS_ASSERTIONS} != "no" # enable extra internal consistency checks CFLAGS+=-D_PTHREADS_INVARIANTS +.endif PRECIOUSLIB= diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index 8dccdf4dfa8c..2cbfd9a459d3 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -120,7 +120,7 @@ __weak_reference(_pthread_mutex_getyieldloops_np, pthread_mutex_getyieldloops_np __weak_reference(_pthread_mutex_isowned_np, pthread_mutex_isowned_np); static void -mutex_init_link(struct pthread_mutex *m) +mutex_init_link(struct pthread_mutex *m __unused) { #if defined(_PTHREADS_INVARIANTS) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 403bbfb1a138..f7120b69fdbd 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -160,6 +160,7 @@ __DEFAULT_YES_OPTIONS = \ PMC \ PORTSNAP \ PPP \ + PTHREADS_ASSERTIONS \ QUOTAS \ RADIUS_SUPPORT \ RBOOTD \ diff --git a/tools/build/options/WITHOUT_PTHREADS_ASSERTIONS b/tools/build/options/WITHOUT_PTHREADS_ASSERTIONS new file mode 100644 index 000000000000..b0961fa43cb6 --- /dev/null +++ b/tools/build/options/WITHOUT_PTHREADS_ASSERTIONS @@ -0,0 +1 @@ +Disable debugging assertions in pthreads library.