From nobody Thu Apr 20 18:01:13 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 4Q2QSn5Zy5z46NsH; Thu, 20 Apr 2023 18:01:13 +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 4Q2QSn4QH6z4GH7; Thu, 20 Apr 2023 18:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682013673; 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=Q1CIEiKtG98BnNTvusGPwoOMvxacb5yS1v9CBehg2a4=; b=AStqKPsXq/D6Vd8xLPaSbUhQyRyRIv259v3WoVbddJuQxqul49+rS2XszkPGhIIy6aYFPQ gnal2oHlG9u9S/nOaBJi6QFap2yo1MtBKbrEVWUHr/QHfW+xffMT8SEg3Nh+uKc9dVq+Kj cE9L1jAgCvdNq8x/f4iHO1H01iYZGL4Ot8R8eKQuSdaQda8pAAbOnhZ600CBC2aODCawL6 xKsevf0Txmf1ZIvzh0kwDDw1s80/qikgGWxEjKypYB7h/w1UDKvrS6qvBGGUte3Dw3zZ0V wVd6YNiGT/yGE10PE0cpAyQQRs6X35gffvRUK2YDhattgVTW5l4egOjs6mIwVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682013673; 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=Q1CIEiKtG98BnNTvusGPwoOMvxacb5yS1v9CBehg2a4=; b=TuO7X9OG7NE9fnfaJCNjb3FFaEWgBoNxv+tGPMet9C8OoHKhAJushtZz3VssWAp4zpZsPL DlJYwEjsHVlLBl1sFAUO8OZ/V/+4kZNJ8Hm5rG+xq4muw++/qdHo53Ba6l8bO9m0NPsIwu a/A9rsgrjOrfjUK7loe+BchcS8fDTsOxkRdQVqXj8HFlxsC92K7eF7psDo92kDL3BJcv2M slIDVEYcyl6onlvP3jEAA3DJOYPIryc0jfBSro5dsGUi/d/UpRvdNKVuJJRrw33J22hYKf 2b/w0wbiqdzWDw7OxviAFbjw6dvFj7AoM8PaD8wldk0Sv8YAGhihxNgcv/R8sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682013673; a=rsa-sha256; cv=none; b=uqp+82Fxo4IjZmkVwhSEjjunUXAsdoB1h8ldpsFC3wpR6Vh2Oo3W4lhBtlroWAD98fGkbU 0rat8jmS+HQzcQQuL3rdxps1Ey8UXn0SaTbTJ0qw4BWiXefg+LB6h3dbCNBkoOtGkneIma RFAaR1JQO5Z8onWKUaSpplh704pKHb6gGBghKjXfGiIp/G8PsMtqN9AI68rtKInOCnlhta z6BV3MW0CSwV99e5dAMMDnATZRPuDsM7uzHgkmQdL/9q8uP3NxJ6lTwE6UPpaXJAmyfL3/ NxWhiQAqNMXBZo+KMZE8jtQTuy69grOO5JtV20zz4BlhRrpAiAIig+Wt5vIS1w== 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 4Q2QSn3VKBznHx; Thu, 20 Apr 2023 18:01:13 +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 33KI1DcT023328; Thu, 20 Apr 2023 18:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KI1DDv023327; Thu, 20 Apr 2023 18:01:13 GMT (envelope-from git) Date: Thu, 20 Apr 2023 18:01:13 GMT Message-Id: <202304201801.33KI1DDv023327@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: 47e888f8363d - main - Remove a few more references to 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: 47e888f8363dff61b48befcfb79161abee65b1d1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=47e888f8363dff61b48befcfb79161abee65b1d1 commit 47e888f8363dff61b48befcfb79161abee65b1d1 Author: John Baldwin AuthorDate: 2023-04-20 18:00:46 +0000 Commit: John Baldwin CommitDate: 2023-04-20 18:00:46 +0000 Remove a few more references to riscv64sf. Fixes: 1ca12bd927d7 Remove the riscv64sf architecture. --- lib/libc/Makefile | 3 +-- lib/libcompiler_rt/Makefile.inc | 4 ---- share/mk/bsd.cpu.mk | 7 +------ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 2c6f2da361b3..e2a8f1473bf3 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -125,8 +125,7 @@ NOASM= .include "${LIBC_SRCTOP}/rpc/Makefile.inc" .include "${LIBC_SRCTOP}/uuid/Makefile.inc" .include "${LIBC_SRCTOP}/xdr/Makefile.inc" -.if (${LIBC_ARCH} == "arm" && (defined(CPUTYPE) && ${CPUTYPE:M*soft*})) || \ - (${LIBC_ARCH} == "riscv" && ${MACHINE_ARCH:Mriscv*sf} != "") +.if (${LIBC_ARCH} == "arm" && (defined(CPUTYPE) && ${CPUTYPE:M*soft*})) .include "${LIBC_SRCTOP}/softfloat/Makefile.inc" .endif .if ${LIBC_ARCH} == "i386" || ${LIBC_ARCH} == "amd64" diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc index 519ff0943ff3..2ceab5f12d8d 100644 --- a/lib/libcompiler_rt/Makefile.inc +++ b/lib/libcompiler_rt/Makefile.inc @@ -246,7 +246,3 @@ SRCS+= switch8.S SRCS+= switchu8.S SRCS+= sync_synchronize.S .endif - -.if ${MACHINE_ARCH:Mriscv*sf} -CFLAGS+= -D__SOFT_FP__ -.endif diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 693a9b5209da..dbd58a385b23 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -317,12 +317,8 @@ CFLAGS.gcc+= -mabi=spe -mfloat-gprs=double -Wa,-me500 .endif .if ${MACHINE_CPUARCH} == "riscv" -.if ${MACHINE_ARCH:Mriscv*sf} -CFLAGS += -march=rv64imac -mabi=lp64 -.else CFLAGS += -march=rv64imafdc -mabi=lp64d .endif -.endif # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk @@ -367,8 +363,7 @@ CXXFLAGS += ${CXXFLAGS.${MACHINE_ARCH}} # Size of time_t: time32, time64 # .if (${MACHINE} == "arm" && (defined(CPUTYPE) && ${CPUTYPE:M*soft*})) || \ - (${MACHINE_ARCH} == "powerpc" && (defined(CPUTYPE) && ${CPUTYPE} == "e500")) || \ - ${MACHINE_ARCH:Mriscv*sf*} + (${MACHINE_ARCH} == "powerpc" && (defined(CPUTYPE) && ${CPUTYPE} == "e500")) MACHINE_ABI+= soft-float .else MACHINE_ABI+= hard-float