Index: head/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3
===================================================================
--- head/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3
+++ head/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3
@@ -76,6 +76,9 @@
 .It Li elf32-powerpc Ta ELF Ta MSB Ta 32
 .It Li elf32-powerpc-freebsd Ta ELF Ta MSB Ta 32
 .It Li elf32-powerpcle Ta ELF Ta LSB Ta 32
+.It Li elf32-riscv Ta ELF Ta LSB Ta 32
+.It Li elf64-riscv Ta ELF Ta LSB Ta 64
+.It Li elf64-riscv-freebsd Ta ELF Ta LSB Ta 64
 .It Li elf32-sh Ta ELF Ta MSB Ta 32
 .It Li elf32-shl Ta ELF Ta LSB Ta 32
 .It Li elf32-sh-nbsd Ta ELF Ta MSB Ta 32
Index: head/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c
===================================================================
--- head/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c
+++ head/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c
@@ -316,6 +316,31 @@
 	},
 
 	{
+		.bt_name      = "elf32-riscv",
+		.bt_type      = ETF_ELF,
+		.bt_byteorder = ELFDATA2LSB,
+		.bt_elfclass  = ELFCLASS32,
+		.bt_machine   = EM_RISCV,
+	},
+
+	{
+		.bt_name      = "elf64-riscv",
+		.bt_type      = ETF_ELF,
+		.bt_byteorder = ELFDATA2LSB,
+		.bt_elfclass  = ELFCLASS64,
+		.bt_machine   = EM_RISCV,
+	},
+
+	{
+		.bt_name      = "elf64-riscv-freebsd",
+		.bt_type      = ETF_ELF,
+		.bt_byteorder = ELFDATA2MSB,
+		.bt_elfclass  = ELFCLASS64,
+		.bt_machine   = EM_RISCV,
+		.bt_osabi     = ELFOSABI_FREEBSD,
+	},
+
+	{
 		.bt_name      = "elf64-sh64",
 		.bt_type      = ETF_ELF,
 		.bt_byteorder = ELFDATA2MSB,