Skip to content

Commit

Permalink
bsd.compat.mk: Drop support for riscv64sf
Browse files Browse the repository at this point in the history
This was removed by upstream FreeBSD and CheriBSD a while ago
  • Loading branch information
bsdjhb committed Jan 9, 2025
1 parent 92b2fda commit b2951ab
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions share/mk/bsd.compat.mk
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,7 @@ LIB64CPUFLAGS+= -march=morello -mabi=aapcs

.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,22 +144,15 @@ LIB64C_MACHINE= riscv
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
Expand Down

0 comments on commit b2951ab

Please sign in to comment.