devel/binutils: Update to 2.37

ChangeLog:
https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=ChangeLog;h=641d82c5358c863fbaba07a61e14a135c5785959;hb=116a737f438d03a1bd6aa706b6ea0b4022f3b7e2

exp-run by antoine@

Related commit: bae65d81de99 - Fix build with upcoming  binutils

PR:	251385
Reported by:	jflopezfernandez@gmail.com (maintainer)
Reviewed by:	arrowd@, koobs@, linimon@, tobik@

16 files changed, 340 insertions, 320 deletions

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 2b8517bc4d9b..dee3fb749890 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,8 +1,7 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 
 PORTNAME=	binutils
-PORTVERSION=	2.33.1
-PORTREVISION=	4
+PORTVERSION=	2.37
 PORTEPOCH?=	1
 CATEGORIES?=	devel
 MASTER_SITES=	SOURCEWARE/binutils/releases
@@ -12,40 +11,44 @@ COMMENT?=	GNU binary tools
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
+LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING3
+LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING3.LIB
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.so:math/gmp \
+		${LOCALBASE}/lib/libmpfr.so:math/mpfr
 
 FLAVORS=	native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \
 		avr i386 mingw32 mips mips64 powerpc powerpc64 powerpc64le riscv64 \
 		riscv64_none_elf s390x sparc64 riscv32_unknown_elf
 FLAVOR?=	native
 
-RELRO_CONFIGURE_ON=	--enable-relro
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.so:math/gmp \
-		${LOCALBASE}/lib/libmpfr.so:math/mpfr
-
-CONFLICTS=	libbfd-[0-9]*
+USES=		bison:alias compiler:env cpe gmake libtool makeinfo perl5 tar:xz
+USE_PERL5=	build
+CPE_VENDOR=	gnu
+GNU_CONFIGURE=	yes
 
 #TEST_DEPENDS+=	runtest:misc/dejagnu
+CONFIGURE_ARGS+=	--disable-werror \
+			--enable-deterministic-archives \
+			--with-sysroot=/ \
+			--enable-x86-relax-relocations=no
+MAKE_ARGS+=	LIBDL=""
+MAKE_ENV+=	ac_cv_func_sbrk=0
 TEST_TARGET=	check
 
+CONFLICTS=	libbfd-[0-9]*
+
 OPTIONS_DEFINE=	NLS RELRO STATIC
+OPTIONS_SUB=	yes
 STATIC_PREVENTS=	NLS
 
 RELRO_DESC=	Enable relocation memory corruption mitigation (-z relro) by default
-
-LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING3
-LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING3.LIB
-
-USES=		bison:alias cpe gmake libtool tar:xz compiler:env
-CPE_VENDOR=	gnu
-GNU_CONFIGURE=	yes
-
+RELRO_CONFIGURE_ON=	--enable-relro
 RELRO_CONFIGURE_OFF=	--enable-relro=no
-OPTIONS_SUB=	yes
+STATIC_LDFLAGS+=	-all-static
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-STATIC_LDFLAGS+=	-all-static
-
 aarch64_COMMENT=	GNU binutils for ${FLAVOR} development
 
 .if ${FLAVOR} != native
@@ -70,6 +73,10 @@ BUTARGET=	${FLAVOR:C/_/-/g}
 BUTARGET=	x86_64-unknown-${OPSYS:tl}${OSREL}
 .endif
 
+.if ${FLAVOR} == mingw32
+USES+=		iconv
+.endif
+
 CONFIGURE_ARGS+=	--disable-shared \
 			--target=${BUTARGET}
 .endif
@@ -96,14 +103,6 @@ INFO=		as \
 		ld
 .endif
 
-CONFIGURE_ARGS+=	--disable-werror \
-			--enable-deterministic-archives \
-			--with-sysroot=/ \
-			--enable-x86-relax-relocations=no
-
-MAKE_ENV+=	ac_cv_func_sbrk=0
-MAKE_ARGS+=	LIBDL=""
-
 .include <bsd.port.pre.mk>
 
 # Actual earliest version may differ slightly
@@ -140,6 +139,7 @@ post-install:
 	${RM} ${STAGEDIR}${PREFIX}/${BUTARGET}/lib/ldscripts/i386bsd.*
 	@if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH:H} ] ; then rm -rf ${STAGEDIR}${PREFIX}/${INFO_PATH:H}; fi
 	${LN} -fs ../../bin/${BUTARGET}-size ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/size
+	${RM} -r ${STAGEDIR}${PREFIX}/lib/bfd-plugins
 .endif
 .for tool in ${BUREMOVE}
 	@${RM} ${STAGEDIR}${PREFIX}/bin/${BUTARGET}-${tool} \
diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo
index 26bb6cf5fda4..429395053a3a 100644
--- a/devel/binutils/distinfo
+++ b/devel/binutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575361927
-SHA256 (binutils-2.33.1.tar.xz) = ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf
-SIZE (binutils-2.33.1.tar.xz) = 21490848
+TIMESTAMP = 1626719973
+SHA256 (binutils-2.37.tar.xz) = 820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c
+SIZE (binutils-2.37.tar.xz) = 22916924
diff --git a/devel/binutils/files/patch-0b398d6.diff b/devel/binutils/files/patch-0b398d6.diff
deleted file mode 100644
index a494fe412e08..000000000000
--- a/devel/binutils/files/patch-0b398d6.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-commit 0b398d69acde3377dfbbeb8a4cfe87ae8c8562fa
-Author: Sergei Trofimovich <siarheit@google.com>
-Date:   Sat Feb 1 23:16:11 2020 +0000
-
-    binutils: drop redundant 'program_name' definition (-fno-common)
-    
-            * coffdump.c (program_name): Drop redundant definition.
-            * srconv.c (program_name): Likewise
-            * sysdump.c (program_name): Likewise
-    
-    Signed-off-by: Sergei Trofimovich <siarheit@google.com>
-
-diff --git a/binutils/ChangeLog b/binutils/ChangeLog
-index a7fd43176b..2caa7e950f 100644
---- binutils/ChangeLog
-+++ binutils/ChangeLog
-@@ -1,3 +1,9 @@
-+2020-02-03  Sergei Trofimovich  <siarheit@google.com>
-+
-+	* coffdump.c (program_name): Drop redundant definition.
-+	* srconv.c (program_name): Likewise
-+	* sysdump.c (program_name): Likewise
-+
- 2020-02-02  H.J. Lu  <hongjiu.lu@intel.com>
- 
- 	PR gas/25380
-diff --git a/binutils/coffdump.c b/binutils/coffdump.c
-index 531a4e46c3..336da57ca2 100644
---- binutils/coffdump.c
-+++ binutils/coffdump.c
-@@ -456,8 +456,6 @@ coff_dump (struct coff_ofile *ptr)
-     dump_coff_section (ptr->sections + i);
- }
- 
--char * program_name;
--
- static void
- show_usage (FILE *file, int status)
- {
-diff --git a/binutils/srconv.c b/binutils/srconv.c
-index 5742b16759..f071794f0a 100644
---- binutils/srconv.c
-+++ binutils/srconv.c
-@@ -1687,8 +1687,6 @@ prescan (struct coff_ofile *otree)
-     }
- }
- 
--char *program_name;
--
- ATTRIBUTE_NORETURN static void
- show_usage (FILE *ffile, int status)
- {
-diff --git a/binutils/sysdump.c b/binutils/sysdump.c
-index d433e71ed9..7eebbd61d3 100644
---- binutils/sysdump.c
-+++ binutils/sysdump.c
-@@ -633,8 +633,6 @@ module (void)
-     }
- }
- 
--char *program_name;
--
- ATTRIBUTE_NORETURN static void
- show_usage (FILE *ffile, int status)
- {
diff --git a/devel/binutils/files/patch-bfd_elfxx-sparc.c b/devel/binutils/files/patch-bfd_elfxx-sparc.c
index 747e489c4fe2..69854e9a67da 100644
--- a/devel/binutils/files/patch-bfd_elfxx-sparc.c
+++ b/devel/binutils/files/patch-bfd_elfxx-sparc.c
@@ -1,9 +1,9 @@
---- bfd/elfxx-sparc.c.orig	2013-11-08 11:13:48.000000000 +0100
-+++ bfd/elfxx-sparc.c	2014-10-10 16:30:23.316125000 +0200
-@@ -2942,12 +2942,14 @@
+--- bfd/elfxx-sparc.c.orig	2021-07-08 13:37:19.000000000 +0200
++++ bfd/elfxx-sparc.c	2021-07-21 09:32:51.373421000 +0200
+@@ -2784,12 +2784,14 @@
    Elf_Internal_Rela *relend;
    int num_relocs;
-   bfd_boolean is_vxworks_tls;
+   bool is_vxworks_tls;
 +  const struct elf_backend_data *bed;
  
    htab = _bfd_sparc_elf_hash_table (info);
@@ -15,9 +15,9 @@
  
    if (elf_hash_table (info)->hgot == NULL)
      got_base = 0;
-@@ -3528,6 +3530,8 @@
+@@ -3448,6 +3450,8 @@
  			      bfd_set_error (bfd_error_bad_value);
- 			      return FALSE;
+ 			      return false;
  			    }
 +			  if (bed->elf_osabi == ELFOSABI_FREEBSD)
 +			    outrel.r_addend -= osec->vma;
diff --git a/devel/binutils/files/patch-gas-configure.tgt b/devel/binutils/files/patch-gas-configure.tgt
deleted file mode 100644
index aacd003bfa8b..000000000000
--- a/devel/binutils/files/patch-gas-configure.tgt
+++ /dev/null
@@ -1,12 +0,0 @@
---- gas/configure.tgt.orig	2020-01-07 16:52:58.735417000 +0100
-+++ gas/configure.tgt	2020-01-07 16:54:02.168703000 +0100
-@@ -392,7 +392,8 @@
- 
-   sparc-*-linux-*)			fmt=elf em=linux ;;
-   sparc-*-solaris*)			fmt=elf em=solaris ;;
--  sparc-*-*bsd*)			fmt=elf em=nbsd ;;
-+  sparc-*-freebsd*)                     fmt=elf em=freebsd ;;
-+  sparc-*-netbsd* | sparc-*-openbsd*)   fmt=elf em=nbsd ;;
- 
-   spu-*-elf)				fmt=elf ;;
- 
diff --git a/devel/binutils/files/patch-gold_gc.h b/devel/binutils/files/patch-gold_gc.h
new file mode 100644
index 000000000000..5430f1897ee5
--- /dev/null
+++ b/devel/binutils/files/patch-gold_gc.h
@@ -0,0 +1,45 @@
+From 10b4dbbf281397e2827820c715c39559c7f7a29d Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Tue, 20 Jul 2021 18:46:57 +0930
+Subject: [PATCH] PR28106, build of 2.37 fails on FreeBSD and Clang
+
+https://en.cppreference.com/w/cpp/types/NULL says NULL might be
+defined as nullptr.
+https://en.cppreference.com/w/cpp/language/reinterpret_cast says
+reinterpret_cast can't be used on nullptr.
+
+	PR gold/28106
+	PR gold/27815
+	* gc.h (gc_process_relocs): Use static_cast in Section_id constructor.
+
+(cherry picked from commit b97bd976233ee4d43c2fe18f6356e62779cbe82d)
+---
+ gold/ChangeLog | 6 ++++++
+ gold/gc.h      | 4 ++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git gold/gc.h gold/gc.h
+index 6ebd81f3fd0..4a1368f5abe 100644
+--- gold/gc.h
++++ gold/gc.h
+@@ -247,7 +247,7 @@ gc_process_relocs(
+ 	      if (is_ordinary) 
+ 		(*secvec).push_back(Section_id(src_obj, dst_indx));
+ 	      else
+-		(*secvec).push_back(Section_id(reinterpret_cast<Relobj*>(NULL), 0));
++		(*secvec).push_back(Section_id(static_cast<Relobj*>(NULL), 0));
+               // If the target of the relocation is an STT_SECTION symbol,
+               // make a note of that by storing -1 in the symbol vector.
+               if (lsym.get_st_type() == elfcpp::STT_SECTION)
+@@ -329,7 +329,7 @@ gc_process_relocs(
+               if (is_ordinary && dst_obj != NULL)
+ 		(*secvec).push_back(Section_id(dst_obj, dst_indx));
+ 	      else
+-		(*secvec).push_back(Section_id(reinterpret_cast<Relobj*>(NULL), 0));
++		(*secvec).push_back(Section_id(static_cast<Relobj*>(NULL), 0));
+               (*symvec).push_back(gsym);
+ 	      (*addendvec).push_back(std::make_pair(
+ 					static_cast<long long>(symvalue),
+-- 
+2.32.0
+
diff --git a/devel/binutils/files/patch-gold_testsuite_Makefile.in b/devel/binutils/files/patch-gold_testsuite_Makefile.in
new file mode 100644
index 000000000000..2f8a15371a24
--- /dev/null
+++ b/devel/binutils/files/patch-gold_testsuite_Makefile.in
@@ -0,0 +1,14 @@
+--- gold/testsuite/Makefile.in.orig	2021-07-02 07:48:07 UTC
++++ gold/testsuite/Makefile.in
+@@ -9585,9 +9585,9 @@ uninstall-am:
+ @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	cp -f incr_comdat_test_2_v3.o incr_comdat_test_1_tmp.o
+ @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie incr_comdat_test_1.o incr_comdat_test_1_tmp.o
+ @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_1.o: exception_test_1.cc gcctestdir/as
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -c -fpic -Wa,-madd-bnd-prefix -o $@ $<
++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -c -fpic -o $@ $<
+ @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_2.o: exception_test_2.cc gcctestdir/as
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -c -Wa,-madd-bnd-prefix -o $@ $<
++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -c -o $@ $<
+ @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_test.stdout: gnu_property_test
+ @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(TEST_READELF) -lhSWn $< >$@
+ @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_test: gcctestdir/ld gnu_property_a.o gnu_property_b.o gnu_property_c.o
diff --git a/devel/binutils/files/patch-libctf_swap.h b/devel/binutils/files/patch-libctf_swap.h
deleted file mode 100644
index eefb60856c72..000000000000
--- a/devel/binutils/files/patch-libctf_swap.h
+++ /dev/null
@@ -1,34 +0,0 @@
---- libctf/swap.h.orig	2019-09-09 13:19:45 UTC
-+++ libctf/swap.h
-@@ -28,13 +28,13 @@
- #else
- 
- /* Provide our own versions of the byteswap functions.  */
--inline uint16_t
-+static inline uint16_t
- bswap_16 (uint16_t v)
- {
-   return ((v >> 8) & 0xff) | ((v & 0xff) << 8);
- }
- 
--inline uint32_t
-+static inline uint32_t
- bswap_32 (uint32_t v)
- {
-   return (  ((v & 0xff000000) >> 24)
-@@ -43,13 +43,13 @@ bswap_32 (uint32_t v)
- 	  | ((v & 0x000000ff) << 24));
- }
- 
--inline uint64_t
-+static inline uint64_t
- bswap_identity_64 (uint64_t v)
- {
-   return v;
- }
- 
--inline uint64_t
-+static inline uint64_t
- bswap_64 (uint64_t v)
- {
-   return (  ((v & 0xff00000000000000ULL) >> 56)
diff --git a/devel/binutils/files/patch-mips64.diff b/devel/binutils/files/patch-mips64.diff
index 18850b028b52..63ea5efee91d 100644
--- a/devel/binutils/files/patch-mips64.diff
+++ b/devel/binutils/files/patch-mips64.diff
@@ -20,22 +20,24 @@
      # Generic vectors
      targ_selvecs="${targ_selvecs} mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
      ;;
---- ld/configure.tgt.orig	2015-07-17 20:52:58.728911150 +0000
-+++ ld/configure.tgt	2015-07-17 21:03:29.559869219 +0000
-@@ -491,12 +491,12 @@
- 			targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip"
- 			targ_extra_libpath=$targ_extra_emuls ;;
+
+--- ./ld/configure.tgt.orig	2021-01-09 19:47:34.000000000 +0900
++++ ./ld/configure.tgt	2021-05-13 16:24:16.129568000 +0900
+@@ -548,13 +548,13 @@
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
  mips64*el-*-freebsd* | mips64*el-*-kfreebsd*-gnu)
 -			targ_emul=elf32ltsmipn32_fbsd
 -			targ_extra_emuls="elf32ltsmip elf32btsmip elf32ltsmipn32 elf32btsmipn32 elf64ltsmip elf64btsmip elf32ltsmip_fbsd elf32btsmip_fbsd elf32btsmipn32_fbsd elf64ltsmip_fbsd elf64btsmip_fbsd"
 +			targ_emul=elf64ltsmip_fbsd
 +			targ_extra_emuls="elf32ltsmip_fbsd elf32btsmip_fbsd elf32ltsmipn32_fbsd elf32btsmipn32_fbsd elf64ltsmip_fbsd elf64btsmip_fbsd elf32ltsmip elf32btsmip elf32ltsmipn32 elf32btsmipn32 elf64ltsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls ;;
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
  mips64*-*-freebsd* | mips64*-*-kfreebsd*-gnu)
 -			targ_emul=elf32btsmipn32_fbsd
 -			targ_extra_emuls="elf32ltsmip elf32btsmip elf32ltsmipn32 elf32btsmipn32 elf64ltsmip elf64btsmip elf32ltsmip_fbsd elf32btsmip_fbsd elf32ltsmipn32_fbsd elf64ltsmip_fbsd elf64btsmip_fbsd"
 +			targ_emul=elf64btsmip_fbsd
 +			targ_extra_emuls="elf32btsmip_fbsd elf32ltsmip_fbsd elf32btsmipn32_fbsd elf32ltsmipn32_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd elf32ltsmip elf32btsmip elf32ltsmipn32 elf32btsmipn32 elf64ltsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls ;;
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
  mips*el-*-freebsd* | mips*el-*-kfreebsd*-gnu)
- 			targ_emul=elf32ltsmip_fbsd
diff --git a/devel/binutils/files/patch-powerpc64le.patch b/devel/binutils/files/patch-powerpc64le.patch
index cb1e440c43ea..3b9cc33f2296 100644
--- a/devel/binutils/files/patch-powerpc64le.patch
+++ b/devel/binutils/files/patch-powerpc64le.patch
@@ -1,129 +1,3 @@
---- bfd/configure.orig	2019-10-12 13:58:20 UTC
-+++ bfd/configure
-@@ -14860,6 +14860,7 @@ do
-     powerpc_elf64_vec)		 tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
-     powerpc_elf64_le_vec)	 tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
-     powerpc_elf64_fbsd_vec)	 tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
-+    powerpc_elf64_fbsd_le_vec)   tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
-     powerpc_pe_vec)		 tb="$tb pe-ppc.lo peigen.lo $coff" ;;
-     powerpc_pe_le_vec)		 tb="$tb pe-ppc.lo peigen.lo $coff" ;;
-     powerpc_pei_vec)		 tb="$tb pei-ppc.lo peigen.lo $coff" ;;
---- bfd/configure.ac.orig	2019-09-09 13:19:43 UTC
-+++ bfd/configure.ac
-@@ -596,6 +596,7 @@ do
-     powerpc_elf64_vec)		 tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
-     powerpc_elf64_le_vec)	 tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
-     powerpc_elf64_fbsd_vec)	 tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
-+    powerpc_elf64_fbsd_le_vec)	 tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
-     powerpc_pe_vec)		 tb="$tb pe-ppc.lo peigen.lo $coff" ;;
-     powerpc_pe_le_vec)		 tb="$tb pe-ppc.lo peigen.lo $coff" ;;
-     powerpc_pei_vec)		 tb="$tb pei-ppc.lo peigen.lo $coff" ;;
---- bfd/elf64-ppc.c.orig	2019-10-09 07:16:05 UTC
-+++ bfd/elf64-ppc.c
-@@ -16979,7 +16979,9 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd,
- /* FreeBSD support */
- 
- #undef  TARGET_LITTLE_SYM
-+#define TARGET_LITTLE_SYM powerpc_elf64_fbsd_le_vec
- #undef  TARGET_LITTLE_NAME
-+#define TARGET_LITTLE_NAME "elf64-powerpcle-freebsd"
- 
- #undef  TARGET_BIG_SYM
- #define TARGET_BIG_SYM	powerpc_elf64_fbsd_vec
---- bfd/targets.c.orig	2019-09-09 13:19:43 UTC
-+++ bfd/targets.c
-@@ -764,6 +764,7 @@ extern const bfd_target powerpc_elf32_vxworks_vec;
- extern const bfd_target powerpc_elf64_vec;
- extern const bfd_target powerpc_elf64_le_vec;
- extern const bfd_target powerpc_elf64_fbsd_vec;
-+extern const bfd_target powerpc_elf64_fbsd_le_vec;
- extern const bfd_target powerpc_pe_vec;
- extern const bfd_target powerpc_pe_le_vec;
- extern const bfd_target powerpc_pei_vec;
-@@ -1158,6 +1159,7 @@ static const bfd_target * const _bfd_target_vector[] =
- 	&powerpc_elf64_vec,
- 	&powerpc_elf64_le_vec,
- 	&powerpc_elf64_fbsd_vec,
-+	&powerpc_elf64_fbsd_le_vec,
- #endif
- 	&powerpc_pe_vec,
- 	&powerpc_pe_le_vec,
---- ld/Makefile.am.orig	2019-09-09 13:19:44 UTC
-+++ ld/Makefile.am
-@@ -439,6 +439,7 @@ ALL_64_EMULATION_SOURCES = \
- 	eelf64btsmip_fbsd.c \
- 	eelf64hppa.c \
- 	eelf64lppc.c \
-+	eelf64lppc_fbsd.c \
- 	eelf64lriscv.c \
- 	eelf64lriscv_lp64f.c \
- 	eelf64lriscv_lp64.c \
-@@ -924,6 +925,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64btsmip_fbsd.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64hppa.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lppc.Pc@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lppc_fbsd.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv_lp64f.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv_lp64.Pc@am__quote@
---- ld/Makefile.in.orig	2019-10-12 13:59:42 UTC
-+++ ld/Makefile.in
-@@ -925,6 +925,7 @@ ALL_64_EMULATION_SOURCES = \
- 	eelf64btsmip_fbsd.c \
- 	eelf64hppa.c \
- 	eelf64lppc.c \
-+	eelf64lppc_fbsd.c \
- 	eelf64lriscv.c \
- 	eelf64lriscv_lp64f.c \
- 	eelf64lriscv_lp64.c \
-@@ -1365,6 +1366,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64btsmip_fbsd.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64hppa.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lppc.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lppc_fbsd.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv_lp64.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv_lp64f.Po@am__quote@
-@@ -2525,6 +2527,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64btsmip_fbsd.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64hppa.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lppc.Pc@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lppc_fbsd.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv_lp64f.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv_lp64.Pc@am__quote@
---- ld/emulparams/elf64lppc_fbsd.sh.orig	2020-11-02 22:40:06 UTC
-+++ ld/emulparams/elf64lppc_fbsd.sh
-@@ -0,0 +1,6 @@
-+source_sh ${srcdir}/emulparams/elf64lppc.sh
-+source_sh ${srcdir}/emulparams/elf_fbsd.sh
-+
-+OUTPUT_FORMAT="elf64-powerpcle-freebsd"
-+DEFAULT_PLT_STATIC_CHAIN=1
-+
---- ld/po/BLD-POTFILES.in.orig	2019-10-12 14:01:44 UTC
-+++ ld/po/BLD-POTFILES.in
-@@ -179,6 +179,7 @@ eelf64btsmip.c
- eelf64btsmip_fbsd.c
- eelf64hppa.c
- eelf64lppc.c
-+eelf64lppc_fbsd.c
- eelf64lriscv.c
- eelf64lriscv_lp64.c
- eelf64lriscv_lp64f.c
---- ld/configure.tgt.orig	2020-11-02 23:58:35.109766000 +0100
-+++ ld/configure.tgt	2020-11-02 23:59:34.659606000 +0100
-@@ -544,6 +544,10 @@
- 			tdir_elf32ppc=`echo "${targ_alias}" | sed -e 's/64//'`
- 			tdir_elf32ppc_fbsd=$tdir_elf32ppc
- 			;;
-+powerpc64le-*-freebsd*)
-+			targ_emul=elf64lppc_fbsd
-+			targ_extra_emuls="elf64ppc"
-+			;;
- powerpc-*-vxworks*)
- 			targ_emul=elf32ppcvxworks
- 			targ_extra_emuls="elf32ppc elf32ppclinux elf32ppcsim" ;;
 --- gas/config/tc-ppc.c.orig	2020-11-03 12:21:04.587127000 +0100
 +++ gas/config/tc-ppc.c	2020-11-03 12:21:33.039193000 +0100
 @@ -1554,7 +1554,9 @@
diff --git a/devel/binutils/files/patch-s390x.diff b/devel/binutils/files/patch-s390x.diff
index aa4fe70569e2..5e63dcf85a74 100644
--- a/devel/binutils/files/patch-s390x.diff
+++ b/devel/binutils/files/patch-s390x.diff
@@ -1,9 +1,9 @@
---- ./ld/configure.tgt.orig	2019-01-19 16:01:33.000000000 +0000
-+++ ./ld/configure.tgt	2019-08-07 20:41:31.800693000 +0000
-@@ -651,6 +651,10 @@ rs6000-*-aix*)		targ_emul=aixrs6
+--- ./ld/configure.tgt.orig	2021-05-13 08:26:36.765168000 +0900
++++ ./ld/configure.tgt	2021-05-13 08:40:35.679397000 +0900
+@@ -787,6 +787,10 @@
+ s12z-*-*)		targ_emul=m9s12zelf
+ 			targ_extra_ofiles=ldelfgen.o
  			;;
- rl78-*-*)		targ_emul=elf32rl78 ;;
- rx-*-*)			targ_emul=elf32rx ;;
 +s390x-*-freebsd*)	targ_emul=elf64_s390
 +			targ_extra_emuls=elf_s390
 +			targ_extra_libpath=$targ_extra_emuls
diff --git a/devel/binutils/pkg-plist b/devel/binutils/pkg-plist
index 95c52b9aacad..2c8766973a3e 100644
--- a/devel/binutils/pkg-plist
+++ b/devel/binutils/pkg-plist
@@ -18,12 +18,17 @@ bin/strings
 bin/strip
 include/bfd.h
 include/bfdlink.h
-include/bfd_stdint.h
+include/ctf-api.h
+include/ctf.h
 include/diagnostics.h
 include/dis-asm.h
 %%GOLD%%include/plugin-api.h
 include/symcat.h
+%%STATIC%%lib/bfd-plugins/libdep.a
+%%NO_STATIC%%lib/bfd-plugins/libdep.so
 lib/libbfd.a
+lib/libctf-nobfd.a
+lib/libctf.a
 lib/libopcodes.a
 man/man1/addr2line.1.gz
 man/man1/ar.1.gz
@@ -117,6 +122,7 @@ man/man1/strip.1.gz
 %%NLS%%share/locale/rw/LC_MESSAGES/gprof.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/binutils.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/bfd.mo
+%%NLS%%%%GOLD%%share/locale/sr/LC_MESSAGES/gold.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/gprof.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/binutils.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/bfd.mo
diff --git a/devel/binutils/pkg-plist-powerpc64le b/devel/binutils/pkg-plist-powerpc64le
index 740185d65dc5..8e5fec0f563a 100644
--- a/devel/binutils/pkg-plist-powerpc64le
+++ b/devel/binutils/pkg-plist-powerpc64le
@@ -65,25 +65,25 @@ man/man1/%%BUTARGET%%-windres.1.gz
 %%BUTARGET%%/lib/ldscripts/elf64lppc_fbsd.xu
 %%BUTARGET%%/lib/ldscripts/elf64lppc_fbsd.xw
 %%BUTARGET%%/lib/ldscripts/elf64lppc_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf64ppc.x
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xbn
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xc
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xce
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xd
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xdc
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xdce
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xde
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xdw
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xe
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xn
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xr
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xs
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xsc
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xsce
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xse
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xsw
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xswe
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xu
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xw
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xwe
+%%BUTARGET%%/lib/ldscripts/elf64lppc.x
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xbn
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xc
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xce
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xd
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xdc
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xdce
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xde
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xdw
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xdwe
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xe
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xn
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xr
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xs
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xsc
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xsce
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xse
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xsw
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xswe
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xu
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xw
+%%BUTARGET%%/lib/ldscripts/elf64lppc.xwe
diff --git a/devel/binutils/pkg-plist-riscv32-unknown-elf b/devel/binutils/pkg-plist-riscv32-unknown-elf
index 8ff36f5c59e7..3c70f8f410f8 100644
--- a/devel/binutils/pkg-plist-riscv32-unknown-elf
+++ b/devel/binutils/pkg-plist-riscv32-unknown-elf
@@ -43,13 +43,91 @@ man/man1/%%BUTARGET%%-windres.1.gz
 %%BUTARGET%%/bin/readelf
 %%BUTARGET%%/bin/size
 %%BUTARGET%%/bin/strip
+%%BUTARGET%%/lib/ldscripts/elf32briscv.x
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xbn
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xc
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xce
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xd
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xdc
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xdce
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xde
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xdw
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xdwe
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xe
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xn
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xr
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xs
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xsc
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xsce
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xse
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xsw
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xswe
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xu
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xw
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xwe
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.x
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xbn
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xc
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xce
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xd
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdc
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdce
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xde
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdw
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdwe
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xe
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xn
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xr
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xs
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xsc
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xsce
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xse
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xsw
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xswe
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xu
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xw
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xwe
+%%BUTARGET%%/lib/ldscripts/elf64briscv.x
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xbn
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xc
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xce
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xd
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xdc
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xdce
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xde
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xdw
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xdwe
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xe
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xn
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xr
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xs
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xsc
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xsce
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xse
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xsw
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xswe
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xu
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xw
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xwe
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.x
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xbn
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xc
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xce
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xd
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdc
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdce
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xde
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdw
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdwe
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xe
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xn
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xr
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xs
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xsc
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xsce
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xse
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xsw
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xswe
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xu
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xw
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xwe
diff --git a/devel/binutils/pkg-plist-riscv64 b/devel/binutils/pkg-plist-riscv64
index a61fc8d99576..3c70f8f410f8 100644
--- a/devel/binutils/pkg-plist-riscv64
+++ b/devel/binutils/pkg-plist-riscv64
@@ -43,6 +43,28 @@ man/man1/%%BUTARGET%%-windres.1.gz
 %%BUTARGET%%/bin/readelf
 %%BUTARGET%%/bin/size
 %%BUTARGET%%/bin/strip
+%%BUTARGET%%/lib/ldscripts/elf32briscv.x
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xbn
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xc
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xce
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xd
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xdc
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xdce
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xde
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xdw
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xdwe
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xe
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xn
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xr
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xs
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xsc
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xsce
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xse
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xsw
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xswe
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xu
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xw
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xwe
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.x
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xbn
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xc
@@ -65,6 +87,28 @@ man/man1/%%BUTARGET%%-windres.1.gz
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xu
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xw
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xwe
+%%BUTARGET%%/lib/ldscripts/elf64briscv.x
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xbn
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xc
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xce
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xd
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xdc
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xdce
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xde
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xdw
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xdwe
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xe
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xn
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xr
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xs
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xsc
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xsce
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xse
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xsw
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xswe
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xu
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xw
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xwe
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.x
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xbn
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xc
diff --git a/devel/binutils/pkg-plist-riscv64-none-elf b/devel/binutils/pkg-plist-riscv64-none-elf
index a4b22ec0e508..501e295e8dd7 100644
--- a/devel/binutils/pkg-plist-riscv64-none-elf
+++ b/devel/binutils/pkg-plist-riscv64-none-elf
@@ -9,26 +9,94 @@
 %%BUTARGET%%/bin/readelf
 %%BUTARGET%%/bin/size
 %%BUTARGET%%/bin/strip
+%%BUTARGET%%/lib/ldscripts/elf32briscv.x
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xbn
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xc
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xce
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xd
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xdc
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xdce
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xde
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xdw
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xdwe
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xe
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xn
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xr
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xs
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xsc
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xsce
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xse
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xsw
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xswe
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xu
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xw
+%%BUTARGET%%/lib/ldscripts/elf32briscv.xwe
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.x
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xbn
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xc
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xce
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xd
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdc
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdce
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xde
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdw
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdwe
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xe
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xr
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xce
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xu
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xn
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xr
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xe
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xce
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xs
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xsc
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xsce
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xse
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xsw
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xswe
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xu
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xbn
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xw
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xwe
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xc
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.x
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xn
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xwe
+%%BUTARGET%%/lib/ldscripts/elf64briscv.x
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xbn
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xc
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xce
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xd
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xdc
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xdce
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xde
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xdw
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xdwe
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xe
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xn
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xr
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xs
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xsc
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xsce
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xse
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xsw
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xswe
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xu
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xw
+%%BUTARGET%%/lib/ldscripts/elf64briscv.xwe
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.x
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xbn
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xc
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xw
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xce
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xd
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdc
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdce
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xde
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdw
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdwe
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xe
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xn
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.x
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xr
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xs
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xsc
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xsce
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xse
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xsw
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xswe
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xu
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xw
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xwe
 bin/%%BUTARGET%%-addr2line
 bin/%%BUTARGET%%-ar
 bin/%%BUTARGET%%-as