From nobody Tue Jun 27 17:19:37 2023 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 4QrBKQ0bwJz4f4TL; Tue, 27 Jun 2023 17:19:38 +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 4QrBKP6phZz3N0s; Tue, 27 Jun 2023 17:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687886378; 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=iKjdv+fLZ0Goi09D8UViYtNKCrrvMWBVrujTdFk9too=; b=T0AVFUCdc1q7QOFawWeLbY5NhYBe5gfO4SIFLBmM1J31GwMKxThwZz+OSIyYML8Ut0Vn6G A46zhQ7xt07HYTaqrnPS/B7clgk9kvEzFkqIiPNLXbINZk4GVtnErVTnJOihfIlmokOL6a wCoD6jIGwQ2v8jdCJ4Na+LbkXBljW9fv8gtfYTXqrQ0hbhmx7VRnwpMoeTc1/4MrQ+QAJ3 tncsmB7ewHUgPsiUaMCb+EJHnTF2wpNdM3hIo/2Y8vVeGt2RyNHOfugEkgopHT7D8Vc57v Ii2NMs49qPeE1mAxt1vi+jUeSOyzlDKf2BgVR5wAqUr+kZzqQGDFu/g0ffqwaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687886378; 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=iKjdv+fLZ0Goi09D8UViYtNKCrrvMWBVrujTdFk9too=; b=HjDC9MhDSqT41rmSaG4qz7PIbjv6TD3mULIN/TncGJk2+IV3aYvkuQbGLN3uwe5xs7R8pR 9t6CW371Kqttd6keufE1NBQkaSRJKISsPV56lTNyN0rcgPGYIXiuLyMf+PChU3whDaERDZ tsGzu1PVPetwYd3TARdltYECXoprtzWus7/nxIifL6xLdoAiCEFDNTNK2AAIrEMATSqL1o TqHaUMunLBYrSxiPsf0Jtb3jGVrv0qxpyHbgbIpAaHTcobkIia8XXI4/0IlhGSUez07p/x 61mTDngTU6De5yFzjVa0DAGZe7Sqidlw1lNdR5aoNOTO4lvOxF5jgNFqVMktHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687886378; a=rsa-sha256; cv=none; b=d+5nG8fZeuDZwxhbBtnt+03HVwhzcRPGzyb+X6Gqw3JYxiT2uQmPorLq0sVoU/sjh1tJpE ypzTv/HgRKwddyQUnMDEqfo3kNnouDUlA/uehp9I3S7AKFapDk4K262CMpFUXW+0QYI6sI v2n1upjSNuH9OjcXhJKfjJQ4lFvq1Jw9inlFz2QdkM7kpc1FNSHEHFhLMf6Xux8um97W5j Zw3qL21DkwYI7F5uG8ShqFFhxze0c3s7bGv2HZBcDuG5NB67To5xBoOw2JenmwXDr8fLXY GVTk9SDsDOAUlnS6I8SgznNt57HO+PM2Y8i6tXT0MwQXk6+2IX0oYOtUoYv++Q== 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 4QrBKP5sWTz11Fm; Tue, 27 Jun 2023 17:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35RHJbaj006767; Tue, 27 Jun 2023 17:19:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35RHJbEB006766; Tue, 27 Jun 2023 17:19:37 GMT (envelope-from git) Date: Tue, 27 Jun 2023 17:19:37 GMT Message-Id: <202306271719.35RHJbEB006766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 36c2fec31dd6 - main - riscv: Remove MACHINE_ARCH-specific remnants of riscv64sf. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36c2fec31dd6e7663acf8f9aac12e66dfff71889 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=36c2fec31dd6e7663acf8f9aac12e66dfff71889 commit 36c2fec31dd6e7663acf8f9aac12e66dfff71889 Author: John Baldwin AuthorDate: 2023-06-27 17:19:31 +0000 Commit: John Baldwin CommitDate: 2023-06-27 17:19:31 +0000 riscv: Remove MACHINE_ARCH-specific remnants of riscv64sf. - Remove now unnecessary MACHINE_ARCHES definition. The default logic in kern_mib.c works fine now for RISC-V. - Remove custom sv_machine_arch hook from sysentvec. Fixes: 1ca12bd927d7 Remove the riscv64sf architecture. Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D40648 --- sys/riscv/include/param.h | 3 --- sys/riscv/riscv/elf_machdep.c | 13 ------------- 2 files changed, 16 deletions(-) diff --git a/sys/riscv/include/param.h b/sys/riscv/include/param.h index 56fe9530b76d..1192865cda28 100644 --- a/sys/riscv/include/param.h +++ b/sys/riscv/include/param.h @@ -50,9 +50,6 @@ #ifndef MACHINE_ARCH #define MACHINE_ARCH "riscv64" #endif -#ifdef _KERNEL -#define MACHINE_ARCHES "riscv64" -#endif #ifdef SMP #ifndef MAXCPU diff --git a/sys/riscv/riscv/elf_machdep.c b/sys/riscv/riscv/elf_machdep.c index e0d37257facd..54298e8f7797 100644 --- a/sys/riscv/riscv/elf_machdep.c +++ b/sys/riscv/riscv/elf_machdep.c @@ -59,8 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include -static const char *riscv_machine_arch(struct proc *p); - u_long elf_hwcap; static struct sysentvec elf64_freebsd_sysvec = { @@ -98,7 +96,6 @@ static struct sysentvec elf64_freebsd_sysvec = { .sv_thread_detach = NULL, .sv_trap = NULL, .sv_hwcap = &elf_hwcap, - .sv_machine_arch = riscv_machine_arch, .sv_onexec_old = exec_onexec_old, .sv_onexit = exit_onexit, .sv_regset_begin = SET_BEGIN(__elfN(regset)), @@ -106,16 +103,6 @@ static struct sysentvec elf64_freebsd_sysvec = { }; INIT_SYSENTVEC(elf64_sysvec, &elf64_freebsd_sysvec); -static const char * -riscv_machine_arch(struct proc *p) -{ - - if ((p->p_elf_flags & EF_RISCV_FLOAT_ABI_MASK) == - EF_RISCV_FLOAT_ABI_SOFT) - return (MACHINE_ARCH "sf"); - return (MACHINE_ARCH); -} - static Elf64_Brandinfo freebsd_brand_info = { .brand = ELFOSABI_FREEBSD, .machine = EM_RISCV,