From nobody Wed Aug 06 12:51:56 2025 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 4bxqtj2mWsz63gVP; Wed, 06 Aug 2025 12:51:57 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bxqtj0xyhz3fK3; Wed, 06 Aug 2025 12:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754484717; 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=+lDUwMPOZkjYVyOykYgIw2FPx4o4CNLNz6/+WXUjz+0=; b=I0Qx9cZyzeugnVToLmcQdMvPSpaKo1nedvvEAnFhImCUv0Zr3UcHr/5eRDEPddxT5KDLZ6 WUz8nGT0W9iAMlPIWQcCfkhFtk2WDsvb/LxA7a+wLKT2fXxQnmOYxJ00U8YGXeXCC/Z+0P eW7MF4RpPqMRiLP+kyj+qsIS0MQiY7R8qW6dYdXrE4vgeXQ2aufwuDA1J1XZEhiYxlVQIn cShZcYTrI2dVltv2dpX92eNt1zTPEpE11i9dNg3/Zo2nZ4C15DicMfJiNIXPGvgYhOOWNM ZAlG+HrxPD1V2n2bD68gK+dwTXpnWP6dRV5SlMQ+dqfUhwIozMsRv6eu59iI6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754484717; 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=+lDUwMPOZkjYVyOykYgIw2FPx4o4CNLNz6/+WXUjz+0=; b=lddRMqI/GYUfWQu7cuoFspKNYWU50uiMseTUYC7KP51j4bGOOm1cJZD1+/kQMvwgmOXyla 1xRqVOAU1GJvO/TTJlpg+culy9oBVBla2y9Ii5NrMwtK8PdRNHwztVd3dX5WvjIIy/NMjU 5VQk3WtWYhnUFa2OQKTQW/4rsALRqNVAVyybETAOtPvlt2HcZ5rJYN/zjPcaYGJykGtpfJ l0X8pOhe8qdmeqcIIDOOeOh3gs5aV7ayD52en+JWuBKhXJaHehbUfISk6TrY3giVbLtAts JMbt+kpjjzMPGOotMx3v1eSN78jhOIvWeG9Fu2k5b6fxYm2a2br1q4xzSaCoZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754484717; a=rsa-sha256; cv=none; b=ajE9BdK9AKOGuM8+88+yAM0jX0/aTVHZUOeTwZVomP9vu4tS0apMLNJSmPtpkPx4FG9AtH /IjGm6LOWU94nkefaShjxqFTlt0KjSQqTkg4zmrwmrSo3/lsxh5r8fbArXsMb4GnpUleoh 7R68t+rZ+QGowNHfQwIx1ttZ3ldHsz0bfZ4EER+ybbyXtpyxd9ZSg3vcErTshwgsHW6MJ7 fNOhFzbEn5ldz7amQIErCUr8pOPyhPydXEf+pxf27II6zZapCdAyyjmdXuZRRNKbK9LsxU tWVJi/GrohXZOvn84TPo9U9CeGGRVGMpX9XzIQz7rXgZRRPW4rJrCeDq2vOasw== 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 4bxqtj0F0vz5qn; Wed, 06 Aug 2025 12:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 576CpuVa046112; Wed, 6 Aug 2025 12:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 576CpuUo046109; Wed, 6 Aug 2025 12:51:56 GMT (envelope-from git) Date: Wed, 6 Aug 2025 12:51:56 GMT Message-Id: <202508061251.576CpuUo046109@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: 401d39e38937 - main - libsys: add a dependency for syscall stubs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 401d39e38937c130f4aaacc7817fabfaa4aeeee7 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=401d39e38937c130f4aaacc7817fabfaa4aeeee7 commit 401d39e38937c130f4aaacc7817fabfaa4aeeee7 Author: Brooks Davis AuthorDate: 2025-08-06 11:28:34 +0000 Commit: Brooks Davis CommitDate: 2025-08-06 11:31:24 +0000 libsys: add a dependency for syscall stubs Make syscall stubs generated by lib/libsys/Makefile.sys depend on it. This will have some false positives, but generating and assembling them is fast. Also add slightly dubious dependencies on compat.h and SYS.h. While here, fix the comment documenting the assembly origin. Reviewed by: kib, emaste Differential Revision: https://reviews.freebsd.org/D51671 --- lib/libsys/Makefile.sys | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index 3eb4bf85153d..7871731dcdcd 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -135,15 +135,28 @@ FEATURE_NOTE='\#include \nGNU_PROPERTY_AARCH64_FEATURE_1_NOTE( FEATURE_NOTE='' .endif -${SASM}: - printf '/* %sgenerated by libc/sys/Makefile.inc */\n' @ > ${.TARGET} +# Add this file as a dependency of the generated assembly along with +# the two included files compat.h and SYS.h. Depending on this Makefile +# will cause some needless regenerations, but handles both changes in +# generated assembly and movement between MIASM and PSEUDO/INTERPOSED. +# The dependency on compat.h and SYS.h should properly be on the +# .S->.o rules, but there are too many .o variants for it to +# be easy and touching the geneated source files has the same effect in +# practice. +__makefile_sys:= ${.PARSEDIR}/${.PARSEFILE} +__asm_deps= ${__makefile_sys} \ + ${LIBC_SRCTOP}/include/compat.h \ + ${LIBSYS_SRCTOP}/${LIBC_ARCH}/SYS.h + +${SASM}: ${__asm_deps} + printf '/* %sgenerated by libsys/Makefile.sys */\n' @ > ${.TARGET} printf '#include "compat.h"\n' >> ${.TARGET} printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' >> ${.TARGET} printf ${NOTE_GNU_STACK} >>${.TARGET} printf ${FEATURE_NOTE} >> ${.TARGET} -${SPSEUDO}: - printf '/* %sgenerated by libc/sys/Makefile.inc */\n' @ > ${.TARGET} +${SPSEUDO}: ${__asm_deps} + printf '/* %sgenerated by libsys/Makefile.sys */\n' @ > ${.TARGET} printf '#include "compat.h"\n' >> ${.TARGET} printf '#include "SYS.h"\nPSEUDO(${.PREFIX:S/_//})\n' \ >> ${.TARGET}