--- Makefile	(revision 556319)
+++ Makefile	(working copy)
@@ -2,18 +2,21 @@ 
 # $FreeBSD$
 
 PORTNAME=	binutils
-PORTVERSION=	2.33.1
-PORTREVISION=	4
+PORTVERSION=	2.35.1
 PORTEPOCH?=	1
 CATEGORIES?=	devel
 MASTER_SITES=	SOURCEWARE/binutils/releases
+PKGNAMEPREFIX=
 
-MAINTAINER?=	jflopezfernandez@gmail.com
-COMMENT?=	GNU binary tools
+MAINTAINER=	jflopezfernandez@gmail.com
+COMMENT=	GNU binary tools
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
+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
@@ -20,8 +23,6 @@ 
 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]*
 
@@ -139,7 +140,7 @@ 
 	${RM} -r ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}
 .endif
 	${RM} ${STAGEDIR}${PREFIX}/${BUTARGET}/lib/ldscripts/i386bsd.*
-	@if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH:H} ] ; then rm -rf ${STAGEDIR}${PREFIX}/${INFO_PATH:H}; fi
+	@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
 .endif
 .for tool in ${BUREMOVE}
--- distinfo	(revision 556319)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1575361927
-SHA256 (binutils-2.33.1.tar.xz) = ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf
-SIZE (binutils-2.33.1.tar.xz) = 21490848
+TIMESTAMP = 1606351815
+SHA256 (binutils-2.35.1.tar.xz) = 3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+SIZE (binutils-2.35.1.tar.xz) = 22031720
--- files/patch-bfd_elfnn-riscv.c	(revision 556319)
+++ files/patch-bfd_elfnn-riscv.c	(working copy)
@@ -11,3 +11,4 @@ 
  
  #define ELF_ARCH			bfd_arch_riscv
  #define ELF_TARGET_ID			RISCV_ELF_DATA
+
--- files/patch-bfd_elfxx-sparc.c	(revision 556319)
+++ files/patch-bfd_elfxx-sparc.c	(working copy)
@@ -1,6 +1,6 @@ 
---- 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	2020-07-24 09:12:19 UTC
++++ bfd/elfxx-sparc.c
+@@ -2783,12 +2783,14 @@ _bfd_sparc_elf_relocate_section (bfd *output_bfd,
    Elf_Internal_Rela *relend;
    int num_relocs;
    bfd_boolean is_vxworks_tls;
@@ -15,7 +15,7 @@ 
  
    if (elf_hash_table (info)->hgot == NULL)
      got_base = 0;
-@@ -3528,6 +3530,8 @@
+@@ -3429,6 +3431,8 @@ _bfd_sparc_elf_relocate_section (bfd *output_bfd,
  			      bfd_set_error (bfd_error_bad_value);
  			      return FALSE;
  			    }
@@ -24,3 +24,4 @@ 
  			}
  
  		      outrel.r_info = SPARC_ELF_R_INFO (htab, rel, indx,
+
--- files/patch-include__safe-ctype.h	(revision 556319)
+++ files/patch-include__safe-ctype.h	(working copy)
@@ -1,6 +1,6 @@ 
---- ./include/safe-ctype.h.orig	2013-08-31 13:25:21.000000000 +0100
-+++ ./include/safe-ctype.h	2013-08-31 13:25:57.000000000 +0100
-@@ -119,6 +119,7 @@
+--- include/safe-ctype.h.orig	2020-07-24 09:12:20 UTC
++++ include/safe-ctype.h
+@@ -119,6 +119,7 @@ extern const unsigned char  _sch_tolower[256];
     including another system header (for instance gnulib's stdint.h).
     So we include ctype.h here and then immediately redefine its macros.  */
  
@@ -8,7 +8,7 @@ 
  #include <ctype.h>
  #undef isalpha
  #define isalpha(c) do_not_use_isalpha_with_safe_ctype
-@@ -146,5 +147,6 @@
+@@ -146,5 +147,6 @@ extern const unsigned char  _sch_tolower[256];
  #define toupper(c) do_not_use_toupper_with_safe_ctype
  #undef tolower
  #define tolower(c) do_not_use_tolower_with_safe_ctype
@@ -15,3 +15,4 @@ 
 +#endif
  
  #endif /* SAFE_CTYPE_H */
+
--- files/patch-ld_emulparams_elf32lriscv-defs.sh	(revision 556319)
+++ files/patch-ld_emulparams_elf32lriscv-defs.sh	(working copy)
@@ -18,3 +18,4 @@ 
  
  TEXT_START_ADDR=0x10000
  MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
+
--- files/patch-mips64.diff	(revision 556319)
+++ files/patch-mips64.diff	(working copy)
@@ -1,41 +1,28 @@ 
---- bfd/config.bfd.orig	2015-07-17 20:05:04.921108109 +0000
-+++ bfd/config.bfd	2015-07-17 20:42:54.567978553 +0000
-@@ -1084,15 +1084,15 @@
+--- bfd/config.bfd.orig	2020-11-25 16:03:32 UTC
++++ bfd/config.bfd
+@@ -1188,6 +1188,11 @@ case "${targ}" in
+     want64=true
      ;;
-   mips64*el-*-freebsd* | mips64*el-*-kfreebsd*-gnu)
-     # FreeBSD vectors
--    targ_defvec=mips_elf32_ntradfbsd_le_vec
--    targ_selvecs="mips_elf32_ntradfbsd_be_vec mips_elf32_tradfbsd_le_vec mips_elf32_tradfbsd_be_vec mips_elf64_tradfbsd_le_vec mips_elf64_tradfbsd_be_vec"
-+    targ_defvec=mips_elf64_tradfbsd_le_vec
-+    targ_selvecs="mips_elf64_tradfbsd_le_vec mips_elf32_ntradfbsd_le_vec mips_elf32_ntradfbsd_be_vec mips_elf32_tradfbsd_le_vec mips_elf32_tradfbsd_be_vec mips_elf64_tradfbsd_be_vec"
-     # Generic vectors
-     targ_selvecs="${targ_selvecs} mips_elf32_ntrad_le_vec mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
-     ;;
-   mips64*-*-freebsd* | mips64*-*-kfreebsd*-gnu)
-     # FreeBSD vectors
--    targ_defvec=mips_elf32_ntradfbsd_be_vec
--    targ_selvecs="mips_elf32_ntradfbsd_le_vec mips_elf32_tradfbsd_be_vec mips_elf32_tradfbsd_le_vec mips_elf64_tradfbsd_be_vec mips_elf64_tradfbsd_le_vec"
-+    targ_defvec=mips_elf64_tradfbsd_be_vec
-+    targ_selvecs="mips_elf64_tradfbsd_be_vec mips_elf32_ntradfbsd_be_vec mips_elf32_ntradfbsd_le_vec mips_elf32_tradfbsd_be_vec mips_elf32_tradfbsd_le_vec mips_elf64_tradfbsd_le_vec"
-     # 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 ;;
- 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 ;;
- 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 ;;
- mips*el-*-freebsd* | mips*el-*-kfreebsd*-gnu)
- 			targ_emul=elf32ltsmip_fbsd
+ #ifdef BFD64
++  s390x-*-freebsd*)
++    targ_defvec=s390_elf64_vec
++    targ_selvecs=s390_elf32_vec
++    want64=true
++    ;;
+   s390x-*-linux*)
+     targ_defvec=s390_elf64_vec
+     targ_selvecs=s390_elf32_vec
+--- ld/configure.tgt.orig	2020-11-25 16:03:32 UTC
++++ ld/configure.tgt
+@@ -776,6 +776,10 @@ rx-*-*)			targ_emul=elf32rx
+ s12z-*-*)		targ_emul=m9s12zelf
+ 			targ_extra_ofiles=ldelfgen.o
+ 			;;
++s390x-*-freebsd*)	targ_emul=elf64_s390
++			targ_extra_emuls=elf_s390
++			targ_extra_libpath=$targ_extra_emuls
++			tdir_elf_s390=`echo ${targ_alias} | sed -e 's/s390x/s390/'` ;;
+ s390x-*-linux*)		targ_emul=elf64_s390
+ 			targ_extra_emuls=elf_s390
+ 			targ_extra_libpath=$targ_extra_emuls
+
--- files/patch-powerpc64le.patch	(revision 556319)
+++ files/patch-powerpc64le.patch	(working copy)
@@ -1,6 +1,6 @@ 
---- bfd/configure.orig	2019-10-12 13:58:20 UTC
+--- bfd/configure.orig	2020-09-19 10:17:17 UTC
 +++ bfd/configure
-@@ -14860,6 +14860,7 @@ do
+@@ -14883,6 +14883,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 ;;
@@ -8,9 +8,9 @@ 
      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.orig	2020-07-24 09:12:19 UTC
 +++ bfd/configure.ac
-@@ -596,6 +596,7 @@ do
+@@ -619,6 +619,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 ;;
@@ -18,9 +18,9 @@ 
      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.orig	2020-09-11 08:19:09 UTC
 +++ bfd/elf64-ppc.c
-@@ -16979,7 +16979,9 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd,
+@@ -17594,7 +17594,9 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd,
  /* FreeBSD support */
  
  #undef  TARGET_LITTLE_SYM
@@ -30,9 +30,9 @@ 
  
  #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.orig	2020-07-24 09:12:19 UTC
 +++ bfd/targets.c
-@@ -764,6 +764,7 @@ extern const bfd_target powerpc_elf32_vxworks_vec;
+@@ -838,6 +838,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;
@@ -40,7 +40,7 @@ 
  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[] =
+@@ -1228,6 +1229,7 @@ static const bfd_target * const _bfd_target_vector[] =
  	&powerpc_elf64_vec,
  	&powerpc_elf64_le_vec,
  	&powerpc_elf64_fbsd_vec,
@@ -48,9 +48,22 @@ 
  #endif
  	&powerpc_pe_vec,
  	&powerpc_pe_le_vec,
---- ld/Makefile.am.orig	2019-09-09 13:19:44 UTC
+--- gas/config/tc-ppc.c.orig	2020-07-24 09:12:19 UTC
++++ gas/config/tc-ppc.c
+@@ -1566,7 +1566,9 @@ ppc_target_format (void)
+ #endif
+ #ifdef OBJ_ELF
+ # ifdef TE_FreeBSD
+-  return (ppc_obj64 ? "elf64-powerpc-freebsd" : "elf32-powerpc-freebsd");
++  return (target_big_endian
++	  ? (ppc_obj64 ? "elf64-powerpc-freebsd" : "elf32-powerpc-freebsd")
++	  : (ppc_obj64 ? "elf64-powerpcle-freebsd" : "elf32-powerpcle-freebsd"));
+ # elif defined (TE_VXWORKS)
+   return "elf32-powerpc-vxworks";
+ # else
+--- ld/Makefile.am.orig	2020-07-24 09:12:20 UTC
 +++ ld/Makefile.am
-@@ -439,6 +439,7 @@ ALL_64_EMULATION_SOURCES = \
+@@ -433,6 +433,7 @@ ALL_64_EMULATION_SOURCES = \
  	eelf64btsmip_fbsd.c \
  	eelf64hppa.c \
  	eelf64lppc.c \
@@ -58,7 +71,7 @@ 
  	eelf64lriscv.c \
  	eelf64lriscv_lp64f.c \
  	eelf64lriscv_lp64.c \
-@@ -924,6 +925,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): 
+@@ -915,6 +916,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@
@@ -66,9 +79,9 @@ 
  @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.orig	2020-09-19 10:21:33 UTC
 +++ ld/Makefile.in
-@@ -925,6 +925,7 @@ ALL_64_EMULATION_SOURCES = \
+@@ -915,6 +915,7 @@ ALL_64_EMULATION_SOURCES = \
  	eelf64btsmip_fbsd.c \
  	eelf64hppa.c \
  	eelf64lppc.c \
@@ -76,7 +89,7 @@ 
  	eelf64lriscv.c \
  	eelf64lriscv_lp64f.c \
  	eelf64lriscv_lp64.c \
-@@ -1365,6 +1366,7 @@ distclean-compile:
+@@ -1355,6 +1356,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@
@@ -84,7 +97,7 @@ 
  @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): 
+@@ -2510,6 +2512,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@
@@ -92,7 +105,7 @@ 
  @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.orig	2020-11-25 16:03:32 UTC
 +++ ld/emulparams/elf64lppc_fbsd.sh
 @@ -0,0 +1,6 @@
 +source_sh ${srcdir}/emulparams/elf64lppc.sh
@@ -101,9 +114,9 @@ 
 +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.orig	2020-09-19 10:21:37 UTC
 +++ ld/po/BLD-POTFILES.in
-@@ -179,6 +179,7 @@ eelf64btsmip.c
+@@ -177,6 +177,7 @@ eelf64btsmip.c
  eelf64btsmip_fbsd.c
  eelf64hppa.c
  eelf64lppc.c
@@ -111,29 +124,4 @@ 
  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 @@
- #endif
- #ifdef OBJ_ELF
- # ifdef TE_FreeBSD
--  return (ppc_obj64 ? "elf64-powerpc-freebsd" : "elf32-powerpc-freebsd");
-+  return (target_big_endian
-+	  ? (ppc_obj64 ? "elf64-powerpc-freebsd" : "elf32-powerpc-freebsd")
-+	  : (ppc_obj64 ? "elf64-powerpcle-freebsd" : "elf32-powerpcle-freebsd"));
- # elif defined (TE_VXWORKS)
-   return "elf32-powerpc-vxworks";
- # else
+
--- files/patch-s390x.diff	(revision 556319)
+++ files/patch-s390x.diff	(working copy)
@@ -1,19 +1,6 @@ 
---- ./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
- 			;;
- 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
-+			tdir_elf_s390=`echo ${targ_alias} | sed -e 's/s390x/s390/'` ;;
- s390x-*-linux*)		targ_emul=elf64_s390
- 			targ_extra_emuls=elf_s390
- 			targ_extra_libpath=$targ_extra_emuls
---- ./gas/configure.orig	2019-02-02 15:50:20.000000000 +0000
-+++ ./gas/configure	2019-08-07 20:44:45.468441000 +0000
-@@ -7095,6 +7095,7 @@ ia64-*-hpux*)
+--- gas/configure.orig	2020-09-19 10:19:52 UTC
++++ gas/configure
+@@ -7098,6 +7098,7 @@ ia64-*-hpux*)
    ;;
  
  x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
@@ -21,7 +8,7 @@ 
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
-@@ -7125,6 +7126,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+@@ -7128,6 +7129,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	  powerpc64-*linux*)
  	    LD="${LD-ld} -m elf32ppclinux"
  	    ;;
@@ -31,7 +18,7 @@ 
  	  s390x-*linux*)
  	    LD="${LD-ld} -m elf_s390"
  	    ;;
-@@ -7146,6 +7150,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+@@ -7149,6 +7153,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    ;;
  	  powerpc-*linux*)
  	    LD="${LD-ld} -m elf64ppc"
@@ -41,17 +28,4 @@ 
  	    ;;
  	  s390*-*linux*|s390*-*tpf*)
  	    LD="${LD-ld} -m elf64_s390"
---- ./bfd/config.bfd.orig	2019-08-07 20:35:52.161591000 +0000
-+++ ./bfd/config.bfd	2019-08-07 20:40:33.579807000 +0000
-@@ -1213,6 +1213,11 @@ case "${targ}" in
-     want64=true
-     ;;
- #ifdef BFD64
-+  s390x-*-freebsd*)
-+    targ_defvec=s390_elf64_vec
-+    targ_selvecs=s390_elf32_vec
-+    want64=true
-+    ;;
-   s390x-*-linux*)
-     targ_defvec=s390_elf64_vec
-     targ_selvecs=s390_elf32_vec
+
--- pkg-plist	(revision 556319)
+++ pkg-plist	(working copy)
@@ -19,11 +19,15 @@ 
 include/bfd.h
 include/bfdlink.h
 include/bfd_stdint.h
+include/ctf.h
+include/ctf-api.h
 include/diagnostics.h
 include/dis-asm.h
 %%GOLD%%include/plugin-api.h
 include/symcat.h
 lib/libbfd.a
+lib/libctf.a
+lib/libctf-nobfd.a
 lib/libopcodes.a
 man/man1/addr2line.1.gz
 man/man1/ar.1.gz
@@ -117,6 +121,7 @@ 
 %%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