From nobody Thu Oct 08 15:21:54 2026 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 4j0tyC2BjSz6vntQ for ; Thu, 08 Oct 2026 15:21:55 +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 4j0tyB3Ly4z4qCs for ; Thu, 08 Oct 2026 15:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791472914; 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=QEhUvnsD/Ohu1fAMYwTAYbH5g5dyteLLhaGR0kJlLM0=; b=e/s3nZSiPNMoLuJwycv4+GJ7bP/OEzTEC0V/4fHjX7rC1b5DG7pQDp2bUfBBVp4CfwyDpr UiMhsC0KzK7zVnQYvruYOEeWv0RhGs4B7QdP7G8PouymFCFdtPpwFvte8f2zFO/41Hc8Xq kpHiLg8vwuSL1ABvJih6rZpj83aAhBSRVBsd2j7HiqA6pw1nWCntVqUs6fOD9YoNzHMMgp q8mCOI30gq1RHAd4hYjDiKo6+YfkHOPpf0TKfHcZhsSkfHZ1JY02I8wo560XTJX/Y/65/F bihXEcmQTqLoPpvh+WfGKCSEzJRwBxm6ZeLvWAFKmWzqkFLdAFO2z+CCOXyDBQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791472914; b=o0GZl+9nC1tKpay4O8FCT1ww+uKPZxFJ8vWOkx1cHP3XMArMS33iZKvI4t+I97xjLbFmvY tTFO7lIisvMf0Cq5Tl58XXUOlTajFDM/wj90eY9+usgCfkUNG91NVTO6GCXFsEZo3KccDq wftWC8pJHBsx9YuQZ/uH7SzpGLhXZNHyaVOmaeoWHbzxYy3Yw6zwCpbsrfzTJZJg810/x3 6/Iblpla135x45UyDbteOio832uATNYYCuDICz3Ro4j7FLGppzKH97rMBVWUl0Tezlh8XR rRf3WtttyLJFatGHEIKnTkHTzCWurrcMND0n/pXe0lp2ljkJxsDjiAc95rLIzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791472914; 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=QEhUvnsD/Ohu1fAMYwTAYbH5g5dyteLLhaGR0kJlLM0=; b=nGMp2QSJLT4D4+zGbTHpHXkrggkxoUFBWdLyDiSJKU4m1K02DfMvp7j1jdHSi0tmIhTK6z A3VPRW01OZxZYd+P9uyQjVfi8PbwKOhTTZfgM0w+x4zlJOjpmKhnSlba8KhcT8U2d2/hyM UtFanqfqEL4tynwEm4S9T5sbwOYvWgLMmvJUvvq8atpF6cDku+krNZ5qXBYy8MtETBA725 0hqLOEHcgTUNknOk+MlWIFmLMrDdVnQBheSCKDlMnUpdBQoxDv8/fjD6iL5bGWiAVXWvn1 Fq3kDFvyAcQ/vfIR3BIKqnuQ75eddggabGFYgHRbC3WHcPGpqFisiOPf4TmvAA== 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 4j0tyB2JY7zmCB for ; Thu, 08 Oct 2026 15:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3835d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 15:21:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 23be969c12b2 - main - libsysdecode: Fix some cpp conditionals 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23be969c12b2c2bb879aa1f2d606478a67a20852 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 15:21:54 +0000 Message-Id: <6ac7b512.3835d.94d0657@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=23be969c12b2c2bb879aa1f2d606478a67a20852 commit 23be969c12b2c2bb879aa1f2d606478a67a20852 Author: John Baldwin AuthorDate: 2026-10-08 15:21:06 +0000 Commit: John Baldwin CommitDate: 2026-10-08 15:21:06 +0000 libsysdecode: Fix some cpp conditionals While testing the bare values happens to work, the intent is to test for their definition. Reviewed by: emaste Fixes: 9a16bd169e8c ("libsysdecode: support errno and syscalls for arm64 Linux") Fixes: b69ae1a34c6f ("libsysdecode: Add preliminary support for decoding Linux syscalls") Differential Revision: https://reviews.freebsd.org/D60415 --- lib/libsysdecode/linux.c | 4 ++-- lib/libsysdecode/syscallnames.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libsysdecode/linux.c b/lib/libsysdecode/linux.c index 1ad3b4f89806..e0bd463ca89e 100644 --- a/lib/libsysdecode/linux.c +++ b/lib/libsysdecode/linux.c @@ -35,9 +35,9 @@ #ifdef __aarch64__ #include -#elif __i386__ +#elif defined(__i386__) #include -#elif __amd64__ +#elif defined(__amd64__) #include #else #error "Unsupported Linux arch" diff --git a/lib/libsysdecode/syscallnames.c b/lib/libsysdecode/syscallnames.c index da356d8ac016..cb7b55cc1607 100644 --- a/lib/libsysdecode/syscallnames.c +++ b/lib/libsysdecode/syscallnames.c @@ -50,7 +50,7 @@ static static #ifdef __aarch64__ #include -#elif __amd64__ +#elif defined(__amd64__) #include #else #include