Page MenuHomeFreeBSD
Files F110732145

D23089.id66503.diff
No OneTemporary
Actions

D23089.id66503.diff
View Options

Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -495,23 +495,20 @@
TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 mipselhf mipshf mips64elhf mips64hf
# powerpcspe excluded until clang fixed
TARGET_ARCHES_powerpc?= powerpc powerpc64
-# riscv64sf excluded due to PR 232085
-TARGET_ARCHES_riscv?= riscv64
+TARGET_ARCHES_riscv?= riscv64 riscv64sf
.for target in ${TARGETS}
TARGET_ARCHES_${target}?= ${target}
.endfor
-MAKE_PARAMS_riscv?= CROSS_TOOLCHAIN=riscv64-gcc
MAKE_PARAMS_mips?= CROSS_TOOLCHAIN=mips-gcc6
MAKE_PARAMS_sparc64?= CROSS_TOOLCHAIN=sparc64-gcc6
TOOLCHAINS_mips= mips-gcc6
-TOOLCHAINS_riscv= riscv64-gcc
TOOLCHAINS_sparc64= sparc64-gcc6
# Remove architectures only supported by external toolchain from
# universe if required toolchain packages are missing.
-.for target in mips riscv sparc64
+.for target in mips sparc64
.if ${_UNIVERSE_TARGETS:M${target}}
.for toolchain in ${TOOLCHAINS_${target}}
.if !exists(/usr/local/share/toolchains/${toolchain}.mk)
Index: share/man/man7/arch.7
===================================================================
--- share/man/man7/arch.7
+++ share/man/man7/arch.7
@@ -319,8 +319,8 @@
.It powerpc Ta Clang Ta GNU ld 2.17.50
.It powerpcspe Ta Clang Ta GNU ld 2.17.50
.It powerpc64 Ta Clang Ta lld
-.It riscv64 Ta GCC(1) Ta GNU ld(1)
-.It riscv64sf Ta GCC(1) Ta GNU ld(1)
+.It riscv64 Ta Clang Ta lld
+.It riscv64sf Ta Clang Ta lld
.It sparc64 Ta GCC(1) Ta GNU ld(1)
.El
.Pp
Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -296,7 +296,7 @@
# be required.
.if ${COMPILER_FEATURES:Mc++11} && (${__TT} != "mips" && \
- ${__TT} != "riscv" && ${__TT} != "sparc64")
+ ${__TT} != "sparc64")
# Clang is enabled, and will be installed as the default /usr/bin/cc.
__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_IS_CC LLD
.elif ${COMPILER_FEATURES:Mc++11} && ${__T} != "sparc64"
@@ -323,7 +323,7 @@
__DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND
.endif
.if ${__TT} != "mips" && ${__T} != "powerpc" && ${__T} != "powerpcspe" && \
- ${__TT} != "riscv" && ${__T} != "sparc64"
+ ${__T} != "sparc64"
__DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
.else
__DEFAULT_NO_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 23, 11:00 AM (8 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16794613
Default Alt Text
D23089.id66503.diff (2 KB)

Event Timeline