diff --git a/external/gpl3/binutils/dist/bfd/config.bfd b/external/gpl3/binutils/dist/bfd/config.bfd
index e70b1a2b2523..d36dbc1ee09c 100644
--- a/external/gpl3/binutils/dist/bfd/config.bfd
+++ b/external/gpl3/binutils/dist/bfd/config.bfd
@@ -1363,8 +1363,8 @@ case "${targ}" in
 
 #ifdef BFD64     
   riscv*-*-*)    
-    targ_defvec=bfd_elf64_riscv_vec
-    targ_selvecs="bfd_elf32_riscv_vec bfd_elf64_riscv_vec"
+    targ_defvec=riscv_elf64_vec
+    targ_selvecs="riscv_elf32_vec riscv_elf64_vec"
     want64=true  
     ;;
 #endif           
diff --git a/external/gpl3/binutils/dist/bfd/configure b/external/gpl3/binutils/dist/bfd/configure
index 8360a65f2d57..26e982b94e13 100644
--- a/external/gpl3/binutils/dist/bfd/configure
+++ b/external/gpl3/binutils/dist/bfd/configure
@@ -15453,6 +15453,8 @@ do
     ns32k_aout_pc532mach_vec)	 tb="$tb pc532-mach.lo aout-ns32k.lo" ;;
     ns32k_aout_pc532nbsd_vec)	 tb="$tb ns32knetbsd.lo aout-ns32k.lo" ;;
     or1k_elf32_vec)		 tb="$tb elf32-or1k.lo elf32.lo $elf" ;;
+    riscv_elf32_vec)		 tb="$tb elf32-riscv.lo elfxx-riscv.lo elf32.lo $elf" ;;
+    riscv_elf64_vec)		 tb="$tb elf64-riscv.lo elf64.lo elfxx-riscv.lo $elf"; target_size=64 ;;
     pdp11_aout_vec)		 tb="$tb pdp11.lo" ;;
     pef_vec)			 tb="$tb pef.lo" ;;
     pef_xlib_vec)		 tb="$tb pef.lo" ;;
diff --git a/external/gpl3/binutils/dist/bfd/configure.ac b/external/gpl3/binutils/dist/bfd/configure.ac
index 6f5e85f3a6fe..388a7e5764b4 100644
--- a/external/gpl3/binutils/dist/bfd/configure.ac
+++ b/external/gpl3/binutils/dist/bfd/configure.ac
@@ -898,6 +898,8 @@ do
     ns32k_aout_pc532mach_vec)	 tb="$tb pc532-mach.lo aout-ns32k.lo" ;;
     ns32k_aout_pc532nbsd_vec)	 tb="$tb ns32knetbsd.lo aout-ns32k.lo" ;;
     or1k_elf32_vec)		 tb="$tb elf32-or1k.lo elf32.lo $elf" ;;
+    riscv_elf32_vec)		 tb="$tb elf32-riskv.lo elffxx-riscv.lo elf32.lo $elf" ;;
+    riscv_elf64_vec)		 tb="$tb elf64-riskv.lo elf64.lo elffxx-riscv.lo $elf" target_size=64 ;;
     pdp11_aout_vec)		 tb="$tb pdp11.lo" ;;
     pef_vec)			 tb="$tb pef.lo" ;;
     pef_xlib_vec)		 tb="$tb pef.lo" ;;
diff --git a/external/gpl3/binutils/dist/bfd/targets.c b/external/gpl3/binutils/dist/bfd/targets.c
index 51f2198c1309..3101e9f0ee91 100644
--- a/external/gpl3/binutils/dist/bfd/targets.c
+++ b/external/gpl3/binutils/dist/bfd/targets.c
@@ -793,6 +793,8 @@ extern const bfd_target powerpc_pe_le_vec;
 extern const bfd_target powerpc_pei_vec;
 extern const bfd_target powerpc_pei_le_vec;
 extern const bfd_target powerpc_xcoff_vec;
+extern const bfd_target riscv_elf32_vec;
+extern const bfd_target riscv_elf64_vec;
 extern const bfd_target rl78_elf32_vec;
 extern const bfd_target rs6000_xcoff64_vec;
 extern const bfd_target rs6000_xcoff64_aix_vec;
@@ -1295,9 +1297,11 @@ static const bfd_target * const _bfd_target_vector[] =
 	&powerpc_xcoff_vec,
 #endif
 
+	&riscv_elf32_vec,
 	&rl78_elf32_vec,
 
 #ifdef BFD64
+        &riscv_elf64_vec,
 	&rs6000_xcoff64_vec,
 	&rs6000_xcoff64_aix_vec,
 #endif