From nobody Mon Feb 05 20:38:34 2024 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 4TTJB24fMCz58xlP; Mon, 5 Feb 2024 20:38:34 +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 4TTJB22Hylz4q7G; Mon, 5 Feb 2024 20:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707165514; 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=+5ifi+B4VoR54yg9iEVset9Y5eWdZuCWCltSuiO/y/8=; b=btw2sW/U43jiVvl3NJY63dPII9KveMIg4v+4myxVOKCnkKp6wVKNP3GkD0jQfV8KwGst6m 1k33K/DlZe719eLHd1L78iZIZaBCV+DdsAMfNLWAygiLmqGhBBom1pg0ZybgGQzM//5183 uzG1Ar9DqL//gOTXukSK+7aKN8oxv+LEJHk8B7QYZI0DrGapNl9Cc+kDPX1El044ZQSdmt 0lRLCGZVmHkfYlYJmU1aI9Z+OB8JEw2rhoiqz8yHPvV7wckaUmnHvbZHPHEkYKobPT3v+y M9gf/rd8JK9uwIW3Db7ntFFtIv6VryL6Qu2PRyNxmnCEFdCZocEof63w8EKMnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707165514; 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=+5ifi+B4VoR54yg9iEVset9Y5eWdZuCWCltSuiO/y/8=; b=rFcYWhPU9WDp4zYFpESGnByYQLfWj96g6ruCe1BTikwTGrpTfq2v9jwp+QMTU0xxmhS2uf mhoSL8FFMy/+BTQaHYodc0qL7hDpZcyFutXDLbfR7J6CKszRXhv+runuuGEEroBKof9yIm OshTTEB+gTkvJcwE8jsuk8nqeFkg5ru5gQjLLz655y2RzS/8fJajNjiLRnKcCB/sxaBp2S edtY8k6PH0K5HEEYB7VeTG5gMk5zRqQITT+VRFaWIIQP7JRcCSQtiY2BSu6M21fQTySVIQ +KamAV9guhqS8rJtDLTDwYVc9PI4lcMoXiV0z4SyYS593Y/QTv1UBxv35nGBzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707165514; a=rsa-sha256; cv=none; b=cTLIgRsZsEug8ote1lTAgydZKCLuXHg1+aUE5uCna+zVGTzMkB5BXexJasMN31MkjUdiUn pGTCrEIlsVHpcTx9VM2tYE2egIpcFxjJrwEeLmOewCBTM0o7O8ZSyhkX7NkSou/JtZRxOl iRCR4L2ynJmuFgOH1zBMwaPmahs0put5iePfQsScZkNk5b2a0C5yJUF0YyuRAC56G8WVH3 Kae4uzSJAINuDUf7LgvNxQdfcmM2fN8aM2BrrYv97Fcc0R/hcuHIwttEOvEZ/9kvSVk6p/ Lx5/2pGC8kKmVJx2UHkMbmNl2bfIPmaGqChKhayf3MAva1qgGNQV+2rnknUxig== 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 4TTJB210RRzvlg; Mon, 5 Feb 2024 20:38:34 +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 415KcY43069209; Mon, 5 Feb 2024 20:38:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 415KcY2J069206; Mon, 5 Feb 2024 20:38:34 GMT (envelope-from git) Date: Mon, 5 Feb 2024 20:38:34 GMT Message-Id: <202402052038.415KcY2J069206@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: 31a46e2cc84d - main - libc: Move per-arch sys/Makefile.inc to libsys 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: 31a46e2cc84d7ebfc25ce5a33e54681057e9ed9a Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=31a46e2cc84d7ebfc25ce5a33e54681057e9ed9a commit 31a46e2cc84d7ebfc25ce5a33e54681057e9ed9a Author: Brooks Davis AuthorDate: 2023-11-14 22:25:24 +0000 Commit: Brooks Davis CommitDate: 2024-02-05 20:34:55 +0000 libc: Move per-arch sys/Makefile.inc to libsys libc//sys/Makefile.inc -> libsys//Makefile.sys. Require that libsys//Makefile.sys exist. At least for current archtiectures, it's not possible for an architecture to not have and MD syscall bits. powerpcspe/Makefile.sys's structure means it had to be modified when moved so rename detection won't work, but it has trivial contents so the history is unimportant. Reviewed by: kib, emaste, imp Pull Request: https://github.com/freebsd/freebsd-src/pull/908 --- lib/libc/Makefile | 1 - lib/libc/powerpcspe/sys/Makefile.inc | 2 -- lib/libsys/Makefile.sys | 5 ++++- lib/{libc/aarch64/sys/Makefile.inc => libsys/aarch64/Makefile.sys} | 0 lib/{libc/amd64/sys/Makefile.inc => libsys/amd64/Makefile.sys} | 0 lib/{libc/arm/sys/Makefile.inc => libsys/arm/Makefile.sys} | 2 +- lib/{libc/i386/sys/Makefile.inc => libsys/i386/Makefile.sys} | 0 lib/{libc/powerpc/sys/Makefile.inc => libsys/powerpc/Makefile.sys} | 0 .../powerpc64/sys/Makefile.inc => libsys/powerpc64/Makefile.sys} | 0 lib/libsys/powerpcspe/Makefile.sys | 7 +++++++ lib/{libc/riscv/sys/Makefile.inc => libsys/riscv/Makefile.sys} | 0 lib/{libc/x86/sys/Makefile.inc => libsys/x86/Makefile.sys} | 0 lib/{libc/x86/sys => libsys/x86}/sched_getcpu_x86.c | 0 13 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 2662d8b6aad0..72300e88d3d7 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -123,7 +123,6 @@ NOASM= .include "${LIBC_SRCTOP}/softfloat/Makefile.inc" .endif .if ${LIBC_ARCH} == "i386" || ${LIBC_ARCH} == "amd64" -.include "${LIBC_SRCTOP}/x86/sys/Makefile.inc" .include "${LIBC_SRCTOP}/x86/gen/Makefile.inc" .endif .if ${MK_NIS} != "no" diff --git a/lib/libc/powerpcspe/sys/Makefile.inc b/lib/libc/powerpcspe/sys/Makefile.inc deleted file mode 100644 index 79a5fe2716be..000000000000 --- a/lib/libc/powerpcspe/sys/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -.PATH: ${LIBSYS_SRCTOP}/powerpc -.sinclude "${LIBC_SRCTOP}/powerpc/sys/Makefile.inc" diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index 699117ff437b..7600c9ef2aae 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -20,7 +20,10 @@ NOASM= exit.o \ yield.o PSEUDO= _exit.o \ _getlogin.o -.sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/sys/Makefile.inc" +.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 NOASM+= clock_gettime.o gettimeofday.o diff --git a/lib/libc/aarch64/sys/Makefile.inc b/lib/libsys/aarch64/Makefile.sys similarity index 100% rename from lib/libc/aarch64/sys/Makefile.inc rename to lib/libsys/aarch64/Makefile.sys diff --git a/lib/libc/amd64/sys/Makefile.inc b/lib/libsys/amd64/Makefile.sys similarity index 100% rename from lib/libc/amd64/sys/Makefile.inc rename to lib/libsys/amd64/Makefile.sys diff --git a/lib/libc/arm/sys/Makefile.inc b/lib/libsys/arm/Makefile.sys similarity index 56% rename from lib/libc/arm/sys/Makefile.inc rename to lib/libsys/arm/Makefile.sys index d5b62d61c90d..ccfaa03a201b 100644 --- a/lib/libc/arm/sys/Makefile.inc +++ b/lib/libsys/arm/Makefile.sys @@ -1,4 +1,4 @@ SRCS+= __vdso_gettc.c \ sched_getcpu_gen.c -MDASM= vfork.S cerror.S syscall.S +MDASM= vfork.S cerror.S syscall.S diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libsys/i386/Makefile.sys similarity index 100% rename from lib/libc/i386/sys/Makefile.inc rename to lib/libsys/i386/Makefile.sys diff --git a/lib/libc/powerpc/sys/Makefile.inc b/lib/libsys/powerpc/Makefile.sys similarity index 100% rename from lib/libc/powerpc/sys/Makefile.inc rename to lib/libsys/powerpc/Makefile.sys diff --git a/lib/libc/powerpc64/sys/Makefile.inc b/lib/libsys/powerpc64/Makefile.sys similarity index 100% rename from lib/libc/powerpc64/sys/Makefile.inc rename to lib/libsys/powerpc64/Makefile.sys diff --git a/lib/libsys/powerpcspe/Makefile.sys b/lib/libsys/powerpcspe/Makefile.sys new file mode 100644 index 000000000000..3862699ae8b2 --- /dev/null +++ b/lib/libsys/powerpcspe/Makefile.sys @@ -0,0 +1,7 @@ +CFLAGS+= -I${LIBC_SRCTOP}/powerpc +CFLAGS+= -I${LIBSYS_SRCTOP}/powerpc + +SYM_MAPS+= ${LIBSYS_SRCTOP}/powerpc/Symbol.map + +.PATH: ${LIBSYS_SRCTOP}/powerpc +.include "${LIBSYS_SRCTOP}/powerpc/Makefile.sys" diff --git a/lib/libc/riscv/sys/Makefile.inc b/lib/libsys/riscv/Makefile.sys similarity index 100% rename from lib/libc/riscv/sys/Makefile.inc rename to lib/libsys/riscv/Makefile.sys diff --git a/lib/libc/x86/sys/Makefile.inc b/lib/libsys/x86/Makefile.sys similarity index 100% rename from lib/libc/x86/sys/Makefile.inc rename to lib/libsys/x86/Makefile.sys diff --git a/lib/libc/x86/sys/sched_getcpu_x86.c b/lib/libsys/x86/sched_getcpu_x86.c similarity index 100% rename from lib/libc/x86/sys/sched_getcpu_x86.c rename to lib/libsys/x86/sched_getcpu_x86.c