diff --git a/config/arch/riscv.in b/config/arch/riscv.in
index e8c1297ba..4efde976d 100644
--- a/config/arch/riscv.in
+++ b/config/arch/riscv.in
@@ -5,6 +5,8 @@
 ##
 ## select ARCH_SUPPORTS_32
 ## select ARCH_DEFAULT_32
+## select ARCH_SUPPORTS_WITH_ABI
+## select ARCH_SUPPORTS_WITH_ARCH
 ## select GCC_REQUIRE_7_or_later
 
 ## help The RISC-V architecture, as defined by:
diff --git a/samples/riscv32-hifive1-elf/crosstool.config b/samples/riscv32-hifive1-elf/crosstool.config
new file mode 100644
index 000000000..18f8870e3
--- /dev/null
+++ b/samples/riscv32-hifive1-elf/crosstool.config
@@ -0,0 +1,6 @@
+CT_EXPERIMENTAL=y
+CT_ARCH_RISCV=y
+CT_ARCH_ARCH="rv32ima"
+CT_ARCH_ABI="ilp32"
+CT_TARGET_VENDOR="hifive1"
+# CT_CC_GCC_LDBL_128 is not set
diff --git a/samples/riscv32-hifive1-elf/reported.by b/samples/riscv32-hifive1-elf/reported.by
new file mode 100644
index 000000000..291cc0007
--- /dev/null
+++ b/samples/riscv32-hifive1-elf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Franz Flasch"
+reporter_url="https://github.com/franzflasch/crosstool-ng"
+reporter_comment=""