From nobody Thu Feb 29 19:19:19 2024 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 4Tm1HW4kgQz5ClZb; Thu, 29 Feb 2024 19:19: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 4Tm1HW2dhyz4XKG; Thu, 29 Feb 2024 19:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709234359; 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=YJM/kjIUFA7cLljZwWwlcmSmQPXs2XIYDA6ohVWS8eY=; b=EWzUDRqVa6Cxbn6FUa9kM9HeCe7RNpls/fjb3vxoxEyOIsa7+q7tgxgdrHSR/aIapac8pt DX47YtPAum6MhkXDJbaXDCz4aVmdqaYpu0MwfR6eEn1RY6+twohRQ0A8nNUtuUyxV1jG1j NKbeKH4z4vDpnoANWEFegN7VZon5P2Dxtb/+3GgbjwqdiuZLGC6f5Lk1O8cNeCYRZqElb3 O1yVzXy8SdkedxuiGyAGYbBVzJM2Tr9oK86n/FMk2aMH+RdUKNZCUH8DGoxOztKJF0DeE/ qJsActXZ+tR4mFncHTYMNesYOZvH251IhLgRdeVbN6cLjcHI7MpEOzUk3VqHHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709234359; a=rsa-sha256; cv=none; b=upe0aYC7ZuFhP3sM/6sANRhpAPr22yeAFcBX+DI8YssLM9mo+c3rGfyb/wSx+biLcuN0YZ pnK6ukiEY1QAtfLzM20+u+QSxHJDoSNLasi6EUBR8V1bovOiIW0S6TIpeMbPLbPIUYAoW/ bWfByvHAtjBYIgp/m8ZPIgQukkuPoJdhMWOKCu8kwRKl6hcuSPHp3BH7PjK0ihsQjuPHAq jeKhqV/qhlb/0Dwtn8zcA+o8i62xwIsfnmFWxkqrDmRfy2webOSbGi1sffpck4yUOz0Dlp 9vmWp7QjWNdYqV8EMm8HUgMAAlW90dmsu54dLCVKfg4PSqgaJhO8isMqbzKKJA== 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=1709234359; 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=YJM/kjIUFA7cLljZwWwlcmSmQPXs2XIYDA6ohVWS8eY=; b=TZVdsvrIL2/5ymC3J6HgqC0snRGpA+5N1EPBkXxLpA2UGnjt7+ZjLLHe2KXGEY3jjKSqKC gnzC9bGaIW3fShqbraQUPw1rcaK434tmsOXsRRzgCnWGKSCZFKv9N6dDaB6ITQMs4Cz9Ml 8rFlKHzcwJordhR84HNsZF3O2/azyCUkt0in73VbZc015AF53luOBDshp8r+eHgn5Rkznz WXM1ob6l7dTqLVaD8iarh/V1yzCSIm9f1M6aEuNsEJceHYezJcmlLJLzZ7grjD6DWYJuLF VNUuKeqnl4K3H9hGd1MzrCm+qH4CDOHzDIF8aapX6uqwBxAwWq6vDDoxDAgZdQ== 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 4Tm1HW27QRzvT7; Thu, 29 Feb 2024 19:19: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 41TJJJdq013053; Thu, 29 Feb 2024 19:19:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41TJJJN7013050; Thu, 29 Feb 2024 19:19:19 GMT (envelope-from git) Date: Thu, 29 Feb 2024 19:19:19 GMT Message-Id: <202402291919.41TJJJN7013050@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: e52a9177d9e4 - main - libsys: reduce makefile declaration duplication 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: e52a9177d9e43518e86d470be9cdbdcd7a699b8a Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e52a9177d9e43518e86d470be9cdbdcd7a699b8a commit e52a9177d9e43518e86d470be9cdbdcd7a699b8a Author: Brooks Davis AuthorDate: 2024-02-29 19:19:01 +0000 Commit: Brooks Davis CommitDate: 2024-02-29 19:19:01 +0000 libsys: reduce makefile declaration duplication Every PSEUDO entry (_foo.o) has a corresponding NOASM entry (foo.o) to suppress its addition to ASM. Check PSEUDO instead when adding entries to ASM. No functional change. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44106 --- lib/libsys/Makefile.sys | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index 6b83e5812f76..cafe197ec15e 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -15,9 +15,7 @@ # While historically machine dependent, all architectures have the following # declarations in common: # -NOASM= exit.o \ - getlogin.o \ - yield.o +NOASM= yield.o PSEUDO= _exit.o \ _getlogin.o .include "${LIBSYS_SRCTOP}/${LIBC_ARCH}/Makefile.sys" @@ -26,7 +24,6 @@ PSEUDO= _exit.o \ .endif SRCS+= clock_gettime.c gettimeofday.c __vdso_gettimeofday.c -NOASM+= clock_gettime.o gettimeofday.o PSEUDO+= _clock_gettime.o _gettimeofday.o # Sources common to both syscall interfaces: @@ -43,7 +40,6 @@ SRCS+= creat.c SRCS+= lockf.c wait.c wait3.c waitpid.c waitid.c SRCS+= recv.c recvmmsg.c send.c sendmmsg.c -NOASM+= sched_getcpu.o PSEUDO+= _sched_getcpu.o SRCS+= brk.c @@ -105,18 +101,17 @@ INTERPOSED = \ writev SRCS+= ${INTERPOSED:S/$/.c/} -NOASM+= ${INTERPOSED:S/$/.o/} PSEUDO+= ${INTERPOSED:C/^.*$/_&.o/} # Add machine dependent asm sources: SRCS+=${MDASM} # Look though the complete list of syscalls (MIASM) for names that are -# not defined with machine dependent implementations (MDASM) and are -# not declared for no generation of default code (NOASM). Add each -# syscall that satisfies these conditions to the ASM list. +# not defined with machine dependent implementations (MDASM), not declared +# without a trival symbol (PSEUDO). Add each syscall that satisfies +# these conditions to the ASM list. .for _asm in ${MIASM} -.if !${MDASM:R:M${_asm:R}} && !${NOASM:R:M${_asm:R}} +.if !${MDASM:R:M${_asm:R}} && !${NOASM:R:M${_asm:R}} && !${PSEUDO:R:M_${_asm:R}} ASM+=$(_asm) .endif .endfor