d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a few more references to riscv64sf.

Browse Source 
Fixes:		1ca12bd927 Remove the riscv64sf architecture.
This commit is contained in:
John Baldwin 2023-04-20 11:00:46 -07:00
parent 1fef7abdc7
commit 47e888f836
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libc/Makefile
View File

@ -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"

4
lib/libcompiler_rt/Makefile.inc
View File

@ -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

7
share/mk/bsd.cpu.mk
View File

@ -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