diff options
| author | Andris Pavenis | 2019-08-21 20:42:20 +0300 |
|---|---|---|
| committer | Andris Pavenis | 2019-08-21 20:42:20 +0300 |
| commit | b61913384d38e84a6520a6160cba4d600ede134d (patch) | |
| tree | 1f0c23601b104ca24bd70bc979edf5339060b4a8 | |
| parent | 9dab91b87e3188857c8f95f9672414e61b1af69f (diff) | |
| download | aur-b61913384d38e84a6520a6160cba4d600ede134d.tar.gz | |
Update to binutils-2.32 (use patches from DJGPP bnu232s.zip without changes, only renamed)
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | binutils-bfd-djgpp.patch | 262 | ||||
| -rw-r--r-- | binutils-djgpp.patch | 390 |
4 files changed, 422 insertions, 248 deletions
@@ -1,6 +1,6 @@ pkgbase = djgpp-binutils pkgdesc = Binutils for the djgpp cross-compiler - pkgver = 2.31.1 + pkgver = 2.32 pkgrel = 1 url = http://www.gnu.org/software/binutils arch = i686 @@ -9,13 +9,13 @@ pkgbase = djgpp-binutils license = GPL3 options = !libtool options = !emptydirs - source = http://ftp.gnu.org/gnu/binutils/binutils-2.31.1.tar.xz + source = http://ftp.gnu.org/gnu/binutils/binutils-2.32.tar.xz source = binutils-bfd-djgpp.patch source = binutils-djgpp.patch source = lto-discard.patch - sha256sums = 5d20086ecf5752cc7d9134246e9588fa201740d540f7eb84d795b1f7a93bca86 - sha256sums = 13cc73a6042515c16ddfa2e6277d09a0c1de7a33fdb1a106f61ee0bbd665014a - sha256sums = e968d8630825bed104d9f9b3c5ffe565ab858c5835acdc96f50ed0fccaf9f08a + sha256sums = 0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 + sha256sums = d5d0f706d44abf4de1a578c27268522bdda9c91b146d2a8fa506f5fec97bee8a + sha256sums = 98716ca9092784e5b44f54134031e1411274f961d2a6b0bfeb702ad97de7c5bc sha256sums = 358cab5b397662718260f41c8a4139c97676600fa5ef9f3aa699bfe27606c434 pkgname = djgpp-binutils @@ -3,7 +3,7 @@ # Contributor: felix <base64 -d <<< ZmVsaXgudm9uLnNAcG9zdGVvLmRlCg==> pkgname=djgpp-binutils -pkgver=2.31.1 +pkgver=2.32 pkgrel=1 pkgdesc="Binutils for the djgpp cross-compiler" arch=('i686' 'x86_64') @@ -15,9 +15,9 @@ source=("http://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.xz" "binutils-bfd-djgpp.patch" "binutils-djgpp.patch" "lto-discard.patch") -sha256sums=('5d20086ecf5752cc7d9134246e9588fa201740d540f7eb84d795b1f7a93bca86' - '13cc73a6042515c16ddfa2e6277d09a0c1de7a33fdb1a106f61ee0bbd665014a' - 'e968d8630825bed104d9f9b3c5ffe565ab858c5835acdc96f50ed0fccaf9f08a' +sha256sums=('0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04' + 'd5d0f706d44abf4de1a578c27268522bdda9c91b146d2a8fa506f5fec97bee8a' + '98716ca9092784e5b44f54134031e1411274f961d2a6b0bfeb702ad97de7c5bc' '358cab5b397662718260f41c8a4139c97676600fa5ef9f3aa699bfe27606c434') _target="i686-pc-msdosdjgpp" diff --git a/binutils-bfd-djgpp.patch b/binutils-bfd-djgpp.patch index 3d0fe74cf101..be817a9b4e59 100644 --- a/binutils-bfd-djgpp.patch +++ b/binutils-bfd-djgpp.patch @@ -2,7 +2,7 @@ # by the DJGPP ports of binutils and gdb. -2018-07-22 Juan Manuel Guerrero <juan.guerrero@gmx.de> +2019-02-13 Juan Manuel Guerrero <juan.guerrero@gmx.de> * bfd/bfd-in.h [__DJGPP__]: Provide the declaration of coff_64k_relocation_enabled. @@ -86,9 +86,8 @@ * libiberty/cp-demangle.c (d_demangle_callback, d_expression_1, d_print_comp): Pacify compiler. Rename functions and variables that shadow the corresponding libc ones. - - * libiberty/cplus-dem.c (remember_Btype): Pacify compiler. Rename - functions and variables that shadow the corresponding libc ones. + (d_bare_function_type): Pacify compiler. Rename functions and + variables that shadow the corresponding libiberty ones. * libiberty/floatformat.c (floatformat_to_double): Pacify compiler. Rename functions and variables that shadow the corresponding libc ones. @@ -134,25 +133,25 @@ -diff -aprNU5 binutils-2.31.1.orig/bfd/bfd-in.h binutils-2.31.1/bfd/bfd-in.h ---- binutils-2.31.1.orig/bfd/bfd-in.h 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/bfd/bfd-in.h 2018-07-27 20:52:18 +0000 -@@ -1061,5 +1061,11 @@ extern bfd_boolean v850_elf_set_note - (bfd *, unsigned int, unsigned int); - - /* MIPS ABI flags data access. For the disassembler. */ - struct elf_internal_abiflags_v0; - extern struct elf_internal_abiflags_v0 *bfd_mips_elf_get_abiflags (bfd *); +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 *); + +/* 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.31.1.orig/bfd/cache.c binutils-2.31.1/bfd/cache.c ---- binutils-2.31.1.orig/bfd/cache.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/bfd/cache.c 2018-07-27 20:52:18 +0000 -@@ -76,11 +76,11 @@ static int +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 +@@ -75,11 +75,11 @@ static int bfd_cache_max_open (void) { if (max_open_files == 0) @@ -165,9 +164,9 @@ diff -aprNU5 binutils-2.31.1.orig/bfd/cache.c binutils-2.31.1/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.31.1.orig/bfd/coff-go32.c binutils-2.31.1/bfd/coff-go32.c ---- binutils-2.31.1.orig/bfd/coff-go32.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/bfd/coff-go32.c 2018-07-27 20:52:18 +0000 +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 @@ -20,10 +20,11 @@ MA 02110-1301, USA. */ @@ -197,9 +196,9 @@ diff -aprNU5 binutils-2.31.1.orig/bfd/coff-go32.c binutils-2.31.1/bfd/coff-go32. +#define coff_mkobject _bfd_go32_mkobject + #include "coff-i386.c" -diff -aprNU5 binutils-2.31.1.orig/bfd/coff-stgo32.c binutils-2.31.1/bfd/coff-stgo32.c ---- binutils-2.31.1.orig/bfd/coff-stgo32.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/bfd/coff-stgo32.c 2018-07-27 20:52:18 +0000 +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 @@ -51,10 +51,13 @@ { COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \ COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \ @@ -261,9 +260,9 @@ diff -aprNU5 binutils-2.31.1.orig/bfd/coff-stgo32.c binutils-2.31.1/bfd/coff-stg + + return TRUE; +} -diff -aprNU5 binutils-2.31.1.orig/bfd/coffcode.h binutils-2.31.1/bfd/coffcode.h ---- binutils-2.31.1.orig/bfd/coffcode.h 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/bfd/coffcode.h 2018-07-27 20:52:18 +0000 +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 @@ -362,10 +362,14 @@ CODE_FRAGMENT #define DOT_ZDEBUG ".zdebug" #define GNU_LINKONCE_WI ".gnu.linkonce.wi." @@ -422,9 +421,9 @@ diff -aprNU5 binutils-2.31.1.orig/bfd/coffcode.h binutils-2.31.1/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.31.1.orig/bfd/cofflink.c binutils-2.31.1/bfd/cofflink.c ---- binutils-2.31.1.orig/bfd/cofflink.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/bfd/cofflink.c 2018-07-27 20:52:18 +0000 +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, o->flags |= SEC_RELOC; o->rel_filepos = rel_filepos; @@ -451,9 +450,9 @@ diff -aprNU5 binutils-2.31.1.orig/bfd/cofflink.c binutils-2.31.1/bfd/cofflink.c reloc. The header overflow bit will be set elsewhere. */ struct internal_reloc incount; -diff -aprNU5 binutils-2.31.1.orig/bfd/coffswap.h binutils-2.31.1/bfd/coffswap.h ---- binutils-2.31.1.orig/bfd/coffswap.h 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/bfd/coffswap.h 2018-07-27 20:52:18 +0000 +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 * scnhdr_int->s_relptr = GET_SCNHDR_RELPTR (abfd, scnhdr_ext->s_relptr); scnhdr_int->s_lnnoptr = GET_SCNHDR_LNNOPTR (abfd, scnhdr_ext->s_lnnoptr); @@ -558,10 +557,10 @@ diff -aprNU5 binutils-2.31.1.orig/bfd/coffswap.h binutils-2.31.1/bfd/coffswap.h #endif return ret; } -diff -aprNU5 binutils-2.31.1.orig/bfd/config.in binutils-2.31.1/bfd/config.in ---- binutils-2.31.1.orig/bfd/config.in 2018-07-18 07:41:16 +0000 -+++ binutils-2.31.1/bfd/config.in 2018-07-27 20:52:18 +0000 -@@ -411,5 +411,39 @@ +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 +@@ -414,5 +414,39 @@ this defined. */ #undef _POSIX_1_SOURCE @@ -601,9 +600,9 @@ diff -aprNU5 binutils-2.31.1.orig/bfd/config.in binutils-2.31.1/bfd/config.in +#else +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif -diff -aprNU5 binutils-2.31.1.orig/bfd/init.c binutils-2.31.1/bfd/init.c ---- binutils-2.31.1.orig/bfd/init.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/bfd/init.c 2018-07-27 20:52:18 +0000 +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 @@ -21,10 +21,16 @@ #include "sysdep.h" @@ -621,10 +620,10 @@ diff -aprNU5 binutils-2.31.1.orig/bfd/init.c binutils-2.31.1/bfd/init.c Initialization SUBSECTION -@@ -49,6 +55,12 @@ DESCRIPTION +@@ -55,7 +61,13 @@ DESCRIPTION However, someday it may be needed, so keep it around. */ - void + unsigned int bfd_init (void) { +#if defined(__DJGPP__) || defined(COFF_GO32_EXE) || defined(COFF_GO32) @@ -633,10 +632,11 @@ diff -aprNU5 binutils-2.31.1.orig/bfd/init.c binutils-2.31.1/bfd/init.c + (disable_64k_reloc_support[0] == 'y' || disable_64k_reloc_support[0] == 'Y') && + disable_64k_reloc_support[1] == '\0') ? TRUE : FALSE; +#endif + return BFD_INIT_MAGIC; } -diff -aprNU5 binutils-2.31.1.orig/bfd/libcoff-in.h binutils-2.31.1/bfd/libcoff-in.h ---- binutils-2.31.1.orig/bfd/libcoff-in.h 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/bfd/libcoff-in.h 2018-07-27 20:52:18 +0000 +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 @@ -31,12 +31,13 @@ extern "C" { /* Object file tdata; access macros. */ @@ -665,10 +665,10 @@ diff -aprNU5 binutils-2.31.1.orig/bfd/libcoff-in.h binutils-2.31.1/bfd/libcoff-i char *go32stub; } coff_data_type; -diff -aprNU5 binutils-2.31.1.orig/bfd/Makefile.in binutils-2.31.1/bfd/Makefile.in ---- binutils-2.31.1.orig/bfd/Makefile.in 2018-07-18 07:41:14 +0000 -+++ binutils-2.31.1/bfd/Makefile.in 2018-07-27 20:52:18 +0000 -@@ -2015,11 +2015,11 @@ host-aout.lo: Makefile +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 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.31.1.orig/bfd/Makefile.in binutils-2.31.1/bfd/Makefile.i rm -f bfd-tmp.h cp bfd-in3.h bfd-tmp.h $(SHELL) $(srcdir)/../move-if-change bfd-tmp.h $(BFD_H) -@@ -2037,11 +2037,11 @@ headers: +@@ -2042,11 +2042,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.31.1.orig/bfd/Makefile.in binutils-2.31.1/bfd/Makefile.i 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.31.1.orig/include/bfdlink.h binutils-2.31.1/include/bfdlink.h ---- binutils-2.31.1.orig/include/bfdlink.h 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/include/bfdlink.h 2018-07-27 20:52:18 +0000 -@@ -291,11 +291,11 @@ struct bfd_elf_version_tree; +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; enum output_type { type_pde, @@ -710,9 +710,9 @@ diff -aprNU5 binutils-2.31.1.orig/include/bfdlink.h binutils-2.31.1/include/bfdl #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.31.1.orig/include/coff/internal.h binutils-2.31.1/include/coff/internal.h ---- binutils-2.31.1.orig/include/coff/internal.h 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/include/coff/internal.h 2018-07-27 20:52:18 +0000 +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 @@ -165,11 +165,11 @@ typedef struct _CODEVIEW_INFO { unsigned long CVSignature; @@ -726,9 +726,9 @@ diff -aprNU5 binutils-2.31.1.orig/include/coff/internal.h binutils-2.31.1/includ /* Default image base for NT. */ #define NT_EXE_IMAGE_BASE 0x400000 #define NT_DLL_IMAGE_BASE 0x10000000 -diff -aprNU5 binutils-2.31.1.orig/include/simple-object.h binutils-2.31.1/include/simple-object.h ---- binutils-2.31.1.orig/include/simple-object.h 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/include/simple-object.h 2018-07-27 20:52:18 +0000 +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 @@ -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,10 +742,10 @@ diff -aprNU5 binutils-2.31.1.orig/include/simple-object.h binutils-2.31.1/includ } #endif -diff -aprNU5 binutils-2.31.1.orig/libiberty/config.in binutils-2.31.1/libiberty/config.in ---- binutils-2.31.1.orig/libiberty/config.in 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/libiberty/config.in 2018-07-27 21:04:22 +0000 -@@ -570,5 +570,59 @@ +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 +@@ -573,5 +573,59 @@ pointer, if such a type exists, and if the system does not define it. */ #undef uintptr_t @@ -805,10 +805,40 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/config.in binutils-2.31.1/libiberty/ +#else /* !__DJGPP__ */ +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif /* !__DJGPP__ */ -diff -aprNU5 binutils-2.31.1.orig/libiberty/cp-demangle.c binutils-2.31.1/libiberty/cp-demangle.c ---- binutils-2.31.1.orig/libiberty/cp-demangle.c 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/libiberty/cp-demangle.c 2018-07-27 20:52:18 +0000 -@@ -3283,26 +3283,26 @@ d_expression_1 (struct d_info *di) +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) + } + + /* <bare-function-type> ::= [J]<type>+ */ + + static struct demangle_component * +-d_bare_function_type (struct d_info *di, int has_return_type) ++d_bare_function_type (struct d_info *di, int has_return_type_flag) + { + struct demangle_component *return_type; + struct demangle_component *tl; + char peek; + +@@ -2945,14 +2945,14 @@ d_bare_function_type (struct d_info *di, + is the return type. */ + peek = d_peek_char (di); + if (peek == 'J') + { + d_advance (di, 1); +- has_return_type = 1; ++ has_return_type_flag = 1; + } + +- if (has_return_type) ++ if (has_return_type_flag) + { + return_type = cplus_demangle_type (di); + if (return_type == NULL) + return NULL; + } +@@ -3306,26 +3306,26 @@ d_expression_1 (struct d_info *di) d_expression_1 (di), NULL); } else if (peek == 'f' && d_peek_next_char (di) == 'p') @@ -841,7 +871,7 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/cp-demangle.c binutils-2.31.1/libibe || (peek == 'o' && d_peek_next_char (di) == 'n')) { /* We can get an unqualified name as an expression in the case of -@@ -4625,11 +4625,11 @@ d_print_comp_inner (struct d_print_info +@@ -4649,11 +4649,11 @@ d_print_comp_inner (struct d_print_info without needing to modify *dc. */ struct demangle_component *mod_inner = NULL; @@ -854,7 +884,7 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/cp-demangle.c binutils-2.31.1/libibe int need_template_restore = 0; if (dc == NULL) -@@ -6206,11 +6206,11 @@ d_demangle_callback (const char *mangled +@@ -6236,11 +6236,11 @@ d_demangle_callback (const char *mangled DCT_GLOBAL_CTORS, DCT_GLOBAL_DTORS } @@ -867,33 +897,9 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/cp-demangle.c binutils-2.31.1/libibe if (mangled[0] == '_' && mangled[1] == 'Z') type = DCT_MANGLED; else if (strncmp (mangled, "_GLOBAL_", 8) == 0 -diff -aprNU5 binutils-2.31.1.orig/libiberty/cplus-dem.c binutils-2.31.1/libiberty/cplus-dem.c ---- binutils-2.31.1.orig/libiberty/cplus-dem.c 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/libiberty/cplus-dem.c 2018-07-27 20:52:18 +0000 -@@ -4464,18 +4464,18 @@ register_Btype (struct work_stuff *work) - - /* Store a value into a previously registered B code type. */ - - static void - remember_Btype (struct work_stuff *work, const char *start, -- int len, int index) -+ int len, int lib_index) - { - char *tem; - - tem = XNEWVEC (char, len + 1); - memcpy (tem, start, len); - tem[len] = '\0'; -- work -> btypevec[index] = tem; -+ work -> btypevec[lib_index] = tem; - } - - /* Lose all the info related to B and K type codes. */ - static void - forget_B_and_K_types (struct work_stuff *work) -diff -aprNU5 binutils-2.31.1.orig/libiberty/floatformat.c binutils-2.31.1/libiberty/floatformat.c ---- binutils-2.31.1.orig/libiberty/floatformat.c 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/libiberty/floatformat.c 2018-07-27 20:52:18 +0000 +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 @@ -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 @@ -917,9 +923,9 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/floatformat.c binutils-2.31.1/libibe dto = INFINITY; if (get_field (ufrom, fmt->byteorder, fmt->totalsize, fmt->sign_start, 1)) -diff -aprNU5 binutils-2.31.1.orig/libiberty/hashtab.c binutils-2.31.1/libiberty/hashtab.c ---- binutils-2.31.1.orig/libiberty/hashtab.c 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/libiberty/hashtab.c 2018-07-27 20:52:18 +0000 +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 @@ -478,28 +478,28 @@ htab_empty (htab_t htab) HASH is the hash value for the element to be inserted. */ @@ -1074,9 +1080,9 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/hashtab.c binutils-2.31.1/libiberty/ /* Like htab_find_slot_with_hash, but compute the hash value from the element. */ -diff -aprNU5 binutils-2.31.1.orig/libiberty/make-relative-prefix.c binutils-2.31.1/libiberty/make-relative-prefix.c ---- binutils-2.31.1.orig/libiberty/make-relative-prefix.c 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/libiberty/make-relative-prefix.c 2018-07-27 20:52:18 +0000 +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 @@ -79,10 +79,11 @@ relative prefix can be found, return @co #if defined (_WIN32) || defined (__MSDOS__) \ || defined (__DJGPP__) || defined (__OS2__) @@ -1129,9 +1135,9 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/make-relative-prefix.c binutils-2.31 /* If there are no common directories, there can be no relative prefix. */ if (common == 0) -diff -aprNU5 binutils-2.31.1.orig/libiberty/make-temp-file.c binutils-2.31.1/libiberty/make-temp-file.c ---- binutils-2.31.1.orig/libiberty/make-temp-file.c 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/libiberty/make-temp-file.c 2018-07-27 20:52:18 +0000 +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 @@ -52,16 +52,31 @@ extern int mkstemps (char *, int); /* '/' works just fine on MS-DOS based systems. */ #ifndef DIR_SEPARATOR @@ -1155,7 +1161,7 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/make-temp-file.c binutils-2.31.1/lib + /* Name of temporary file. mktemp requires 6 trailing X's. */ - #define TEMP_FILE "ccXXXXXX" + #define TEMP_FILE "XXXXXX" #define TEMP_FILE_LEN (sizeof(TEMP_FILE) - 1) -#if !defined(_WIN32) || defined(__CYGWIN__) @@ -1192,9 +1198,9 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/make-temp-file.c binutils-2.31.1/lib #else /* defined(_WIN32) && !defined(__CYGWIN__) */ DWORD len; -diff -aprNU5 binutils-2.31.1.orig/libiberty/pex-common.c binutils-2.31.1/libiberty/pex-common.c ---- binutils-2.31.1.orig/libiberty/pex-common.c 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/libiberty/pex-common.c 2018-07-27 20:52:18 +0000 +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 @@ -115,11 +115,11 @@ temp_file (struct pex_obj *obj, int flag if (len >= 6 @@ -1234,9 +1240,9 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/pex-common.c binutils-2.31.1/libiber obj->next_input = -1; } else if ((obj->flags & PEX_USE_PIPES) == 0) -diff -aprNU5 binutils-2.31.1.orig/libiberty/simple-object-coff.c binutils-2.31.1/libiberty/simple-object-coff.c ---- binutils-2.31.1.orig/libiberty/simple-object-coff.c 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/libiberty/simple-object-coff.c 2018-07-27 20:52:18 +0000 +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 @@ -649,17 +649,17 @@ simple_object_coff_write_to_file (simple new_offset = offset & mask; new_offset &= ~ mask; @@ -1260,10 +1266,10 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/simple-object-coff.c binutils-2.31.1 } scnsize = 0; -diff -aprNU5 binutils-2.31.1.orig/libiberty/simple-object-elf.c binutils-2.31.1/libiberty/simple-object-elf.c ---- binutils-2.31.1.orig/libiberty/simple-object-elf.c 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/libiberty/simple-object-elf.c 2018-07-29 15:26:24 +0000 -@@ -986,20 +986,20 @@ simple_object_elf_write_to_file (simple_ +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_ new_sh_offset = sh_offset + mask; new_sh_offset &= ~ mask; while (new_sh_offset > sh_offset) @@ -1290,9 +1296,9 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/simple-object-elf.c binutils-2.31.1/ sh_size = 0; for (buffer = section->buffers; buffer != NULL; buffer = buffer->next) { -diff -aprNU5 binutils-2.31.1.orig/libiberty/simple-object-mach-o.c binutils-2.31.1/libiberty/simple-object-mach-o.c ---- binutils-2.31.1.orig/libiberty/simple-object-mach-o.c 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/libiberty/simple-object-mach-o.c 2018-07-29 16:29:30 +0000 +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 @@ -424,11 +424,11 @@ simple_object_mach_o_segment (simple_obj unsigned int index_index; unsigned int nametab_index; @@ -1561,9 +1567,9 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/simple-object-mach-o.c binutils-2.31 /* Write out the segment header. */ -diff -aprNU5 binutils-2.31.1.orig/libiberty/simple-object-xcoff.c binutils-2.31.1/libiberty/simple-object-xcoff.c ---- binutils-2.31.1.orig/libiberty/simple-object-xcoff.c 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/libiberty/simple-object-xcoff.c 2018-07-29 15:32:32 +0000 +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 @@ -905,17 +905,17 @@ simple_object_xcoff_write_to_file (simpl new_offset = offset & mask; new_offset &= ~ mask; @@ -1587,9 +1593,9 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/simple-object-xcoff.c binutils-2.31. } scnsize = 0; -diff -aprNU5 binutils-2.31.1.orig/libiberty/simple-object.c binutils-2.31.1/libiberty/simple-object.c ---- binutils-2.31.1.orig/libiberty/simple-object.c 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/libiberty/simple-object.c 2018-07-27 20:52:18 +0000 +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 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 @@ -1663,9 +1669,9 @@ diff -aprNU5 binutils-2.31.1.orig/libiberty/simple-object.c binutils-2.31.1/libi { simple_object_release_write (dest_sobj); return errmsg; -diff -aprNU5 binutils-2.31.1.orig/libiberty/stack-limit.c binutils-2.31.1/libiberty/stack-limit.c ---- binutils-2.31.1.orig/libiberty/stack-limit.c 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/libiberty/stack-limit.c 2018-07-27 20:52:18 +0000 +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 @@ -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 0f4f694e5618..7c7393ae79a5 100644 --- a/binutils-djgpp.patch +++ b/binutils-djgpp.patch @@ -2,7 +2,7 @@ # excluding the changes specific to libbfd and libiberty. -2018-07-21 Juan Manuel Guerrero <juan.guerrero@gmx.de> +2019-02-13 Juan Manuel Guerrero <juan.guerrero@gmx.de> * binutils/addr2line.c (main): Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name. @@ -105,9 +105,9 @@ -diff -aprNU5 binutils-2.31.1.orig/binutils/ar.c binutils-2.31.1/binutils/ar.c ---- binutils-2.31.1.orig/binutils/ar.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/binutils/ar.c 2018-07-21 17:04:22 +0000 +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) setlocale (LC_CTYPE, ""); #endif @@ -121,9 +121,9 @@ diff -aprNU5 binutils-2.31.1.orig/binutils/ar.c binutils-2.31.1/binutils/ar.c #if BFD_SUPPORTS_PLUGINS bfd_plugin_set_program_name (program_name); #endif -diff -aprNU5 binutils-2.31.1.orig/binutils/coffdump.c binutils-2.31.1/binutils/coffdump.c ---- binutils-2.31.1.orig/binutils/coffdump.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/binutils/coffdump.c 2018-07-21 17:04:22 +0000 +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 @@ -497,11 +497,11 @@ main (int ac, char **av) setlocale (LC_CTYPE, ""); #endif @@ -137,10 +137,10 @@ diff -aprNU5 binutils-2.31.1.orig/binutils/coffdump.c binutils-2.31.1/binutils/c expandargv (&ac, &av); -diff -aprNU5 binutils-2.31.1.orig/binutils/config.in binutils-2.31.1/binutils/config.in ---- binutils-2.31.1.orig/binutils/config.in 2018-07-18 07:46:06 +0000 -+++ binutils-2.31.1/binutils/config.in 2018-07-21 17:43:36 +0000 -@@ -291,5 +291,40 @@ +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 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE @@ -181,10 +181,10 @@ diff -aprNU5 binutils-2.31.1.orig/binutils/config.in binutils-2.31.1/binutils/co +#else +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif -diff -aprNU5 binutils-2.31.1.orig/binutils/cxxfilt.c binutils-2.31.1/binutils/cxxfilt.c ---- binutils-2.31.1.orig/binutils/cxxfilt.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/binutils/cxxfilt.c 2018-07-21 17:04:22 +0000 -@@ -172,11 +172,11 @@ main (int argc, char **argv) +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 +@@ -142,11 +142,11 @@ main (int argc, char **argv) { int c; const char *valid_symbols; @@ -197,10 +197,10 @@ diff -aprNU5 binutils-2.31.1.orig/binutils/cxxfilt.c binutils-2.31.1/binutils/cx expandargv (&argc, &argv); -diff -aprNU5 binutils-2.31.1.orig/binutils/nm.c binutils-2.31.1/binutils/nm.c ---- binutils-2.31.1.orig/binutils/nm.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/binutils/nm.c 2018-07-21 17:04:22 +0000 -@@ -1641,11 +1641,11 @@ main (int argc, char **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) setlocale (LC_COLLATE, ""); #endif bindtextdomain (PACKAGE, LOCALEDIR); @@ -213,10 +213,10 @@ diff -aprNU5 binutils-2.31.1.orig/binutils/nm.c binutils-2.31.1/binutils/nm.c #if BFD_SUPPORTS_PLUGINS bfd_plugin_set_program_name (program_name); #endif -diff -aprNU5 binutils-2.31.1.orig/binutils/objcopy.c binutils-2.31.1/binutils/objcopy.c ---- binutils-2.31.1.orig/binutils/objcopy.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/binutils/objcopy.c 2018-07-21 17:04:22 +0000 -@@ -5548,11 +5548,11 @@ main (int argc, char *argv[]) +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[]) setlocale (LC_CTYPE, ""); #endif bindtextdomain (PACKAGE, LOCALEDIR); @@ -229,10 +229,10 @@ diff -aprNU5 binutils-2.31.1.orig/binutils/objcopy.c binutils-2.31.1/binutils/ob START_PROGRESS (program_name, 0); expandargv (&argc, &argv); -diff -aprNU5 binutils-2.31.1.orig/binutils/objdump.c binutils-2.31.1/binutils/objdump.c ---- binutils-2.31.1.orig/binutils/objdump.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/binutils/objdump.c 2018-07-21 17:04:22 +0000 -@@ -3826,11 +3826,11 @@ main (int argc, char **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) #endif bindtextdomain (PACKAGE, LOCALEDIR); @@ -245,10 +245,10 @@ diff -aprNU5 binutils-2.31.1.orig/binutils/objdump.c binutils-2.31.1/binutils/ob START_PROGRESS (program_name, 0); -diff -aprNU5 binutils-2.31.1.orig/binutils/readelf.c binutils-2.31.1/binutils/readelf.c ---- binutils-2.31.1.orig/binutils/readelf.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/binutils/readelf.c 2018-07-21 17:04:22 +0000 -@@ -570,11 +570,16 @@ print_symbol (signed int width, const ch +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 #ifdef HAVE_MBSTATE_T /* Try to find out how many bytes made up the character that was @@ -265,9 +265,9 @@ diff -aprNU5 binutils-2.31.1.orig/binutils/readelf.c binutils-2.31.1/binutils/re #endif if (n != (size_t) -1 && n != (size_t) -2 && n > 0) symbol += (n - 1); -diff -aprNU5 binutils-2.31.1.orig/binutils/size.c binutils-2.31.1/binutils/size.c ---- binutils-2.31.1.orig/binutils/size.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/binutils/size.c 2018-07-21 17:04:22 +0000 +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) setlocale (LC_CTYPE, ""); #endif @@ -281,9 +281,9 @@ diff -aprNU5 binutils-2.31.1.orig/binutils/size.c binutils-2.31.1/binutils/size. expandargv (&argc, &argv); -diff -aprNU5 binutils-2.31.1.orig/binutils/srconv.c binutils-2.31.1/binutils/srconv.c ---- binutils-2.31.1.orig/binutils/srconv.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/binutils/srconv.c 2018-07-21 17:04:22 +0000 +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 @@ -1731,11 +1731,11 @@ main (int ac, char **av) setlocale (LC_CTYPE, ""); #endif @@ -297,9 +297,9 @@ diff -aprNU5 binutils-2.31.1.orig/binutils/srconv.c binutils-2.31.1/binutils/src expandargv (&ac, &av); -diff -aprNU5 binutils-2.31.1.orig/binutils/strings.c binutils-2.31.1/binutils/strings.c ---- binutils-2.31.1.orig/binutils/strings.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/binutils/strings.c 2018-07-21 17:04:22 +0000 +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 @@ -153,11 +153,11 @@ main (int argc, char **argv) setlocale (LC_ALL, ""); #endif @@ -313,9 +313,9 @@ diff -aprNU5 binutils-2.31.1.orig/binutils/strings.c binutils-2.31.1/binutils/st expandargv (&argc, &argv); -diff -aprNU5 binutils-2.31.1.orig/binutils/sysdump.c binutils-2.31.1/binutils/sysdump.c ---- binutils-2.31.1.orig/binutils/sysdump.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/binutils/sysdump.c 2018-07-21 17:04:22 +0000 +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 @@ -668,11 +668,11 @@ main (int ac, char **av) setlocale (LC_CTYPE, ""); #endif @@ -329,10 +329,10 @@ diff -aprNU5 binutils-2.31.1.orig/binutils/sysdump.c binutils-2.31.1/binutils/sy expandargv (&ac, &av); -diff -aprNU5 binutils-2.31.1.orig/config.sub binutils-2.31.1/config.sub ---- binutils-2.31.1.orig/config.sub 2018-07-06 07:13:30 +0000 -+++ binutils-2.31.1/config.sub 2018-07-21 17:46:36 +0000 -@@ -250,10 +250,19 @@ case $1 in +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 +@@ -301,10 +301,19 @@ case $1 in basic_machine=i686-pc os=dicos ;; @@ -352,10 +352,10 @@ diff -aprNU5 binutils-2.31.1.orig/config.sub binutils-2.31.1/config.sub ebmon29k) basic_machine=a29k-amd os=ebmon -diff -aprNU5 binutils-2.31.1.orig/djgpp/build.sh binutils-2.31.1/djgpp/build.sh ---- binutils-2.31.1.orig/djgpp/build.sh 1970-01-01 00:00:00 +0000 -+++ binutils-2.31.1/djgpp/build.sh 2018-07-21 17:04:22 +0000 -@@ -0,0 +1,321 @@ +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 +@@ -0,0 +1,490 @@ +# This script only works in the ./djgpp directory. + +export HOME=. @@ -411,6 +411,7 @@ diff -aprNU5 binutils-2.31.1.orig/djgpp/build.sh binutils-2.31.1/djgpp/build.sh +export ac_cv_prog_mkdir=${MKDIR_P='/dev/env/DJDIR/bin/mkdir -p'} +export ac_cv_prog_RM=${RM='/dev/env/DJDIR/bin/rm'} +export ac_cv_prog_MV=${MV='/dev/env/DJDIR/bin/mv'} ++export ac_cv_prog_CAT=${CAT='/dev/env/DJDIR/bin/cat'} +export ac_cv_prog_SORT=${SORT='/dev/env/DJDIR/bin/sort'} +export ac_cv_prog_TAR=${TAR='/dev/env/DJDIR/bin/tar'} +export ac_cv_prog_PR_PROGRAM=${PR='/dev/env/DJDIR/bin/pr'} @@ -440,7 +441,7 @@ diff -aprNU5 binutils-2.31.1.orig/djgpp/build.sh binutils-2.31.1/djgpp/build.sh +# Ensure that always old GNU extern inline semantics is used +# (aka -fgnu89-inline) even if ISO C99 semantics has been specified. +case $(gcc --version 2>/dev/null | sed "/^.* \([1-9]\+\.[0-9]\+[.0-9]*\).*$/!d;s/^.* \([1-9]\+\.[0-9]\+[.0-9]*\).*$/\1/") in -+[1-3].*|4.[0-1][.0-9]* ) export CFLAGS=${CFLAGS='-g2 -O2 -march=i386 -mtune=i586'};; ++[1-3].*|4.[0-1][.0-9]* ) export CFLAGS=${CFLAGS='-g2 -O2 -std=gnu99 -march=i386 -mtune=i586'};; +* ) export CFLAGS=${CFLAGS='-g2 -O2 -fgnu89-inline -march=i386 -mtune=i586'};; +esac + @@ -510,6 +511,153 @@ diff -aprNU5 binutils-2.31.1.orig/djgpp/build.sh binutils-2.31.1/djgpp/build.sh + } +} + ++# Supress makeinfo test. DJGPP does not provide any other port than 4.13. ++/# For an installed makeinfo, we require it to be from texinfo 4.7 or/,/;;/ { ++ /MAKEINFO.*makeinfo/ s/MAKEINFO/IGNORE_&/ ++} ++ ++# We always use _deps and _libs instead of .deps and .libs, because ++# the latter is an invalid name on 8+3 MS-DOS filesystem. This makes ++# the generated Makefiles good for every DJGPP installation, not only ++# the one where the package was configured (which could happen to be ++# a Windows box, where leading dots in file names are allowed). ++s,\.deps,_deps,g ++s,\.libs,_libs,g ++/^rmdir[ ]*\.tst/ i\\ ++am__leading_dot=_ ++ ++# Autoconf 2.63b produces if clauses that are enclosed in \` ++# so we cannot use \` to replace parenthesized commands. ++# This case must be treated before the parenthesized commands ++# are replaced by \`. ++/.*\`if[ ](/ { ++ s/(/"/ ++ s/)/"/ ++} ++ ++# Replace (command) > /dev/null with \`command > /dev/null\`, since ++# parenthesized commands always return zero status in the ported Bash, ++# even if the named command doesn't exist ++/if ([^|;\`]*null/{ ++ s,(,\`, ++ s,\\([^ )]\\)),\\1, ++ /null[ ]*2>&1/ s,2>&1,&\`, ++ /null.*null/ s,null.*null,&\`, ++ /null.*null/ !{ ++ /null[ ]*2>&1/ !s,null,&\`, ++ } ++} ++ ++# DOS-style absolute file names should be supported as well ++/\*) top_srcdir=/s,/\*,[\\\\\\\\/]* | ?:[\\\\\\\\/]*, ++ ++# The following two items are changes needed for configuring ++# and compiling across partitions. ++# 1) The given srcdir value is always translated from the ++# "x:" syntax into "/dev/x" syntax while we run configure. ++/^[ ]*-srcdir=\\*.*$/ a\\ ++ ac_optarg=\`echo "\$ac_optarg" | sed "s,^\\\\([A-Za-z]\\\\):,/dev/\\\\1,"\` ++/set X \`ls -Lt \\\$srcdir/ i\\ ++ if \`echo \$srcdir | grep "^/dev/" - > /dev/null\`; then\\ ++ srcdir=\`echo "\$srcdir" | sed -e "s%^/dev/%%" -e "s%/%:/%"\`\\ ++ fi ++ ++# Autoconf 2.52e generated configure scripts ++# write absolute paths into Makefiles making ++# them useless for DJGPP installations for which ++# the package has not been configured for. ++/am_missing_run=/,/^$/ { ++ /^fi$/ a\\ ++am_missing_run=\`echo "\$am_missing_run" | sed 's%/dev.*/@FILE_NAME@[-_0-9]\\\\{1,1\\\\}[-.0-9A-z+]*%\${top_srcdir}%;s%.:.*/@FILE_NAME@[-_0-9]\\\\{1,1\\\\}[-.0-9A-z+]*%\${top_srcdir}%'\` ++} ++/^[ ]*install_sh=/,/^$/ { ++ /^fi$/ a\\ ++install_sh=\`echo "\$install_sh" | sed 's%/dev.*/@FILE_NAME@[-_0-9]\\\\{1,1\\\\}[-.0-9A-z+]*%\${top_srcdir}%;s%.:.*/@FILE_NAME@[-_0-9]\\\\{1,1\\\\}[-.0-9A-z+]*%\${top_srcdir}%'\` ++} ++ ++# Only if both builddir and srcdir are on the same ++# partition the absolute paths are converted to ++# relative paths so that the produced makefiles are ++# good for all installations but not only for the one ++# where it was configured. ++/^# If the template does not know about datarootdir, expand it.$/ i\\ ++# DJGPP specific.\\ ++# Autoconf generated configure scripts write\\ ++# absolute paths into Makefiles making them\\ ++# useless for DJGPP installations for which\\ ++# the package has not been configured for.\\ ++djgpp_ac_abs_top_builddir_drive=\\\$(echo \${ac_abs_top_builddir} | sed -e 's%:[/\\\\\\\\]*.*$%%;s%^/dev/\\\\([A-z]\\\\)/.*$%\\\\1%')\\ ++djgpp_ac_abs_top_srcdir_drive=\\\$(echo \${ac_abs_top_srcdir} | sed -e 's%:[/\\\\\\\\]*.*$%%;s%^/dev/\\\\([A-z]\\\\)/.*$%\\\\1%')\\ ++if [ "x\\\${ac_abs_top_srcdir}" == "x\\\${ac_top_srcdir}" ]; then\\ ++ paths_are_absolute=yes\\ ++else\\ ++ paths_are_absolute=no\\ ++fi\\ ++\\ ++if [ "x\\\${djgpp_ac_abs_top_builddir_drive}" == "x\\\${djgpp_ac_abs_top_srcdir_drive}" ]; then\\ ++ # builddir and srcdir are on the same partition.\\ ++\\ ++ # Convert absolute buildir paths to relative ones.\\ ++ paths_to_be_adjusted="ac_abs_builddir ac_abs_top_builddir"\\ ++ for path in \\\${paths_to_be_adjusted}; do\\ ++ eval _path=\\\\\\\${\$path}\\ ++ eval djgpp_\\\${path}=\$(echo \\\${_path} | sed -e "s%\\\${ac_abs_top_builddir}%\\\${ac_builddir}%")\\ ++ done\\ ++\\ ++ if [ "x\\\${paths_are_absolute}" == "xyes" ]; then\\ ++ # Convert absolute srcdir paths to relative ones.\\ ++ djgpp_relative_prefix=\$(echo \\\${ac_abs_builddir} | sed -e 's%^[A-z]:%%;s%^/dev/[A-z]%%;s%^%.%;s%[/\\\\\\\\][A-z0-9._+-]\\\\+%/..%g;s%[/\\\\\\\\]$%%')\\ ++ paths_to_be_adjusted="ac_srcdir ac_abs_srcdir ac_top_srcdir ac_abs_top_srcdir"\\ ++ for path in \\\${paths_to_be_adjusted}; do\\ ++ eval _path=\\\\\\\${\$path}\\ ++ eval djgpp_\\\${path}=\$(echo \\\${_path} | sed -e "s%^[A-z]:%%;s%^/dev/[A-z]%%;s%^%\\\${djgpp_relative_prefix}%")\\ ++ done\\ ++ else\\ ++ djgpp_ac_srcdir="\\\${ac_srcdir}"\\ ++ djgpp_ac_abs_srcdir="\\\${ac_srcdir}"\\ ++ djgpp_ac_top_srcdir="\\\${ac_top_srcdir}"\\ ++ djgpp_ac_abs_top_srcdir="\\\${ac_top_srcdir}"\\ ++ fi\\ ++else\\ ++ # builddir and srcdir are on different partitions.\\ ++\\ ++ paths_to_be_adjusted="ac_abs_builddir ac_abs_top_builddir"\\ ++ for path in \\\${paths_to_be_adjusted}; do\\ ++ eval djgpp_\\\${path}=\\\\\\\${\$path}\\ ++ done\\ ++\\ ++ paths_to_be_adjusted="ac_srcdir ac_abs_srcdir ac_top_srcdir ac_abs_top_srcdir"\\ ++ for path in \\\${paths_to_be_adjusted}; do\\ ++ eval djgpp_\\\${path}=\\\\\\\${\$path}\\ ++ done\\ ++fi\\ ++ ++ ++/^s|@configure_input@|\\\$ac_sed_conf_input|;t t$/,/^\\\$ac_datarootdir_hack$/ { ++ s/\\\$ac_srcdir/\\\$djgpp_ac_srcdir/ ++ s/\\\$ac_abs_srcdir/\\\$djgpp_ac_abs_srcdir/ ++ s/\\\$ac_top_srcdir/\\\$djgpp_ac_top_srcdir/ ++ s/\\\$ac_abs_top_srcdir/\\\$djgpp_ac_abs_top_srcdir/ ++ s/\\\$ac_abs_builddir/\\\$djgpp_ac_abs_builddir/ ++ s/\\\$ac_abs_top_builddir/\\\$djgpp_ac_abs_top_builddir/ ++} ++ ++# Add DJGPP version information. ++/^#define VERSION/ s/\\\$VERSION/& (DJGPP port (r1))/ ++ ++# We need makeinfo to make the html formated docs. ++/\\\$am_missing_run[ ]*makeinfo/ s,\\\$am_missing_run,, ++ ++# The path to the FORTRAN compiler and libraries ++# shall contain no absolute path reference so it ++# will be good for all djgpp installations. ++/^FLIBS="\\\$ac_cv_flibs"/ i\\ ++ac_djgpp_path=\`echo "\$DJDIR" | sed 's%\\\\\\\\\\\\%/%g' | tr \$as_cr_LETTERS \$as_cr_letters\`\\ ++ac_cv_flibs=\`echo "\$ac_cv_flibs" | sed "s%-L$ac_djgpp_path%-L/dev/env/DJDIR%g"\` ++ ++# Do not split info output. ++/^MAKEINFO=.*$/s:=.*$:&" --no-split": ++ +# The CR test for awk does not work for DJGPP. +/^ac_cs_awk_cr=/,/^$/ { + /^fi$/ a\\ @@ -524,6 +672,7 @@ diff -aprNU5 binutils-2.31.1.orig/djgpp/build.sh binutils-2.31.1/djgpp/build.sh +# Force the test for 'ln -s' to report 'cp -pf'. +/as_ln_s='ln -s'/ s/ln -s/cp -pf/ + ++##LIBTOOL="\${CONFIG_SHELL-\$SHELL} "'\$(top_builddir)/libtool' +# Set the right shell for libtool +/^LIBTOOL=.*libtool'$/ s/".*"/'\$(SHELL) '/ + @@ -541,17 +690,38 @@ diff -aprNU5 binutils-2.31.1.orig/djgpp/build.sh binutils-2.31.1/djgpp/build.sh + +# Fix realpath check. DJGPP always prepends a drive letter. +/checking whether realpath works/,/^_ACEOF$/ { -+ /name && \*name == '\/'/ s/\*name/name[2]/ ++ /name && \\*name == '\\/'/ s/\\*name/name[2]/ +} + -+# Supress makeinfo test. DJGPP does not provide any other port than 4.13. -+/# For an installed makeinfo, we require it to be from texinfo 4.7 or/,/;;/ { -+ /MAKEINFO.*makeinfo/ s/MAKEINFO/IGNORE_&/ ++# This works around a bug in DJGPP port of Bash 2.0x. ++s|return \$ac_retval|(&)|g ++ ++# DJGPP port of Bash 2.04 doesn't like this redirection of stdin ++/exec 7</s|7<&0 </dev/null|| ++ ++# Remove LINGUAS from dependecy list in ./po/Makefile ++/POMAKEFILEDEPS=/ s/POMAKEFILEDEPS LINGUAS/POMAKEFILEDEPS #LINGUAS/ ++ ++# The dup2 check of autoconf will fail with SIGABRT due to implementations issues in DJGPP's version of dup2. ++# To avoid this, it will not be allowed to use file descriptors greather than 255. ++# This will be removed as soon as a fixed versions of DJGPP is released. ++/checking whether dup2 works/,/^_ACEOF$/ { ++ /dup2.*256);/d +} ++ ++# Convert am_aux_dir and abs_aux_dir into relative paths. ++/^# Expand \$ac_aux_dir to an absolute path./ { ++n ++a\\ ++am_aux_dir=\${ac_aux_dir} ++} ++ ++/abs_aux_dir=/ a\\ ++abs_aux_dir=\${ac_aux_dir} +EOF + + -+for file in ../ltmain.sh ../configure ../bfd/configure ../binutils/configure ../gas/configure ../gprof/configure ../ld/configure ../opcodes/configure; do ++for file in ../ltmain.sh ../configure ../bfd/configure ../binutils/configure ../gas/configure ../gprof/configure ../ld/configure ../opcodes/configure ../zlib/configure; do + if test ! -f ${file}.orig; then + cp -vf ${file} ${file}.orig + touch ${file}.orig -r ${file} @@ -625,7 +795,6 @@ diff -aprNU5 binutils-2.31.1.orig/djgpp/build.sh binutils-2.31.1/djgpp/build.sh +touch ../ld/configure.ac -r ../ld/configure.tgt + + -+ +# +# 3: Configure and build the libs and programs. +# @@ -649,7 +818,7 @@ diff -aprNU5 binutils-2.31.1.orig/djgpp/build.sh binutils-2.31.1/djgpp/build.sh +echo Configuring the progs and libs for DJGPP. >> build_log.txt +echo >> build_log.txt + -+../configure --disable-dependency-tracking ${NLS_SUPPORT} \ ++../configure --prefix='/dev/env/DJDIR' --disable-dependency-tracking ${NLS_SUPPORT} \ + --with-mpc-include='/dev/env/DJDIR/include' --with-mpc-lib='/dev/env/DJDIR/lib' \ + --with-mpfr-include='/dev/env/DJDIR/include' --with-mpfr-lib='/dev/env/DJDIR/lib' \ + --with-gmp-include='/dev/env/DJDIR/include' --with-gmp-lib='/dev/env/DJDIR/lib' \ @@ -677,10 +846,10 @@ diff -aprNU5 binutils-2.31.1.orig/djgpp/build.sh binutils-2.31.1/djgpp/build.sh +make >> build_log.txt 2>&1 + +touch stop_build.txt -diff -aprNU5 binutils-2.31.1.orig/gas/as.c binutils-2.31.1/gas/as.c ---- binutils-2.31.1.orig/gas/as.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/gas/as.c 2018-07-21 17:04:22 +0000 -@@ -1218,11 +1218,11 @@ main (int argc, char ** argv) +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) #ifdef HOST_SPECIAL_INIT HOST_SPECIAL_INIT (argc, argv); @@ -693,9 +862,9 @@ diff -aprNU5 binutils-2.31.1.orig/gas/as.c binutils-2.31.1/gas/as.c expandargv (&argc, &argv); START_PROGRESS (myname, 0); -diff -aprNU5 binutils-2.31.1.orig/gas/config/obj-coff-seh.c binutils-2.31.1/gas/config/obj-coff-seh.c ---- binutils-2.31.1.orig/gas/config/obj-coff-seh.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/gas/config/obj-coff-seh.c 2018-07-21 17:04:22 +0000 +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 @@ -62,11 +62,11 @@ get_pxdata_name (segT seg, const char *b else if (dot < dollar) name = dot; @@ -709,10 +878,10 @@ diff -aprNU5 binutils-2.31.1.orig/gas/config/obj-coff-seh.c binutils-2.31.1/gas/ } /* Allocate a seh_seg_list structure. */ -diff -aprNU5 binutils-2.31.1.orig/gas/config.in binutils-2.31.1/gas/config.in ---- binutils-2.31.1.orig/gas/config.in 2018-07-18 07:41:48 +0000 -+++ binutils-2.31.1/gas/config.in 2018-07-21 17:50:30 +0000 -@@ -393,5 +393,42 @@ +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 @@ #undef inline #endif @@ -755,9 +924,9 @@ diff -aprNU5 binutils-2.31.1.orig/gas/config.in binutils-2.31.1/gas/config.in +#else +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif -diff -aprNU5 binutils-2.31.1.orig/gas/dw2gencfi.c binutils-2.31.1/gas/dw2gencfi.c ---- binutils-2.31.1.orig/gas/dw2gencfi.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/gas/dw2gencfi.c 2018-07-21 17:04:22 +0000 +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 @@ -255,11 +255,11 @@ get_debugseg_name (segT seg, const char name = dot; else @@ -771,10 +940,10 @@ diff -aprNU5 binutils-2.31.1.orig/gas/dw2gencfi.c binutils-2.31.1/gas/dw2gencfi. /* Allocate a dwcfi_seg_list structure. */ static struct dwcfi_seg_list * -diff -aprNU5 binutils-2.31.1.orig/gold/config.in binutils-2.31.1/gold/config.in ---- binutils-2.31.1.orig/gold/config.in 2018-06-24 18:43:54 +0000 -+++ binutils-2.31.1/gold/config.in 2018-07-21 17:04:22 +0000 -@@ -289,5 +289,39 @@ +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 +@@ -295,5 +295,39 @@ this defined. */ #undef _POSIX_1_SOURCE @@ -814,9 +983,9 @@ diff -aprNU5 binutils-2.31.1.orig/gold/config.in binutils-2.31.1/gold/config.in +#else +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif -diff -aprNU5 binutils-2.31.1.orig/gprof/gconfig.in binutils-2.31.1/gprof/gconfig.in ---- binutils-2.31.1.orig/gprof/gconfig.in 2018-07-18 07:46:44 +0000 -+++ binutils-2.31.1/gprof/gconfig.in 2018-07-21 17:04:22 +0000 +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 @@ -117,5 +117,42 @@ this defined. */ #undef _POSIX_1_SOURCE @@ -860,9 +1029,9 @@ diff -aprNU5 binutils-2.31.1.orig/gprof/gconfig.in binutils-2.31.1/gprof/gconfig +#else +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif -diff -aprNU5 binutils-2.31.1.orig/gprof/gprof.c binutils-2.31.1/gprof/gprof.c ---- binutils-2.31.1.orig/gprof/gprof.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/gprof/gprof.c 2018-07-21 17:04:22 +0000 +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 @@ -196,11 +196,17 @@ main (int argc, char **argv) #ifdef ENABLE_NLS bindtextdomain (PACKAGE, LOCALEDIR); @@ -882,9 +1051,9 @@ diff -aprNU5 binutils-2.31.1.orig/gprof/gprof.c binutils-2.31.1/gprof/gprof.c expandargv (&argc, &argv); while ((ch = getopt_long (argc, argv, -diff -aprNU5 binutils-2.31.1.orig/ld/config.in binutils-2.31.1/ld/config.in ---- binutils-2.31.1.orig/ld/config.in 2018-07-18 07:46:24 +0000 -+++ binutils-2.31.1/ld/config.in 2018-07-21 17:04:22 +0000 +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 @@ -252,5 +252,52 @@ this defined. */ #undef _POSIX_1_SOURCE @@ -938,9 +1107,9 @@ diff -aprNU5 binutils-2.31.1.orig/ld/config.in binutils-2.31.1/ld/config.in +#else +# define STRIP_FULL_PATH_AND_EXTENSION(file_name) (file_name) +#endif -diff -aprNU5 binutils-2.31.1.orig/ld/configure binutils-2.31.1/ld/configure ---- binutils-2.31.1.orig/ld/configure 2018-07-18 07:46:20 +0000 -+++ binutils-2.31.1/ld/configure 2018-07-21 17:04:22 +0000 +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 @@ -961,10 +1130,10 @@ diff -aprNU5 binutils-2.31.1.orig/ld/configure binutils-2.31.1/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.31.1.orig/ld/ldfile.c binutils-2.31.1/ld/ldfile.c ---- binutils-2.31.1.orig/ld/ldfile.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/ld/ldfile.c 2018-07-21 17:04:22 +0000 -@@ -62,10 +62,128 @@ typedef struct search_arch +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 static search_dirs_type **search_tail_ptr = &search_head; static search_arch_type *search_arch_head; @@ -972,8 +1141,8 @@ diff -aprNU5 binutils-2.31.1.orig/ld/ldfile.c binutils-2.31.1/ld/ldfile.c + +#ifdef __DJGPP__ -+/* Map library long filename to an library short filename -+ according to the filename table stored in /dev/env/DJDIR/lib/libnames.tab. */ ++/* Map library long filename to a library short filename according ++ to the filename table stored in /dev/env/DJDIR/lib/libnames.tab. */ + +static bfd_boolean +map_LFN_to_SFN (const char **filename) @@ -1035,7 +1204,6 @@ diff -aprNU5 binutils-2.31.1.orig/ld/ldfile.c binutils-2.31.1/ld/ldfile.c + if (table) + { + char *extension, *libname, *prefix = concat(*filename, (const char *)NULL); -+ char line[128]; + int i; + + /* Strip library prefix and suffix. */ @@ -1093,7 +1261,7 @@ diff -aprNU5 binutils-2.31.1.orig/ld/ldfile.c binutils-2.31.1/ld/ldfile.c static bfd_boolean is_sysrooted_pathname (const char *name) -@@ -122,12 +240,23 @@ ldfile_add_library_path (const char *nam +@@ -122,12 +239,23 @@ ldfile_add_library_path (const char *nam bfd_boolean ldfile_try_open_bfd (const char *attempt, @@ -1117,7 +1285,7 @@ diff -aprNU5 binutils-2.31.1.orig/ld/ldfile.c binutils-2.31.1/ld/ldfile.c if (entry->the_bfd == NULL) info_msg (_("attempt to open %s failed\n"), attempt); else -@@ -369,11 +498,11 @@ ldfile_open_file_search (const char *arc +@@ -369,11 +497,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); @@ -1130,9 +1298,9 @@ diff -aprNU5 binutils-2.31.1.orig/ld/ldfile.c binutils-2.31.1/ld/ldfile.c { entry->filename = string; return TRUE; -diff -aprNU5 binutils-2.31.1.orig/ld/ldmain.c binutils-2.31.1/ld/ldmain.c ---- binutils-2.31.1.orig/ld/ldmain.c 2018-06-24 18:38:56 +0000 -+++ binutils-2.31.1/ld/ldmain.c 2018-07-21 17:52:32 +0000 +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) setlocale (LC_CTYPE, ""); #endif @@ -1146,7 +1314,7 @@ diff -aprNU5 binutils-2.31.1.orig/ld/ldmain.c binutils-2.31.1/ld/ldmain.c START_PROGRESS (program_name, 0); expandargv (&argc, &argv); -@@ -976,10 +976,34 @@ multiple_definition (struct bfd_link_inf +@@ -988,10 +988,34 @@ multiple_definition (struct bfd_link_inf || (nsec->output_section != NULL && !bfd_is_abs_section (nsec) && bfd_is_abs_section (nsec->output_section)))) @@ -1181,9 +1349,9 @@ diff -aprNU5 binutils-2.31.1.orig/ld/ldmain.c binutils-2.31.1/ld/ldmain.c { nbfd = obfd; nsec = osec; -diff -aprNU5 binutils-2.31.1.orig/ld/libnames.tab binutils-2.31.1/ld/libnames.tab ---- binutils-2.31.1.orig/ld/libnames.tab 1970-01-01 00:00:00 +0000 -+++ binutils-2.31.1/ld/libnames.tab 2018-07-21 17:04:22 +0000 +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 @@ -0,0 +1,31 @@ +# +# Table to map libraries long file name to short file names. @@ -1216,9 +1384,9 @@ diff -aprNU5 binutils-2.31.1.orig/ld/libnames.tab binutils-2.31.1/ld/libnames.ta +pcre2-16 pcr216 +pcre2-32 pcr232 +pcre2-posix pcr2posix -diff -aprNU5 binutils-2.31.1.orig/ld/scripttempl/i386go32.sc binutils-2.31.1/ld/scripttempl/i386go32.sc ---- binutils-2.31.1.orig/ld/scripttempl/i386go32.sc 2018-06-24 18:38:58 +0000 -+++ binutils-2.31.1/ld/scripttempl/i386go32.sc 2018-07-21 17:04:22 +0000 +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 @@ -45,18 +45,27 @@ SECTIONS } .data ${RELOCATING+ ${DATA_ALIGNMENT}} : { @@ -1266,9 +1434,9 @@ diff -aprNU5 binutils-2.31.1.orig/ld/scripttempl/i386go32.sc binutils-2.31.1/ld/ .stabstr 0 : { *(.stabstr) } EOF -diff -aprNU5 binutils-2.31.1.orig/opcodes/config.in binutils-2.31.1/opcodes/config.in ---- binutils-2.31.1.orig/opcodes/config.in 2018-07-18 07:41:40 +0000 -+++ binutils-2.31.1/opcodes/config.in 2018-07-21 17:04:22 +0000 +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 @@ -118,5 +118,42 @@ this defined. */ #undef _POSIX_1_SOURCE |