diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | binutils-bfd-djgpp.patch | 232 | ||||
| -rw-r--r-- | binutils-djgpp.patch | 390 | ||||
| -rw-r--r-- | lto-discard.patch | 10 |
5 files changed, 417 insertions, 239 deletions
@@ -1,6 +1,6 @@ pkgbase = djgpp-binutils pkgdesc = Binutils for the djgpp cross-compiler - pkgver = 2.32 + pkgver = 2.34 pkgrel = 1 url = http://www.gnu.org/software/binutils arch = i686 @@ -9,14 +9,14 @@ pkgbase = djgpp-binutils license = GPL3 options = !libtool options = !emptydirs - source = http://ftp.gnu.org/gnu/binutils/binutils-2.32.tar.xz + source = http://ftp.gnu.org/gnu/binutils/binutils-2.34.tar.xz source = binutils-bfd-djgpp.patch source = binutils-djgpp.patch source = lto-discard.patch - sha256sums = 0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - sha256sums = d5d0f706d44abf4de1a578c27268522bdda9c91b146d2a8fa506f5fec97bee8a - sha256sums = 98716ca9092784e5b44f54134031e1411274f961d2a6b0bfeb702ad97de7c5bc - sha256sums = 358cab5b397662718260f41c8a4139c97676600fa5ef9f3aa699bfe27606c434 + sha256sums = f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + sha256sums = 1c2000eab25c4f4c3d9962ea4b32a7f0067c23478980c1b73663f237929ad036 + sha256sums = 1c786d5e7a313533ec2b54fc56248bcfceb64f5231ef7722a84524f8ce11ead3 + sha256sums = 4cd5c23535918d19579533a027a643e4caaf5fc43563beb74c2d6b4dfd5ca768 pkgname = djgpp-binutils @@ -3,7 +3,7 @@ # Contributor: felix <base64 -d <<< ZmVsaXgudm9uLnNAcG9zdGVvLmRlCg==> pkgname=djgpp-binutils -pkgver=2.32 +pkgver=2.34 pkgrel=1 pkgdesc="Binutils for the djgpp cross-compiler" arch=('i686' 'x86_64') @@ -15,17 +15,17 @@ source=("http://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.xz" "binutils-bfd-djgpp.patch" "binutils-djgpp.patch" "lto-discard.patch") -sha256sums=('0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04' - 'd5d0f706d44abf4de1a578c27268522bdda9c91b146d2a8fa506f5fec97bee8a' - '98716ca9092784e5b44f54134031e1411274f961d2a6b0bfeb702ad97de7c5bc' - '358cab5b397662718260f41c8a4139c97676600fa5ef9f3aa699bfe27606c434') +sha256sums=('f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952' + '1c2000eab25c4f4c3d9962ea4b32a7f0067c23478980c1b73663f237929ad036' + '1c786d5e7a313533ec2b54fc56248bcfceb64f5231ef7722a84524f8ce11ead3' + '4cd5c23535918d19579533a027a643e4caaf5fc43563beb74c2d6b4dfd5ca768') _target="i686-pc-msdosdjgpp" prepare() { cd binutils-${pkgver} # Apply DJGPP related patches from - # ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/bnu2311s.zip + # ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/bnu234s.zip patch -Np1 <${srcdir}/binutils-djgpp.patch patch -Np1 <${srcdir}/binutils-bfd-djgpp.patch # diff --git a/binutils-bfd-djgpp.patch b/binutils-bfd-djgpp.patch index be817a9b4e59..104e11c51413 100644 --- a/binutils-bfd-djgpp.patch +++ b/binutils-bfd-djgpp.patch @@ -2,7 +2,7 @@ # by the DJGPP ports of binutils and gdb. -2019-02-13 Juan Manuel Guerrero <juan.guerrero@gmx.de> +2020-03-01 Juan Manuel Guerrero <juan.guerrero@gmx.de> * bfd/bfd-in.h [__DJGPP__]: Provide the declaration of coff_64k_relocation_enabled. @@ -133,24 +133,24 @@ -diff -aprNU5 binutils-2.32.orig/bfd/bfd-in.h binutils-2.32/bfd/bfd-in.h ---- binutils-2.32.orig/bfd/bfd-in.h 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/bfd/bfd-in.h 2019-02-13 22:25:44 +0000 -@@ -1071,5 +1071,11 @@ extern bfd_boolean elf32_csky_size_stubs - void (*) (void)); - extern void elf32_csky_next_input_section - (struct bfd_link_info *, struct bfd_section *); - extern int elf32_csky_setup_section_lists - (bfd *, struct bfd_link_info *); +diff -aprNU5 binutils-2.34.orig/bfd/bfd-in.h binutils-2.34/bfd/bfd-in.h +--- binutils-2.34.orig/bfd/bfd-in.h 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/bfd/bfd-in.h 2020-03-01 19:17:02 +0000 +@@ -562,5 +562,11 @@ extern bfd *bfd_elf_bfd_from_remote_memo + struct ecoff_debug_info; + struct ecoff_debug_swap; + struct ecoff_extr; + struct bfd_link_info; + struct bfd_link_hash_entry; + +/* This controls if the coff 64k relocation support shall be disabled or not. + By default always enabled. */ +#if defined(__DJGPP__) || defined(COFF_GO32_EXE) || defined(COFF_GO32) +extern bfd_boolean coff_64k_relocation_enabled; +#endif -diff -aprNU5 binutils-2.32.orig/bfd/cache.c binutils-2.32/bfd/cache.c ---- binutils-2.32.orig/bfd/cache.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/bfd/cache.c 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/bfd/cache.c binutils-2.34/bfd/cache.c +--- binutils-2.34.orig/bfd/cache.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/bfd/cache.c 2020-03-01 19:10:00 +0000 @@ -75,11 +75,11 @@ static int bfd_cache_max_open (void) { @@ -164,9 +164,9 @@ diff -aprNU5 binutils-2.32.orig/bfd/cache.c binutils-2.32/bfd/cache.c RLIMIT_NOFILE to a value that is not supported by libc, resulting in "Too many open files" errors. This can happen here even though max_open_files is set to rlim.rlim_cur / 8. For example, if -diff -aprNU5 binutils-2.32.orig/bfd/coff-go32.c binutils-2.32/bfd/coff-go32.c ---- binutils-2.32.orig/bfd/coff-go32.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/bfd/coff-go32.c 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/bfd/coff-go32.c binutils-2.34/bfd/coff-go32.c +--- binutils-2.34.orig/bfd/coff-go32.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/bfd/coff-go32.c 2020-03-01 19:10:00 +0000 @@ -20,10 +20,11 @@ MA 02110-1301, USA. */ @@ -196,9 +196,9 @@ diff -aprNU5 binutils-2.32.orig/bfd/coff-go32.c binutils-2.32/bfd/coff-go32.c +#define coff_mkobject _bfd_go32_mkobject + #include "coff-i386.c" -diff -aprNU5 binutils-2.32.orig/bfd/coff-stgo32.c binutils-2.32/bfd/coff-stgo32.c ---- binutils-2.32.orig/bfd/coff-stgo32.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/bfd/coff-stgo32.c 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/bfd/coff-stgo32.c binutils-2.34/bfd/coff-stgo32.c +--- binutils-2.34.orig/bfd/coff-stgo32.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/bfd/coff-stgo32.c 2020-03-01 19:10:00 +0000 @@ -51,10 +51,13 @@ { COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \ COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \ @@ -260,9 +260,9 @@ diff -aprNU5 binutils-2.32.orig/bfd/coff-stgo32.c binutils-2.32/bfd/coff-stgo32. + + return TRUE; +} -diff -aprNU5 binutils-2.32.orig/bfd/coffcode.h binutils-2.32/bfd/coffcode.h ---- binutils-2.32.orig/bfd/coffcode.h 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/bfd/coffcode.h 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/bfd/coffcode.h binutils-2.34/bfd/coffcode.h +--- binutils-2.34.orig/bfd/coffcode.h 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/bfd/coffcode.h 2020-03-01 19:10:00 +0000 @@ -362,10 +362,14 @@ CODE_FRAGMENT #define DOT_ZDEBUG ".zdebug" #define GNU_LINKONCE_WI ".gnu.linkonce.wi." @@ -278,7 +278,7 @@ diff -aprNU5 binutils-2.32.orig/bfd/coffcode.h binutils-2.32/bfd/coffcode.h #define COFFLONGSECTIONCATHELPER(x,y) x ## y /* If the input macro Y is blank or '1', return an odd number; if it is '0', return an even number. Result undefined in all other cases. */ -@@ -1950,17 +1954,57 @@ coff_set_alignment_hook (bfd *abfd, asec +@@ -1953,17 +1957,57 @@ coff_set_alignment_hook (bfd *abfd, asec } } @@ -336,7 +336,7 @@ diff -aprNU5 binutils-2.32.orig/bfd/coffcode.h binutils-2.32/bfd/coffcode.h #endif /* ! COFF_ALIGN_IN_SECTION_HEADER */ #ifndef coff_mkobject -@@ -2513,12 +2557,12 @@ coff_write_relocs (bfd * abfd, int first +@@ -2521,12 +2565,12 @@ coff_write_relocs (bfd * abfd, int first #endif if (bfd_seek (abfd, s->rel_filepos, SEEK_SET) != 0) @@ -351,7 +351,7 @@ diff -aprNU5 binutils-2.32.orig/bfd/coffcode.h binutils-2.32/bfd/coffcode.h struct internal_reloc n; memset (& n, 0, sizeof (n)); -@@ -3332,10 +3376,14 @@ coff_apply_checksum (bfd *abfd) +@@ -3337,10 +3381,14 @@ coff_apply_checksum (bfd *abfd) return TRUE; } @@ -366,7 +366,7 @@ diff -aprNU5 binutils-2.32.orig/bfd/coffcode.h binutils-2.32/bfd/coffcode.h { asection *current; bfd_boolean hasrelocs = FALSE; -@@ -3376,13 +3424,13 @@ coff_write_object_contents (bfd * abfd) +@@ -3381,13 +3429,13 @@ coff_write_object_contents (bfd * abfd) /* Work out the size of the reloc and linno areas. */ for (current = abfd->sections; current != NULL; current = @@ -382,7 +382,7 @@ diff -aprNU5 binutils-2.32.orig/bfd/coffcode.h binutils-2.32/bfd/coffcode.h reloc_count += current->reloc_count; } -@@ -3406,13 +3454,13 @@ coff_write_object_contents (bfd * abfd) +@@ -3411,13 +3459,13 @@ coff_write_object_contents (bfd * abfd) if (current->reloc_count) { @@ -398,7 +398,7 @@ diff -aprNU5 binutils-2.32.orig/bfd/coffcode.h binutils-2.32/bfd/coffcode.h } else current->rel_filepos = 0; -@@ -3743,10 +3791,22 @@ coff_write_object_contents (bfd * abfd) +@@ -3748,10 +3796,22 @@ coff_write_object_contents (bfd * abfd) } } #endif @@ -421,10 +421,10 @@ diff -aprNU5 binutils-2.32.orig/bfd/coffcode.h binutils-2.32/bfd/coffcode.h /* Don't include the internal abs section in the section count */ /* We will NOT put a fucking timestamp in the header here. Every time you -diff -aprNU5 binutils-2.32.orig/bfd/cofflink.c binutils-2.32/bfd/cofflink.c ---- binutils-2.32.orig/bfd/cofflink.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/bfd/cofflink.c 2019-02-13 22:25:44 +0000 -@@ -683,11 +683,11 @@ _bfd_coff_final_link (bfd *abfd, +diff -aprNU5 binutils-2.34.orig/bfd/cofflink.c binutils-2.34/bfd/cofflink.c +--- binutils-2.34.orig/bfd/cofflink.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/bfd/cofflink.c 2020-03-01 19:10:00 +0000 +@@ -687,11 +687,11 @@ _bfd_coff_final_link (bfd *abfd, o->flags |= SEC_RELOC; o->rel_filepos = rel_filepos; rel_filepos += o->reloc_count * relsz; @@ -437,7 +437,7 @@ diff -aprNU5 binutils-2.32.orig/bfd/cofflink.c binutils-2.32/bfd/cofflink.c if (bfd_coff_long_section_names (abfd) && strlen (o->name) > SCNNMLEN) -@@ -1102,11 +1102,11 @@ _bfd_coff_final_link (bfd *abfd, +@@ -1106,11 +1106,11 @@ _bfd_coff_final_link (bfd *abfd, bfd_coff_swap_reloc_out (abfd, irel, erel); } @@ -450,10 +450,10 @@ diff -aprNU5 binutils-2.32.orig/bfd/cofflink.c binutils-2.32/bfd/cofflink.c reloc. The header overflow bit will be set elsewhere. */ struct internal_reloc incount; -diff -aprNU5 binutils-2.32.orig/bfd/coffswap.h binutils-2.32/bfd/coffswap.h ---- binutils-2.32.orig/bfd/coffswap.h 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/bfd/coffswap.h 2019-02-13 22:25:44 +0000 -@@ -750,10 +750,23 @@ coff_swap_scnhdr_in (bfd * abfd, void * +diff -aprNU5 binutils-2.34.orig/bfd/coffswap.h binutils-2.34/bfd/coffswap.h +--- binutils-2.34.orig/bfd/coffswap.h 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/bfd/coffswap.h 2020-03-01 19:10:00 +0000 +@@ -744,10 +744,23 @@ coff_swap_scnhdr_in (bfd * abfd, void * scnhdr_int->s_relptr = GET_SCNHDR_RELPTR (abfd, scnhdr_ext->s_relptr); scnhdr_int->s_lnnoptr = GET_SCNHDR_LNNOPTR (abfd, scnhdr_ext->s_lnnoptr); scnhdr_int->s_flags = GET_SCNHDR_FLAGS (abfd, scnhdr_ext->s_flags); @@ -477,7 +477,7 @@ diff -aprNU5 binutils-2.32.orig/bfd/coffswap.h binutils-2.32/bfd/coffswap.h #endif } -@@ -774,10 +787,65 @@ coff_swap_scnhdr_out (bfd * abfd, void * +@@ -768,10 +781,65 @@ coff_swap_scnhdr_out (bfd * abfd, void * PUT_SCNHDR_SIZE (abfd, scnhdr_int->s_size, scnhdr_ext->s_size); PUT_SCNHDR_SCNPTR (abfd, scnhdr_int->s_scnptr, scnhdr_ext->s_scnptr); PUT_SCNHDR_RELPTR (abfd, scnhdr_int->s_relptr, scnhdr_ext->s_relptr); @@ -543,7 +543,7 @@ diff -aprNU5 binutils-2.32.orig/bfd/coffswap.h binutils-2.32/bfd/coffswap.h else { char buf[sizeof (scnhdr_int->s_name) + 1]; -@@ -805,10 +873,13 @@ coff_swap_scnhdr_out (bfd * abfd, void * +@@ -799,10 +867,13 @@ coff_swap_scnhdr_out (bfd * abfd, void * bfd_set_error (bfd_error_file_truncated); PUT_SCNHDR_NRELOC (abfd, 0xffff, scnhdr_ext->s_nreloc); ret = 0; @@ -557,9 +557,9 @@ diff -aprNU5 binutils-2.32.orig/bfd/coffswap.h binutils-2.32/bfd/coffswap.h #endif return ret; } -diff -aprNU5 binutils-2.32.orig/bfd/config.in binutils-2.32/bfd/config.in ---- binutils-2.32.orig/bfd/config.in 2019-02-02 15:48:02 +0000 -+++ binutils-2.32/bfd/config.in 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/bfd/config.in binutils-2.34/bfd/config.in +--- binutils-2.34.orig/bfd/config.in 2020-02-01 11:49:18 +0000 ++++ binutils-2.34/bfd/config.in 2020-03-01 19:10:00 +0000 @@ -414,5 +414,39 @@ this defined. */ #undef _POSIX_1_SOURCE @@ -600,9 +600,9 @@ diff -aprNU5 binutils-2.32.orig/bfd/config.in binutils-2.32/bfd/config.in +#else +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif -diff -aprNU5 binutils-2.32.orig/bfd/init.c binutils-2.32/bfd/init.c ---- binutils-2.32.orig/bfd/init.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/bfd/init.c 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/bfd/init.c binutils-2.34/bfd/init.c +--- binutils-2.34.orig/bfd/init.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/bfd/init.c 2020-03-01 19:10:00 +0000 @@ -21,10 +21,16 @@ #include "sysdep.h" @@ -634,9 +634,9 @@ diff -aprNU5 binutils-2.32.orig/bfd/init.c binutils-2.32/bfd/init.c +#endif return BFD_INIT_MAGIC; } -diff -aprNU5 binutils-2.32.orig/bfd/libcoff-in.h binutils-2.32/bfd/libcoff-in.h ---- binutils-2.32.orig/bfd/libcoff-in.h 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/bfd/libcoff-in.h 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/bfd/libcoff-in.h binutils-2.34/bfd/libcoff-in.h +--- binutils-2.34.orig/bfd/libcoff-in.h 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/bfd/libcoff-in.h 2020-03-01 19:10:00 +0000 @@ -31,12 +31,13 @@ extern "C" { /* Object file tdata; access macros. */ @@ -665,10 +665,10 @@ diff -aprNU5 binutils-2.32.orig/bfd/libcoff-in.h binutils-2.32/bfd/libcoff-in.h char *go32stub; } coff_data_type; -diff -aprNU5 binutils-2.32.orig/bfd/Makefile.in binutils-2.32/bfd/Makefile.in ---- binutils-2.32.orig/bfd/Makefile.in 2019-02-02 15:47:56 +0000 -+++ binutils-2.32/bfd/Makefile.in 2019-02-13 22:25:44 +0000 -@@ -2020,11 +2020,11 @@ host-aout.lo: Makefile +diff -aprNU5 binutils-2.34.orig/bfd/Makefile.in binutils-2.34/bfd/Makefile.in +--- binutils-2.34.orig/bfd/Makefile.in 2020-02-01 11:49:12 +0000 ++++ binutils-2.34/bfd/Makefile.in 2020-03-01 19:10:00 +0000 +@@ -2033,11 +2033,11 @@ host-aout.lo: Makefile aout-params.h: gen-aout ./gen-aout host > aout-params.h gen-aout: $(srcdir)/gen-aout.c Makefile @@ -681,7 +681,7 @@ diff -aprNU5 binutils-2.32.orig/bfd/Makefile.in binutils-2.32/bfd/Makefile.in rm -f bfd-tmp.h cp bfd-in3.h bfd-tmp.h $(SHELL) $(srcdir)/../move-if-change bfd-tmp.h $(BFD_H) -@@ -2042,11 +2042,11 @@ headers: +@@ -2055,11 +2055,11 @@ headers: $(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h # We only rebuild the header files automatically if we have been @@ -694,10 +694,10 @@ diff -aprNU5 binutils-2.32.orig/bfd/Makefile.in binutils-2.32/bfd/Makefile.in cp $(bfddocdir)/bfd.h bfd-in2.h-new $(SHELL) $(srcdir)/../move-if-change bfd-in2.h-new $(srcdir)/bfd-in2.h touch stmp-bin2-h -diff -aprNU5 binutils-2.32.orig/include/bfdlink.h binutils-2.32/include/bfdlink.h ---- binutils-2.32.orig/include/bfdlink.h 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/include/bfdlink.h 2019-02-13 22:25:44 +0000 -@@ -296,11 +296,11 @@ struct bfd_elf_version_tree; +diff -aprNU5 binutils-2.34.orig/include/bfdlink.h binutils-2.34/include/bfdlink.h +--- binutils-2.34.orig/include/bfdlink.h 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/include/bfdlink.h 2020-03-01 19:10:00 +0000 +@@ -302,11 +302,11 @@ struct bfd_elf_version_tree; enum output_type { type_pde, @@ -710,9 +710,9 @@ diff -aprNU5 binutils-2.32.orig/include/bfdlink.h binutils-2.32/include/bfdlink. #define bfd_link_pde(info) ((info)->type == type_pde) #define bfd_link_dll(info) ((info)->type == type_dll) #define bfd_link_relocatable(info) ((info)->type == type_relocatable) -diff -aprNU5 binutils-2.32.orig/include/coff/internal.h binutils-2.32/include/coff/internal.h ---- binutils-2.32.orig/include/coff/internal.h 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/include/coff/internal.h 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/include/coff/internal.h binutils-2.34/include/coff/internal.h +--- binutils-2.34.orig/include/coff/internal.h 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/include/coff/internal.h 2020-03-01 19:10:00 +0000 @@ -165,11 +165,11 @@ typedef struct _CODEVIEW_INFO { unsigned long CVSignature; @@ -726,9 +726,9 @@ diff -aprNU5 binutils-2.32.orig/include/coff/internal.h binutils-2.32/include/co /* Default image base for NT. */ #define NT_EXE_IMAGE_BASE 0x400000 #define NT_DLL_IMAGE_BASE 0x10000000 -diff -aprNU5 binutils-2.32.orig/include/simple-object.h binutils-2.32/include/simple-object.h ---- binutils-2.32.orig/include/simple-object.h 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/include/simple-object.h 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/include/simple-object.h binutils-2.34/include/simple-object.h +--- binutils-2.34.orig/include/simple-object.h 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/include/simple-object.h 2020-03-01 19:10:00 +0000 @@ -204,11 +204,11 @@ simple_object_release_write (simple_obje If an error occurs, return the errno value in ERR and an error string. */ @@ -742,9 +742,9 @@ diff -aprNU5 binutils-2.32.orig/include/simple-object.h binutils-2.32/include/si } #endif -diff -aprNU5 binutils-2.32.orig/libiberty/config.in binutils-2.32/libiberty/config.in ---- binutils-2.32.orig/libiberty/config.in 2019-01-19 16:01:34 +0000 -+++ binutils-2.32/libiberty/config.in 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/libiberty/config.in binutils-2.34/libiberty/config.in +--- binutils-2.34.orig/libiberty/config.in 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libiberty/config.in 2020-03-01 19:10:00 +0000 @@ -573,5 +573,59 @@ pointer, if such a type exists, and if the system does not define it. */ #undef uintptr_t @@ -805,10 +805,10 @@ diff -aprNU5 binutils-2.32.orig/libiberty/config.in binutils-2.32/libiberty/conf +#else /* !__DJGPP__ */ +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif /* !__DJGPP__ */ -diff -aprNU5 binutils-2.32.orig/libiberty/cp-demangle.c binutils-2.32/libiberty/cp-demangle.c ---- binutils-2.32.orig/libiberty/cp-demangle.c 2019-01-19 16:01:34 +0000 -+++ binutils-2.32/libiberty/cp-demangle.c 2019-02-13 22:32:24 +0000 -@@ -2933,11 +2933,11 @@ d_parmlist (struct d_info *di) +diff -aprNU5 binutils-2.34.orig/libiberty/cp-demangle.c binutils-2.34/libiberty/cp-demangle.c +--- binutils-2.34.orig/libiberty/cp-demangle.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libiberty/cp-demangle.c 2020-03-01 19:10:00 +0000 +@@ -2950,11 +2950,11 @@ d_parmlist (struct d_info *di) } /* <bare-function-type> ::= [J]<type>+ */ @@ -821,7 +821,7 @@ diff -aprNU5 binutils-2.32.orig/libiberty/cp-demangle.c binutils-2.32/libiberty/ struct demangle_component *tl; char peek; -@@ -2945,14 +2945,14 @@ d_bare_function_type (struct d_info *di, +@@ -2962,14 +2962,14 @@ d_bare_function_type (struct d_info *di, is the return type. */ peek = d_peek_char (di); if (peek == 'J') @@ -838,7 +838,7 @@ diff -aprNU5 binutils-2.32.orig/libiberty/cp-demangle.c binutils-2.32/libiberty/ if (return_type == NULL) return NULL; } -@@ -3306,26 +3306,26 @@ d_expression_1 (struct d_info *di) +@@ -3323,26 +3323,26 @@ d_expression_1 (struct d_info *di) d_expression_1 (di), NULL); } else if (peek == 'f' && d_peek_next_char (di) == 'p') @@ -871,7 +871,7 @@ diff -aprNU5 binutils-2.32.orig/libiberty/cp-demangle.c binutils-2.32/libiberty/ || (peek == 'o' && d_peek_next_char (di) == 'n')) { /* We can get an unqualified name as an expression in the case of -@@ -4649,11 +4649,11 @@ d_print_comp_inner (struct d_print_info +@@ -4683,11 +4683,11 @@ d_print_comp_inner (struct d_print_info without needing to modify *dc. */ struct demangle_component *mod_inner = NULL; @@ -884,7 +884,7 @@ diff -aprNU5 binutils-2.32.orig/libiberty/cp-demangle.c binutils-2.32/libiberty/ int need_template_restore = 0; if (dc == NULL) -@@ -6236,11 +6236,11 @@ d_demangle_callback (const char *mangled +@@ -6271,11 +6271,11 @@ d_demangle_callback (const char *mangled DCT_GLOBAL_CTORS, DCT_GLOBAL_DTORS } @@ -897,9 +897,9 @@ diff -aprNU5 binutils-2.32.orig/libiberty/cp-demangle.c binutils-2.32/libiberty/ if (mangled[0] == '_' && mangled[1] == 'Z') type = DCT_MANGLED; else if (strncmp (mangled, "_GLOBAL_", 8) == 0 -diff -aprNU5 binutils-2.32.orig/libiberty/floatformat.c binutils-2.32/libiberty/floatformat.c ---- binutils-2.32.orig/libiberty/floatformat.c 2019-01-19 16:01:34 +0000 -+++ binutils-2.32/libiberty/floatformat.c 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/libiberty/floatformat.c binutils-2.34/libiberty/floatformat.c +--- binutils-2.34.orig/libiberty/floatformat.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libiberty/floatformat.c 2020-03-01 19:10:00 +0000 @@ -484,20 +484,20 @@ floatformat_to_double (const struct floa /* If the exponent indicates a NaN, we don't have information to decide what to do. So we handle it like IEEE, except that we @@ -907,25 +907,25 @@ diff -aprNU5 binutils-2.32.orig/libiberty/floatformat.c binutils-2.32/libiberty/ if ((unsigned long) exponent == fmt->exp_nan) { - int nan = mant_bits_set (fmt, ufrom); -+ int _nan = mant_bits_set (fmt, ufrom); ++ int bfd_nan = mant_bits_set (fmt, ufrom); /* On certain systems (such as GNU/Linux), the use of the - INFINITY macro below may generate a warning that can not be + INFINITY macro below may generate a warning that cannot be silenced due to a bug in GCC (PR preprocessor/11931). The preprocessor fails to recognise the __extension__ keyword in conjunction with the GNU/C99 extension for hexadecimal floating point constants and will issue a warning when compiling with -pedantic. */ - if (nan) -+ if (_nan) ++ if (bfd_nan) dto = NAN; else dto = INFINITY; if (get_field (ufrom, fmt->byteorder, fmt->totalsize, fmt->sign_start, 1)) -diff -aprNU5 binutils-2.32.orig/libiberty/hashtab.c binutils-2.32/libiberty/hashtab.c ---- binutils-2.32.orig/libiberty/hashtab.c 2019-01-19 16:01:34 +0000 -+++ binutils-2.32/libiberty/hashtab.c 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/libiberty/hashtab.c binutils-2.34/libiberty/hashtab.c +--- binutils-2.34.orig/libiberty/hashtab.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libiberty/hashtab.c 2020-03-01 19:10:00 +0000 @@ -478,28 +478,28 @@ htab_empty (htab_t htab) HASH is the hash value for the element to be inserted. */ @@ -1080,9 +1080,9 @@ diff -aprNU5 binutils-2.32.orig/libiberty/hashtab.c binutils-2.32/libiberty/hash /* Like htab_find_slot_with_hash, but compute the hash value from the element. */ -diff -aprNU5 binutils-2.32.orig/libiberty/make-relative-prefix.c binutils-2.32/libiberty/make-relative-prefix.c ---- binutils-2.32.orig/libiberty/make-relative-prefix.c 2019-01-19 16:01:34 +0000 -+++ binutils-2.32/libiberty/make-relative-prefix.c 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/libiberty/make-relative-prefix.c binutils-2.34/libiberty/make-relative-prefix.c +--- binutils-2.34.orig/libiberty/make-relative-prefix.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libiberty/make-relative-prefix.c 2020-03-01 19:10:00 +0000 @@ -79,10 +79,11 @@ relative prefix can be found, return @co #if defined (_WIN32) || defined (__MSDOS__) \ || defined (__DJGPP__) || defined (__OS2__) @@ -1109,7 +1109,7 @@ diff -aprNU5 binutils-2.32.orig/libiberty/make-relative-prefix.c binutils-2.32/l static char *save_string (const char *, int); static char **split_directories (const char *, int *); static void free_split_directories (char **); -@@ -335,11 +339,11 @@ make_relative_prefix_1 (const char *prog +@@ -338,11 +342,11 @@ make_relative_prefix_1 (const char *prog we can do. */ if (prog_num == bin_num) { @@ -1122,7 +1122,7 @@ diff -aprNU5 binutils-2.32.orig/libiberty/make-relative-prefix.c binutils-2.32/l if (prog_num <= 0 || i == bin_num) goto bailout; -@@ -351,11 +355,11 @@ make_relative_prefix_1 (const char *prog +@@ -354,11 +358,11 @@ make_relative_prefix_1 (const char *prog /* Find how many directories are in common between bin_prefix & prefix. */ n = (prefix_num < bin_num) ? prefix_num : bin_num; @@ -1135,9 +1135,9 @@ diff -aprNU5 binutils-2.32.orig/libiberty/make-relative-prefix.c binutils-2.32/l /* If there are no common directories, there can be no relative prefix. */ if (common == 0) -diff -aprNU5 binutils-2.32.orig/libiberty/make-temp-file.c binutils-2.32/libiberty/make-temp-file.c ---- binutils-2.32.orig/libiberty/make-temp-file.c 2019-01-19 16:01:34 +0000 -+++ binutils-2.32/libiberty/make-temp-file.c 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/libiberty/make-temp-file.c binutils-2.34/libiberty/make-temp-file.c +--- binutils-2.34.orig/libiberty/make-temp-file.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libiberty/make-temp-file.c 2020-03-01 19:10:00 +0000 @@ -52,16 +52,31 @@ extern int mkstemps (char *, int); /* '/' works just fine on MS-DOS based systems. */ #ifndef DIR_SEPARATOR @@ -1198,9 +1198,9 @@ diff -aprNU5 binutils-2.32.orig/libiberty/make-temp-file.c binutils-2.32/libiber #else /* defined(_WIN32) && !defined(__CYGWIN__) */ DWORD len; -diff -aprNU5 binutils-2.32.orig/libiberty/pex-common.c binutils-2.32/libiberty/pex-common.c ---- binutils-2.32.orig/libiberty/pex-common.c 2019-01-19 16:01:34 +0000 -+++ binutils-2.32/libiberty/pex-common.c 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/libiberty/pex-common.c binutils-2.34/libiberty/pex-common.c +--- binutils-2.34.orig/libiberty/pex-common.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libiberty/pex-common.c 2020-03-01 19:10:00 +0000 @@ -115,11 +115,11 @@ temp_file (struct pex_obj *obj, int flag if (len >= 6 @@ -1240,9 +1240,9 @@ diff -aprNU5 binutils-2.32.orig/libiberty/pex-common.c binutils-2.32/libiberty/p obj->next_input = -1; } else if ((obj->flags & PEX_USE_PIPES) == 0) -diff -aprNU5 binutils-2.32.orig/libiberty/simple-object-coff.c binutils-2.32/libiberty/simple-object-coff.c ---- binutils-2.32.orig/libiberty/simple-object-coff.c 2019-01-19 16:01:34 +0000 -+++ binutils-2.32/libiberty/simple-object-coff.c 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/libiberty/simple-object-coff.c binutils-2.34/libiberty/simple-object-coff.c +--- binutils-2.34.orig/libiberty/simple-object-coff.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libiberty/simple-object-coff.c 2020-03-01 19:10:00 +0000 @@ -649,17 +649,17 @@ simple_object_coff_write_to_file (simple new_offset = offset & mask; new_offset &= ~ mask; @@ -1266,10 +1266,10 @@ diff -aprNU5 binutils-2.32.orig/libiberty/simple-object-coff.c binutils-2.32/lib } scnsize = 0; -diff -aprNU5 binutils-2.32.orig/libiberty/simple-object-elf.c binutils-2.32/libiberty/simple-object-elf.c ---- binutils-2.32.orig/libiberty/simple-object-elf.c 2019-01-19 16:01:34 +0000 -+++ binutils-2.32/libiberty/simple-object-elf.c 2019-02-13 22:25:44 +0000 -@@ -990,20 +990,20 @@ simple_object_elf_write_to_file (simple_ +diff -aprNU5 binutils-2.34.orig/libiberty/simple-object-elf.c binutils-2.34/libiberty/simple-object-elf.c +--- binutils-2.34.orig/libiberty/simple-object-elf.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libiberty/simple-object-elf.c 2020-03-01 19:10:00 +0000 +@@ -998,20 +998,20 @@ simple_object_elf_write_to_file (simple_ new_sh_offset = sh_offset + mask; new_sh_offset &= ~ mask; while (new_sh_offset > sh_offset) @@ -1296,9 +1296,9 @@ diff -aprNU5 binutils-2.32.orig/libiberty/simple-object-elf.c binutils-2.32/libi sh_size = 0; for (buffer = section->buffers; buffer != NULL; buffer = buffer->next) { -diff -aprNU5 binutils-2.32.orig/libiberty/simple-object-mach-o.c binutils-2.32/libiberty/simple-object-mach-o.c ---- binutils-2.32.orig/libiberty/simple-object-mach-o.c 2019-01-19 16:01:34 +0000 -+++ binutils-2.32/libiberty/simple-object-mach-o.c 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/libiberty/simple-object-mach-o.c binutils-2.34/libiberty/simple-object-mach-o.c +--- binutils-2.34.orig/libiberty/simple-object-mach-o.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libiberty/simple-object-mach-o.c 2020-03-01 19:10:00 +0000 @@ -424,11 +424,11 @@ simple_object_mach_o_segment (simple_obj unsigned int index_index; unsigned int nametab_index; @@ -1567,9 +1567,9 @@ diff -aprNU5 binutils-2.32.orig/libiberty/simple-object-mach-o.c binutils-2.32/l /* Write out the segment header. */ -diff -aprNU5 binutils-2.32.orig/libiberty/simple-object-xcoff.c binutils-2.32/libiberty/simple-object-xcoff.c ---- binutils-2.32.orig/libiberty/simple-object-xcoff.c 2019-01-19 16:01:34 +0000 -+++ binutils-2.32/libiberty/simple-object-xcoff.c 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/libiberty/simple-object-xcoff.c binutils-2.34/libiberty/simple-object-xcoff.c +--- binutils-2.34.orig/libiberty/simple-object-xcoff.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libiberty/simple-object-xcoff.c 2020-03-01 19:10:00 +0000 @@ -905,17 +905,17 @@ simple_object_xcoff_write_to_file (simpl new_offset = offset & mask; new_offset &= ~ mask; @@ -1593,10 +1593,10 @@ diff -aprNU5 binutils-2.32.orig/libiberty/simple-object-xcoff.c binutils-2.32/li } scnsize = 0; -diff -aprNU5 binutils-2.32.orig/libiberty/simple-object.c binutils-2.32/libiberty/simple-object.c ---- binutils-2.32.orig/libiberty/simple-object.c 2019-01-19 16:01:34 +0000 -+++ binutils-2.32/libiberty/simple-object.c 2019-02-13 22:25:44 +0000 -@@ -254,40 +254,40 @@ simple_object_find_section (simple_objec +diff -aprNU5 binutils-2.34.orig/libiberty/simple-object.c binutils-2.34/libiberty/simple-object.c +--- binutils-2.34.orig/libiberty/simple-object.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libiberty/simple-object.c 2020-03-01 19:10:00 +0000 +@@ -258,40 +258,40 @@ simple_object_find_section (simple_objec Returns non-NULL if NAME is a LTO debug section, NULL if not. If RENAME is true it will rename LTO debug sections to non-LTO ones. */ @@ -1643,7 +1643,7 @@ diff -aprNU5 binutils-2.32.orig/libiberty/simple-object.c binutils-2.32/libibert return strcpy (newname, name); /* Copy over .comment section under the same name if present. Solaris ld uses them to relax its checking of ELF gABI access rules for -@@ -316,11 +316,11 @@ handle_lto_debug_sections_norename (cons +@@ -320,11 +320,11 @@ handle_lto_debug_sections_norename (cons /* Copy LTO debug sections. */ @@ -1656,7 +1656,7 @@ diff -aprNU5 binutils-2.32.orig/libiberty/simple-object.c binutils-2.32/libibert simple_object_write *dest_sobj; simple_object_attributes *attrs; int outfd; -@@ -339,11 +339,11 @@ simple_object_copy_lto_debug_sections (s +@@ -343,11 +343,11 @@ simple_object_copy_lto_debug_sections (s if (! dest_sobj) return errmsg; @@ -1669,9 +1669,9 @@ diff -aprNU5 binutils-2.32.orig/libiberty/simple-object.c binutils-2.32/libibert { simple_object_release_write (dest_sobj); return errmsg; -diff -aprNU5 binutils-2.32.orig/libiberty/stack-limit.c binutils-2.32/libiberty/stack-limit.c ---- binutils-2.32.orig/libiberty/stack-limit.c 2019-01-19 16:01:34 +0000 -+++ binutils-2.32/libiberty/stack-limit.c 2019-02-13 22:25:44 +0000 +diff -aprNU5 binutils-2.34.orig/libiberty/stack-limit.c binutils-2.34/libiberty/stack-limit.c +--- binutils-2.34.orig/libiberty/stack-limit.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libiberty/stack-limit.c 2020-03-01 19:10:00 +0000 @@ -49,11 +49,11 @@ stack_limit_increase (unsigned long pref #if defined(HAVE_SETRLIMIT) && defined(HAVE_GETRLIMIT) \ && defined(RLIMIT_STACK) && defined(RLIM_INFINITY) diff --git a/binutils-djgpp.patch b/binutils-djgpp.patch index 7c7393ae79a5..91f2fe1064c9 100644 --- a/binutils-djgpp.patch +++ b/binutils-djgpp.patch @@ -2,7 +2,7 @@ # excluding the changes specific to libbfd and libiberty. -2019-02-13 Juan Manuel Guerrero <juan.guerrero@gmx.de> +2020-03-01 Juan Manuel Guerrero <juan.guerrero@gmx.de> * binutils/addr2line.c (main): Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name. @@ -99,16 +99,24 @@ * opcodes/config.in [__DJGPP__]: Added DJGPP specific macros definitions. They are all NO-OPS for other OSes. + * libctf/config.h.in [__DJGPP__]: Added DJGPP specific macros definitions. + Define HAVE_TSL_SUPPORT if the gcc version is greather equal than 4.3.0. + * libctf/swap.h [__DJGPP__]: bswap_identity_64, bswap_16, bswap_32 and + bswap_64 reimplemented as macros to avoid issues with the inline versions + of those functions with different gcc versions. + * libctf/ctf-archive.c [HAVE_TSL_SUPPORT]: Do not use __thread if not supported + by gcc. -diff -aprNU5 binutils-2.32.orig/binutils/ar.c binutils-2.32/binutils/ar.c ---- binutils-2.32.orig/binutils/ar.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/binutils/ar.c 2019-02-13 22:00:24 +0000 -@@ -694,11 +694,11 @@ main (int argc, char **argv) + +diff -aprNU5 binutils-2.34.orig/binutils/ar.c binutils-2.34/binutils/ar.c +--- binutils-2.34.orig/binutils/ar.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/binutils/ar.c 2020-03-01 19:35:24 +0000 +@@ -719,11 +719,11 @@ main (int argc, char **argv) setlocale (LC_CTYPE, ""); #endif bindtextdomain (PACKAGE, LOCALEDIR); @@ -121,9 +129,9 @@ diff -aprNU5 binutils-2.32.orig/binutils/ar.c binutils-2.32/binutils/ar.c #if BFD_SUPPORTS_PLUGINS bfd_plugin_set_program_name (program_name); #endif -diff -aprNU5 binutils-2.32.orig/binutils/coffdump.c binutils-2.32/binutils/coffdump.c ---- binutils-2.32.orig/binutils/coffdump.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/binutils/coffdump.c 2019-02-13 22:00:24 +0000 +diff -aprNU5 binutils-2.34.orig/binutils/coffdump.c binutils-2.34/binutils/coffdump.c +--- binutils-2.34.orig/binutils/coffdump.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/binutils/coffdump.c 2020-03-01 19:35:24 +0000 @@ -497,11 +497,11 @@ main (int ac, char **av) setlocale (LC_CTYPE, ""); #endif @@ -137,10 +145,10 @@ diff -aprNU5 binutils-2.32.orig/binutils/coffdump.c binutils-2.32/binutils/coffd expandargv (&ac, &av); -diff -aprNU5 binutils-2.32.orig/binutils/config.in binutils-2.32/binutils/config.in ---- binutils-2.32.orig/binutils/config.in 2019-02-02 15:54:12 +0000 -+++ binutils-2.32/binutils/config.in 2019-02-13 22:00:24 +0000 -@@ -297,5 +297,40 @@ +diff -aprNU5 binutils-2.34.orig/binutils/config.in binutils-2.34/binutils/config.in +--- binutils-2.34.orig/binutils/config.in 2020-02-01 11:50:08 +0000 ++++ binutils-2.34/binutils/config.in 2020-03-01 19:35:24 +0000 +@@ -300,5 +300,40 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE @@ -181,9 +189,9 @@ diff -aprNU5 binutils-2.32.orig/binutils/config.in binutils-2.32/binutils/config +#else +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif -diff -aprNU5 binutils-2.32.orig/binutils/cxxfilt.c binutils-2.32/binutils/cxxfilt.c ---- binutils-2.32.orig/binutils/cxxfilt.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/binutils/cxxfilt.c 2019-02-13 22:00:24 +0000 +diff -aprNU5 binutils-2.34.orig/binutils/cxxfilt.c binutils-2.34/binutils/cxxfilt.c +--- binutils-2.34.orig/binutils/cxxfilt.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/binutils/cxxfilt.c 2020-03-01 19:35:24 +0000 @@ -142,11 +142,11 @@ main (int argc, char **argv) { int c; @@ -197,10 +205,10 @@ diff -aprNU5 binutils-2.32.orig/binutils/cxxfilt.c binutils-2.32/binutils/cxxfil expandargv (&argc, &argv); -diff -aprNU5 binutils-2.32.orig/binutils/nm.c binutils-2.32/binutils/nm.c ---- binutils-2.32.orig/binutils/nm.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/binutils/nm.c 2019-02-13 22:00:24 +0000 -@@ -1651,11 +1651,11 @@ main (int argc, char **argv) +diff -aprNU5 binutils-2.34.orig/binutils/nm.c binutils-2.34/binutils/nm.c +--- binutils-2.34.orig/binutils/nm.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/binutils/nm.c 2020-03-01 19:35:24 +0000 +@@ -1695,11 +1695,11 @@ main (int argc, char **argv) setlocale (LC_COLLATE, ""); #endif bindtextdomain (PACKAGE, LOCALEDIR); @@ -213,10 +221,10 @@ diff -aprNU5 binutils-2.32.orig/binutils/nm.c binutils-2.32/binutils/nm.c #if BFD_SUPPORTS_PLUGINS bfd_plugin_set_program_name (program_name); #endif -diff -aprNU5 binutils-2.32.orig/binutils/objcopy.c binutils-2.32/binutils/objcopy.c ---- binutils-2.32.orig/binutils/objcopy.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/binutils/objcopy.c 2019-02-13 22:00:24 +0000 -@@ -5654,11 +5654,11 @@ main (int argc, char *argv[]) +diff -aprNU5 binutils-2.34.orig/binutils/objcopy.c binutils-2.34/binutils/objcopy.c +--- binutils-2.34.orig/binutils/objcopy.c 2020-01-28 09:32:00 +0000 ++++ binutils-2.34/binutils/objcopy.c 2020-03-01 19:35:24 +0000 +@@ -5935,11 +5935,11 @@ main (int argc, char *argv[]) setlocale (LC_CTYPE, ""); #endif bindtextdomain (PACKAGE, LOCALEDIR); @@ -229,10 +237,10 @@ diff -aprNU5 binutils-2.32.orig/binutils/objcopy.c binutils-2.32/binutils/objcop START_PROGRESS (program_name, 0); expandargv (&argc, &argv); -diff -aprNU5 binutils-2.32.orig/binutils/objdump.c binutils-2.32/binutils/objdump.c ---- binutils-2.32.orig/binutils/objdump.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/binutils/objdump.c 2019-02-13 22:00:24 +0000 -@@ -4022,11 +4022,11 @@ main (int argc, char **argv) +diff -aprNU5 binutils-2.34.orig/binutils/objdump.c binutils-2.34/binutils/objdump.c +--- binutils-2.34.orig/binutils/objdump.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/binutils/objdump.c 2020-03-01 19:35:24 +0000 +@@ -5031,11 +5031,11 @@ main (int argc, char **argv) #endif bindtextdomain (PACKAGE, LOCALEDIR); @@ -245,10 +253,10 @@ diff -aprNU5 binutils-2.32.orig/binutils/objdump.c binutils-2.32/binutils/objdum START_PROGRESS (program_name, 0); -diff -aprNU5 binutils-2.32.orig/binutils/readelf.c binutils-2.32/binutils/readelf.c ---- binutils-2.32.orig/binutils/readelf.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/binutils/readelf.c 2019-02-13 22:00:24 +0000 -@@ -571,11 +571,16 @@ print_symbol (signed int width, const ch +diff -aprNU5 binutils-2.34.orig/binutils/readelf.c binutils-2.34/binutils/readelf.c +--- binutils-2.34.orig/binutils/readelf.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/binutils/readelf.c 2020-03-01 19:35:24 +0000 +@@ -584,11 +584,16 @@ print_symbol (signed int width, const ch #ifdef HAVE_MBSTATE_T /* Try to find out how many bytes made up the character that was @@ -265,10 +273,10 @@ diff -aprNU5 binutils-2.32.orig/binutils/readelf.c binutils-2.32/binutils/readel #endif if (n != (size_t) -1 && n != (size_t) -2 && n > 0) symbol += (n - 1); -diff -aprNU5 binutils-2.32.orig/binutils/size.c binutils-2.32/binutils/size.c ---- binutils-2.32.orig/binutils/size.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/binutils/size.c 2019-02-13 22:00:24 +0000 -@@ -129,11 +129,11 @@ main (int argc, char **argv) +diff -aprNU5 binutils-2.34.orig/binutils/size.c binutils-2.34/binutils/size.c +--- binutils-2.34.orig/binutils/size.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/binutils/size.c 2020-03-01 19:35:24 +0000 +@@ -141,11 +141,11 @@ main (int argc, char **argv) setlocale (LC_CTYPE, ""); #endif bindtextdomain (PACKAGE, LOCALEDIR); @@ -281,9 +289,9 @@ diff -aprNU5 binutils-2.32.orig/binutils/size.c binutils-2.32/binutils/size.c expandargv (&argc, &argv); -diff -aprNU5 binutils-2.32.orig/binutils/srconv.c binutils-2.32/binutils/srconv.c ---- binutils-2.32.orig/binutils/srconv.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/binutils/srconv.c 2019-02-13 22:00:24 +0000 +diff -aprNU5 binutils-2.34.orig/binutils/srconv.c binutils-2.34/binutils/srconv.c +--- binutils-2.34.orig/binutils/srconv.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/binutils/srconv.c 2020-03-01 19:35:24 +0000 @@ -1731,11 +1731,11 @@ main (int ac, char **av) setlocale (LC_CTYPE, ""); #endif @@ -297,9 +305,9 @@ diff -aprNU5 binutils-2.32.orig/binutils/srconv.c binutils-2.32/binutils/srconv. expandargv (&ac, &av); -diff -aprNU5 binutils-2.32.orig/binutils/strings.c binutils-2.32/binutils/strings.c ---- binutils-2.32.orig/binutils/strings.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/binutils/strings.c 2019-02-13 22:00:24 +0000 +diff -aprNU5 binutils-2.34.orig/binutils/strings.c binutils-2.34/binutils/strings.c +--- binutils-2.34.orig/binutils/strings.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/binutils/strings.c 2020-03-01 19:35:24 +0000 @@ -153,11 +153,11 @@ main (int argc, char **argv) setlocale (LC_ALL, ""); #endif @@ -313,9 +321,9 @@ diff -aprNU5 binutils-2.32.orig/binutils/strings.c binutils-2.32/binutils/string expandargv (&argc, &argv); -diff -aprNU5 binutils-2.32.orig/binutils/sysdump.c binutils-2.32/binutils/sysdump.c ---- binutils-2.32.orig/binutils/sysdump.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/binutils/sysdump.c 2019-02-13 22:00:24 +0000 +diff -aprNU5 binutils-2.34.orig/binutils/sysdump.c binutils-2.34/binutils/sysdump.c +--- binutils-2.34.orig/binutils/sysdump.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/binutils/sysdump.c 2020-03-01 19:35:24 +0000 @@ -668,11 +668,11 @@ main (int ac, char **av) setlocale (LC_CTYPE, ""); #endif @@ -329,9 +337,9 @@ diff -aprNU5 binutils-2.32.orig/binutils/sysdump.c binutils-2.32/binutils/sysdum expandargv (&ac, &av); -diff -aprNU5 binutils-2.32.orig/config.sub binutils-2.32/config.sub ---- binutils-2.32.orig/config.sub 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/config.sub 2019-02-13 22:00:24 +0000 +diff -aprNU5 binutils-2.34.orig/config.sub binutils-2.34/config.sub +--- binutils-2.34.orig/config.sub 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/config.sub 2020-03-01 19:35:24 +0000 @@ -301,10 +301,19 @@ case $1 in basic_machine=i686-pc os=dicos @@ -352,9 +360,9 @@ diff -aprNU5 binutils-2.32.orig/config.sub binutils-2.32/config.sub ebmon29k) basic_machine=a29k-amd os=ebmon -diff -aprNU5 binutils-2.32.orig/djgpp/build.sh binutils-2.32/djgpp/build.sh ---- binutils-2.32.orig/djgpp/build.sh 1970-01-01 00:00:00 +0000 -+++ binutils-2.32/djgpp/build.sh 2019-02-13 22:15:42 +0000 +diff -aprNU5 binutils-2.34.orig/djgpp/build.sh binutils-2.34/djgpp/build.sh +--- binutils-2.34.orig/djgpp/build.sh 1970-01-01 00:00:00 +0000 ++++ binutils-2.34/djgpp/build.sh 2020-03-01 19:35:24 +0000 @@ -0,0 +1,490 @@ +# This script only works in the ./djgpp directory. + @@ -721,7 +729,7 @@ diff -aprNU5 binutils-2.32.orig/djgpp/build.sh binutils-2.32/djgpp/build.sh +EOF + + -+for file in ../ltmain.sh ../configure ../bfd/configure ../binutils/configure ../gas/configure ../gprof/configure ../ld/configure ../opcodes/configure ../zlib/configure; do ++for file in ../ltmain.sh ../configure ../bfd/configure ../binutils/configure ../gas/configure ../gprof/configure ../ld/configure ../opcodes/configure ../zlib/configure ../libctf/configure; do + if test ! -f ${file}.orig; then + cp -vf ${file} ${file}.orig + touch ${file}.orig -r ${file} @@ -780,7 +788,7 @@ diff -aprNU5 binutils-2.32.orig/djgpp/build.sh binutils-2.32/djgpp/build.sh +EOF + + -+for file in ./../bfd/Makefile.in ./../bfd/doc/Makefile.in ./../binutils/doc/Makefile.in ./../etc/Makefile.in ./../gas/doc/Makefile.in ./../gprof/Makefile.in ./../ld/Makefile.in ./../libiberty/Makefile.in; do ++for file in ./../bfd/Makefile.in ./../bfd/doc/Makefile.in ./../binutils/doc/Makefile.in ./../etc/Makefile.in ./../gas/doc/Makefile.in ./../gprof/Makefile.in ./../ld/Makefile.in ./../libiberty/Makefile.in ./../libctf/Makefile.in; do + if test ! -f ${file}.orig; then + cp -vf ${file} ${file}.orig + touch ${file}.orig -r ${file} @@ -846,10 +854,10 @@ diff -aprNU5 binutils-2.32.orig/djgpp/build.sh binutils-2.32/djgpp/build.sh +make >> build_log.txt 2>&1 + +touch stop_build.txt -diff -aprNU5 binutils-2.32.orig/gas/as.c binutils-2.32/gas/as.c ---- binutils-2.32.orig/gas/as.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/gas/as.c 2019-02-13 22:00:26 +0000 -@@ -1223,11 +1223,11 @@ main (int argc, char ** argv) +diff -aprNU5 binutils-2.34.orig/gas/as.c binutils-2.34/gas/as.c +--- binutils-2.34.orig/gas/as.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/gas/as.c 2020-03-01 19:35:24 +0000 +@@ -1240,11 +1240,11 @@ main (int argc, char ** argv) #ifdef HOST_SPECIAL_INIT HOST_SPECIAL_INIT (argc, argv); @@ -862,9 +870,9 @@ diff -aprNU5 binutils-2.32.orig/gas/as.c binutils-2.32/gas/as.c expandargv (&argc, &argv); START_PROGRESS (myname, 0); -diff -aprNU5 binutils-2.32.orig/gas/config/obj-coff-seh.c binutils-2.32/gas/config/obj-coff-seh.c ---- binutils-2.32.orig/gas/config/obj-coff-seh.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/gas/config/obj-coff-seh.c 2019-02-13 22:00:26 +0000 +diff -aprNU5 binutils-2.34.orig/gas/config/obj-coff-seh.c binutils-2.34/gas/config/obj-coff-seh.c +--- binutils-2.34.orig/gas/config/obj-coff-seh.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/gas/config/obj-coff-seh.c 2020-03-01 19:35:24 +0000 @@ -62,11 +62,11 @@ get_pxdata_name (segT seg, const char *b else if (dot < dollar) name = dot; @@ -878,10 +886,10 @@ diff -aprNU5 binutils-2.32.orig/gas/config/obj-coff-seh.c binutils-2.32/gas/conf } /* Allocate a seh_seg_list structure. */ -diff -aprNU5 binutils-2.32.orig/gas/config.in binutils-2.32/gas/config.in ---- binutils-2.32.orig/gas/config.in 2019-02-02 15:50:24 +0000 -+++ binutils-2.32/gas/config.in 2019-02-13 22:00:26 +0000 -@@ -409,5 +409,42 @@ +diff -aprNU5 binutils-2.34.orig/gas/config.in binutils-2.34/gas/config.in +--- binutils-2.34.orig/gas/config.in 2020-02-01 11:49:54 +0000 ++++ binutils-2.34/gas/config.in 2020-03-01 19:35:24 +0000 +@@ -412,5 +412,42 @@ #undef inline #endif @@ -924,14 +932,14 @@ diff -aprNU5 binutils-2.32.orig/gas/config.in binutils-2.32/gas/config.in +#else +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif -diff -aprNU5 binutils-2.32.orig/gas/dw2gencfi.c binutils-2.32/gas/dw2gencfi.c ---- binutils-2.32.orig/gas/dw2gencfi.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/gas/dw2gencfi.c 2019-02-13 22:00:26 +0000 +diff -aprNU5 binutils-2.34.orig/gas/dw2gencfi.c binutils-2.34/gas/dw2gencfi.c +--- binutils-2.34.orig/gas/dw2gencfi.c 2020-01-18 13:55:46 +0000 ++++ binutils-2.34/gas/dw2gencfi.c 2020-03-01 19:35:24 +0000 @@ -255,11 +255,11 @@ get_debugseg_name (segT seg, const char - name = dot; - else - name = dollar; - } + else if (dot < dollar) + name = dot; + else + name = dollar; - return concat (base_name, name, NULL); + return concat (base_name, name, (char *)NULL); @@ -940,9 +948,9 @@ diff -aprNU5 binutils-2.32.orig/gas/dw2gencfi.c binutils-2.32/gas/dw2gencfi.c /* Allocate a dwcfi_seg_list structure. */ static struct dwcfi_seg_list * -diff -aprNU5 binutils-2.32.orig/gold/config.in binutils-2.32/gold/config.in ---- binutils-2.32.orig/gold/config.in 2019-01-19 16:33:26 +0000 -+++ binutils-2.32/gold/config.in 2019-02-13 22:00:26 +0000 +diff -aprNU5 binutils-2.34.orig/gold/config.in binutils-2.34/gold/config.in +--- binutils-2.34.orig/gold/config.in 2020-01-18 14:04:34 +0000 ++++ binutils-2.34/gold/config.in 2020-03-01 19:35:24 +0000 @@ -295,5 +295,39 @@ this defined. */ #undef _POSIX_1_SOURCE @@ -983,9 +991,9 @@ diff -aprNU5 binutils-2.32.orig/gold/config.in binutils-2.32/gold/config.in +#else +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif -diff -aprNU5 binutils-2.32.orig/gprof/gconfig.in binutils-2.32/gprof/gconfig.in ---- binutils-2.32.orig/gprof/gconfig.in 2019-02-02 15:56:30 +0000 -+++ binutils-2.32/gprof/gconfig.in 2019-02-13 22:00:26 +0000 +diff -aprNU5 binutils-2.34.orig/gprof/gconfig.in binutils-2.34/gprof/gconfig.in +--- binutils-2.34.orig/gprof/gconfig.in 2020-02-01 11:52:24 +0000 ++++ binutils-2.34/gprof/gconfig.in 2020-03-01 19:35:24 +0000 @@ -117,5 +117,42 @@ this defined. */ #undef _POSIX_1_SOURCE @@ -1029,9 +1037,9 @@ diff -aprNU5 binutils-2.32.orig/gprof/gconfig.in binutils-2.32/gprof/gconfig.in +#else +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif -diff -aprNU5 binutils-2.32.orig/gprof/gprof.c binutils-2.32/gprof/gprof.c ---- binutils-2.32.orig/gprof/gprof.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/gprof/gprof.c 2019-02-13 22:00:26 +0000 +diff -aprNU5 binutils-2.34.orig/gprof/gprof.c binutils-2.34/gprof/gprof.c +--- binutils-2.34.orig/gprof/gprof.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/gprof/gprof.c 2020-03-01 19:35:24 +0000 @@ -196,11 +196,17 @@ main (int argc, char **argv) #ifdef ENABLE_NLS bindtextdomain (PACKAGE, LOCALEDIR); @@ -1051,9 +1059,9 @@ diff -aprNU5 binutils-2.32.orig/gprof/gprof.c binutils-2.32/gprof/gprof.c expandargv (&argc, &argv); while ((ch = getopt_long (argc, argv, -diff -aprNU5 binutils-2.32.orig/ld/config.in binutils-2.32/ld/config.in ---- binutils-2.32.orig/ld/config.in 2019-02-02 15:54:48 +0000 -+++ binutils-2.32/ld/config.in 2019-02-13 22:00:26 +0000 +diff -aprNU5 binutils-2.34.orig/ld/config.in binutils-2.34/ld/config.in +--- binutils-2.34.orig/ld/config.in 2020-02-01 11:50:28 +0000 ++++ binutils-2.34/ld/config.in 2020-03-01 19:35:24 +0000 @@ -252,5 +252,52 @@ this defined. */ #undef _POSIX_1_SOURCE @@ -1107,10 +1115,10 @@ diff -aprNU5 binutils-2.32.orig/ld/config.in binutils-2.32/ld/config.in +#else +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif -diff -aprNU5 binutils-2.32.orig/ld/configure binutils-2.32/ld/configure ---- binutils-2.32.orig/ld/configure 2019-02-02 15:54:42 +0000 -+++ binutils-2.32/ld/configure 2019-02-13 22:00:26 +0000 -@@ -17667,10 +17667,19 @@ ac_config_commands="$ac_config_commands +diff -aprNU5 binutils-2.34.orig/ld/configure binutils-2.34/ld/configure +--- binutils-2.34.orig/ld/configure 2020-02-01 11:50:24 +0000 ++++ binutils-2.34/ld/configure 2020-03-01 19:35:24 +0000 +@@ -17700,10 +17700,19 @@ ac_config_commands="$ac_config_commands @@ -1130,10 +1138,10 @@ diff -aprNU5 binutils-2.32.orig/ld/configure binutils-2.32/ld/configure cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure -diff -aprNU5 binutils-2.32.orig/ld/ldfile.c binutils-2.32/ld/ldfile.c ---- binutils-2.32.orig/ld/ldfile.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/ld/ldfile.c 2019-02-14 21:15:36 +0000 -@@ -62,10 +62,127 @@ typedef struct search_arch +diff -aprNU5 binutils-2.34.orig/ld/ldfile.c binutils-2.34/ld/ldfile.c +--- binutils-2.34.orig/ld/ldfile.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/ld/ldfile.c 2020-03-01 19:35:24 +0000 +@@ -63,10 +63,127 @@ typedef struct search_arch static search_dirs_type **search_tail_ptr = &search_head; static search_arch_type *search_arch_head; @@ -1261,7 +1269,7 @@ diff -aprNU5 binutils-2.32.orig/ld/ldfile.c binutils-2.32/ld/ldfile.c static bfd_boolean is_sysrooted_pathname (const char *name) -@@ -122,12 +239,23 @@ ldfile_add_library_path (const char *nam +@@ -123,12 +240,23 @@ ldfile_add_library_path (const char *nam bfd_boolean ldfile_try_open_bfd (const char *attempt, @@ -1285,7 +1293,7 @@ diff -aprNU5 binutils-2.32.orig/ld/ldfile.c binutils-2.32/ld/ldfile.c if (entry->the_bfd == NULL) info_msg (_("attempt to open %s failed\n"), attempt); else -@@ -369,11 +497,11 @@ ldfile_open_file_search (const char *arc +@@ -370,11 +498,11 @@ ldfile_open_file_search (const char *arc if (entry->flags.maybe_archive && !entry->flags.full_name_provided) string = concat (search->name, slash, lib, entry->filename, arch, suffix, (const char *) NULL); @@ -1298,10 +1306,10 @@ diff -aprNU5 binutils-2.32.orig/ld/ldfile.c binutils-2.32/ld/ldfile.c { entry->filename = string; return TRUE; -diff -aprNU5 binutils-2.32.orig/ld/ldmain.c binutils-2.32/ld/ldmain.c ---- binutils-2.32.orig/ld/ldmain.c 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/ld/ldmain.c 2019-02-13 22:00:26 +0000 -@@ -200,11 +200,11 @@ main (int argc, char **argv) +diff -aprNU5 binutils-2.34.orig/ld/ldmain.c binutils-2.34/ld/ldmain.c +--- binutils-2.34.orig/ld/ldmain.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/ld/ldmain.c 2020-03-01 19:35:24 +0000 +@@ -203,11 +203,11 @@ main (int argc, char **argv) setlocale (LC_CTYPE, ""); #endif bindtextdomain (PACKAGE, LOCALEDIR); @@ -1314,7 +1322,7 @@ diff -aprNU5 binutils-2.32.orig/ld/ldmain.c binutils-2.32/ld/ldmain.c START_PROGRESS (program_name, 0); expandargv (&argc, &argv); -@@ -988,10 +988,34 @@ multiple_definition (struct bfd_link_inf +@@ -992,10 +992,34 @@ multiple_definition (struct bfd_link_inf || (nsec->output_section != NULL && !bfd_is_abs_section (nsec) && bfd_is_abs_section (nsec->output_section)))) @@ -1349,9 +1357,9 @@ diff -aprNU5 binutils-2.32.orig/ld/ldmain.c binutils-2.32/ld/ldmain.c { nbfd = obfd; nsec = osec; -diff -aprNU5 binutils-2.32.orig/ld/libnames.tab binutils-2.32/ld/libnames.tab ---- binutils-2.32.orig/ld/libnames.tab 1970-01-01 00:00:00 +0000 -+++ binutils-2.32/ld/libnames.tab 2019-02-13 22:00:26 +0000 +diff -aprNU5 binutils-2.34.orig/ld/libnames.tab binutils-2.34/ld/libnames.tab +--- binutils-2.34.orig/ld/libnames.tab 1970-01-01 00:00:00 +0000 ++++ binutils-2.34/ld/libnames.tab 2020-03-01 19:35:24 +0000 @@ -0,0 +1,31 @@ +# +# Table to map libraries long file name to short file names. @@ -1384,9 +1392,9 @@ diff -aprNU5 binutils-2.32.orig/ld/libnames.tab binutils-2.32/ld/libnames.tab +pcre2-16 pcr216 +pcre2-32 pcr232 +pcre2-posix pcr2posix -diff -aprNU5 binutils-2.32.orig/ld/scripttempl/i386go32.sc binutils-2.32/ld/scripttempl/i386go32.sc ---- binutils-2.32.orig/ld/scripttempl/i386go32.sc 2019-01-19 16:01:32 +0000 -+++ binutils-2.32/ld/scripttempl/i386go32.sc 2019-02-13 22:00:26 +0000 +diff -aprNU5 binutils-2.34.orig/ld/scripttempl/i386go32.sc binutils-2.34/ld/scripttempl/i386go32.sc +--- binutils-2.34.orig/ld/scripttempl/i386go32.sc 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/ld/scripttempl/i386go32.sc 2020-03-01 19:35:24 +0000 @@ -45,18 +45,27 @@ SECTIONS } .data ${RELOCATING+ ${DATA_ALIGNMENT}} : { @@ -1434,9 +1442,147 @@ diff -aprNU5 binutils-2.32.orig/ld/scripttempl/i386go32.sc binutils-2.32/ld/scri .stabstr 0 : { *(.stabstr) } EOF -diff -aprNU5 binutils-2.32.orig/opcodes/config.in binutils-2.32/opcodes/config.in ---- binutils-2.32.orig/opcodes/config.in 2019-02-02 15:49:40 +0000 -+++ binutils-2.32/opcodes/config.in 2019-02-13 22:00:26 +0000 +diff -aprNU5 binutils-2.34.orig/libctf/config.h.in binutils-2.34/libctf/config.h.in +--- binutils-2.34.orig/libctf/config.h.in 2020-01-18 14:02:32 +0000 ++++ binutils-2.34/libctf/config.h.in 2020-03-01 19:35:24 +0000 +@@ -153,5 +153,35 @@ + this defined. */ + #undef _POSIX_1_SOURCE + + /* Define to 1 if you need to in order for `stat' and other things to work. */ + #undef _POSIX_SOURCE ++ ++#ifdef __DJGPP__ ++/* gcc no longer includes this by default. */ ++# include <sys/version.h> ++ ++/* ++ * (ENOTSUP and EOPNOTSUPP have the same value on Linux, ++ * but according to POSIX.1 these error values should be ++ * distinct.) ++ */ ++ ++# if !defined(ENOTSUP) && defined(EOPNOTSUPP) ++# define ENOTSUP EOPNOTSUPP ++# endif ++ ++/* Values taken from FreeBSD. */ ++# ifndef ENOTSUP ++# define ENOTSUP 9926 /* Operation not supported (POSIX.1-2001). */ ++# endif ++ ++# undef DJGPP_GCC_VERSION ++# define DJGPP_GCC_VERSION ((__GNUC__) * 10000 + (__GNUC_MINOR__) * 100 + (__GNUC_PATCHLEVEL__)) ++# if DJGPP_GCC_VERSION < 40300 ++# define HAVE_TSL_SUPPORT 0 ++# else ++# define HAVE_TSL_SUPPORT 1 ++# endif /* DJGPP_GCC_VERSION */ ++# undef DJGPP_GCC_VERSION ++ ++#endif /* __DJGPP__ */ +diff -aprNU5 binutils-2.34.orig/libctf/ctf-archive.c binutils-2.34/libctf/ctf-archive.c +--- binutils-2.34.orig/libctf/ctf-archive.c 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libctf/ctf-archive.c 2020-03-01 19:58:00 +0000 +@@ -43,11 +43,15 @@ static void *arc_mmap_file (int fd, size + static int arc_mmap_writeout (int fd, void *header, size_t headersz, + const char **errmsg); + static int arc_mmap_unmap (void *header, size_t headersz, const char **errmsg); + + /* bsearch() internal state. */ ++#if (HAVE_TSL_SUPPORT - 1) == 0 + static __thread char *search_nametbl; ++#else ++static char *search_nametbl; ++#endif + + /* Write out a CTF archive to the start of the file referenced by the passed-in + fd. The entries in CTF_FILES are referenced by name: the names are passed in + the names array, which must have CTF_FILES entries. + +diff -aprNU5 binutils-2.34.orig/libctf/swap.h binutils-2.34/libctf/swap.h +--- binutils-2.34.orig/libctf/swap.h 2020-01-18 13:55:48 +0000 ++++ binutils-2.34/libctf/swap.h 2020-03-01 19:59:52 +0000 +@@ -25,10 +25,11 @@ + + #ifdef HAVE_BYTESWAP_H + #include <byteswap.h> + #else + ++#ifndef __DJGPP__ + /* Provide our own versions of the byteswap functions. */ + static inline uint16_t + bswap_16 (uint16_t v) + { + return ((v >> 8) & 0xff) | ((v & 0xff) << 8); +@@ -59,8 +60,64 @@ bswap_64 (uint64_t v) + | ((v & 0x00000000ff000000ULL) << 8) + | ((v & 0x0000000000ff0000ULL) << 24) + | ((v & 0x000000000000ff00ULL) << 40) + | ((v & 0x00000000000000ffULL) << 56)); + } ++#else /* __DJGPP__ */ ++ ++/* The inline functions make trouble with diferent versions of gcc thus use macros. */ ++# if defined (__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)) ++# define __gnuc_extension__ __extension__ ++# else ++# define __gnuc_extension__ ++# endif ++ ++# define bswap_identity_64(v) \ ++ (__gnuc_extension__ \ ++ ({ \ ++ uint64_t value = (v); \ ++ value; \ ++ }) \ ++ ) ++ ++# define bswap_16(v) \ ++ (__gnuc_extension__ \ ++ ({ \ ++ uint16_t _v = (v); \ ++ uint16_t value = ( ((_v >> 8) & 0xFF) \ ++ | ((_v & 0xFF) << 8)); \ ++ value; \ ++ }) \ ++ ) ++ ++# define bswap_32(v) \ ++ (__gnuc_extension__ \ ++ ({ \ ++ uint32_t _v = (v); \ ++ uint32_t value = ( ((_v & 0xFF000000) >> 24) \ ++ | ((_v & 0x00FF0000) >> 8) \ ++ | ((_v & 0x0000FF00) << 8) \ ++ | ((_v & 0x000000FF) << 24)); \ ++ value; \ ++ }) \ ++ ) ++ ++# define bswap_64(v) \ ++ (__gnuc_extension__ \ ++ ({ \ ++ uint64_t _v = (v); \ ++ uint64_t value = ( ((_v & 0xFF00000000000000ULL) >> 56) \ ++ | ((_v & 0x00FF000000000000ULL) >> 40) \ ++ | ((_v & 0x0000FF0000000000ULL) >> 24) \ ++ | ((_v & 0x000000FF00000000ULL) >> 8) \ ++ | ((_v & 0x00000000FF000000ULL) << 8) \ ++ | ((_v & 0x0000000000FF0000ULL) << 24) \ ++ | ((_v & 0x000000000000FF00ULL) << 40) \ ++ | ((_v & 0x00000000000000FFULL) << 56)); \ ++ value; \ ++ }) \ ++ ) ++#endif /* __DJGPP__ */ ++ + #endif /* !defined(HAVE_BYTESWAP_H) */ + + #endif /* !defined(_CTF_SWAP_H) */ +diff -aprNU5 binutils-2.34.orig/opcodes/config.in binutils-2.34/opcodes/config.in +--- binutils-2.34.orig/opcodes/config.in 2020-02-01 11:49:44 +0000 ++++ binutils-2.34/opcodes/config.in 2020-03-01 19:35:24 +0000 @@ -118,5 +118,42 @@ this defined. */ #undef _POSIX_1_SOURCE @@ -1480,3 +1626,35 @@ diff -aprNU5 binutils-2.32.orig/opcodes/config.in binutils-2.32/opcodes/config.i +#else +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif + + + + + + + +2020-03-16 Juan Manuel Guerrero <juan.guerrero@gmx.de> + + * ld/scripttempl/i386go32.sc: Added missing leading dot to the + gnu.lto_ symbol. + + + + + +diff -aprNU5 binutils-2.34.orig/ld/scripttempl/i386go32.sc binutils-2.34/ld/scripttempl/i386go32.sc +--- binutils-2.34.orig/ld/scripttempl/i386go32.sc 2020-03-16 20:51:36 +0000 ++++ binutils-2.34/ld/scripttempl/i386go32.sc 2020-03-16 20:58:40 +0000 +@@ -82,11 +82,11 @@ SECTIONS + *(COMMON) + ${RELOCATING+ end = . ; PROVIDE(_end = .) ;} + ${RELOCATING+ . = ALIGN(${SEGMENT_SIZE});} + } + /* Discard LTO sections. */ +- /DISCARD/ : { *(gnu.lto_*) } ++ /DISCARD/ : { *(.gnu.lto_*) } + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + EOF + diff --git a/lto-discard.patch b/lto-discard.patch index 2194e39a050b..5bfc3ea019ca 100644 --- a/lto-discard.patch +++ b/lto-discard.patch @@ -1,12 +1,12 @@ -diff -ur src/binutils-2.29.1.orig/ld/scripttempl/i386go32.sc src/binutils-2.29.1/ld/scripttempl/i386go32.sc ---- src/binutils-2.29.1.orig/ld/scripttempl/i386go32.sc 2017-12-28 16:44:53.887247994 +0200 -+++ src/binutils-2.29.1/ld/scripttempl/i386go32.sc 2017-12-28 16:54:10.917217558 +0200 +diff -ur src/binutils-2.34.orig/ld/scripttempl/i386go32.sc src/binutils-2.34/ld/scripttempl/i386go32.sc +--- src/binutils-2.34.orig/ld/scripttempl/i386go32.sc 2020-05-16 07:42:54.856946631 +0300 ++++ src/binutils-2.34/ld/scripttempl/i386go32.sc 2020-05-16 07:54:52.886973462 +0300 @@ -84,7 +84,7 @@ ${RELOCATING+ . = ALIGN(${SEGMENT_SIZE});} } /* Discard LTO sections. */ -- /DISCARD/ : { *(gnu.lto_*) } -+ /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(gnu.lto_*) } +- /DISCARD/ : { *(.gnu.lto_*) } ++ /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) } /* Stabs debugging sections. */ .stab 0 : { *(.stab) } .stabstr 0 : { *(.stabstr) } |