From nobody Tue Jan 02 17:00:13 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 4T4Jxn5hNVz55qj1; Tue, 2 Jan 2024 17:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T4Jxn4DPNz3XBl; Tue, 2 Jan 2024 17:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704214813; 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=OItNM/xxHd1D8nFwWWzScRHoEPyPPLDpEq89E3JuQDc=; b=aUM/oeZQqTBFXg58hlIIuPy58xeKfZWPfNSmtNb3TBYxnBG8elPdokSeLJ7qe9U9IAZ4pD qNLjrxl2WajBY2a+ns7lofUtp7QMRU4urWLSMgzoxrzKBiE2yWmEabYuzfAJGNuJlA6zFy ZQmObXwxCnLccGSTubpl4NvFGPCzecv2Y+C2cyoUjRev6lzgqIqLjsNEQ7md7N/0pifd// we0efBcGvXC0TtK0mYICLwmmpPoT2TlamB+Avklro1Yj31ebew4vmaoAPcxD5i3fQHnTLp fWkw3kkOIJPkp5AeOC//MiTJ8meFERq013F7Zrtk88Drnu1S+pQ7nZhIKLt33A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704214813; a=rsa-sha256; cv=none; b=QLtR4o/qopO/ans5OQklcF9nRW2tyrt6tT82GMu8wUZITqVzZYZ7kUcx+ijWiaMRdXNDRS uJXJe+tuQROSeseP4W8pPdW8N353pyG8JH4bJnfnp2CLsKp4FJVL574mpjdXVF/C9VUfK0 fbuaiVLJEj3XpoBgZa1rVVVh2dA0Gy3YgHOM2qYqnnOEcyaQQRWIE+yfkK+rFVm3xdiQfT L1jxKUIykDv2ZWPKYlfPYNew62HrN1ATMa4pQjBHf5E0iXO4Oh4Obs4WPxZzsBvtuqcrnX SybliPqQl/u7smjbZh9QwD2I620dK3SqBoD2yahugSaJxAMG6AlP5bTy3/jqaA== 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=1704214813; 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=OItNM/xxHd1D8nFwWWzScRHoEPyPPLDpEq89E3JuQDc=; b=Hv+1PqVa7/cleSZXKZ38dnGnQFLY8fzONRUcz2cF10zFX3q+xecJxz3wzUy8umpqOQS2il /6LMiGA2AIeAS83crUV8sXXY2JLK1VSReCdykpApVjIvaIp7MGBcVsZsdMFHIMl9ORhewW g6aIJdAjDN79ag59E7d4MoIC0hnzmudVtayHlmFVQ5vuVnu9A3AF7ua/A084iIon/Mit9S /3pl/qJISyuR268CBrLmv0rwCt1UNtT48dEFoIz9uBbhnIMtGCEbFG1DA2F0zAV0gqGD74 CghcPxqxp+kC+gFfrUtEVQClo8NDzqiIeJUXwYtu+q2MBmH4jEktKFftnHO6Dw== 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 4T4Jxn3KZjz181q; Tue, 2 Jan 2024 17:00:13 +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 402H0DD3041788; Tue, 2 Jan 2024 17:00:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 402H0D8Z041784; Tue, 2 Jan 2024 17:00:13 GMT (envelope-from git) Date: Tue, 2 Jan 2024 17:00:13 GMT Message-Id: <202401021700.402H0D8Z041784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 1b0471936f7e - stable/14 - libc: simplify MDASM/NOASM checks 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b0471936f7e8c30c994ea514cf3396a0b3c6dac Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=1b0471936f7e8c30c994ea514cf3396a0b3c6dac commit 1b0471936f7e8c30c994ea514cf3396a0b3c6dac Author: Brooks Davis AuthorDate: 2023-12-06 20:48:46 +0000 Commit: Brooks Davis CommitDate: 2024-01-02 16:59:04 +0000 libc: simplify MDASM/NOASM checks Use boolean evaluation of :M matches and a single if statement. Reviewed by: imp, kib Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42915 (cherry picked from commit fc0288993cdad8a559fcd2c2166cf95f1fa43745) --- lib/libc/sys/Makefile.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 1acc66c5f726..13769e5bdf19 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -109,11 +109,9 @@ SRCS+=${MDASM} # not declared for no generation of default code (NOASM). Add each # syscall that satisfies these conditions to the ASM list. .for _asm in ${MIASM} -.if (${MDASM:R:M${_asm:R}} == "") -.if (${NOASM:R:M${_asm:R}} == "") +.if !${MDASM:R:M${_asm:R}} && !${NOASM:R:M${_asm:R}} ASM+=$(_asm) .endif -.endif .endfor SASM= ${ASM:S/.o/.S/}