Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bsd.compat.mk: Drop support for riscv64sf #2287

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+3 −13
Open

bsd.compat.mk: Drop support for riscv64sf #2287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions share/mk/bsd.compat.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,7 @@

.if ${COMPAT_ARCH:Mriscv*c*}
HAS_COMPAT+= 64
LIB64_RISCV_ABI= lp64
.if !${COMPAT_ARCH:Mriscv*sf}
LIB64_RISCV_ABI:= ${LIB64_RISCV_ABI}d
.endif
LIB64_RISCV_ABI= lp64d
LIB64_MACHINE= riscv
LIB64_MACHINE_ARCH=riscv64
LIB64WMAKEENV= MACHINE_CPU="riscv cheri"
Expand Down Expand Up @@ -147,25 +144,18 @@
LIB64C_MACHINE_ARCH= ${COMPAT_ARCH}c
LIB64CWMAKEFLAGS= CPUTYPE=cheri
LIB64CCPUFLAGS= -target riscv64-unknown-freebsd13.0
LIB64C_RISCV_ABI= l64pc128
.if !${MACHINE_ARCH:Mriscv*sf}
LIB64C_RISCV_ABI:= ${LIB64C_RISCV_ABI}d
.endif
LIB64C_RISCV_ABI= l64pc128d
LIB64CCPUFLAGS+= -march=${LIB64C_RISCV_MARCH} -mabi=${LIB64C_RISCV_ABI}
.endif # ${COMPAT_ARCH:Mriscv64*}
.endif # ${MK_LIB64C} != "no"

.if ${COMPAT_ARCH:Mriscv*}
.for _LIBCOMPAT in ${HAS_COMPAT}
# See bsd.cpu.mk
LIB${_LIBCOMPAT}_RISCV_MARCH= rv64ima
.if !${COMPAT_ARCH:Mriscv*sf*}
LIB${_LIBCOMPAT}_RISCV_MARCH:= ${LIB${_LIBCOMPAT}_RISCV_MARCH}fd
.endif
LIB${_LIBCOMPAT}_RISCV_MARCH:= ${LIB${_LIBCOMPAT}_RISCV_MARCH}c
LIB${_LIBCOMPAT}_RISCV_MARCH= rv64imafdc
.if ${COMPAT_ARCH:Mriscv*c*} || ${_LIBCOMPAT:M64C}
LIB${_LIBCOMPAT}_RISCV_MARCH:= ${LIB${_LIBCOMPAT}_RISCV_MARCH}xcheri
.endif

Check warning on line 158 in share/mk/bsd.compat.mk

View workflow job for this annotation

GitHub Actions / Style Checker 

Missing Signed-off-by: line
.endfor
.endif

Expand Down
Loading