From nobody Thu Feb 29 19:19:20 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 4Tm1HX67YYz5Ckwl; Thu, 29 Feb 2024 19:19:20 +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 4Tm1HX3DtHz4X6B; Thu, 29 Feb 2024 19:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709234360; 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=FuRD//F1oUBMQgFAAJBeMQwhd6mIj4PB9yaxf7LE9IA=; b=LTYBZ4px0UI1vhe1dw8qBhuDnuoRRESzCMdJFvmn3HoBz5jLS1u2QxFzEfEMYS+d8GE3JE IVTLpkqHVSxRgdQnazrb+LZJQsWg/5hqC4UGFt6voXl/iUDJCHovnYZ4CHPlArzzdWssKj POe7iTrGT7Z+qiTQw2UbNWwtuzjH1WjfXJq+Ro9nbyuGeF3miNIQdqaXAwT79O5xGf3l7c rqgeSIL0il6GeyBa+mugWjLlYnpiTn+4MAE3Rpjv0XdyzGuoLbO0fgH9Sf+A+rHdKGKOtF cFJm8eRCl4lma1BB8hMWx9yWrnaVRWUbH6FJiRGelxpANV+IoVEQzpaibZczpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709234360; a=rsa-sha256; cv=none; b=Hw8+66blcnXr2aGCEaGDcBFVz1fbVzQ8wKQlEBSeMXnu42gQvtV8k6to1+C6S6t7RsrwdT bQ1pKMK+srnMCbZ86NS7CTKe8n4OcLWY9UxKB3HlsDhqqr4KZHJ3N7xMvfB1hh82OnT4JV mqRmbKCH8BPRsPuxV6yrQy9toYdAmv2kbPHZPianNcz9DeJt3mkbGjBeWd5AqP47fCn2d3 aitwkk6u0iS+yeflaHhrvoJ0rtNV/cItOQvvAbwj8Zpsib8kwpkSuZ+2EVDKS6xZ3FdhLX hZOPo0seq0EwdWXDi0BhIPha/tqz11cYtQSrx01VIxJ/DJ7h/p8rgSGZhPjqoQ== 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=1709234360; 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=FuRD//F1oUBMQgFAAJBeMQwhd6mIj4PB9yaxf7LE9IA=; b=jNX9HO8wKINTguhHb1gtebBOP84nDaEdT5ZNn9pQXbDGeqvsuiLMdwhThiEcYJv8m6ta3S 8db68bvdJTPrYatPLocqzVrfPcViFehNRVUwDRIDa+cMGlDnvvznSXoQ0AquQxW0H212AS l7VMZQJ+9J9dBm/qnAlcRkQNujU4rZmh0pvyvwZzPsZpnfTd+NAEhgotG06hHbvqv3ZLYC 6H48z42/nZuwPVNRKnFOnBd+fJKRaO7IEJ7tgo9VVkNBZMwurrFoOjFMGrsqZ72F467eom Ef+oPyLCfSj4l+X6LXKx2j89xOu3rnL3NxWj8EIfu5N+JHtkas1iN9OMDCkOIQ== 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 4Tm1HX2s2yzty7; Thu, 29 Feb 2024 19:19:20 +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 41TJJKi1013094; Thu, 29 Feb 2024 19:19:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41TJJKqF013091; Thu, 29 Feb 2024 19:19:20 GMT (envelope-from git) Date: Thu, 29 Feb 2024 19:19:20 GMT Message-Id: <202402291919.41TJJKqF013091@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: f102db5028cd - main - libsys: consolidate PSEUDO definitions 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: f102db5028cd8502d46d50bd5bd1f1e30a847c39 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=f102db5028cd8502d46d50bd5bd1f1e30a847c39 commit f102db5028cd8502d46d50bd5bd1f1e30a847c39 Author: Brooks Davis AuthorDate: 2024-02-29 19:19:01 +0000 Commit: Brooks Davis CommitDate: 2024-02-29 19:19:01 +0000 libsys: consolidate PSEUDO definitions Consolidate in preparation for further cleanup. Also relocate the sole NOASM entry. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44107 --- lib/libsys/Makefile.sys | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index cafe197ec15e..8af379be92e2 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -12,19 +12,12 @@ # NOASM will prevent the default syscall code from being generated. # PSEUDO generates _() and __sys_() symbols, but not (). # -# While historically machine dependent, all architectures have the following -# declarations in common: -# -NOASM= yield.o -PSEUDO= _exit.o \ - _getlogin.o .include "${LIBSYS_SRCTOP}/${LIBC_ARCH}/Makefile.sys" .if ${LIBC_ARCH} == "i386" || ${LIBC_ARCH} == "amd64" .include "${LIBSYS_SRCTOP}/x86/Makefile.sys" .endif SRCS+= clock_gettime.c gettimeofday.c __vdso_gettimeofday.c -PSEUDO+= _clock_gettime.o _gettimeofday.o # Sources common to both syscall interfaces: SRCS+= \ @@ -40,8 +33,6 @@ SRCS+= creat.c SRCS+= lockf.c wait.c wait3.c waitpid.c waitid.c SRCS+= recv.c recvmmsg.c send.c sendmmsg.c -PSEUDO+= _sched_getcpu.o - SRCS+= brk.c SRCS+= closefrom.c SRCS+= pipe.c @@ -59,6 +50,15 @@ SOBJS+= libc_stubs.pico STATICOBJS+= auxv.o .endif +NOASM= yield.o + +PSEUDO= \ + _clock_gettime.o \ + _exit.o \ + _getlogin.o \ + _gettimeofday.o \ + _sched_getcpu.o + INTERPOSED = \ accept \ accept4 \