From nobody Wed Dec 6 20:49:19 2023 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 4SlqJb4MCrz52xg7; Wed, 6 Dec 2023 20:49:19 +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 4SlqJb3HPlz3Qc0; Wed, 6 Dec 2023 20:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701895759; 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=QkvDmzzPfQEA5ZARDPxiDms4D6Y4DhuD+bTsxJluVqs=; b=ye/e1qa2j5Z/Y16zVveG/AxsylDIzwqVf7PqlqPL+CP8TiHBbzX/Rtrpl9fP9FymKUPQv3 xZzOFHjvJxsY8fyiEKS6cD7Su+gYCSqI4zpVXgw/J1qQuMOPhnqV8Vysn8m/ycxf75FZNJ 7p4PcS7q7If6xr00dNnyKnS4+0zBog/Bt+1TuPsrXAIrvkKKT4n9m6dlKIvSfpqvJjsPWZ RCv3sZGVrTN9FnOkOdmYP7FqXJY8JZE2HZF5fSq30bfdfIGgLAQQfHuH50/jbCdp6BYHLs pfi7TX2X89Qw7sYNLR6ZGCVW45MHcOSzJw0uJRgsbhtZkXCwnNTLO1FXcqzGKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701895759; a=rsa-sha256; cv=none; b=fLNE5aVxasg30qSdROLnpMJdLbjzoIgV7DxgI2yTW3VWM68eeBSAjzA8DAUP08pdjOvYft 4nqMDAge5Emj+T9dg4jawsiRY2uER+u/7Z7XwB+t6TuK3aCXvq/B4spJxJoywuD2cfQ5J0 LMIPgmofJ/oDSod7ZF8vPNweVY+81sGAlUmHCSrxxabUHJWDxXI5QTNPmAIl168gIS73de rYMbH0pv+IDwObyILqKnYUKHtSX6ui45tVKQAmpSY4ZH48f9/8pjtXOpPYvNYzGOfghax+ jI0lxg97byCLRaw/+F6qImczh31igp3uFHrOe+kd7BqAMwlr/66jWIGJ1PN+ow== 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=1701895759; 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=QkvDmzzPfQEA5ZARDPxiDms4D6Y4DhuD+bTsxJluVqs=; b=Ip5xUqc8GJT8o4bJV3RHpgvRyxdvBc1Zy0CMMg9kdbNey2DAHlBbxzDtKxuvZVH7Fcsfp9 B2to9STNz/6NNyAOaFKffvYFbkFgWVcOV+3rSffxrlpVjyEWBN4J9KPXyE0OlJfW3txnvU OYvqb3sKdoutREBT/OtdFu3YBizTe3Ed04qdqO/UEQdvB/RI7KPcU200jf/UrIqhXBzyfr MQRzG3flF37CQ7Diqmyu5tGTXW+hxlJkSlO7CKAXM3rCHr4GzyQZXFMppDF8Uof8DUUYVY 0nT1K2PpxwOiZo8Ckz+hs8POov51a5i/BHKv0QK/jMKE1WB38u5WXkBjhKdfSA== 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 4SlqJb2Kw6z177b; Wed, 6 Dec 2023 20:49:19 +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 3B6KnJno055085; Wed, 6 Dec 2023 20:49:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6KnJbZ055082; Wed, 6 Dec 2023 20:49:19 GMT (envelope-from git) Date: Wed, 6 Dec 2023 20:49:19 GMT Message-Id: <202312062049.3B6KnJbZ055082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: fc0288993cda - main - 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/main X-Git-Reftype: branch X-Git-Commit: fc0288993cdad8a559fcd2c2166cf95f1fa43745 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=fc0288993cdad8a559fcd2c2166cf95f1fa43745 commit fc0288993cdad8a559fcd2c2166cf95f1fa43745 Author: Brooks Davis AuthorDate: 2023-12-06 20:48:46 +0000 Commit: Brooks Davis CommitDate: 2023-12-06 20:49:08 +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 --- 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 b9ac43bac077..4137699bb741 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -98,11 +98,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/}