--- Makefile (revision 556249) +++ Makefile (working copy) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= binutils -PORTVERSION= 2.33.1 -PORTREVISION= 4 +PORTVERSION= 2.35.1 +PORTREVISION= 0 PORTEPOCH?= 1 CATEGORIES?= devel MASTER_SITES= SOURCEWARE/binutils/releases --- distinfo (revision 556249) +++ 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 = 1606265052 +SHA256 (binutils-2.35.1.tar.xz) = 3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607 +SIZE (binutils-2.35.1.tar.xz) = 22031720 --- files/patch-0b398d6.diff (revision 556249) +++ files/patch-0b398d6.diff (nonexistent) @@ -1,65 +0,0 @@ -commit 0b398d69acde3377dfbbeb8a4cfe87ae8c8562fa -Author: Sergei Trofimovich -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 - -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 -+ -+ * coffdump.c (program_name): Drop redundant definition. -+ * srconv.c (program_name): Likewise -+ * sysdump.c (program_name): Likewise -+ - 2020-02-02 H.J. Lu - - 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) - { --- files/patch-bfd_elfnn-aarch64.c (revision 556249) +++ files/patch-bfd_elfnn-aarch64.c (nonexistent) @@ -1,28 +0,0 @@ ---- bfd/elfnn-aarch64.c.orig 2016-11-20 12:04:44.613621000 +0000 -+++ bfd/elfnn-aarch64.c 2016-11-20 12:05:01.143334000 +0000 -@@ -4369,7 +4369,9 @@ - off = h->got.offset; - BFD_ASSERT (off != (bfd_vma) - 1); - if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h) -- || (bfd_link_pic (info) -+ || ((bfd_link_pic (info) -+ || (!bfd_link_relocatable (info) -+ && (info->export_dynamic || info->dynamic))) - && SYMBOL_REFERENCES_LOCAL (info, h)) - || (ELF_ST_VISIBILITY (h->other) - && h->root.type == bfd_link_hash_undefweak)) -@@ -8891,6 +8893,14 @@ - + h->root.u.def.section->output_section->vma - + h->root.u.def.section->output_offset); - } -+ else if (!bfd_link_relocatable (info) -+ && (info->export_dynamic || info->dynamic) -+ && SYMBOL_REFERENCES_LOCAL (info, h)) -+ { -+ BFD_ASSERT ((h->got.offset & 1) != 0); -+ rela.r_info = ELFNN_R_INFO (h->dynindx, AARCH64_R (GLOB_DAT)); -+ rela.r_addend = 0; -+ } - else - { - do_glob_dat: --- files/patch-bfd_elfxx-sparc.c (revision 556249) +++ 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; } --- files/patch-gas-configure.tgt (revision 556249) +++ files/patch-gas-configure.tgt (nonexistent) @@ -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 ;; - --- files/patch-include__safe-ctype.h (revision 556249) +++ 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 #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 --- files/patch-libctf_swap.h (revision 556249) +++ files/patch-libctf_swap.h (nonexistent) @@ -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) --- files/patch-mips64.diff (revision 556249) +++ files/patch-mips64.diff (working copy) @@ -1,41 +1,27 @@ ---- 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 556249) +++ 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,3 @@ 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 556249) +++ 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,3 @@ ;; 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