From 990e05e576318cb98c925f8f0f8dca16c14deca9 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 3 May 2021 12:04:44 +0300 Subject: [PATCH] gdb: Update to 10.2 --- ...-unwind-cygwin-_sigbe-and-sigdelayed.patch | 64 +- gdb/0002-7.8-windows-nat-cygwin.patch | 58 +- ...for-realpath-failures-in-windows_mak.patch | 20 +- gdb/0004-7.8-symtab-cygwin.patch | 16 +- ...ble-CLI-styling-by-default-on-Cygwin.patch | 25 - ...b-9.1-msysize.patch => 0005-msysize.patch} | 1657 ++++++++--------- ...thread_local_segv_handler-definition.patch | 103 - gdb/PKGBUILD | 30 +- 8 files changed, 875 insertions(+), 1098 deletions(-) delete mode 100644 gdb/0005-Enable-CLI-styling-by-default-on-Cygwin.patch rename gdb/{gdb-9.1-msysize.patch => 0005-msysize.patch} (69%) delete mode 100644 gdb/0006-Move-thread_local_segv_handler-definition.patch diff --git a/gdb/0001-Teach-gdb-how-to-unwind-cygwin-_sigbe-and-sigdelayed.patch b/gdb/0001-Teach-gdb-how-to-unwind-cygwin-_sigbe-and-sigdelayed.patch index 35876948..0771ea8d 100644 --- a/gdb/0001-Teach-gdb-how-to-unwind-cygwin-_sigbe-and-sigdelayed.patch +++ b/gdb/0001-Teach-gdb-how-to-unwind-cygwin-_sigbe-and-sigdelayed.patch @@ -1,4 +1,4 @@ -From 555f6ed2b933288a8c61417792ba407be667d502 Mon Sep 17 00:00:00 2001 +From 1822f7cf064bc795a31e8eeb736e48593abb5af2 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 12 Jan 2016 22:49:09 +0000 Subject: [PATCH 1/5] Teach gdb how to unwind cygwin _sigbe and sigdelayed @@ -40,20 +40,21 @@ as we unwind the stack. [1] https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;a=blob;f=winsup/cygwin/gendef [2] https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;a=blob;f=winsup/cygwin/how-signals-work.txt --- - gdb/amd64-windows-tdep.c | 57 ++++++++++++ - gdb/i386-cygwin-tdep.c | 28 ++++++ - gdb/windows-tdep.c | 237 +++++++++++++++++++++++++++++++++++++++++++++++ - gdb/windows-tdep.h | 21 +++++ - 4 files changed, 343 insertions(+) + gdb/amd64-windows-tdep.c | 57 +++++++++- + gdb/i386-windows-tdep.c | 28 +++++ + gdb/windows-tdep.c | 237 +++++++++++++++++++++++++++++++++++++++ + gdb/windows-tdep.h | 20 ++++ + 4 files changed, 341 insertions(+), 1 deletion(-) diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c -index 1a033365a9..6c6a66b9ca 100644 +index 3f9cbebc5d3..130d421be7e 100644 --- a/gdb/amd64-windows-tdep.c +++ b/gdb/amd64-windows-tdep.c -@@ -1206,9 +1206,66 @@ amd64_windows_auto_wide_charset (void) +@@ -1208,11 +1208,66 @@ amd64_windows_auto_wide_charset (void) return "UTF-16"; } +-/* Common parts for gdbarch initialization for Windows and Cygwin on AMD64. */ +static const struct insn_pattern amd64_sigbe_bytes[] = { + /* movq $-8,%r11 */ + { 0x49, 0xff }, @@ -106,9 +107,9 @@ index 1a033365a9..6c6a66b9ca 100644 + { + amd64_sigdelayed_bytes, COUNT(amd64_sigdelayed_bytes) + }; -+ + static void - amd64_windows_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) + amd64_windows_init_abi_common (gdbarch_info info, struct gdbarch *gdbarch) { + + cygwin_sigwrapper_frame_unwind_set_sigbe_pattern (&amd64_sigbe); @@ -116,12 +117,12 @@ index 1a033365a9..6c6a66b9ca 100644 + frame_unwind_append_unwinder (gdbarch, &cygwin_sigwrapper_frame_unwind); /* The dwarf2 unwinder (appended very early by i386_gdbarch_init) is preferred over the SEH one. The reasons are: - - binaries without SEH but with dwarf2 debug info are correcly handled -diff --git a/gdb/i386-cygwin-tdep.c b/gdb/i386-cygwin-tdep.c -index f200d39f2d..9ccec6556f 100644 ---- a/gdb/i386-cygwin-tdep.c -+++ b/gdb/i386-cygwin-tdep.c -@@ -26,6 +26,7 @@ + - binaries without SEH but with dwarf2 debug info are correctly handled +diff --git a/gdb/i386-windows-tdep.c b/gdb/i386-windows-tdep.c +index 4ffaa4562b5..26132f0a800 100644 +--- a/gdb/i386-windows-tdep.c ++++ b/gdb/i386-windows-tdep.c +@@ -27,6 +27,7 @@ #include "xml-support.h" #include "gdbcore.h" #include "inferior.h" @@ -129,7 +130,7 @@ index f200d39f2d..9ccec6556f 100644 /* Core file support. */ -@@ -204,11 +205,38 @@ i386_cygwin_auto_wide_charset (void) +@@ -199,6 +200,30 @@ i386_windows_auto_wide_charset (void) return "UTF-16"; } @@ -157,19 +158,21 @@ index f200d39f2d..9ccec6556f 100644 + i386_sigbe_bytes, COUNT(i386_sigbe_bytes) + }; + - static void - i386_cygwin_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) + /* Implement the "push_dummy_call" gdbarch method. */ + + static CORE_ADDR +@@ -236,6 +261,9 @@ i386_windows_init_abi_common (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + cygwin_sigwrapper_frame_unwind_set_sigbe_pattern (&i386_sigbe); + frame_unwind_append_unwinder (gdbarch, &cygwin_sigwrapper_frame_unwind); + - windows_init_abi (info, gdbarch); + set_gdbarch_skip_trampoline_code (gdbarch, i386_windows_skip_trampoline_code); - set_gdbarch_skip_trampoline_code (gdbarch, i386_cygwin_skip_trampoline_code); + set_gdbarch_skip_main_prologue (gdbarch, i386_skip_main_prologue); diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c -index e77996f797..3e035ec765 100644 +index 019d4d18b64..a2c7a1efa97 100644 --- a/gdb/windows-tdep.c +++ b/gdb/windows-tdep.c @@ -33,6 +33,7 @@ @@ -178,9 +181,9 @@ index e77996f797..3e035ec765 100644 #include "solib-target.h" +#include "frame-unwind.h" #include "gdbcore.h" - - struct cmd_list_element *info_w32_cmdlist; -@@ -518,3 +519,239 @@ even if their meaning is unknown."), + #include "coff/internal.h" + #include "libcoff.h" +@@ -1120,3 +1121,239 @@ even if their meaning is unknown."), isn't another convenience variable of the same name. */ create_internalvar_type_lazy ("_tlb", &tlb_funcs, NULL); } @@ -421,14 +424,13 @@ index e77996f797..3e035ec765 100644 + &cygwin_sigwrapper_frame_sniffer +}; diff --git a/gdb/windows-tdep.h b/gdb/windows-tdep.h -index 38242cfd22..51ed98bbcf 100644 +index 00ae7a6258e..9c2efcc0516 100644 --- a/gdb/windows-tdep.h +++ b/gdb/windows-tdep.h -@@ -32,4 +32,25 @@ extern void windows_xfer_shared_library (const char* so_name, +@@ -48,4 +48,24 @@ extern void cygwin_init_abi (struct gdbarch_info info, + + extern bool is_linked_with_cygwin_dll (bfd *abfd); - extern void windows_init_abi (struct gdbarch_info info, - struct gdbarch *gdbarch); -+ +extern const struct frame_unwind cygwin_sigwrapper_frame_unwind; + +/* An instruction to match. */ @@ -451,5 +453,5 @@ index 38242cfd22..51ed98bbcf 100644 + #endif -- -2.14.2 +2.31.1.windows.1 diff --git a/gdb/0002-7.8-windows-nat-cygwin.patch b/gdb/0002-7.8-windows-nat-cygwin.patch index 9ef4f0f8..a6fef13d 100644 --- a/gdb/0002-7.8-windows-nat-cygwin.patch +++ b/gdb/0002-7.8-windows-nat-cygwin.patch @@ -1,7 +1,7 @@ -From ef91df5ca767096015bedd6a81ef1008161d96d2 Mon Sep 17 00:00:00 2001 +From 78a3fc32338171cb791512076e3696e62d08c33a Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 12 Jan 2016 22:26:26 +0000 -Subject: [PATCH 2/5] 7.8-windows-nat-cygwin.patch +Subject: [PATCH 2/5] 7.8-windows-nat-cygwin Remaining parts of 7.8-windows-nat-cygwin.patch not yet upstream. @@ -36,14 +36,14 @@ have other problems...) * In one place, clarify that thread_rec()'s second parameter is a bool flag. (This should be done everywhere, or not) --- - gdb/windows-nat.c | 28 ++++++++++++++++++---------- - 1 file changed, 18 insertions(+), 10 deletions(-) + gdb/windows-nat.c | 25 ++++++++++++++++--------- + 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c -index 3add8e63f9..0e366c3162 100644 +index 108e1e32edc..a0faa058be7 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c -@@ -154,8 +154,7 @@ static GetConsoleFontSize_ftype *GetConsoleFontSize; +@@ -176,8 +176,7 @@ static Wow64GetThreadSelectorEntry_ftype *Wow64GetThreadSelectorEntry; # define bad_GetModuleFileNameEx bad_GetModuleFileNameExW #endif @@ -51,19 +51,18 @@ index 3add8e63f9..0e366c3162 100644 - cygwin signal. */ +static DWORD signal_thread_id; /* Non-zero if we saved context. */ #ifdef __CYGWIN__ - static CONTEXT saved_context; /* Containes the saved context from a + static CONTEXT saved_context; /* Contains the saved context from a cygwin signal. */ -@@ -403,7 +402,8 @@ thread_rec (DWORD id, int get_context) - { - if (!th->suspended && get_context) - { -- if (get_context > 0 && id != current_event.dwThreadId) -+ if (get_context > 0 && id != current_event.dwThreadId -+ && id != signal_thread_id) - { - if (SuspendThread (th->h) == (DWORD) -1) - { -@@ -612,7 +612,7 @@ windows_nat_target::fetch_registers (struct regcache *regcache, int r) +@@ -403,7 +402,7 @@ windows_nat::thread_rec (ptid_t ptid, thread_disposition_type disposition) + /* Nothing. */ + break; + case INVALIDATE_CONTEXT: +- if (ptid.lwp () != current_event.dwThreadId) ++ if (ptid.lwp () != current_event.dwThreadId && ptid.lwp () != signal_thread_id) + th->suspend (); + th->reload_context = true; + break; +@@ -644,7 +643,7 @@ windows_nat_target::fetch_registers (struct regcache *regcache, int r) if (th->reload_context) { #ifdef __CYGWIN__ @@ -72,7 +71,7 @@ index 3add8e63f9..0e366c3162 100644 { /* Lie about where the program actually is stopped since cygwin has informed us that we should consider the signal -@@ -620,7 +620,7 @@ windows_nat_target::fetch_registers (struct regcache *regcache, int r) +@@ -652,7 +651,7 @@ windows_nat_target::fetch_registers (struct regcache *regcache, int r) "saved_context. */ memcpy (&th->context, &saved_context, __COPY_CONTEXT_SIZE); @@ -81,7 +80,7 @@ index 3add8e63f9..0e366c3162 100644 } else #endif -@@ -1007,7 +1007,11 @@ handle_output_debug_string (struct target_waitstatus *ourstatus) +@@ -997,7 +996,11 @@ windows_nat::handle_output_debug_string (struct target_waitstatus *ourstatus) else if (!startswith (s.get (), _CYGWIN_SIGNAL_STRING)) { #ifdef __CYGWIN__ @@ -94,7 +93,7 @@ index 3add8e63f9..0e366c3162 100644 #endif { char *p = strchr (s.get (), '\0'); -@@ -1046,7 +1050,12 @@ handle_output_debug_string (struct target_waitstatus *ourstatus) +@@ -1036,7 +1039,12 @@ windows_nat::handle_output_debug_string (struct target_waitstatus *ourstatus) &saved_context, __COPY_CONTEXT_SIZE, &n) && n == __COPY_CONTEXT_SIZE) @@ -108,15 +107,15 @@ index 3add8e63f9..0e366c3162 100644 } } #endif -@@ -1563,7 +1572,6 @@ get_windows_debug_event (struct target_ops *ops, +@@ -1563,7 +1571,6 @@ windows_nat_target::get_windows_debug_event (int pid, + event_code = current_event.dwDebugEventCode; ourstatus->kind = TARGET_WAITKIND_SPURIOUS; - th = NULL; - have_saved_context = 0; switch (event_code) { -@@ -1736,7 +1744,7 @@ get_windows_debug_event (struct target_ops *ops, +@@ -1765,7 +1772,7 @@ windows_nat_target::get_windows_debug_event (int pid, } out: @@ -125,15 +124,6 @@ index 3add8e63f9..0e366c3162 100644 } /* Wait for interesting events to occur in the target process. */ -@@ -3041,7 +3049,7 @@ windows_nat_target::get_tib_address (ptid_t ptid, CORE_ADDR *addr) - { - windows_thread_info *th; - -- th = thread_rec (ptid.tid (), 0); -+ th = thread_rec (ptid.tid (), FALSE); - if (th == NULL) - return false; - -- -2.21.0 +2.31.1.windows.1 diff --git a/gdb/0003-Better-handling-for-realpath-failures-in-windows_mak.patch b/gdb/0003-Better-handling-for-realpath-failures-in-windows_mak.patch index 613ef4ab..787750d7 100644 --- a/gdb/0003-Better-handling-for-realpath-failures-in-windows_mak.patch +++ b/gdb/0003-Better-handling-for-realpath-failures-in-windows_mak.patch @@ -1,4 +1,4 @@ -From 814d76c4c887b9fd920ee655da79fce7c58b5398 Mon Sep 17 00:00:00 2001 +From 4e5eaa702d02a7c6170f2d534b323996f1afe06c Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Wed, 13 Jan 2016 18:27:48 +0000 Subject: [PATCH 3/5] Better handling for realpath() failures in @@ -14,14 +14,14 @@ Warn rather than stopping with an error in those cases. Original patch from Tim Chick. Memory leak fix by Corinna Vinschen. --- - gdb/windows-nat.c | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) + gdb/windows-nat.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c -index 69b9559605..3bd191aa96 100644 +index a0faa058be7..8329e3d0235 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c -@@ -643,13 +643,22 @@ windows_make_so (const char *name, LPVOID load_addr) +@@ -817,9 +817,15 @@ windows_make_so (const char *name, LPVOID load_addr) else { char *rname = realpath (name, NULL); @@ -39,14 +39,6 @@ index 69b9559605..3bd191aa96 100644 free (rname); } else -- error (_("dll path too long")); -+ { -+ warning (_("dll path for \"%s\" can not be evaluated"), name); -+ strcpy (so->so_name, so->so_original_name); -+ } - } - /* Record cygwin1.dll .text start/end. */ - p = strchr (so->so_name, '\0') - (sizeof ("/cygwin1.dll") - 1); -- -2.14.2 +2.31.1.windows.1 diff --git a/gdb/0004-7.8-symtab-cygwin.patch b/gdb/0004-7.8-symtab-cygwin.patch index e762a95a..788d9ff2 100644 --- a/gdb/0004-7.8-symtab-cygwin.patch +++ b/gdb/0004-7.8-symtab-cygwin.patch @@ -1,7 +1,7 @@ -From e9c7d4386fb7ce9bff02c249a2473e1d639080b9 Mon Sep 17 00:00:00 2001 +From 0114ce5b4d8383abc6bbfa034c92ee9a29cb7e2c Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sun, 24 Jul 2016 18:18:10 +0100 -Subject: [PATCH 4/5] 7.8-symtab-cygwin.patch +Subject: [PATCH 4/5] 7.8-symtab-cygwin See https://sourceware.org/ml/gdb-patches/2002-03/msg00557.html --- @@ -9,10 +9,10 @@ See https://sourceware.org/ml/gdb-patches/2002-03/msg00557.html 1 file changed, 37 insertions(+) diff --git a/gdb/symtab.c b/gdb/symtab.c -index a897a6a29a7..689c1803bbb 100644 +index b519499f262..a051f4a7ea4 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c -@@ -810,6 +810,10 @@ create_demangled_names_hash (struct objfile_per_bfd_storage *per_bfd) +@@ -791,6 +791,10 @@ create_demangled_names_hash (struct objfile_per_bfd_storage *per_bfd) free_demangled_name_entry, xcalloc, xfree)); } @@ -23,7 +23,7 @@ index a897a6a29a7..689c1803bbb 100644 /* See symtab.h */ char * -@@ -819,6 +823,39 @@ symbol_find_demangled_name (struct general_symbol_info *gsymbol, +@@ -800,6 +804,39 @@ symbol_find_demangled_name (struct general_symbol_info *gsymbol, char *demangled = NULL; int i; @@ -60,9 +60,9 @@ index a897a6a29a7..689c1803bbb 100644 + } + } + - if (gsymbol->language == language_unknown) - gsymbol->language = language_auto; + if (gsymbol->language () == language_unknown) + gsymbol->m_language = language_auto; -- -2.21.0 +2.31.1.windows.1 diff --git a/gdb/0005-Enable-CLI-styling-by-default-on-Cygwin.patch b/gdb/0005-Enable-CLI-styling-by-default-on-Cygwin.patch deleted file mode 100644 index 591d0388..00000000 --- a/gdb/0005-Enable-CLI-styling-by-default-on-Cygwin.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f9bbaaab6e48d670d2c854479f96b12d6d19d1e7 Mon Sep 17 00:00:00 2001 -From: Jon Turney -Date: Sun, 29 Dec 2019 22:26:41 +0000 -Subject: [PATCH 5/5] Enable CLI styling by default on Cygwin - ---- - gdb/cli/cli-style.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdb/cli/cli-style.c b/gdb/cli/cli-style.c -index 7e20c1b4826..f3d98ae4091 100644 ---- a/gdb/cli/cli-style.c -+++ b/gdb/cli/cli-style.c -@@ -25,7 +25,7 @@ - - /* True if styling is enabled. */ - --#if defined (__MSDOS__) || defined (__CYGWIN__) -+#if defined (__MSDOS__) - bool cli_styling = false; - #else - bool cli_styling = true; --- -2.21.0 - diff --git a/gdb/gdb-9.1-msysize.patch b/gdb/0005-msysize.patch similarity index 69% rename from gdb/gdb-9.1-msysize.patch rename to gdb/0005-msysize.patch index a284c365..34af38c0 100644 --- a/gdb/gdb-9.1-msysize.patch +++ b/gdb/0005-msysize.patch @@ -1,7 +1,69 @@ -diff -Naur gdb-9.1-orig/ar-lib gdb-9.1/ar-lib ---- gdb-9.1-orig/ar-lib 2018-06-27 00:37:28.000000000 +0300 -+++ gdb-9.1/ar-lib 2020-04-19 11:44:58.912221900 +0300 -@@ -53,7 +53,7 @@ +From 88e6bc22865b9400146cc867be69485ac71f9875 Mon Sep 17 00:00:00 2001 +From: Orgad Shaneh +Date: Mon, 3 May 2021 11:56:43 +0300 +Subject: [PATCH 5/5] msysize + +--- + ar-lib | 4 +- + bfd/acinclude.m4 | 2 +- + bfd/config.bfd | 4 +- + bfd/configure | 36 +++++++++------ + bfd/configure.ac | 4 ++ + compile | 4 +- + config.guess | 3 ++ + config.rpath | 8 ++-- + config/dfp.m4 | 3 +- + config/elf.m4 | 2 +- + config/lthostflags.m4 | 2 +- + config/mmap.m4 | 4 +- + config/picflag.m4 | 2 + + config/tcl.m4 | 4 +- + configure | 22 ++++----- + configure.ac | 20 ++++----- + gdb/configure | 10 ++--- + gdb/configure.ac | 6 +-- + gdb/configure.host | 2 + + gdb/configure.nat | 7 ++- + gdb/configure.tgt | 7 ++- + gdb/testsuite/gdb.base/bigcore.exp | 3 +- + gdb/testsuite/gdb.base/fileio.exp | 2 +- + gdb/testsuite/gdb.base/maint.exp | 3 +- + gdb/testsuite/gdb.base/shreloc.exp | 4 +- + gdb/testsuite/gdb.base/solib-weak.exp | 3 +- + gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp | 3 +- + gdb/testsuite/gdb.server/wrapper.exp | 3 +- + gdb/testsuite/lib/gdb.exp | 22 ++++++--- + gdb/windows-nat.c | 6 +++ + gdbserver/configure.srv | 4 +- + gnulib/configure | 8 ++-- + gnulib/import/m4/double-slash-root.m4 | 2 +- + gnulib/import/m4/dup2.m4 | 2 +- + gnulib/import/m4/fcntl.m4 | 2 +- + libctf/configure | 34 +++++++++----- + libctf/configure.ac | 6 +++ + libdecnumber/configure | 3 +- + libiberty/configure | 4 +- + libiberty/configure.ac | 2 +- + libtool.m4 | 36 ++++++++------- + ltmain.sh | 52 +++++++++++----------- + ltoptions.m4 | 2 +- + opcodes/configure | 34 +++++++++----- + opcodes/configure.ac | 4 ++ + readline/readline/configure | 2 +- + readline/readline/configure.ac | 2 +- + readline/readline/support/config.guess | 3 ++ + readline/readline/support/config.rpath | 10 ++--- + readline/readline/support/shlib-install | 4 +- + readline/readline/support/shobj-conf | 18 ++++++++ + sim/aarch64/configure | 27 ++++++----- + sim/arm/configure | 28 +++++++----- + 53 files changed, 309 insertions(+), 185 deletions(-) + +diff --git a/ar-lib b/ar-lib +index 05094d34c69..1b16134da54 100755 +--- a/ar-lib ++++ b/ar-lib +@@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; @@ -10,7 +72,7 @@ diff -Naur gdb-9.1-orig/ar-lib gdb-9.1/ar-lib file_conv=cygwin ;; *) -@@ -65,7 +65,7 @@ +@@ -65,7 +65,7 @@ func_file_conv () mingw) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; @@ -19,10 +81,11 @@ diff -Naur gdb-9.1-orig/ar-lib gdb-9.1/ar-lib file=`cygpath -m "$file" || echo "$file"` ;; wine) -diff -Naur gdb-9.1-orig/bfd/acinclude.m4 gdb-9.1/bfd/acinclude.m4 ---- gdb-9.1-orig/bfd/acinclude.m4 2020-02-08 15:50:13.000000000 +0300 -+++ gdb-9.1/bfd/acinclude.m4 2020-04-19 11:28:05.708492000 +0300 -@@ -21,7 +21,7 @@ +diff --git a/bfd/acinclude.m4 b/bfd/acinclude.m4 +index b014ef3a8c0..207a6a90ada 100644 +--- a/bfd/acinclude.m4 ++++ b/bfd/acinclude.m4 +@@ -21,7 +21,7 @@ AC_DEFUN([BFD_BINARY_FOPEN], [AC_REQUIRE([AC_CANONICAL_TARGET]) case "${host}" in changequote(,)dnl @@ -31,31 +94,33 @@ diff -Naur gdb-9.1-orig/bfd/acinclude.m4 gdb-9.1/bfd/acinclude.m4 changequote([,])dnl AC_DEFINE(USE_BINARY_FOPEN, 1, [Use b modifier when opening binary files?]) ;; esac])dnl -diff -Naur gdb-9.1-orig/bfd/config.bfd gdb-9.1/bfd/config.bfd ---- gdb-9.1-orig/bfd/config.bfd 2020-02-08 15:50:13.000000000 +0300 -+++ gdb-9.1/bfd/config.bfd 2020-04-19 11:28:06.244197200 +0300 -@@ -699,7 +699,7 @@ - targ_archs="$targ_archs bfd_arm_arch" +diff --git a/bfd/config.bfd b/bfd/config.bfd +index 6c2919e47eb..7f9d92474a2 100644 +--- a/bfd/config.bfd ++++ b/bfd/config.bfd +@@ -684,7 +684,7 @@ case "${targ}" in + targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec" want64=true ;; - x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin) + x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin | x86_64-*-msys) targ_defvec=x86_64_pe_vec - targ_selvecs="x86_64_pe_vec x86_64_pei_vec x86_64_pe_be_vec x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec i386_pe_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec" + targ_selvecs="x86_64_pe_vec x86_64_pei_vec x86_64_pe_big_vec x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec i386_pe_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec" want64=true -@@ -749,7 +749,7 @@ +@@ -734,7 +734,7 @@ case "${targ}" in targ_defvec=i386_elf32_vec targ_selvecs="iamcu_elf32_vec i386_coff_vec" ;; - i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe) + i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-msys* | i[3-7]86-*-winnt | i[3-7]86-*-pe) targ_defvec=i386_pe_vec - targ_selvecs="i386_pe_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec" + targ_selvecs="i386_pe_vec i386_pe_big_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec" targ_underscore=yes -diff -Naur gdb-9.1-orig/bfd/configure gdb-9.1/bfd/configure ---- gdb-9.1-orig/bfd/configure 2020-02-08 15:50:13.000000000 +0300 -+++ gdb-9.1/bfd/configure 2020-04-19 11:28:06.607211600 +0300 -@@ -6297,7 +6297,7 @@ +diff --git a/bfd/configure b/bfd/configure +index a9c4fd93669..78bbe74aba1 100755 +--- a/bfd/configure ++++ b/bfd/configure +@@ -6298,7 +6298,7 @@ else lt_cv_sys_max_cmd_len=-1; ;; @@ -64,7 +129,7 @@ diff -Naur gdb-9.1-orig/bfd/configure gdb-9.1/bfd/configure # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -6639,7 +6639,7 @@ +@@ -6640,7 +6640,7 @@ bsdi[45]*) lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -73,7 +138,7 @@ diff -Naur gdb-9.1-orig/bfd/configure gdb-9.1/bfd/configure # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' -@@ -7219,7 +7219,7 @@ +@@ -7220,7 +7220,7 @@ case $host_os in aix*) symcode='[BCDT]' ;; @@ -82,7 +147,7 @@ diff -Naur gdb-9.1-orig/bfd/configure gdb-9.1/bfd/configure symcode='[ABCDGISTW]' ;; hpux*) -@@ -8803,7 +8803,7 @@ +@@ -8804,7 +8804,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # PIC is the default for these OSes. ;; @@ -91,7 +156,7 @@ diff -Naur gdb-9.1-orig/bfd/configure gdb-9.1/bfd/configure # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -8885,7 +8885,7 @@ +@@ -8886,7 +8886,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } fi ;; @@ -100,7 +165,7 @@ diff -Naur gdb-9.1-orig/bfd/configure gdb-9.1/bfd/configure # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' -@@ -9347,7 +9347,7 @@ +@@ -9348,7 +9348,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie extract_expsyms_cmds= case $host_os in @@ -109,7 +174,7 @@ diff -Naur gdb-9.1-orig/bfd/configure gdb-9.1/bfd/configure # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. -@@ -9462,7 +9462,7 @@ +@@ -9463,7 +9463,7 @@ _LT_EOF fi ;; @@ -118,7 +183,7 @@ diff -Naur gdb-9.1-orig/bfd/configure gdb-9.1/bfd/configure # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' -@@ -9893,7 +9893,7 @@ +@@ -9894,7 +9894,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec=-rdynamic ;; @@ -127,7 +192,7 @@ diff -Naur gdb-9.1-orig/bfd/configure gdb-9.1/bfd/configure # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -10794,14 +10794,14 @@ +@@ -10795,14 +10795,14 @@ bsdi[45]*) # libtool to hard-code these into programs ;; @@ -144,20 +209,20 @@ diff -Naur gdb-9.1-orig/bfd/configure gdb-9.1/bfd/configure library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10825,6 +10825,12 @@ +@@ -10824,6 +10824,12 @@ cygwin* | mingw* | pw32* | cegcc*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" - ;; ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ++ ;; + msys*) + # Msys DLLs use 'msys-' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" -+ ;; + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -11461,7 +11467,7 @@ +@@ -11462,7 +11468,7 @@ else lt_cv_dlopen_libs= ;; @@ -166,7 +231,7 @@ diff -Naur gdb-9.1-orig/bfd/configure gdb-9.1/bfd/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs= ;; -@@ -14201,7 +14207,7 @@ +@@ -14256,7 +14262,7 @@ _ACEOF case "${host}" in @@ -175,7 +240,7 @@ diff -Naur gdb-9.1-orig/bfd/configure gdb-9.1/bfd/configure $as_echo "#define USE_BINARY_FOPEN 1" >>confdefs.h ;; -@@ -14413,7 +14419,7 @@ +@@ -14468,7 +14474,7 @@ $as_echo "$bfd_cv_ld_as_needed" >&6; } LIBM= case $host in @@ -184,7 +249,7 @@ diff -Naur gdb-9.1-orig/bfd/configure gdb-9.1/bfd/configure # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) -@@ -14568,6 +14574,10 @@ +@@ -14623,6 +14629,10 @@ if test "$enable_shared" = "yes"; then *-*-darwin*) SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl" ;; @@ -195,10 +260,11 @@ diff -Naur gdb-9.1-orig/bfd/configure gdb-9.1/bfd/configure esac if test -n "$SHARED_LIBADD"; then -diff -Naur gdb-9.1-orig/bfd/configure.ac gdb-9.1/bfd/configure.ac ---- gdb-9.1-orig/bfd/configure.ac 2020-02-08 15:50:13.000000000 +0300 -+++ gdb-9.1/bfd/configure.ac 2020-04-19 11:28:06.996701600 +0300 -@@ -304,6 +304,10 @@ +diff --git a/bfd/configure.ac b/bfd/configure.ac +index f62659acd7f..1f28de4e15b 100644 +--- a/bfd/configure.ac ++++ b/bfd/configure.ac +@@ -329,6 +329,10 @@ changequote([,])dnl *-*-darwin*) SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl" ;; @@ -209,10 +275,11 @@ diff -Naur gdb-9.1-orig/bfd/configure.ac gdb-9.1/bfd/configure.ac esac if test -n "$SHARED_LIBADD"; then -diff -Naur gdb-9.1-orig/compile gdb-9.1/compile ---- gdb-9.1-orig/compile 2014-11-20 18:25:31.000000000 +0300 -+++ gdb-9.1/compile 2020-04-19 11:28:06.055710700 +0300 -@@ -53,7 +53,7 @@ +diff --git a/compile b/compile +index a85b723c7e6..a4ecdb2519c 100755 +--- a/compile ++++ b/compile +@@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; @@ -221,7 +288,7 @@ diff -Naur gdb-9.1-orig/compile gdb-9.1/compile file_conv=cygwin ;; *) -@@ -67,7 +67,7 @@ +@@ -67,7 +67,7 @@ func_file_conv () mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; @@ -230,101 +297,11 @@ diff -Naur gdb-9.1-orig/compile gdb-9.1/compile file=`cygpath -m "$file" || echo "$file"` ;; wine/*) -diff -Naur gdb-9.1-orig/config/dfp.m4 gdb-9.1/config/dfp.m4 ---- gdb-9.1-orig/config/dfp.m4 2018-11-07 22:00:24.000000000 +0300 -+++ gdb-9.1/config/dfp.m4 2020-04-19 11:47:19.136623800 +0300 -@@ -23,7 +23,8 @@ - powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \ - i?86*-*-elfiamcu | i?86*-*-gnu* | x86_64*-*-gnu* | \ - i?86*-*-mingw* | x86_64*-*-mingw* | \ -- i?86*-*-cygwin* | x86_64*-*-cygwin*) -+ i?86*-*-cygwin* | x86_64*-*-cygwin* | \ -+ i?86*-*-msys* | x86_64*-*-msys*) - enable_decimal_float=yes - ;; - *) -diff -Naur gdb-9.1-orig/config/elf.m4 gdb-9.1/config/elf.m4 ---- gdb-9.1-orig/config/elf.m4 2015-03-17 17:12:52.000000000 +0300 -+++ gdb-9.1/config/elf.m4 2020-04-19 11:28:07.548184100 +0300 -@@ -15,7 +15,7 @@ - - target_elf=no - case $target in -- *-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \ -+ *-darwin* | *-aix* | *-cygwin* |*-msys* | *-mingw* | *-aout* | *-*coff* | \ - *-msdosdjgpp* | *-vms* | *-wince* | *-*-pe* | \ - alpha*-dec-osf* | *-interix* | hppa[[12]]*-*-hpux* | \ - nvptx-*-none) -diff -Naur gdb-9.1-orig/config/lthostflags.m4 gdb-9.1/config/lthostflags.m4 ---- gdb-9.1-orig/config/lthostflags.m4 2013-12-22 14:09:55.000000000 +0400 -+++ gdb-9.1/config/lthostflags.m4 2020-04-19 11:28:07.900226000 +0300 -@@ -13,7 +13,7 @@ - AC_REQUIRE([AC_CANONICAL_SYSTEM]) - - case $host in -- *-cygwin* | *-mingw*) -+ *-cygwin* | *-msys* | *-mingw*) - # 'host' will be top-level target in the case of a target lib, - # we must compare to with_cross_host to decide if this is a native - # or cross-compiler and select where to install dlls appropriately. -diff -Naur gdb-9.1-orig/config/mmap.m4 gdb-9.1/config/mmap.m4 ---- gdb-9.1-orig/config/mmap.m4 2013-12-22 14:09:55.000000000 +0400 -+++ gdb-9.1/config/mmap.m4 2020-04-19 11:28:08.082702300 +0300 -@@ -42,7 +42,7 @@ - # Systems known to be in this category are Windows (all variants), - # VMS, and Darwin. - case "$host_os" in -- *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00) -+ *vms* | cygwin* | msys* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00) - gcc_cv_func_mmap_dev_zero=no ;; - *) - gcc_cv_func_mmap_dev_zero=yes;; -@@ -74,7 +74,7 @@ - # above for use of /dev/zero. - # Systems known to be in this category are Windows, VMS, and SCO Unix. - case "$host_os" in -- *vms* | cygwin* | pe | mingw* | sco* | udk* ) -+ *vms* | cygwin* | msys* | pe | mingw* | sco* | udk* ) - gcc_cv_func_mmap_anon=no ;; - *) - gcc_cv_func_mmap_anon=yes;; -diff -Naur gdb-9.1-orig/config/picflag.m4 gdb-9.1/config/picflag.m4 ---- gdb-9.1-orig/config/picflag.m4 2018-04-13 18:13:11.000000000 +0300 -+++ gdb-9.1/config/picflag.m4 2020-04-19 11:28:08.277173300 +0300 -@@ -25,6 +25,8 @@ - ;; - i[[34567]]86-*-cygwin* | x86_64-*-cygwin*) - ;; -+ i[[34567]]86-*-msys* | x86_64-*-msys*) -+ ;; - i[[34567]]86-*-mingw* | x86_64-*-mingw*) - ;; - i[[34567]]86-*-interix[[3-9]]*) -diff -Naur gdb-9.1-orig/config/tcl.m4 gdb-9.1/config/tcl.m4 ---- gdb-9.1-orig/config/tcl.m4 2018-03-02 20:07:33.000000000 +0300 -+++ gdb-9.1/config/tcl.m4 2020-04-19 11:28:08.652170400 +0300 -@@ -33,7 +33,7 @@ - - # First check to see if --with-tcl was specified. - case "${host}" in -- *-*-cygwin*) platDir="win" ;; -+ *-*-cygwin* | *-*-msys*) platDir="win" ;; - *) platDir="unix" ;; - esac - if test x"${with_tclconfig}" != x ; then -@@ -165,7 +165,7 @@ - - # then check for a private Tk library - case "${host}" in -- *-*-cygwin*) platDir="win" ;; -+ *-*-cygwin* | *-*-msys*) platDir="win" ;; - *) platDir="unix" ;; - esac - if test x"${ac_cv_c_tkconfig}" = x ; then -diff -Naur gdb-9.1-orig/config.guess gdb-9.1/config.guess ---- gdb-9.1-orig/config.guess 2020-02-08 15:50:13.000000000 +0300 -+++ gdb-9.1/config.guess 2020-04-19 11:48:20.891646400 +0300 -@@ -896,6 +896,9 @@ +diff --git a/config.guess b/config.guess +index 45001cfecde..37552a903c3 100755 +--- a/config.guess ++++ b/config.guess +@@ -904,6 +904,9 @@ EOF amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-pc-cygwin exit ;; @@ -334,10 +311,11 @@ diff -Naur gdb-9.1-orig/config.guess gdb-9.1/config.guess prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; -diff -Naur gdb-9.1-orig/config.rpath gdb-9.1/config.rpath ---- gdb-9.1-orig/config.rpath 2013-12-22 14:09:55.000000000 +0400 -+++ gdb-9.1/config.rpath 2020-04-19 11:28:09.189708000 +0300 -@@ -109,7 +109,7 @@ +diff --git a/config.rpath b/config.rpath +index 4dea75957c2..4f12c27e029 100755 +--- a/config.rpath ++++ b/config.rpath +@@ -109,7 +109,7 @@ hardcode_direct=no hardcode_minus_L=no case "$host_os" in @@ -346,7 +324,7 @@ diff -Naur gdb-9.1-orig/config.rpath gdb-9.1/config.rpath # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. -@@ -149,7 +149,7 @@ +@@ -149,7 +149,7 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; @@ -355,7 +333,7 @@ diff -Naur gdb-9.1-orig/config.rpath gdb-9.1/config.rpath # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' -@@ -268,7 +268,7 @@ +@@ -268,7 +268,7 @@ else ;; bsdi4*) ;; @@ -364,7 +342,7 @@ diff -Naur gdb-9.1-orig/config.rpath gdb-9.1/config.rpath # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -437,7 +437,7 @@ +@@ -437,7 +437,7 @@ case "$host_os" in ;; bsdi4*) ;; @@ -373,232 +351,86 @@ diff -Naur gdb-9.1-orig/config.rpath gdb-9.1/config.rpath shrext=.dll ;; darwin* | rhapsody*) -diff -Naur gdb-9.1-orig/configure gdb-9.1/configure ---- gdb-9.1-orig/configure 2020-02-08 15:50:13.000000000 +0300 -+++ gdb-9.1/configure 2020-04-19 11:28:09.390163900 +0300 -@@ -3099,7 +3099,7 @@ - # Configure extra directories which are host specific - - case "${host}" in -- *-cygwin*) -+ *-cygwin* | *-msys*) - configdirs="$configdirs libtermcap" ;; - esac - -@@ -3500,7 +3500,7 @@ - # Disable the go frontend on systems where it is known to not work. Please keep - # this in sync with contrib/config-list.mk. - case "${target}" in --*-*-darwin* | *-*-cygwin* | *-*-mingw*) -+*-*-darwin* | *-*-cygwin* | *-*-msys* | *-*-mingw*) - unsupported_languages="$unsupported_languages go" - ;; - esac -@@ -3513,7 +3513,7 @@ - # PR 46986 - noconfigdirs="$noconfigdirs target-libgo" - ;; -- *-*-cygwin* | *-*-mingw*) -+ *-*-cygwin* | *-*-mingw* | *-*-msys*) - noconfigdirs="$noconfigdirs target-libgo" - ;; - esac -@@ -3781,7 +3781,7 @@ - i[3456789]86-*-mingw*) - target_configdirs="$target_configdirs target-winsup" - ;; -- *-*-cygwin*) -+ *-*-cygwin* | *-*-msys*) - target_configdirs="$target_configdirs target-libtermcap target-winsup" - noconfigdirs="$noconfigdirs target-libgloss" - # always build newlib if winsup directory is present. -@@ -3926,7 +3926,7 @@ - i[3456789]86-*-msdosdjgpp*) - host_makefile_frag="config/mh-djgpp" - ;; -- *-cygwin*) -+ *-cygwin* | *-msys*) - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if cat works as expected" >&5 - $as_echo_n "checking to see if cat works as expected... " >&6; } -@@ -6086,7 +6086,7 @@ +diff --git a/config/dfp.m4 b/config/dfp.m4 +index a137ddebf8c..249eed50285 100644 +--- a/config/dfp.m4 ++++ b/config/dfp.m4 +@@ -23,7 +23,8 @@ Valid choices are 'yes', 'bid', 'dpd', and 'no'.]) ;; + powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \ + i?86*-*-elfiamcu | i?86*-*-gnu* | x86_64*-*-gnu* | \ + i?86*-*-mingw* | x86_64*-*-mingw* | \ +- i?86*-*-cygwin* | x86_64*-*-cygwin*) ++ i?86*-*-cygwin* | x86_64*-*-cygwin* | \ ++ i?86*-*-msys* | x86_64*-*-msys*) + enable_decimal_float=yes + ;; + *) +diff --git a/config/elf.m4 b/config/elf.m4 +index 1772a44318e..7d4f5054562 100644 +--- a/config/elf.m4 ++++ b/config/elf.m4 +@@ -15,7 +15,7 @@ AC_REQUIRE([AC_CANONICAL_TARGET]) target_elf=no case $target in - *-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \ -+ *-darwin* | *-aix* | *-cygwin* | *-msys* | *-mingw* | *-aout* | *-*coff* | \ ++ *-darwin* | *-aix* | *-cygwin* |*-msys* | *-mingw* | *-aout* | *-*coff* | \ *-msdosdjgpp* | *-vms* | *-wince* | *-*-pe* | \ - alpha*-dec-osf* | *-interix* | hppa[12]*-*-hpux* | \ + alpha*-dec-osf* | *-interix* | hppa[[12]]*-*-hpux* | \ nvptx-*-none) -@@ -6104,7 +6104,7 @@ - else - if test x"$default_enable_lto" = x"yes" ; then - case $target in -- *-apple-darwin[912]* | *-cygwin* | *-mingw* | *djgpp*) ;; -+ *-apple-darwin[912]* | *-cygwin* | *-msys* | *-mingw* | *djgpp*) ;; - # On other non-ELF platforms, LTO has yet to be validated. - *) enable_lto=no ;; - esac -@@ -6115,7 +6115,7 @@ - # warn during gcc/ subconfigure; unless you're bootstrapping with - # -flto it won't be needed until after installation anyway. - case $target in -- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;; -+ *-cygwin* | *-msys* | *-mingw* | *-apple-darwin* | *djgpp*) ;; - *) if test x"$enable_lto" = x"yes"; then - as_fn_error $? "LTO support is not enabled for this target." "$LINENO" 5 - fi -@@ -6125,7 +6125,7 @@ - # Among non-ELF, only Windows platforms support the lto-plugin so far. - # Build it unless LTO was explicitly disabled. - case $target in -- *-cygwin* | *-mingw*) build_lto_plugin=$enable_lto ;; -+ *-cygwin* | *-msys* | *-mingw*) build_lto_plugin=$enable_lto ;; - *) ;; - esac +diff --git a/config/lthostflags.m4 b/config/lthostflags.m4 +index bc0f59ee79e..ad977d43dc5 100644 +--- a/config/lthostflags.m4 ++++ b/config/lthostflags.m4 +@@ -13,7 +13,7 @@ AC_DEFUN([ACX_LT_HOST_FLAGS], [ + AC_REQUIRE([AC_CANONICAL_SYSTEM]) -@@ -7089,7 +7089,7 @@ - case "${host}" in - *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; - *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; -- *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;; -+ *-*-mingw* | *-*-cygwin | *-*-msys ) RPATH_ENVVAR=PATH ;; - *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; - esac - -@@ -7610,7 +7610,7 @@ - case " $target_configargs " in - *" --with-newlib "*) - case "$target" in -- *-cygwin*) -+ *-cygwin* | *-msys*) - FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -isystem $$s/winsup/cygwin/include' - ;; - esac -diff -Naur gdb-9.1-orig/configure.ac gdb-9.1/configure.ac ---- gdb-9.1-orig/configure.ac 2020-02-08 15:54:22.000000000 +0300 -+++ gdb-9.1/configure.ac 2020-04-19 11:28:09.751211900 +0300 -@@ -424,7 +424,7 @@ - # Configure extra directories which are host specific - - case "${host}" in -- *-cygwin*) -+ *-cygwin* | *-msys*) - configdirs="$configdirs libtermcap" ;; - esac - -@@ -793,7 +793,7 @@ - # Disable the go frontend on systems where it is known to not work. Please keep - # this in sync with contrib/config-list.mk. - case "${target}" in --*-*-darwin* | *-*-cygwin* | *-*-mingw*) -+*-*-darwin* | *-*-cygwin* | *-*-msys* | *-*-mingw*) - unsupported_languages="$unsupported_languages go" - ;; - esac -@@ -806,7 +806,7 @@ - # PR 46986 - noconfigdirs="$noconfigdirs target-libgo" + case $host in +- *-cygwin* | *-mingw*) ++ *-cygwin* | *-msys* | *-mingw*) + # 'host' will be top-level target in the case of a target lib, + # we must compare to with_cross_host to decide if this is a native + # or cross-compiler and select where to install dlls appropriately. +diff --git a/config/mmap.m4 b/config/mmap.m4 +index fba0d9d3657..df2c778524c 100644 +--- a/config/mmap.m4 ++++ b/config/mmap.m4 +@@ -42,7 +42,7 @@ else + # Systems known to be in this category are Windows (all variants), + # VMS, and Darwin. + case "$host_os" in +- *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00) ++ *vms* | cygwin* | msys* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00) + gcc_cv_func_mmap_dev_zero=no ;; + *) + gcc_cv_func_mmap_dev_zero=yes;; +@@ -74,7 +74,7 @@ else + # above for use of /dev/zero. + # Systems known to be in this category are Windows, VMS, and SCO Unix. + case "$host_os" in +- *vms* | cygwin* | pe | mingw* | sco* | udk* ) ++ *vms* | cygwin* | msys* | pe | mingw* | sco* | udk* ) + gcc_cv_func_mmap_anon=no ;; + *) + gcc_cv_func_mmap_anon=yes;; +diff --git a/config/picflag.m4 b/config/picflag.m4 +index 8b106f9af88..48846c30d7c 100644 +--- a/config/picflag.m4 ++++ b/config/picflag.m4 +@@ -25,6 +25,8 @@ case "${$2}" in ;; -- *-*-cygwin* | *-*-mingw*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw*) - noconfigdirs="$noconfigdirs target-libgo" + i[[34567]]86-*-cygwin* | x86_64-*-cygwin*) ;; - esac -@@ -1074,7 +1074,7 @@ - i[[3456789]]86-*-mingw*) - target_configdirs="$target_configdirs target-winsup" - ;; -- *-*-cygwin*) -+ *-*-cygwin* | *-*-msys*) - target_configdirs="$target_configdirs target-libtermcap target-winsup" - noconfigdirs="$noconfigdirs target-libgloss" - # always build newlib if winsup directory is present. -@@ -1219,7 +1219,7 @@ - i[[3456789]]86-*-msdosdjgpp*) - host_makefile_frag="config/mh-djgpp" - ;; -- *-cygwin*) -+ *-cygwin* | *-msys*) - ACX_CHECK_CYGWIN_CAT_WORKS - host_makefile_frag="config/mh-cygwin" - ;; -@@ -1723,7 +1723,7 @@ - build_lto_plugin=yes - ],[if test x"$default_enable_lto" = x"yes" ; then - case $target in -- *-apple-darwin[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;; -+ *-apple-darwin[[912]]* | *-cygwin* | *-msys* | *-mingw* | *djgpp*) ;; - # On other non-ELF platforms, LTO has yet to be validated. - *) enable_lto=no ;; - esac -@@ -1734,7 +1734,7 @@ - # warn during gcc/ subconfigure; unless you're bootstrapping with - # -flto it won't be needed until after installation anyway. - case $target in -- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;; -+ *-cygwin* | *-msys* | *-mingw* | *-apple-darwin* | *djgpp*) ;; - *) if test x"$enable_lto" = x"yes"; then - AC_MSG_ERROR([LTO support is not enabled for this target.]) - fi -@@ -1744,7 +1744,7 @@ - # Among non-ELF, only Windows platforms support the lto-plugin so far. - # Build it unless LTO was explicitly disabled. - case $target in -- *-cygwin* | *-mingw*) build_lto_plugin=$enable_lto ;; -+ *-cygwin* | *-msys* | *-mingw*) build_lto_plugin=$enable_lto ;; - *) ;; - esac - ]) -@@ -2617,7 +2617,7 @@ - case "${host}" in - *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; - *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; -- *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;; -+ *-*-mingw* | *-*-cygwin | *-*-msys ) RPATH_ENVVAR=PATH ;; - *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; - esac - -@@ -3133,7 +3133,7 @@ - case " $target_configargs " in - *" --with-newlib "*) - case "$target" in -- *-cygwin*) -+ *-cygwin* | *-msys*) - FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -isystem $$s/winsup/cygwin/include' - ;; - esac -diff -Naur gdb-9.1-orig/gdb/configure gdb-9.1/gdb/configure ---- gdb-9.1-orig/gdb/configure 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gdb/configure 2020-04-19 11:42:21.974547600 +0300 -@@ -8954,7 +8954,7 @@ - # have a separate termcap library, or no curses library at all. - - case $host_os in -- cygwin*) -+ cygwin* | msys*) - if test -d "$srcdir/libtermcap"; then - LIBS="../libtermcap/libtermcap.a $LIBS" - ac_cv_search_tgetent="../libtermcap/libtermcap.a" -@@ -16349,7 +16349,7 @@ - if test x"$gdb_cv_os_cygwin" = xyes; then - WIN32LIBS="-luser32" - case "${target}" in -- *cygwin*) WIN32LIBS="$WIN32LIBS -limagehlp" -+ *cygwin* | *msys*) WIN32LIBS="$WIN32LIBS -limagehlp" ++ i[[34567]]86-*-msys* | x86_64-*-msys*) ++ ;; + i[[34567]]86-*-mingw* | x86_64-*-mingw*) ;; - esac - fi -@@ -17026,7 +17026,7 @@ - - - case "${host}" in --*-*-cygwin* | *-*-mingw* ) -+*-*-cygwin* | *-*-msys* | *-*-mingw* ) - configdir="win" - ;; - *) -@@ -17069,7 +17069,7 @@ + i[[34567]]86-*-interix[[3-9]]*) +diff --git a/config/tcl.m4 b/config/tcl.m4 +index 4542a4b23d7..209bd8d9b8e 100644 +--- a/config/tcl.m4 ++++ b/config/tcl.m4 +@@ -33,7 +33,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ # First check to see if --with-tcl was specified. case "${host}" in @@ -607,7 +439,7 @@ diff -Naur gdb-9.1-orig/gdb/configure gdb-9.1/gdb/configure *) platDir="unix" ;; esac if test x"${with_tclconfig}" != x ; then -@@ -17198,7 +17198,7 @@ +@@ -165,7 +165,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ # then check for a private Tk library case "${host}" in @@ -616,10 +448,208 @@ diff -Naur gdb-9.1-orig/gdb/configure gdb-9.1/gdb/configure *) platDir="unix" ;; esac if test x"${ac_cv_c_tkconfig}" = x ; then -diff -Naur gdb-9.1-orig/gdb/configure.ac gdb-9.1/gdb/configure.ac ---- gdb-9.1-orig/gdb/configure.ac 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gdb/configure.ac 2020-04-19 11:41:59.452511300 +0300 -@@ -555,7 +555,7 @@ +diff --git a/configure b/configure +index 68779feb42b..bd208a23f95 100755 +--- a/configure ++++ b/configure +@@ -3082,7 +3082,7 @@ fi + # Configure extra directories which are host specific + + case "${host}" in +- *-cygwin*) ++ *-cygwin* | *-msys*) + configdirs="$configdirs libtermcap" ;; + esac + +@@ -3483,7 +3483,7 @@ esac + # Disable the go frontend on systems where it is known to not work. Please keep + # this in sync with contrib/config-list.mk. + case "${target}" in +-*-*-darwin* | *-*-cygwin* | *-*-mingw*) ++*-*-darwin* | *-*-cygwin* | *-*-msys* | *-*-mingw*) + unsupported_languages="$unsupported_languages go" + ;; + esac +@@ -3515,7 +3515,7 @@ if test x$enable_libgo = x; then + # PR 46986 + noconfigdirs="$noconfigdirs target-libgo" + ;; +- *-*-cygwin* | *-*-mingw*) ++ *-*-cygwin* | *-*-mingw* | *-*-msys*) + noconfigdirs="$noconfigdirs target-libgo" + ;; + esac +@@ -3783,7 +3783,7 @@ case "${target}" in + i[3456789]86-*-mingw*) + target_configdirs="$target_configdirs target-winsup" + ;; +- *-*-cygwin*) ++ *-*-cygwin* | *-*-msys*) + target_configdirs="$target_configdirs target-libtermcap target-winsup" + noconfigdirs="$noconfigdirs target-libgloss" + # always build newlib if winsup directory is present. +@@ -3931,7 +3931,7 @@ case "${host}" in + i[3456789]86-*-msdosdjgpp*) + host_makefile_frag="config/mh-djgpp" + ;; +- *-cygwin*) ++ *-cygwin* | *-msys*) + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if cat works as expected" >&5 + $as_echo_n "checking to see if cat works as expected... " >&6; } +@@ -6091,7 +6091,7 @@ fi + + target_elf=no + case $target in +- *-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \ ++ *-darwin* | *-aix* | *-cygwin* | *-msys* | *-mingw* | *-aout* | *-*coff* | \ + *-msdosdjgpp* | *-vms* | *-wince* | *-*-pe* | \ + alpha*-dec-osf* | *-interix* | hppa[12]*-*-hpux* | \ + nvptx-*-none) +@@ -6109,7 +6109,7 @@ if test $target_elf = yes; then : + else + if test x"$default_enable_lto" = x"yes" ; then + case $target in +- *-apple-darwin[912]* | *-cygwin* | *-mingw* | *djgpp*) ;; ++ *-apple-darwin[912]* | *-cygwin* | *-msys* | *-mingw* | *djgpp*) ;; + # On other non-ELF platforms, LTO has yet to be validated. + *) enable_lto=no ;; + esac +@@ -6120,7 +6120,7 @@ else + # warn during gcc/ subconfigure; unless you're bootstrapping with + # -flto it won't be needed until after installation anyway. + case $target in +- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;; ++ *-cygwin* | *-msys* | *-mingw* | *-apple-darwin* | *djgpp*) ;; + *) if test x"$enable_lto" = x"yes"; then + as_fn_error $? "LTO support is not enabled for this target." "$LINENO" 5 + fi +@@ -6130,7 +6130,7 @@ else + # Among non-ELF, only Windows platforms support the lto-plugin so far. + # Build it unless LTO was explicitly disabled. + case $target in +- *-cygwin* | *-mingw*) build_lto_plugin=$enable_lto ;; ++ *-cygwin* | *-msys* | *-mingw*) build_lto_plugin=$enable_lto ;; + *) ;; + esac + +@@ -7094,7 +7094,7 @@ rm -f conftest* + case "${host}" in + *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; + *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; +- *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;; ++ *-*-mingw* | *-*-cygwin | *-*-msys ) RPATH_ENVVAR=PATH ;; + *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; + esac + +@@ -7619,7 +7619,7 @@ case " $target_configdirs " in + case " $target_configargs " in + *" --with-newlib "*) + case "$target" in +- *-cygwin*) ++ *-cygwin* | *-msys*) + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -isystem $$s/winsup/cygwin/include' + ;; + esac +diff --git a/configure.ac b/configure.ac +index d16a2757689..e94053e0dba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -407,7 +407,7 @@ AC_ARG_ENABLE(compressed_debug_sections, + # Configure extra directories which are host specific + + case "${host}" in +- *-cygwin*) ++ *-cygwin* | *-msys*) + configdirs="$configdirs libtermcap" ;; + esac + +@@ -776,7 +776,7 @@ esac + # Disable the go frontend on systems where it is known to not work. Please keep + # this in sync with contrib/config-list.mk. + case "${target}" in +-*-*-darwin* | *-*-cygwin* | *-*-mingw*) ++*-*-darwin* | *-*-cygwin* | *-*-msys* | *-*-mingw*) + unsupported_languages="$unsupported_languages go" + ;; + esac +@@ -805,7 +805,7 @@ if test x$enable_libgo = x; then + # PR 46986 + noconfigdirs="$noconfigdirs target-libgo" + ;; +- *-*-cygwin* | *-*-mingw*) ++ *-*-cygwin* | *-*-msys* | *-*-mingw*) + noconfigdirs="$noconfigdirs target-libgo" + ;; + esac +@@ -1073,7 +1073,7 @@ case "${target}" in + i[[3456789]]86-*-mingw*) + target_configdirs="$target_configdirs target-winsup" + ;; +- *-*-cygwin*) ++ *-*-cygwin* | *-*-msys*) + target_configdirs="$target_configdirs target-libtermcap target-winsup" + noconfigdirs="$noconfigdirs target-libgloss" + # always build newlib if winsup directory is present. +@@ -1221,7 +1221,7 @@ case "${host}" in + i[[3456789]]86-*-msdosdjgpp*) + host_makefile_frag="config/mh-djgpp" + ;; +- *-cygwin*) ++ *-cygwin* | *-msys*) + ACX_CHECK_CYGWIN_CAT_WORKS + host_makefile_frag="config/mh-cygwin" + ;; +@@ -1725,7 +1725,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. + build_lto_plugin=yes + ],[if test x"$default_enable_lto" = x"yes" ; then + case $target in +- *-apple-darwin[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;; ++ *-apple-darwin[[912]]* | *-cygwin* | *-msys* | *-mingw* | *djgpp*) ;; + # On other non-ELF platforms, LTO has yet to be validated. + *) enable_lto=no ;; + esac +@@ -1736,7 +1736,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. + # warn during gcc/ subconfigure; unless you're bootstrapping with + # -flto it won't be needed until after installation anyway. + case $target in +- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;; ++ *-cygwin* | *-msys* | *-mingw* | *-apple-darwin* | *djgpp*) ;; + *) if test x"$enable_lto" = x"yes"; then + AC_MSG_ERROR([LTO support is not enabled for this target.]) + fi +@@ -1746,7 +1746,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. + # Among non-ELF, only Windows platforms support the lto-plugin so far. + # Build it unless LTO was explicitly disabled. + case $target in +- *-cygwin* | *-mingw*) build_lto_plugin=$enable_lto ;; ++ *-cygwin* | *-msys* | *-mingw*) build_lto_plugin=$enable_lto ;; + *) ;; + esac + ]) +@@ -2619,7 +2619,7 @@ rm -f conftest* + case "${host}" in + *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; + *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; +- *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;; ++ *-*-mingw* | *-*-cygwin | *-*-msys ) RPATH_ENVVAR=PATH ;; + *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; + esac + +@@ -3139,7 +3139,7 @@ case " $target_configdirs " in + case " $target_configargs " in + *" --with-newlib "*) + case "$target" in +- *-cygwin*) ++ *-cygwin* | *-msys*) + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -isystem $$s/winsup/cygwin/include' + ;; + esac +diff --git a/gdb/configure b/gdb/configure +index 03464ae50a2..282ee8f1780 100755 +--- a/gdb/configure ++++ b/gdb/configure +@@ -9236,7 +9236,7 @@ fi # have a separate termcap library, or no curses library at all. case $host_os in @@ -628,7 +658,7 @@ diff -Naur gdb-9.1-orig/gdb/configure.ac gdb-9.1/gdb/configure.ac if test -d "$srcdir/libtermcap"; then LIBS="../libtermcap/libtermcap.a $LIBS" ac_cv_search_tgetent="../libtermcap/libtermcap.a" -@@ -1821,7 +1821,7 @@ +@@ -16788,7 +16788,7 @@ WIN32LIBS= if test x"$gdb_cv_os_cygwin" = xyes; then WIN32LIBS="-luser32" case "${target}" in @@ -637,7 +667,56 @@ diff -Naur gdb-9.1-orig/gdb/configure.ac gdb-9.1/gdb/configure.ac ;; esac fi -@@ -1893,7 +1893,7 @@ +@@ -17473,7 +17473,7 @@ WIN32LDAPP= + + + case "${host}" in +-*-*-cygwin* | *-*-mingw* ) ++*-*-cygwin* | *-*-msys* | *-*-mingw* ) + configdir="win" + ;; + *) +@@ -17516,7 +17516,7 @@ else + + # First check to see if --with-tcl was specified. + case "${host}" in +- *-*-cygwin*) platDir="win" ;; ++ *-*-cygwin* | *-*-msys*) platDir="win" ;; + *) platDir="unix" ;; + esac + if test x"${with_tclconfig}" != x ; then +@@ -17645,7 +17645,7 @@ else + + # then check for a private Tk library + case "${host}" in +- *-*-cygwin*) platDir="win" ;; ++ *-*-cygwin* | *-*-msys*) platDir="win" ;; + *) platDir="unix" ;; + esac + if test x"${ac_cv_c_tkconfig}" = x ; then +diff --git a/gdb/configure.ac b/gdb/configure.ac +index 7678b16290e..98de3853d25 100644 +--- a/gdb/configure.ac ++++ b/gdb/configure.ac +@@ -550,7 +550,7 @@ fi + # have a separate termcap library, or no curses library at all. + + case $host_os in +- cygwin*) ++ cygwin* | msys*) + if test -d "$srcdir/libtermcap"; then + LIBS="../libtermcap/libtermcap.a $LIBS" + ac_cv_search_tgetent="../libtermcap/libtermcap.a" +@@ -1757,7 +1757,7 @@ WIN32LIBS= + if test x"$gdb_cv_os_cygwin" = xyes; then + WIN32LIBS="-luser32" + case "${target}" in +- *cygwin*) WIN32LIBS="$WIN32LIBS -limagehlp" ++ *cygwin* | *msys*) WIN32LIBS="$WIN32LIBS -limagehlp" + ;; + esac + fi +@@ -1820,7 +1820,7 @@ AC_SUBST(WIN32LIBS) AC_SUBST(WIN32LDAPP) case "${host}" in @@ -646,10 +725,11 @@ diff -Naur gdb-9.1-orig/gdb/configure.ac gdb-9.1/gdb/configure.ac configdir="win" ;; *) -diff -Naur gdb-9.1-orig/gdb/configure.host gdb-9.1/gdb/configure.host ---- gdb-9.1-orig/gdb/configure.host 2019-11-19 04:10:41.000000000 +0300 -+++ gdb-9.1/gdb/configure.host 2020-04-19 11:28:11.197969800 +0300 -@@ -117,6 +117,7 @@ +diff --git a/gdb/configure.host b/gdb/configure.host +index ce528237291..1338c3e3da1 100644 +--- a/gdb/configure.host ++++ b/gdb/configure.host +@@ -117,6 +117,7 @@ i[34567]86-*-openbsd*) gdb_host=obsd ;; i[34567]86-*-solaris2* | x86_64-*-solaris2*) gdb_host=sol2 ;; i[34567]86-*-cygwin*) gdb_host=cygwin ;; @@ -657,7 +737,7 @@ diff -Naur gdb-9.1-orig/gdb/configure.host gdb-9.1/gdb/configure.host ia64-*-linux*) gdb_host=linux ;; -@@ -182,6 +183,7 @@ +@@ -182,6 +183,7 @@ x86_64-*-mingw*) gdb_host=mingw64 gdb_host_obs=mingw-hdep.o ;; x86_64-*-cygwin*) gdb_host=cygwin64 ;; @@ -665,20 +745,21 @@ diff -Naur gdb-9.1-orig/gdb/configure.host gdb-9.1/gdb/configure.host m32r*-*-linux*) gdb_host=linux ;; xtensa*-*-linux*) gdb_host=linux ;; -diff -Naur gdb-9.1-orig/gdb/configure.nat gdb-9.1/gdb/configure.nat ---- gdb-9.1-orig/gdb/configure.nat 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gdb/configure.nat 2020-04-19 11:38:00.405588900 +0300 -@@ -77,6 +77,9 @@ +diff --git a/gdb/configure.nat b/gdb/configure.nat +index bb70e303384..f466b448e79 100644 +--- a/gdb/configure.nat ++++ b/gdb/configure.nat +@@ -77,6 +77,9 @@ case ${gdb_host} in cygwin*) - NATDEPFILES='x86-nat.o nat/x86-dregs.o windows-nat.o' + NATDEPFILES='x86-nat.o nat/x86-dregs.o windows-nat.o nat/windows-nat.o' ;; + msys*) -+ NATDEPFILES='x86-nat.o nat/x86-dregs.o windows-nat.o' ++ NATDEPFILES='x86-nat.o nat/x86-dregs.o windows-nat.o nat/windows-nat.o' + ;; mingw*) - NATDEPFILES='x86-nat.o nat/x86-dregs.o windows-nat.o' + NATDEPFILES='x86-nat.o nat/x86-dregs.o windows-nat.o nat/windows-nat.o' ;; -@@ -123,7 +126,7 @@ +@@ -123,7 +126,7 @@ case ${gdb_host} in ;; esac ;; @@ -687,7 +768,7 @@ diff -Naur gdb-9.1-orig/gdb/configure.nat gdb-9.1/gdb/configure.nat case ${gdb_host_cpu} in i386) # Native config information for GDB on i386 -@@ -132,7 +135,7 @@ +@@ -132,7 +135,7 @@ case ${gdb_host} in ;; esac ;; @@ -696,12 +777,13 @@ diff -Naur gdb-9.1-orig/gdb/configure.nat gdb-9.1/gdb/configure.nat case ${gdb_host_cpu} in i386) # Native config information for GDB on amd64 -diff -Naur gdb-9.1-orig/gdb/configure.tgt gdb-9.1/gdb/configure.tgt ---- gdb-9.1-orig/gdb/configure.tgt 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gdb/configure.tgt 2020-04-19 11:51:31.214159600 +0300 -@@ -313,6 +313,11 @@ - gdb_target_obs="i386-cygwin-tdep.o windows-tdep.o" - build_gdbserver=yes +diff --git a/gdb/configure.tgt b/gdb/configure.tgt +index a3e11c4b9b8..0bf83c1c61b 100644 +--- a/gdb/configure.tgt ++++ b/gdb/configure.tgt +@@ -317,6 +317,11 @@ i[34567]86-*-cygwin*) + # Target: Intel 386 running win32 + gdb_target_obs="i386-windows-tdep.o windows-tdep.o" ;; +i[34567]86-*-msys*) + # Target: Intel 386 running win32 @@ -710,8 +792,8 @@ diff -Naur gdb-9.1-orig/gdb/configure.tgt gdb-9.1/gdb/configure.tgt + ;; i[34567]86-*-mingw32*) # Target: Intel 386 running win32 - gdb_target_obs="i386-cygwin-tdep.o windows-tdep.o" -@@ -748,7 +753,7 @@ + gdb_target_obs="i386-windows-tdep.o windows-tdep.o" +@@ -738,7 +743,7 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) gdb_target_obs="amd64-fbsd-tdep.o ${i386_tobjs} \ i386-bsd-tdep.o i386-fbsd-tdep.o" ;; @@ -719,63 +801,12 @@ diff -Naur gdb-9.1-orig/gdb/configure.tgt gdb-9.1/gdb/configure.tgt +x86_64-*-mingw* | x86_64-*-cygwin* | x86_64-*-msys*) # Target: MingW/amd64 gdb_target_obs="amd64-windows-tdep.o \ - ${i386_tobjs} i386-cygwin-tdep.o \ -@@ -794,7 +799,7 @@ - *-*-*-gnu*) ;; # prevent non-GNU kernels to match the Hurd rule below - *-*-gnu*) gdb_osabi=GDB_OSABI_HURD ;; - *-*-mingw32ce*) gdb_osabi=GDB_OSABI_WINCE ;; --*-*-mingw* | *-*-cygwin*) -+*-*-mingw* | *-*-cygwin* | *-*-msys*) - gdb_osabi=GDB_OSABI_CYGWIN ;; - *-*-dicos*) gdb_osabi=GDB_OSABI_DICOS ;; - *-*-symbianelf*) -diff -Naur gdb-9.1-orig/gdb/defs.h gdb-9.1/gdb/defs.h ---- gdb-9.1-orig/gdb/defs.h 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gdb/defs.h 2020-04-19 11:28:18.677804400 +0300 -@@ -487,6 +487,7 @@ - GDB_OSABI_GO32, - GDB_OSABI_QNXNTO, - GDB_OSABI_CYGWIN, -+ GDB_OSABI_MSYS, - GDB_OSABI_AIX, - GDB_OSABI_DICOS, - GDB_OSABI_DARWIN, -diff -Naur gdb-9.1-orig/gdb/gdbserver/configure.srv gdb-9.1/gdb/gdbserver/configure.srv ---- gdb-9.1-orig/gdb/gdbserver/configure.srv 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gdb/gdbserver/configure.srv 2020-04-19 11:28:12.456291500 +0300 -@@ -85,7 +85,7 @@ - srv_linux_usrregs=yes - srv_linux_thread_db=yes - ;; -- i[34567]86-*-cygwin*) srv_regobj="" -+ i[34567]86-*-cygwin*|i[34567]86-*-msys*) srv_regobj="" - srv_tgtobj="x86-low.o x86-dregs.o win32-low.o win32-i386-low.o" - srv_tgtobj="${srv_tgtobj} arch/i386.o" - ;; -@@ -368,7 +368,7 @@ - srv_tgtobj="${srv_tgtobj} arch/amd64.o" - srv_mingw=yes - ;; -- x86_64-*-cygwin*) srv_regobj="" -+ x86_64-*-cygwin*|x86_64-*-msys*) srv_regobj="" - srv_tgtobj="x86-low.o x86-dregs.o i387-fp.o win32-low.o win32-i386-low.o" - srv_tgtobj="${srv_tgtobj} arch/amd64.o" - ;; -diff -Naur gdb-9.1-orig/gdb/osabi.c gdb-9.1/gdb/osabi.c ---- gdb-9.1-orig/gdb/osabi.c 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gdb/osabi.c 2020-04-19 11:28:15.193194600 +0300 -@@ -72,6 +72,7 @@ - { "DJGPP", NULL }, - { "QNX-Neutrino", NULL }, - { "Cygwin", NULL }, -+ { "MSYS", NULL }, - { "AIX", NULL }, - { "DICOS", NULL }, - { "Darwin", NULL }, -diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.base/bigcore.exp gdb-9.1/gdb/testsuite/gdb.base/bigcore.exp ---- gdb-9.1-orig/gdb/testsuite/gdb.base/bigcore.exp 2020-02-08 15:49:30.000000000 +0300 -+++ gdb-9.1/gdb/testsuite/gdb.base/bigcore.exp 2020-04-19 11:28:12.829166900 +0300 -@@ -33,7 +33,8 @@ + ${i386_tobjs} i386-windows-tdep.o \ +diff --git a/gdb/testsuite/gdb.base/bigcore.exp b/gdb/testsuite/gdb.base/bigcore.exp +index bac72f07484..b6030b06e81 100644 +--- a/gdb/testsuite/gdb.base/bigcore.exp ++++ b/gdb/testsuite/gdb.base/bigcore.exp +@@ -33,7 +33,8 @@ if ![isnative] then { if { [istarget "*-*-*bsd*"] || [istarget "*-*-solaris*"] || [istarget "*-*-darwin*"] @@ -785,10 +816,11 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.base/bigcore.exp gdb-9.1/gdb/testsuite untested "kernel lacks sparse corefile support (PR gdb/1551)" return } -diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.base/fileio.exp gdb-9.1/gdb/testsuite/gdb.base/fileio.exp ---- gdb-9.1-orig/gdb/testsuite/gdb.base/fileio.exp 2020-02-08 15:49:30.000000000 +0300 -+++ gdb-9.1/gdb/testsuite/gdb.base/fileio.exp 2020-04-19 11:28:13.201154800 +0300 -@@ -253,7 +253,7 @@ +diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp +index eb88b4e0420..31f13d9d439 100644 +--- a/gdb/testsuite/gdb.base/fileio.exp ++++ b/gdb/testsuite/gdb.base/fileio.exp +@@ -253,7 +253,7 @@ gdb_test continue \ # This test fails on Cygwin because unlink() succeeds on Win32 systems # in that situation. @@ -797,10 +829,11 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.base/fileio.exp gdb-9.1/gdb/testsuite/ setup_xfail "*-*-*" } gdb_test continue \ -diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.base/maint.exp gdb-9.1/gdb/testsuite/gdb.base/maint.exp ---- gdb-9.1-orig/gdb/testsuite/gdb.base/maint.exp 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gdb/testsuite/gdb.base/maint.exp 2020-04-19 11:28:13.571296300 +0300 -@@ -193,7 +193,7 @@ +diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp +index 62e427604c9..ab7f17ed743 100644 +--- a/gdb/testsuite/gdb.base/maint.exp ++++ b/gdb/testsuite/gdb.base/maint.exp +@@ -193,7 +193,7 @@ gdb_test "maint set per-command off" \ # The timeout value is raised, because printing all the symbols and # statistical information about Cygwin and Windows libraries takes a lot # of time. @@ -809,7 +842,7 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.base/maint.exp gdb-9.1/gdb/testsuite/g set oldtimeout $timeout set timeout [expr $timeout + 500] } -@@ -474,6 +474,7 @@ +@@ -467,6 +467,7 @@ gdb_test_multiple "maint info sections CODE" "maint info sections CODE" { # The "maint info sections DATA" test is marked for XFAIL on Windows, # because Windows has text sections marked DATA. setup_xfail "*-*-*cygwin*" @@ -817,10 +850,11 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.base/maint.exp gdb-9.1/gdb/testsuite/g setup_xfail "*-*-*mingw*" gdb_test_multiple "maint info sections DATA" "maint info sections DATA" { -diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.base/shreloc.exp gdb-9.1/gdb/testsuite/gdb.base/shreloc.exp ---- gdb-9.1-orig/gdb/testsuite/gdb.base/shreloc.exp 2020-02-08 15:49:30.000000000 +0300 -+++ gdb-9.1/gdb/testsuite/gdb.base/shreloc.exp 2020-04-19 11:28:13.936346400 +0300 -@@ -44,7 +44,7 @@ +diff --git a/gdb/testsuite/gdb.base/shreloc.exp b/gdb/testsuite/gdb.base/shreloc.exp +index 8cc9adb123e..b82db96e1a9 100644 +--- a/gdb/testsuite/gdb.base/shreloc.exp ++++ b/gdb/testsuite/gdb.base/shreloc.exp +@@ -44,7 +44,7 @@ if [get_compiler_info] { set lib_opts "debug" set exec_opts [list debug shlib=$lib1_sl shlib=$lib2_sl] @@ -829,7 +863,7 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.base/shreloc.exp gdb-9.1/gdb/testsuite lappend lib_opts "ldflags=-Wl,--image-base,0x04000000" } -@@ -226,7 +226,7 @@ +@@ -226,7 +226,7 @@ if [send_gdb_discard "maint print msymbols ${msymfile}"] { } } @@ -838,10 +872,11 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.base/shreloc.exp gdb-9.1/gdb/testsuite # # We know the names of some absolute symbols included in the # portable-executable (DLL) format. Check that they didn't get -diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.base/solib-weak.exp gdb-9.1/gdb/testsuite/gdb.base/solib-weak.exp ---- gdb-9.1-orig/gdb/testsuite/gdb.base/solib-weak.exp 2020-02-08 15:49:30.000000000 +0300 -+++ gdb-9.1/gdb/testsuite/gdb.base/solib-weak.exp 2020-04-19 11:28:14.287378200 +0300 -@@ -25,7 +25,8 @@ +diff --git a/gdb/testsuite/gdb.base/solib-weak.exp b/gdb/testsuite/gdb.base/solib-weak.exp +index 0457acaa1d3..59b48fe58c2 100644 +--- a/gdb/testsuite/gdb.base/solib-weak.exp ++++ b/gdb/testsuite/gdb.base/solib-weak.exp +@@ -25,7 +25,8 @@ if {[skip_shlib_tests]} { if {([istarget arm*-*-symbianelf*] || [istarget *-*-mingw*] || [istarget *-*-cygwin*] @@ -851,10 +886,11 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.base/solib-weak.exp gdb-9.1/gdb/testsu return 0 } -diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp gdb-9.1/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp ---- gdb-9.1-orig/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp 2020-02-08 15:49:30.000000000 +0300 -+++ gdb-9.1/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp 2020-04-19 11:28:14.461903500 +0300 -@@ -32,7 +32,8 @@ +diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp b/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp +index 580272986c9..0d4f37ceff0 100644 +--- a/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp ++++ b/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp +@@ -32,7 +32,8 @@ gdb_test_no_output "set breakpoint pending off" gdb_test "break 'z:file.c':func" {Breakpoint [0-9]+ at .*} set dos [expr [istarget "*-*-cygwin*"] || [istarget "i?86-*-mingw*"] \ @@ -864,10 +900,11 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp gdb-9.1/gdb/t if { $dos } { gdb_test "break file.c:func" {Breakpoint [0-9]+ at .*} -diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.server/wrapper.exp gdb-9.1/gdb/testsuite/gdb.server/wrapper.exp ---- gdb-9.1-orig/gdb/testsuite/gdb.server/wrapper.exp 2020-02-08 15:49:30.000000000 +0300 -+++ gdb-9.1/gdb/testsuite/gdb.server/wrapper.exp 2020-04-19 11:28:14.642385000 +0300 -@@ -26,7 +26,8 @@ +diff --git a/gdb/testsuite/gdb.server/wrapper.exp b/gdb/testsuite/gdb.server/wrapper.exp +index 695deea174d..45d3d326087 100644 +--- a/gdb/testsuite/gdb.server/wrapper.exp ++++ b/gdb/testsuite/gdb.server/wrapper.exp +@@ -26,7 +26,8 @@ if { [skip_gdbserver_tests] } { } if { [istarget *-*-mingw*] @@ -877,10 +914,11 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/gdb.server/wrapper.exp gdb-9.1/gdb/testsui unsupported "gdbserver does not support --wrapper on this target (PR server/15967)" return -1 } -diff -Naur gdb-9.1-orig/gdb/testsuite/lib/gdb.exp gdb-9.1/gdb/testsuite/lib/gdb.exp ---- gdb-9.1-orig/gdb/testsuite/lib/gdb.exp 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gdb/testsuite/lib/gdb.exp 2020-04-19 11:54:45.662045400 +0300 -@@ -2044,7 +2044,8 @@ +diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp +index ff6e8c7e238..e95e5804d7d 100644 +--- a/gdb/testsuite/lib/gdb.exp ++++ b/gdb/testsuite/lib/gdb.exp +@@ -2166,7 +2166,8 @@ proc skip_shlib_tests {} { || [istarget arm*-*-symbianelf*] || [istarget *-*-mingw*] || [istarget *-*-cygwin*] @@ -890,7 +928,7 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/lib/gdb.exp gdb-9.1/gdb/testsuite/lib/gdb. return 0 } -@@ -3741,7 +3742,8 @@ +@@ -3969,7 +3970,8 @@ proc gdb_compile {source dest type options} { lappend source "-Wl,$shlib_name" } elseif { ([istarget "*-*-mingw*"] || [istarget *-*-cygwin*] @@ -900,7 +938,7 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/lib/gdb.exp gdb-9.1/gdb/testsuite/lib/gdb. lappend source "${shlib_name}.a" } else { lappend source $shlib_name -@@ -3749,7 +3751,8 @@ +@@ -3977,7 +3979,8 @@ proc gdb_compile {source dest type options} { if { $shlib_found == 0 } { set shlib_found 1 if { ([istarget "*-*-mingw*"] @@ -910,7 +948,7 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/lib/gdb.exp gdb-9.1/gdb/testsuite/lib/gdb. lappend new_options "additional_flags=-Wl,--enable-auto-import" } if { [test_compiler_info "gcc-*"] || [test_compiler_info "clang-*"] } { -@@ -3789,6 +3792,7 @@ +@@ -4017,6 +4020,7 @@ proc gdb_compile {source dest type options} { if { $shlib_load || $shlib_found } { if { ([istarget "*-*-mingw*"] || [istarget *-*-cygwin*] @@ -918,7 +956,7 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/lib/gdb.exp gdb-9.1/gdb/testsuite/lib/gdb. || [istarget *-*-pe*]) } { # Do not need anything. } elseif { [istarget *-*-freebsd*] || [istarget *-*-openbsd*] } { -@@ -3873,7 +3877,8 @@ +@@ -4101,7 +4105,8 @@ proc gdb_compile {source dest type options} { if { $type == "executable" } { if { ([istarget "*-*-mingw*"] || [istarget "*-*-*djgpp"] @@ -928,7 +966,7 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/lib/gdb.exp gdb-9.1/gdb/testsuite/lib/gdb. # Force output to unbuffered mode, by linking in an object file # with a global contructor that calls setvbuf. # -@@ -4004,6 +4009,7 @@ +@@ -4232,6 +4237,7 @@ proc gdb_compile_shlib {sources dest options} { } "clang-*" { if { !([istarget "*-*-cygwin*"] @@ -936,7 +974,7 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/lib/gdb.exp gdb-9.1/gdb/testsuite/lib/gdb. || [istarget "*-*-mingw*"]) } { lappend obj_options "additional_flags=-fpic" } -@@ -4012,6 +4018,7 @@ +@@ -4240,6 +4246,7 @@ proc gdb_compile_shlib {sources dest options} { if { !([istarget "powerpc*-*-aix*"] || [istarget "rs6000*-*-aix*"] || [istarget "*-*-cygwin*"] @@ -944,7 +982,7 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/lib/gdb.exp gdb-9.1/gdb/testsuite/lib/gdb. || [istarget "*-*-mingw*"] || [istarget "*-*-pe*"]) } { lappend obj_options "additional_flags=-fpic" -@@ -4048,6 +4055,7 @@ +@@ -4276,6 +4283,7 @@ proc gdb_compile_shlib {sources dest options} { if { ([istarget "*-*-mingw*"] || [istarget *-*-cygwin*] @@ -952,7 +990,7 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/lib/gdb.exp gdb-9.1/gdb/testsuite/lib/gdb. || [istarget *-*-pe*]) } { if { [is_remote host] } { set name [file tail ${dest}] -@@ -4075,6 +4083,7 @@ +@@ -4303,6 +4311,7 @@ proc gdb_compile_shlib {sources dest options} { if { [is_remote host] && ([istarget "*-*-mingw*"] || [istarget *-*-cygwin*] @@ -960,7 +998,7 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/lib/gdb.exp gdb-9.1/gdb/testsuite/lib/gdb. || [istarget *-*-pe*]) } { set dest_tail_name [file tail ${dest}] remote_upload host $dest_tail_name.a ${dest}.a -@@ -4467,7 +4476,7 @@ +@@ -4695,7 +4704,7 @@ proc kill_wait_spawned_process { proc_spawn_id } { proc spawn_id_get_pid { spawn_id } { set testpid [exp_pid -i $spawn_id] @@ -969,7 +1007,7 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/lib/gdb.exp gdb-9.1/gdb/testsuite/lib/gdb. # testpid is the Cygwin PID, GDB uses the Windows PID, which # might be different due to the way fork/exec works. set testpid [ exec ps -e | gawk "{ if (\$1 == $testpid) print \$4; }" ] -@@ -5639,6 +5648,7 @@ +@@ -6070,6 +6079,7 @@ gdb_caching_proc gdb_has_argv0 { || [istarget *-*-aix*] || [istarget *-*-gnu*] || [istarget *-*-cygwin*] || [istarget *-*-mingw32*] @@ -977,7 +1015,7 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/lib/gdb.exp gdb-9.1/gdb/testsuite/lib/gdb. || [istarget *-*-*djgpp*] || [istarget *-*-go32*] || [istarget *-wince-pe] || [istarget *-*-mingw32ce*] || [istarget *-*-symbianelf*] -@@ -5674,7 +5684,7 @@ +@@ -6105,7 +6115,7 @@ gdb_caching_proc gdb_has_argv0 { proc get_build_id { filename } { if { ([istarget "*-*-mingw*"] @@ -986,10 +1024,11 @@ diff -Naur gdb-9.1-orig/gdb/testsuite/lib/gdb.exp gdb-9.1/gdb/testsuite/lib/gdb. set objdump_program [gdb_find_objdump] set result [catch {set data [exec $objdump_program -p $filename | grep signature | cut "-d " -f4]} output] verbose "result is $result" -diff -Naur gdb-9.1-orig/gdb/windows-nat.c gdb-9.1/gdb/windows-nat.c ---- gdb-9.1-orig/gdb/windows-nat.c 2020-04-19 11:35:51.657394300 +0300 -+++ gdb-9.1/gdb/windows-nat.c 2020-04-19 11:28:15.384639900 +0300 -@@ -766,9 +766,15 @@ +diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c +index 8329e3d0235..1e753d302d4 100644 +--- a/gdb/windows-nat.c ++++ b/gdb/windows-nat.c +@@ -834,9 +834,15 @@ windows_make_so (const char *name, LPVOID load_addr) strcpy (so->so_name, so->so_original_name); } } @@ -1005,19 +1044,33 @@ diff -Naur gdb-9.1-orig/gdb/windows-nat.c gdb-9.1/gdb/windows-nat.c { asection *text = NULL; -diff -Naur gdb-9.1-orig/gnulib/configure gdb-9.1/gnulib/configure ---- gdb-9.1-orig/gnulib/configure 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gnulib/configure 2020-04-19 11:56:57.827667500 +0300 -@@ -5805,7 +5805,7 @@ - else - case "$host_os" in - osf*) gl_use_threads=no ;; -- cygwin*) -+ cygwin*|msys*) - case `uname -r` in - 1.[0-5].*) gl_use_threads=no ;; - *) gl_use_threads=yes ;; -@@ -7536,7 +7536,7 @@ +diff --git a/gdbserver/configure.srv b/gdbserver/configure.srv +index 0cb5072c8ab..7fe99d02735 100644 +--- a/gdbserver/configure.srv ++++ b/gdbserver/configure.srv +@@ -84,7 +84,7 @@ case "${gdbserver_host}" in + srv_linux_regsets=yes + srv_linux_thread_db=yes + ;; +- i[34567]86-*-cygwin*) srv_regobj="" ++ i[34567]86-*-cygwin* | i[34567]86-*-msys*) srv_regobj="" + srv_tgtobj="x86-low.o nat/x86-dregs.o win32-low.o" + srv_tgtobj="${srv_tgtobj} win32-i386-low.o" + srv_tgtobj="${srv_tgtobj} nat/windows-nat.o" +@@ -354,7 +354,7 @@ case "${gdbserver_host}" in + srv_tgtobj="${srv_tgtobj} arch/amd64.o arch/i386.o" + srv_mingw=yes + ;; +- x86_64-*-cygwin*) srv_regobj="" ++ x86_64-*-cygwin* | x86_64-*-msys*) srv_regobj="" + srv_tgtobj="x86-low.o nat/x86-dregs.o i387-fp.o" + srv_tgtobj="${srv_tgtobj} win32-low.o win32-i386-low.o" + srv_tgtobj="${srv_tgtobj} nat/windows-nat.o" +diff --git a/gnulib/configure b/gnulib/configure +index ef7f6d5e80f..fdac457799c 100644 +--- a/gnulib/configure ++++ b/gnulib/configure +@@ -7686,7 +7686,7 @@ else # special semantics and is distinct from /, please report it to # . case $host in @@ -1026,16 +1079,7 @@ diff -Naur gdb-9.1-orig/gnulib/configure gdb-9.1/gnulib/configure gl_cv_double_slash_root=yes ;; *) # Be optimistic and assume that / and // are the same when we -@@ -9469,7 +9469,7 @@ - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_getcwd_null="guessing yes";; - # Guess yes on Cygwin. -- cygwin*) gl_cv_func_getcwd_null="guessing yes";; -+ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";; - # If we don't know, assume the worst. - *) gl_cv_func_getcwd_null="guessing no";; - esac -@@ -17225,7 +17225,7 @@ +@@ -18119,7 +18119,7 @@ else # special semantics and is distinct from /, please report it to # . case $host in @@ -1044,7 +1088,7 @@ diff -Naur gdb-9.1-orig/gnulib/configure gdb-9.1/gnulib/configure gl_cv_double_slash_root=yes ;; *) # Be optimistic and assume that / and // are the same when we -@@ -17364,7 +17364,7 @@ +@@ -18259,7 +18259,7 @@ else case "$host_os" in mingw*) # on this platform, dup2 always returns 0 for success gl_cv_func_dup2_works="guessing no" ;; @@ -1053,7 +1097,7 @@ diff -Naur gdb-9.1-orig/gnulib/configure gdb-9.1/gnulib/configure gl_cv_func_dup2_works="guessing no" ;; aix* | freebsd*) # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE, -@@ -17715,7 +17715,7 @@ +@@ -18590,7 +18590,7 @@ if ${gl_cv_func_fcntl_f_dupfd_works+:} false; then : else if test "$cross_compiling" = yes; then : case $host_os in @@ -1062,67 +1106,11 @@ diff -Naur gdb-9.1-orig/gnulib/configure gdb-9.1/gnulib/configure gl_cv_func_fcntl_f_dupfd_works="guessing no" ;; *) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;; esac -@@ -19939,7 +19939,7 @@ - else - if test "$cross_compiling" = yes; then : - case "$host_os" in -- cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows -+ cygwin* | msys*) # on cygwin 1.5.25, getdtablesize() automatically grows - gl_cv_func_getdtablesize_works="guessing no" ;; - *) gl_cv_func_getdtablesize_works="guessing yes" ;; - esac -diff -Naur gdb-9.1-orig/gnulib/import/extra/config.rpath gdb-9.1/gnulib/import/extra/config.rpath ---- gdb-9.1-orig/gnulib/import/extra/config.rpath 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gnulib/import/extra/config.rpath 2020-04-19 11:57:56.182652900 +0300 -@@ -57,7 +57,7 @@ - aix*) - wl='-Wl,' - ;; -- mingw* | cygwin* | pw32* | os2* | cegcc*) -+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) - ;; - hpux9* | hpux10* | hpux11*) - wl='-Wl,' -@@ -149,7 +149,7 @@ - hardcode_minus_L=no - - case "$host_os" in -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. -@@ -198,7 +198,7 @@ - ld_shlibs=no - fi - ;; -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' -@@ -348,7 +348,7 @@ - ;; - bsdi[45]*) - ;; -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -533,7 +533,7 @@ - bsdi[45]*) - library_names_spec='$libname$shrext' - ;; -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - shrext=.dll - library_names_spec='$libname.dll.a $libname.lib' - ;; -diff -Naur gdb-9.1-orig/gnulib/import/m4/double-slash-root.m4 gdb-9.1/gnulib/import/m4/double-slash-root.m4 ---- gdb-9.1-orig/gnulib/import/m4/double-slash-root.m4 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gnulib/import/m4/double-slash-root.m4 2020-04-19 11:58:33.450299600 +0300 -@@ -16,7 +16,7 @@ +diff --git a/gnulib/import/m4/double-slash-root.m4 b/gnulib/import/m4/double-slash-root.m4 +index c463ac41aca..5d2613d4981 100644 +--- a/gnulib/import/m4/double-slash-root.m4 ++++ b/gnulib/import/m4/double-slash-root.m4 +@@ -16,7 +16,7 @@ AC_DEFUN([gl_DOUBLE_SLASH_ROOT], # special semantics and is distinct from /, please report it to # . case $host in @@ -1131,10 +1119,11 @@ diff -Naur gdb-9.1-orig/gnulib/import/m4/double-slash-root.m4 gdb-9.1/gnulib/imp gl_cv_double_slash_root=yes ;; *) # Be optimistic and assume that / and // are the same when we -diff -Naur gdb-9.1-orig/gnulib/import/m4/dup2.m4 gdb-9.1/gnulib/import/m4/dup2.m4 ---- gdb-9.1-orig/gnulib/import/m4/dup2.m4 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gnulib/import/m4/dup2.m4 2020-04-19 11:58:51.769985300 +0300 -@@ -78,7 +78,7 @@ +diff --git a/gnulib/import/m4/dup2.m4 b/gnulib/import/m4/dup2.m4 +index 21b1ecc26b8..3d3eef22929 100644 +--- a/gnulib/import/m4/dup2.m4 ++++ b/gnulib/import/m4/dup2.m4 +@@ -78,7 +78,7 @@ AC_DEFUN([gl_FUNC_DUP2], [case "$host_os" in mingw*) # on this platform, dup2 always returns 0 for success gl_cv_func_dup2_works="guessing no" ;; @@ -1143,10 +1132,11 @@ diff -Naur gdb-9.1-orig/gnulib/import/m4/dup2.m4 gdb-9.1/gnulib/import/m4/dup2.m gl_cv_func_dup2_works="guessing no" ;; aix* | freebsd*) # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE, -diff -Naur gdb-9.1-orig/gnulib/import/m4/fcntl.m4 gdb-9.1/gnulib/import/m4/fcntl.m4 ---- gdb-9.1-orig/gnulib/import/m4/fcntl.m4 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gnulib/import/m4/fcntl.m4 2020-04-19 11:59:31.612484000 +0300 -@@ -69,7 +69,7 @@ +diff --git a/gnulib/import/m4/fcntl.m4 b/gnulib/import/m4/fcntl.m4 +index 562ae2395df..968d73be01d 100644 +--- a/gnulib/import/m4/fcntl.m4 ++++ b/gnulib/import/m4/fcntl.m4 +@@ -69,7 +69,7 @@ AC_DEFUN([gl_FUNC_FCNTL], [gl_cv_func_fcntl_f_dupfd_works=yes], [gl_cv_func_fcntl_f_dupfd_works=no], [case $host_os in @@ -1155,94 +1145,11 @@ diff -Naur gdb-9.1-orig/gnulib/import/m4/fcntl.m4 gdb-9.1/gnulib/import/m4/fcntl gl_cv_func_fcntl_f_dupfd_works="guessing no" ;; *) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;; esac])]) -diff -Naur gdb-9.1-orig/gnulib/import/m4/getcwd.m4 gdb-9.1/gnulib/import/m4/getcwd.m4 ---- gdb-9.1-orig/gnulib/import/m4/getcwd.m4 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gnulib/import/m4/getcwd.m4 2020-04-19 11:59:51.754804700 +0300 -@@ -51,7 +51,7 @@ - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_getcwd_null="guessing yes";; - # Guess yes on Cygwin. -- cygwin*) gl_cv_func_getcwd_null="guessing yes";; -+ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";; - # If we don't know, assume the worst. - *) gl_cv_func_getcwd_null="guessing no";; - esac -diff -Naur gdb-9.1-orig/gnulib/import/m4/getdtablesize.m4 gdb-9.1/gnulib/import/m4/getdtablesize.m4 ---- gdb-9.1-orig/gnulib/import/m4/getdtablesize.m4 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gnulib/import/m4/getdtablesize.m4 2020-04-19 12:00:16.792089600 +0300 -@@ -28,7 +28,7 @@ - [gl_cv_func_getdtablesize_works=yes], - [gl_cv_func_getdtablesize_works=no], - [case "$host_os" in -- cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows -+ cygwin* | msys*) # on cygwin 1.5.25, getdtablesize() automatically grows - gl_cv_func_getdtablesize_works="guessing no" ;; - *) gl_cv_func_getdtablesize_works="guessing yes" ;; - esac]) -diff -Naur gdb-9.1-orig/gnulib/import/m4/malloc.m4 gdb-9.1/gnulib/import/m4/malloc.m4 ---- gdb-9.1-orig/gnulib/import/m4/malloc.m4 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gnulib/import/m4/malloc.m4 2020-04-19 12:00:42.167181800 +0300 -@@ -33,7 +33,7 @@ - [case "$host_os" in - # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ | hpux* | solaris* | cygwin* | msys* | mingw*) - ac_cv_func_malloc_0_nonnull=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_malloc_0_nonnull=no ;; -diff -Naur gdb-9.1-orig/gnulib/import/m4/realloc.m4 gdb-9.1/gnulib/import/m4/realloc.m4 ---- gdb-9.1-orig/gnulib/import/m4/realloc.m4 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gnulib/import/m4/realloc.m4 2020-04-19 12:01:05.850741600 +0300 -@@ -33,7 +33,7 @@ - [case "$host_os" in - # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ | hpux* | solaris* | cygwin* | msys* | mingw*) - ac_cv_func_realloc_0_nonnull=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_realloc_0_nonnull=no ;; -diff -Naur gdb-9.1-orig/gnulib/import/m4/threadlib.m4 gdb-9.1/gnulib/import/m4/threadlib.m4 ---- gdb-9.1-orig/gnulib/import/m4/threadlib.m4 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gnulib/import/m4/threadlib.m4 2020-04-19 12:01:35.856943100 +0300 -@@ -68,7 +68,7 @@ - dnl bugs that lead to endless loops or crashes. See - dnl . - osf*) gl_use_threads=no ;; -- cygwin*) -+ cygwin* | msys*) - case `uname -r` in - 1.[0-5].*) gl_use_threads=no ;; - *) gl_use_threads=yes ;; -diff -Naur gdb-9.1-orig/gnulib/import/Makefile.am gdb-9.1/gnulib/import/Makefile.am ---- gdb-9.1-orig/gnulib/import/Makefile.am 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gnulib/import/Makefile.am 2020-04-19 12:02:07.238763200 +0300 -@@ -795,7 +795,7 @@ - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ -diff -Naur gdb-9.1-orig/gnulib/import/Makefile.in gdb-9.1/gnulib/import/Makefile.in ---- gdb-9.1-orig/gnulib/import/Makefile.in 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/gnulib/import/Makefile.in 2020-04-19 12:04:17.493213300 +0300 -@@ -2290,7 +2290,7 @@ - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ -diff -Naur gdb-9.1-orig/libctf/configure gdb-9.1/libctf/configure ---- gdb-9.1-orig/libctf/configure 2020-02-08 15:49:30.000000000 +0300 -+++ gdb-9.1/libctf/configure 2020-04-19 12:06:55.311051500 +0300 -@@ -5999,7 +5999,7 @@ +diff --git a/libctf/configure b/libctf/configure +index b7ca7cd5003..273cf9ebdbb 100755 +--- a/libctf/configure ++++ b/libctf/configure +@@ -6087,7 +6087,7 @@ else lt_cv_sys_max_cmd_len=-1; ;; @@ -1251,7 +1158,7 @@ diff -Naur gdb-9.1-orig/libctf/configure gdb-9.1/libctf/configure # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -6341,7 +6341,7 @@ +@@ -6429,7 +6429,7 @@ bsdi[45]*) lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -1260,7 +1167,7 @@ diff -Naur gdb-9.1-orig/libctf/configure gdb-9.1/libctf/configure # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' -@@ -6921,7 +6921,7 @@ +@@ -7009,7 +7009,7 @@ case $host_os in aix*) symcode='[BCDT]' ;; @@ -1269,7 +1176,7 @@ diff -Naur gdb-9.1-orig/libctf/configure gdb-9.1/libctf/configure symcode='[ABCDGISTW]' ;; hpux*) -@@ -8506,7 +8506,7 @@ +@@ -8594,7 +8594,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # PIC is the default for these OSes. ;; @@ -1278,7 +1185,7 @@ diff -Naur gdb-9.1-orig/libctf/configure gdb-9.1/libctf/configure # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -8588,7 +8588,7 @@ +@@ -8676,7 +8676,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } fi ;; @@ -1287,7 +1194,7 @@ diff -Naur gdb-9.1-orig/libctf/configure gdb-9.1/libctf/configure # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' -@@ -9050,7 +9050,7 @@ +@@ -9138,7 +9138,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie extract_expsyms_cmds= case $host_os in @@ -1296,7 +1203,7 @@ diff -Naur gdb-9.1-orig/libctf/configure gdb-9.1/libctf/configure # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. -@@ -9165,7 +9165,7 @@ +@@ -9253,7 +9253,7 @@ _LT_EOF fi ;; @@ -1305,7 +1212,7 @@ diff -Naur gdb-9.1-orig/libctf/configure gdb-9.1/libctf/configure # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' -@@ -9596,7 +9596,7 @@ +@@ -9684,7 +9684,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec=-rdynamic ;; @@ -1314,7 +1221,7 @@ diff -Naur gdb-9.1-orig/libctf/configure gdb-9.1/libctf/configure # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -10497,14 +10497,14 @@ +@@ -10585,14 +10585,14 @@ bsdi[45]*) # libtool to hard-code these into programs ;; @@ -1331,20 +1238,20 @@ diff -Naur gdb-9.1-orig/libctf/configure gdb-9.1/libctf/configure library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10528,6 +10528,12 @@ +@@ -10614,6 +10614,12 @@ cygwin* | mingw* | pw32* | cegcc*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" - ;; ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ++ ;; + msys*) + # MSYS DLLs use 'msys-' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" -+ ;; + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -11164,7 +11170,7 @@ +@@ -11252,7 +11258,7 @@ else lt_cv_dlopen_libs= ;; @@ -1353,7 +1260,7 @@ diff -Naur gdb-9.1-orig/libctf/configure gdb-9.1/libctf/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs= ;; -@@ -13195,6 +13201,12 @@ +@@ -13364,6 +13370,12 @@ if test "$enable_shared" = "yes"; then BFD_LIBADD="-L`pwd`/../bfd -lbfd" ;; @@ -1366,10 +1273,11 @@ diff -Naur gdb-9.1-orig/libctf/configure gdb-9.1/libctf/configure *-*-darwin*) BFD_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib" BFD_DEPENDENCIES="../bfd/libbfd.la" -diff -Naur gdb-9.1-orig/libctf/configure.ac gdb-9.1/libctf/configure.ac ---- gdb-9.1-orig/libctf/configure.ac 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/libctf/configure.ac 2020-04-19 12:07:57.046996100 +0300 -@@ -188,6 +188,12 @@ +diff --git a/libctf/configure.ac b/libctf/configure.ac +index 575da4677f3..2da8b27ea3b 100644 +--- a/libctf/configure.ac ++++ b/libctf/configure.ac +@@ -197,6 +197,12 @@ changequote([,])dnl BFD_LIBADD="-L`pwd`/../bfd -lbfd" ;; @@ -1382,10 +1290,11 @@ diff -Naur gdb-9.1-orig/libctf/configure.ac gdb-9.1/libctf/configure.ac *-*-darwin*) BFD_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib" BFD_DEPENDENCIES="../bfd/libbfd.la" -diff -Naur gdb-9.1-orig/libdecnumber/configure gdb-9.1/libdecnumber/configure ---- gdb-9.1-orig/libdecnumber/configure 2018-11-07 22:00:24.000000000 +0300 -+++ gdb-9.1/libdecnumber/configure 2020-04-19 12:08:34.214779800 +0300 -@@ -4767,7 +4767,8 @@ +diff --git a/libdecnumber/configure b/libdecnumber/configure +index 14c103a0718..014eff1abaf 100755 +--- a/libdecnumber/configure ++++ b/libdecnumber/configure +@@ -4764,7 +4764,8 @@ else powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \ i?86*-*-elfiamcu | i?86*-*-gnu* | x86_64*-*-gnu* | \ i?86*-*-mingw* | x86_64*-*-mingw* | \ @@ -1395,10 +1304,11 @@ diff -Naur gdb-9.1-orig/libdecnumber/configure gdb-9.1/libdecnumber/configure enable_decimal_float=yes ;; *) -diff -Naur gdb-9.1-orig/libiberty/configure gdb-9.1/libiberty/configure ---- gdb-9.1-orig/libiberty/configure 2018-12-24 05:59:29.000000000 +0300 -+++ gdb-9.1/libiberty/configure 2020-04-19 11:28:16.111950500 +0300 -@@ -5183,6 +5183,8 @@ +diff --git a/libiberty/configure b/libiberty/configure +index ff93c9ee9a6..363fbca9559 100755 +--- a/libiberty/configure ++++ b/libiberty/configure +@@ -5186,6 +5186,8 @@ case "${host}" in ;; i[34567]86-*-cygwin* | x86_64-*-cygwin*) ;; @@ -1407,7 +1317,7 @@ diff -Naur gdb-9.1-orig/libiberty/configure gdb-9.1/libiberty/configure i[34567]86-*-mingw* | x86_64-*-mingw*) ;; i[34567]86-*-interix[3-9]*) -@@ -6255,7 +6257,7 @@ +@@ -6447,7 +6449,7 @@ fi case "${host}" in @@ -1416,10 +1326,11 @@ diff -Naur gdb-9.1-orig/libiberty/configure gdb-9.1/libiberty/configure $as_echo "#define HAVE_SYS_ERRLIST 1" >>confdefs.h $as_echo "#define HAVE_SYS_NERR 1" >>confdefs.h -diff -Naur gdb-9.1-orig/libiberty/configure.ac gdb-9.1/libiberty/configure.ac ---- gdb-9.1-orig/libiberty/configure.ac 2018-12-24 05:59:29.000000000 +0300 -+++ gdb-9.1/libiberty/configure.ac 2020-04-19 11:28:16.465005200 +0300 -@@ -549,7 +549,7 @@ +diff --git a/libiberty/configure.ac b/libiberty/configure.ac +index 4e2599c14a8..1d6f6d87cbd 100644 +--- a/libiberty/configure.ac ++++ b/libiberty/configure.ac +@@ -552,7 +552,7 @@ AC_SUBST(CHECK) AC_SUBST(target_header_dir) case "${host}" in @@ -1428,10 +1339,11 @@ diff -Naur gdb-9.1-orig/libiberty/configure.ac gdb-9.1/libiberty/configure.ac AC_DEFINE(HAVE_SYS_ERRLIST) AC_DEFINE(HAVE_SYS_NERR) ;; -diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 ---- gdb-9.1-orig/libtool.m4 2018-06-27 00:37:28.000000000 +0300 -+++ gdb-9.1/libtool.m4 2020-04-19 11:28:16.830994400 +0300 -@@ -1491,7 +1491,7 @@ +diff --git a/libtool.m4 b/libtool.m4 +index 434530059fa..03e321f6a25 100644 +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -1491,7 +1491,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=-1; ;; @@ -1440,7 +1352,7 @@ diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -1733,7 +1733,7 @@ +@@ -1733,7 +1733,7 @@ else lt_cv_dlopen_libs= ;; @@ -1449,7 +1361,7 @@ diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs= ;; -@@ -2204,14 +2204,14 @@ +@@ -2204,14 +2204,14 @@ bsdi[[45]]*) # libtool to hard-code these into programs ;; @@ -1466,20 +1378,20 @@ diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -2235,6 +2235,12 @@ - m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) - ;; -+ msys*) -+ # Msys DLLs use 'msys-' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +@@ -2232,6 +2232,12 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -@@ -3001,7 +3007,7 @@ ++ msys*) ++ # Msys DLLs use 'msys-' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; +@@ -3001,7 +3007,7 @@ bsdi[[45]]*) lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -1488,7 +1400,7 @@ diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' -@@ -3285,7 +3291,7 @@ +@@ -3285,7 +3291,7 @@ AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in @@ -1497,7 +1409,7 @@ diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) -@@ -3360,7 +3366,7 @@ +@@ -3360,7 +3366,7 @@ case $host_os in aix*) symcode='[[BCDT]]' ;; @@ -1506,7 +1418,7 @@ diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 symcode='[[ABCDGISTW]]' ;; hpux*) -@@ -3607,7 +3613,7 @@ +@@ -3607,7 +3613,7 @@ m4_if([$1], [CXX], [ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; @@ -1515,7 +1427,7 @@ diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -3920,7 +3926,7 @@ +@@ -3920,7 +3926,7 @@ m4_if([$1], [CXX], [ # PIC is the default for these OSes. ;; @@ -1524,7 +1436,7 @@ diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -4003,7 +4009,7 @@ +@@ -4003,7 +4009,7 @@ m4_if([$1], [CXX], [ fi ;; @@ -1533,7 +1445,7 @@ diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], -@@ -4236,7 +4242,7 @@ +@@ -4236,7 +4242,7 @@ m4_if([$1], [CXX], [ pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; @@ -1542,7 +1454,7 @@ diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ;; *) -@@ -4288,7 +4294,7 @@ +@@ -4288,7 +4294,7 @@ dnl Note also adjust exclude_expsyms for C++ above. extract_expsyms_cmds= case $host_os in @@ -1551,7 +1463,7 @@ diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. -@@ -4403,7 +4409,7 @@ +@@ -4403,7 +4409,7 @@ _LT_EOF fi ;; @@ -1560,7 +1472,7 @@ diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -@@ -4776,7 +4782,7 @@ +@@ -4776,7 +4782,7 @@ _LT_EOF _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; @@ -1569,7 +1481,7 @@ diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -5720,7 +5726,7 @@ +@@ -5720,7 +5726,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; @@ -1578,10 +1490,11 @@ diff -Naur gdb-9.1-orig/libtool.m4 gdb-9.1/libtool.m4 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh ---- gdb-9.1-orig/ltmain.sh 2014-02-26 19:21:42.000000000 +0400 -+++ gdb-9.1/ltmain.sh 2020-04-19 11:28:17.015673000 +0300 -@@ -976,7 +976,7 @@ +diff --git a/ltmain.sh b/ltmain.sh +index 9503ec85d70..67481b480e2 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -976,7 +976,7 @@ func_enable_tag () case $host in @@ -1590,7 +1503,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh # don't eliminate duplications in $postdeps and $predeps opt_duplicate_compiler_generated_deps=: ;; -@@ -1453,7 +1453,7 @@ +@@ -1453,7 +1453,7 @@ func_mode_compile () # On Cygwin there's no "real" PIC flag so we must build both object types case $host_os in @@ -1599,7 +1512,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh pic_mode=default ;; esac -@@ -2279,7 +2279,7 @@ +@@ -2279,7 +2279,7 @@ func_mode_install () 'exit $?' tstripme="$stripme" case $host_os in @@ -1608,7 +1521,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh case $realname in *.dll.a) tstripme="" -@@ -2385,7 +2385,7 @@ +@@ -2385,7 +2385,7 @@ func_mode_install () # Do a test to see if this is really a libtool program. case $host in @@ -1617,7 +1530,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh if func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" wrapper=$func_ltwrapper_scriptname_result -@@ -2460,7 +2460,7 @@ +@@ -2460,7 +2460,7 @@ func_mode_install () # remove .exe since cygwin /usr/bin/install will append another # one anyway case $install_prog,$host in @@ -1626,7 +1539,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh case $file:$destfile in *.exe:*.exe) # this is ok -@@ -2595,7 +2595,7 @@ +@@ -2595,7 +2595,7 @@ extern \"C\" { $RM $export_symbols ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" case $host in @@ -1635,7 +1548,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh echo EXPORTS > "$output_objdir/$outputname.def" cat "$export_symbols" >> "$output_objdir/$outputname.def" ;; -@@ -2607,7 +2607,7 @@ +@@ -2607,7 +2607,7 @@ extern \"C\" { $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T $MV "$nlist"T "$nlist" case $host in @@ -1644,7 +1557,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh echo EXPORTS > "$output_objdir/$outputname.def" cat "$nlist" >> "$output_objdir/$outputname.def" ;; -@@ -2663,7 +2663,7 @@ +@@ -2663,7 +2663,7 @@ typedef struct { } lt_dlsymlist; " case $host in @@ -1653,7 +1566,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh echo >> "$output_objdir/$my_dlsyms" "\ /* DATA imports from DLLs on WIN32 con't be const, because runtime relocations are performed -- see ld's documentation -@@ -2749,7 +2749,7 @@ +@@ -2749,7 +2749,7 @@ static const void *lt_preloaded_setup() { # Transform the symbol file into the correct name. symfileobj="$output_objdir/${my_outputname}S.$objext" case $host in @@ -1662,7 +1575,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh if test -f "$output_objdir/$my_outputname.def"; then compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -@@ -3192,7 +3192,7 @@ +@@ -3192,7 +3192,7 @@ func_to_host_path () func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ;; @@ -1671,7 +1584,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh func_to_host_path_result=`cygpath -w "$1" | $SED -e "$lt_sed_naive_backslashify"` ;; -@@ -3265,7 +3265,7 @@ +@@ -3265,7 +3265,7 @@ func_to_host_pathlist () ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ;; @@ -1680,7 +1593,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | $SED -e "$lt_sed_naive_backslashify"` ;; -@@ -3571,7 +3571,7 @@ +@@ -3571,7 +3571,7 @@ main (int argc, char *argv[]) { EOF case "$host" in @@ -1689,7 +1602,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh # make stdout use "unix" line endings echo " setmode(1,_O_BINARY);" ;; -@@ -4233,7 +4233,7 @@ +@@ -4233,7 +4233,7 @@ func_mode_link () { $opt_debug case $host in @@ -1698,7 +1611,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out # which system we are compiling for in order to pass an extra -@@ -4713,7 +4713,7 @@ +@@ -4713,7 +4713,7 @@ func_mode_link () ;; esac case $host in @@ -1707,7 +1620,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; -@@ -4733,7 +4733,7 @@ +@@ -4733,7 +4733,7 @@ func_mode_link () -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in @@ -1716,7 +1629,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh # These systems don't actually have a C or math library (as such) continue ;; -@@ -4813,7 +4813,7 @@ +@@ -4813,7 +4813,7 @@ func_mode_link () -no-install) case $host in @@ -1725,7 +1638,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. func_warning "\`-no-install' is ignored for $host" -@@ -5772,7 +5772,7 @@ +@@ -5772,7 +5772,7 @@ func_mode_link () if test -n "$library_names" && { test "$use_static_libs" = no || test -z "$old_library"; }; then case $host in @@ -1734,7 +1647,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh # No point in relinking DLLs because paths are not encoded notinst_deplibs="$notinst_deplibs $lib" need_relink=no -@@ -5842,7 +5842,7 @@ +@@ -5842,7 +5842,7 @@ func_mode_link () elif test -n "$soname_spec"; then # bleh windows case $host in @@ -1743,7 +1656,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh func_arith $current - $age major=$func_arith_result versuffix="-$major" -@@ -6693,7 +6693,7 @@ +@@ -6693,7 +6693,7 @@ func_mode_link () if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in @@ -1752,7 +1665,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) -@@ -7194,7 +7194,7 @@ +@@ -7194,7 +7194,7 @@ EOF orig_export_symbols= case $host_os in @@ -1761,7 +1674,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile if test "x`$SED 1q $export_symbols`" != xEXPORTS; then -@@ -7710,7 +7710,7 @@ +@@ -7710,7 +7710,7 @@ EOF prog) case $host in @@ -1770,7 +1683,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ -@@ -7823,7 +7823,7 @@ +@@ -7823,7 +7823,7 @@ EOF esac fi case $host in @@ -1779,7 +1692,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; -@@ -7901,7 +7901,7 @@ +@@ -7901,7 +7901,7 @@ EOF # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. wrappers_required=no ;; @@ -1788,7 +1701,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh if test "$build_libtool_libs" != yes; then wrappers_required=no fi -@@ -8029,14 +8029,14 @@ +@@ -8029,14 +8029,14 @@ EOF esac # test for cygwin because mv fails w/o .exe extensions case $host in @@ -1805,7 +1718,7 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result -@@ -8343,7 +8343,7 @@ +@@ -8343,7 +8343,7 @@ EOF # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in @@ -1814,10 +1727,11 @@ diff -Naur gdb-9.1-orig/ltmain.sh gdb-9.1/ltmain.sh # If a -bindir argument was supplied, place the dll there. if test "x$bindir" != x ; then -diff -Naur gdb-9.1-orig/ltoptions.m4 gdb-9.1/ltoptions.m4 ---- gdb-9.1-orig/ltoptions.m4 2013-12-22 14:09:57.000000000 +0400 -+++ gdb-9.1/ltoptions.m4 2020-04-19 11:28:17.198359300 +0300 -@@ -126,7 +126,7 @@ +diff --git a/ltoptions.m4 b/ltoptions.m4 +index 5ef12ced2a8..5e7bc34702b 100644 +--- a/ltoptions.m4 ++++ b/ltoptions.m4 +@@ -126,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll], [enable_win32_dll=yes case $host in @@ -1826,10 +1740,11 @@ diff -Naur gdb-9.1-orig/ltoptions.m4 gdb-9.1/ltoptions.m4 AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) -diff -Naur gdb-9.1-orig/opcodes/configure gdb-9.1/opcodes/configure ---- gdb-9.1-orig/opcodes/configure 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/opcodes/configure 2020-04-19 11:28:17.384852100 +0300 -@@ -6007,7 +6007,7 @@ +diff --git a/opcodes/configure b/opcodes/configure +index e448c9ea9c0..965c284238e 100755 +--- a/opcodes/configure ++++ b/opcodes/configure +@@ -6007,7 +6007,7 @@ else lt_cv_sys_max_cmd_len=-1; ;; @@ -1838,7 +1753,7 @@ diff -Naur gdb-9.1-orig/opcodes/configure gdb-9.1/opcodes/configure # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -6349,7 +6349,7 @@ +@@ -6349,7 +6349,7 @@ bsdi[45]*) lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -1847,7 +1762,7 @@ diff -Naur gdb-9.1-orig/opcodes/configure gdb-9.1/opcodes/configure # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' -@@ -6929,7 +6929,7 @@ +@@ -6929,7 +6929,7 @@ case $host_os in aix*) symcode='[BCDT]' ;; @@ -1856,7 +1771,7 @@ diff -Naur gdb-9.1-orig/opcodes/configure gdb-9.1/opcodes/configure symcode='[ABCDGISTW]' ;; hpux*) -@@ -8514,7 +8514,7 @@ +@@ -8514,7 +8514,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # PIC is the default for these OSes. ;; @@ -1865,7 +1780,7 @@ diff -Naur gdb-9.1-orig/opcodes/configure gdb-9.1/opcodes/configure # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -8596,7 +8596,7 @@ +@@ -8596,7 +8596,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } fi ;; @@ -1874,7 +1789,7 @@ diff -Naur gdb-9.1-orig/opcodes/configure gdb-9.1/opcodes/configure # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' -@@ -9058,7 +9058,7 @@ +@@ -9058,7 +9058,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie extract_expsyms_cmds= case $host_os in @@ -1883,7 +1798,7 @@ diff -Naur gdb-9.1-orig/opcodes/configure gdb-9.1/opcodes/configure # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. -@@ -9173,7 +9173,7 @@ +@@ -9173,7 +9173,7 @@ _LT_EOF fi ;; @@ -1892,7 +1807,7 @@ diff -Naur gdb-9.1-orig/opcodes/configure gdb-9.1/opcodes/configure # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' -@@ -9604,7 +9604,7 @@ +@@ -9604,7 +9604,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec=-rdynamic ;; @@ -1901,7 +1816,7 @@ diff -Naur gdb-9.1-orig/opcodes/configure gdb-9.1/opcodes/configure # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -10505,14 +10505,14 @@ +@@ -10505,14 +10505,14 @@ bsdi[45]*) # libtool to hard-code these into programs ;; @@ -1918,20 +1833,20 @@ diff -Naur gdb-9.1-orig/opcodes/configure gdb-9.1/opcodes/configure library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10536,6 +10536,12 @@ +@@ -10534,6 +10534,12 @@ cygwin* | mingw* | pw32* | cegcc*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" - ;; ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ++ ;; + msys*) + # Msys DLLs use 'msys-' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" -+ ;; + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -11172,7 +11178,7 @@ +@@ -11172,7 +11178,7 @@ else lt_cv_dlopen_libs= ;; @@ -1940,7 +1855,7 @@ diff -Naur gdb-9.1-orig/opcodes/configure gdb-9.1/opcodes/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs= ;; -@@ -12617,7 +12623,7 @@ +@@ -12617,7 +12623,7 @@ $as_echo "$bfd_cv_ld_as_needed" >&6; } LIBM= case $host in @@ -1949,7 +1864,7 @@ diff -Naur gdb-9.1-orig/opcodes/configure gdb-9.1/opcodes/configure # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) -@@ -12787,6 +12793,10 @@ +@@ -12787,6 +12793,10 @@ if test "$enable_shared" = "yes"; then SHARED_LDFLAGS="-no-undefined" SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin" ;; @@ -1960,10 +1875,11 @@ diff -Naur gdb-9.1-orig/opcodes/configure gdb-9.1/opcodes/configure *-*-darwin*) SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib ${SHARED_LIBADD}" SHARED_DEPENDENCIES="../bfd/libbfd.la" -diff -Naur gdb-9.1-orig/opcodes/configure.ac gdb-9.1/opcodes/configure.ac ---- gdb-9.1-orig/opcodes/configure.ac 2020-02-08 15:50:14.000000000 +0300 -+++ gdb-9.1/opcodes/configure.ac 2020-04-19 11:28:17.743877500 +0300 -@@ -178,6 +178,10 @@ +diff --git a/opcodes/configure.ac b/opcodes/configure.ac +index 00be9c88be0..685fbdf631a 100644 +--- a/opcodes/configure.ac ++++ b/opcodes/configure.ac +@@ -178,6 +178,10 @@ changequote([,])dnl SHARED_LDFLAGS="-no-undefined" SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin" ;; @@ -1974,10 +1890,11 @@ diff -Naur gdb-9.1-orig/opcodes/configure.ac gdb-9.1/opcodes/configure.ac *-*-darwin*) SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib ${SHARED_LIBADD}" SHARED_DEPENDENCIES="../bfd/libbfd.la" -diff -Naur gdb-9.1-orig/readline/readline/configure gdb-9.1/readline/readline/configure ---- gdb-9.1-orig/readline/readline/configure 2019-11-19 04:10:41.000000000 +0300 -+++ gdb-9.1/readline/readline/configure 2020-04-19 12:10:27.951039600 +0300 -@@ -2596,7 +2596,7 @@ +diff --git a/readline/readline/configure b/readline/readline/configure +index de7499e6dfd..fc916eacb24 100755 +--- a/readline/readline/configure ++++ b/readline/readline/configure +@@ -2596,7 +2596,7 @@ fi CROSS_COMPILE= if test "x$cross_compiling" = "xyes"; then case "${host}" in @@ -1986,10 +1903,11 @@ diff -Naur gdb-9.1-orig/readline/readline/configure gdb-9.1/readline/readline/co cross_cache=${srcdir}/cross-build/cygwin.cache ;; *-mingw*) -diff -Naur gdb-9.1-orig/readline/readline/configure.ac gdb-9.1/readline/readline/configure.ac ---- gdb-9.1-orig/readline/readline/configure.ac 2019-11-19 04:10:41.000000000 +0300 -+++ gdb-9.1/readline/readline/configure.ac 2020-04-19 12:10:55.668169300 +0300 -@@ -75,7 +75,7 @@ +diff --git a/readline/readline/configure.ac b/readline/readline/configure.ac +index b9b3e1c8aa8..d3af3c5839d 100644 +--- a/readline/readline/configure.ac ++++ b/readline/readline/configure.ac +@@ -75,7 +75,7 @@ dnl build machine. CROSS_COMPILE= if test "x$cross_compiling" = "xyes"; then case "${host}" in @@ -1998,10 +1916,11 @@ diff -Naur gdb-9.1-orig/readline/readline/configure.ac gdb-9.1/readline/readline cross_cache=${srcdir}/cross-build/cygwin.cache ;; *-mingw*) -diff -Naur gdb-9.1-orig/readline/readline/support/config.guess gdb-9.1/readline/readline/support/config.guess ---- gdb-9.1-orig/readline/readline/support/config.guess 2019-11-19 04:10:41.000000000 +0300 -+++ gdb-9.1/readline/readline/support/config.guess 2020-04-19 12:11:48.978560700 +0300 -@@ -906,6 +906,9 @@ +diff --git a/readline/readline/support/config.guess b/readline/readline/support/config.guess +index 15c6cbfc5dc..e2131eaf3db 100755 +--- a/readline/readline/support/config.guess ++++ b/readline/readline/support/config.guess +@@ -906,6 +906,9 @@ EOF amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-pc-cygwin exit ;; @@ -2011,10 +1930,11 @@ diff -Naur gdb-9.1-orig/readline/readline/support/config.guess gdb-9.1/readline/ prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; -diff -Naur gdb-9.1-orig/readline/readline/support/config.rpath gdb-9.1/readline/readline/support/config.rpath ---- gdb-9.1-orig/readline/readline/support/config.rpath 2019-11-19 04:10:41.000000000 +0300 -+++ gdb-9.1/readline/readline/support/config.rpath 2020-04-19 12:12:36.046281400 +0300 -@@ -57,7 +57,7 @@ +diff --git a/readline/readline/support/config.rpath b/readline/readline/support/config.rpath +index fc5913d7878..54df9203647 100755 +--- a/readline/readline/support/config.rpath ++++ b/readline/readline/support/config.rpath +@@ -57,7 +57,7 @@ else aix*) wl='-Wl,' ;; @@ -2023,7 +1943,7 @@ diff -Naur gdb-9.1-orig/readline/readline/support/config.rpath gdb-9.1/readline/ ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' -@@ -149,7 +149,7 @@ +@@ -149,7 +149,7 @@ hardcode_direct=no hardcode_minus_L=no case "$host_os" in @@ -2032,7 +1952,7 @@ diff -Naur gdb-9.1-orig/readline/readline/support/config.rpath gdb-9.1/readline/ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. -@@ -198,7 +198,7 @@ +@@ -198,7 +198,7 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; @@ -2041,7 +1961,7 @@ diff -Naur gdb-9.1-orig/readline/readline/support/config.rpath gdb-9.1/readline/ # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' -@@ -348,7 +348,7 @@ +@@ -348,7 +348,7 @@ else ;; bsdi[45]*) ;; @@ -2050,7 +1970,7 @@ diff -Naur gdb-9.1-orig/readline/readline/support/config.rpath gdb-9.1/readline/ # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -533,7 +533,7 @@ +@@ -533,7 +533,7 @@ case "$host_os" in bsdi[45]*) library_names_spec='$libname$shrext' ;; @@ -2059,10 +1979,11 @@ diff -Naur gdb-9.1-orig/readline/readline/support/config.rpath gdb-9.1/readline/ shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur gdb-9.1-orig/readline/readline/support/shlib-install gdb-9.1/readline/readline/support/shlib-install ---- gdb-9.1-orig/readline/readline/support/shlib-install 2019-11-19 04:10:41.000000000 +0300 -+++ gdb-9.1/readline/readline/support/shlib-install 2020-04-19 12:13:01.444170000 +0300 -@@ -75,7 +75,7 @@ +diff --git a/readline/readline/support/shlib-install b/readline/readline/support/shlib-install +index f4eea278fae..3dd36a58995 100755 +--- a/readline/readline/support/shlib-install ++++ b/readline/readline/support/shlib-install +@@ -75,7 +75,7 @@ hpux*|darwin*|macosx*|linux*|solaris2*) if [ -z "$uninstall" ]; then chmod 755 ${INSTALLDIR}/${LIBNAME} fi ;; @@ -2071,7 +1992,7 @@ diff -Naur gdb-9.1-orig/readline/readline/support/shlib-install gdb-9.1/readline IMPLIBNAME=`echo ${LIBNAME} \ | sed -e 's,^cyg,lib,' -e 's,[0-9]*.dll$,.dll.a,'` if [ -z "$uninstall" ]; then -@@ -194,7 +194,7 @@ +@@ -194,7 +194,7 @@ hpux1*) fi ;; @@ -2080,10 +2001,11 @@ diff -Naur gdb-9.1-orig/readline/readline/support/shlib-install gdb-9.1/readline # Links to .dlls don't work. Hence shobj-conf used DLLVERSION.dll # instead of so.SHLIB_MAJOR.SHLIB_MINOR. The postinstall above # took care of everything else. -diff -Naur gdb-9.1-orig/readline/readline/support/shobj-conf gdb-9.1/readline/readline/support/shobj-conf ---- gdb-9.1-orig/readline/readline/support/shobj-conf 2019-11-19 04:10:41.000000000 +0300 -+++ gdb-9.1/readline/readline/support/shobj-conf 2020-04-19 12:13:39.639306700 +0300 -@@ -535,6 +535,24 @@ +diff --git a/readline/readline/support/shobj-conf b/readline/readline/support/shobj-conf +index 7920f1b5cb9..017a59e18a0 100755 +--- a/readline/readline/support/shobj-conf ++++ b/readline/readline/support/shobj-conf +@@ -535,6 +535,24 @@ cygwin*) fi ;; @@ -2108,10 +2030,11 @@ diff -Naur gdb-9.1-orig/readline/readline/support/shobj-conf gdb-9.1/readline/re mingw*) SHOBJ_LD='$(CC)' SHOBJ_LDFLAGS='-shared -Wl,--enable-auto-import -Wl,--enable-auto-image-base -Wl,--export-all -Wl,--out-implib=$(@).a' -diff -Naur gdb-9.1-orig/sim/aarch64/configure gdb-9.1/sim/aarch64/configure ---- gdb-9.1-orig/sim/aarch64/configure 2018-06-27 00:37:28.000000000 +0300 -+++ gdb-9.1/sim/aarch64/configure 2020-04-19 12:16:43.386632300 +0300 -@@ -6281,7 +6281,7 @@ +diff --git a/sim/aarch64/configure b/sim/aarch64/configure +index dc68c75b621..10a4df6a0f3 100755 +--- a/sim/aarch64/configure ++++ b/sim/aarch64/configure +@@ -6281,7 +6281,7 @@ else lt_cv_sys_max_cmd_len=-1; ;; @@ -2120,7 +2043,7 @@ diff -Naur gdb-9.1-orig/sim/aarch64/configure gdb-9.1/sim/aarch64/configure # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -6623,7 +6623,7 @@ +@@ -6623,7 +6623,7 @@ bsdi[45]*) lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -2129,7 +2052,7 @@ diff -Naur gdb-9.1-orig/sim/aarch64/configure gdb-9.1/sim/aarch64/configure # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' -@@ -7245,7 +7245,7 @@ +@@ -7245,7 +7245,7 @@ case $host_os in aix*) symcode='[BCDT]' ;; @@ -2138,7 +2061,7 @@ diff -Naur gdb-9.1-orig/sim/aarch64/configure gdb-9.1/sim/aarch64/configure symcode='[ABCDGISTW]' ;; hpux*) -@@ -9954,7 +9954,7 @@ +@@ -9954,7 +9954,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # PIC is the default for these OSes. ;; @@ -2147,7 +2070,7 @@ diff -Naur gdb-9.1-orig/sim/aarch64/configure gdb-9.1/sim/aarch64/configure # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -10036,7 +10036,7 @@ +@@ -10036,7 +10036,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } fi ;; @@ -2156,7 +2079,7 @@ diff -Naur gdb-9.1-orig/sim/aarch64/configure gdb-9.1/sim/aarch64/configure # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' -@@ -10498,7 +10498,7 @@ +@@ -10498,7 +10498,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie extract_expsyms_cmds= case $host_os in @@ -2165,7 +2088,7 @@ diff -Naur gdb-9.1-orig/sim/aarch64/configure gdb-9.1/sim/aarch64/configure # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. -@@ -10613,7 +10613,7 @@ +@@ -10613,7 +10613,7 @@ _LT_EOF fi ;; @@ -2174,7 +2097,7 @@ diff -Naur gdb-9.1-orig/sim/aarch64/configure gdb-9.1/sim/aarch64/configure # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' -@@ -11044,7 +11044,7 @@ +@@ -11044,7 +11044,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec=-rdynamic ;; @@ -2183,7 +2106,7 @@ diff -Naur gdb-9.1-orig/sim/aarch64/configure gdb-9.1/sim/aarch64/configure # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -11945,14 +11945,14 @@ +@@ -11945,14 +11945,14 @@ bsdi[45]*) # libtool to hard-code these into programs ;; @@ -2200,19 +2123,19 @@ diff -Naur gdb-9.1-orig/sim/aarch64/configure gdb-9.1/sim/aarch64/configure library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -11975,6 +11975,11 @@ +@@ -11974,6 +11974,11 @@ cygwin* | mingw* | pw32* | cegcc*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + msys*) + # MSYS DLLs use 'msys-' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix -@@ -12612,7 +12617,7 @@ +@@ -12612,7 +12617,7 @@ else lt_cv_dlopen_libs= ;; @@ -2221,10 +2144,11 @@ diff -Naur gdb-9.1-orig/sim/aarch64/configure gdb-9.1/sim/aarch64/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs= ;; -diff -Naur gdb-9.1-orig/sim/arm/configure gdb-9.1/sim/arm/configure ---- gdb-9.1-orig/sim/arm/configure 2018-06-27 00:37:28.000000000 +0300 -+++ gdb-9.1/sim/arm/configure 2020-04-19 12:15:00.334779400 +0300 -@@ -6281,7 +6281,7 @@ +diff --git a/sim/arm/configure b/sim/arm/configure +index 11b8a189959..c01a54cb4a5 100755 +--- a/sim/arm/configure ++++ b/sim/arm/configure +@@ -6281,7 +6281,7 @@ else lt_cv_sys_max_cmd_len=-1; ;; @@ -2233,7 +2157,7 @@ diff -Naur gdb-9.1-orig/sim/arm/configure gdb-9.1/sim/arm/configure # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -6623,7 +6623,7 @@ +@@ -6623,7 +6623,7 @@ bsdi[45]*) lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -2242,7 +2166,7 @@ diff -Naur gdb-9.1-orig/sim/arm/configure gdb-9.1/sim/arm/configure # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' -@@ -7245,7 +7245,7 @@ +@@ -7245,7 +7245,7 @@ case $host_os in aix*) symcode='[BCDT]' ;; @@ -2251,7 +2175,7 @@ diff -Naur gdb-9.1-orig/sim/arm/configure gdb-9.1/sim/arm/configure symcode='[ABCDGISTW]' ;; hpux*) -@@ -9954,7 +9954,7 @@ +@@ -9954,7 +9954,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # PIC is the default for these OSes. ;; @@ -2260,7 +2184,7 @@ diff -Naur gdb-9.1-orig/sim/arm/configure gdb-9.1/sim/arm/configure # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -10036,7 +10036,7 @@ +@@ -10036,7 +10036,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } fi ;; @@ -2269,7 +2193,7 @@ diff -Naur gdb-9.1-orig/sim/arm/configure gdb-9.1/sim/arm/configure # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' -@@ -10498,7 +10498,7 @@ +@@ -10498,7 +10498,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie extract_expsyms_cmds= case $host_os in @@ -2278,7 +2202,7 @@ diff -Naur gdb-9.1-orig/sim/arm/configure gdb-9.1/sim/arm/configure # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. -@@ -10613,7 +10613,7 @@ +@@ -10613,7 +10613,7 @@ _LT_EOF fi ;; @@ -2287,7 +2211,7 @@ diff -Naur gdb-9.1-orig/sim/arm/configure gdb-9.1/sim/arm/configure # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' -@@ -11044,7 +11044,7 @@ +@@ -11044,7 +11044,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec=-rdynamic ;; @@ -2296,7 +2220,7 @@ diff -Naur gdb-9.1-orig/sim/arm/configure gdb-9.1/sim/arm/configure # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -11945,14 +11945,14 @@ +@@ -11945,14 +11945,14 @@ bsdi[45]*) # libtool to hard-code these into programs ;; @@ -2313,20 +2237,20 @@ diff -Naur gdb-9.1-orig/sim/arm/configure gdb-9.1/sim/arm/configure library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -11976,6 +11976,12 @@ +@@ -11974,6 +11974,12 @@ cygwin* | mingw* | pw32* | cegcc*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" - ;; ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ++ ;; + msys*) + # MSYS DLLs use 'msys-' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" -+ ;; + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -12612,7 +12618,7 @@ +@@ -12612,7 +12618,7 @@ else lt_cv_dlopen_libs= ;; @@ -2335,3 +2259,6 @@ diff -Naur gdb-9.1-orig/sim/arm/configure gdb-9.1/sim/arm/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs= ;; +-- +2.31.1.windows.1 + diff --git a/gdb/0006-Move-thread_local_segv_handler-definition.patch b/gdb/0006-Move-thread_local_segv_handler-definition.patch deleted file mode 100644 index 1083128c..00000000 --- a/gdb/0006-Move-thread_local_segv_handler-definition.patch +++ /dev/null @@ -1,103 +0,0 @@ -From de63ee3bb106cfc54a7155ebc3ba7b656209e8ad Mon Sep 17 00:00:00 2001 -From: Jon Turney -Date: Mon, 6 Jan 2020 18:11:38 +0000 -Subject: [PATCH 6/6] Move thread_local_segv_handler definition - -Move thread_local_segv_handler definition, to work around a problem on -Cygwin/x86_64 with referencing thread_local variables from a different -TU. - -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64697 ---- - gdb/cp-support.c | 17 +++++++++++++++++ - gdb/event-top.c | 19 +------------------ - gdb/event-top.h | 8 +++----- - 3 files changed, 21 insertions(+), 23 deletions(-) - -diff --git a/gdb/cp-support.c b/gdb/cp-support.c -index c1d62f1711e..e69012b25d0 100644 ---- a/gdb/cp-support.c -+++ b/gdb/cp-support.c -@@ -1485,6 +1485,23 @@ static thread_local SIGJMP_BUF *gdb_demangle_jmp_buf; - - static std::atomic gdb_demangle_attempt_core_dump; - -+/* The SIGSEGV handler for this thread, or NULL if there is none. GDB -+ always installs a global SIGSEGV handler, and then lets threads -+ indicate their interest in handling the signal by setting this -+ thread-local variable. */ -+ -+thread_local void (*thread_local_segv_handler) (int); -+ -+void -+handle_sigsegv (int sig) -+{ -+ install_handle_sigsegv (); -+ -+ if (thread_local_segv_handler == nullptr) -+ abort (); /* ARI: abort */ -+ thread_local_segv_handler (sig); -+} -+ - /* Signal handler for gdb_demangle. */ - - static void -diff --git a/gdb/event-top.c b/gdb/event-top.c -index 8ac6965f388..9e501ea7152 100644 ---- a/gdb/event-top.c -+++ b/gdb/event-top.c -@@ -847,15 +847,8 @@ gdb_readline_no_editing_callback (gdb_client_data client_data) - ui->input_handler (gdb::unique_xmalloc_ptr (result)); - } - -- --/* See event-top.h. */ -- --thread_local void (*thread_local_segv_handler) (int); -- --static void handle_sigsegv (int sig); -- - /* Install the SIGSEGV handler. */ --static void -+void - install_handle_sigsegv () - { - #if defined (HAVE_SIGACTION) -@@ -875,16 +868,6 @@ install_handle_sigsegv () - - /* Handler for SIGSEGV. */ - --static void --handle_sigsegv (int sig) --{ -- install_handle_sigsegv (); -- -- if (thread_local_segv_handler == nullptr) -- abort (); -- thread_local_segv_handler (sig); --} -- - - - /* The serial event associated with the QUIT flag. set_quit_flag sets -diff --git a/gdb/event-top.h b/gdb/event-top.h -index f858626dd53..f0c9a4f8b0f 100644 ---- a/gdb/event-top.h -+++ b/gdb/event-top.h -@@ -70,10 +70,8 @@ extern void gdb_rl_callback_handler_install (const char *prompt); - currently installed. */ - extern void gdb_rl_callback_handler_reinstall (void); - --/* The SIGSEGV handler for this thread, or NULL if there is none. GDB -- always installs a global SIGSEGV handler, and then lets threads -- indicate their interest in handling the signal by setting this -- thread-local variable. */ --extern thread_local void (*thread_local_segv_handler) (int); -+void handle_sigsegv (int sig); -+ -+void install_handle_sigsegv (); - - #endif --- -2.21.0 - diff --git a/gdb/PKGBUILD b/gdb/PKGBUILD index ada3ec0f..3d161dfa 100644 --- a/gdb/PKGBUILD +++ b/gdb/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer: Alexey Pavlov pkgname=gdb -pkgver=9.2 -pkgrel=3 -_gcc_ver=9.3.0 +pkgver=10.2 +pkgrel=1 +_gcc_ver=10.2.0 pkgdesc="GNU Debugger (MSYS2 version)" arch=('i686' 'x86_64') license=('GPL3') url="https://www.gnu.org/software/gdb/" groups=('base-devel') -depends=("libiconv" "zlib" "expat" "python" "libexpat" "libreadline" "mpfr") +depends=("libiconv" "zlib" "expat" "python" "libexpat" "libreadline" "mpfr" "xxhash") #checkdepends=('dejagnu' 'bc') makedepends=("libiconv-devel" "zlib-devel" "ncurses-devel" "liblzma-devel" "mpfr-devel" "libexpat-devel" "libreadline-devel" "python-devel") options=('staticlibs' '!distcc' '!ccache') @@ -19,20 +19,16 @@ source=("https://ftp.gnu.org/gnu/gdb/gdb-${pkgver}.tar.xz"{,.sig} 0002-7.8-windows-nat-cygwin.patch 0003-Better-handling-for-realpath-failures-in-windows_mak.patch 0004-7.8-symtab-cygwin.patch - 0005-Enable-CLI-styling-by-default-on-Cygwin.patch - 0006-Move-thread_local_segv_handler-definition.patch - 'gdb-9.1-msysize.patch') + 0005-msysize.patch) validpgpkeys=('F40ADB902B24264AA42E50BF92EDB04BFF325CF3') -sha256sums=('360cd7ae79b776988e89d8f9a01c985d0b1fa21c767a4295e5f88cb49175c555' +sha256sums=('aaa1223d534c9b700a8bec952d9748ee1977513f178727e1bee520ee000b4f29' 'SKIP' '2bbe7eddb1828c394d0ff99777058df79b1a596172603bb0e30d983fc1ea8785' - '2bdd02d6dc46d1186a3fa4485922d277686ca9ff827dde6b9fa1a90e9345c953' - '295fa28ad89e7e8bde2dd846644e3a9dc92485c4b87c6d17244fb02b19e09ccb' - '91994d62047bb76688a785c9a911f8deda6e7b7aa258aade0a6b29904a9e9b58' - '6d368418cb7654d7054996b4bc3d7a24ef440028fd1007b204b1429aa7e97b11' - '2156ad9e4b0ab528ec7ed4edf36ac2cbb6ef3092c71964edba16560d62a79878' - 'aac0a21993be88a5414e231ead1a81b318e821869bccb73dd863dc5aab357769' - '85d6e7f728f103b6e87ad7fc240ed5e31469bedff7a05e361462b433344b1338') + 'bebb9adc23867939e4fb04639ef0da4c63aa09faad221f20c1d5fc810317f198' + 'cbb6162bb222161906f1425e76f630b724bdfe807d11748803e887e2f6ec3b13' + 'cdf8e29386848652069754d95089c6fd3f93cad939a8eed6e6a9875550eac3e0' + 'caa97f691e22e10c0b57251f31ca79a17a25bb77a351dbb80ec47a95fa577d49' + 'cd13a9b84472399e2ae41efc74e9cc0c85bad0d8769a76ab1ea769e8de7e83d2') prepare() { cd ${srcdir}/${pkgname}-${pkgver} @@ -41,9 +37,7 @@ prepare() { patch -p1 -i ${srcdir}/0002-7.8-windows-nat-cygwin.patch patch -p1 -i ${srcdir}/0003-Better-handling-for-realpath-failures-in-windows_mak.patch patch -p1 -i ${srcdir}/0004-7.8-symtab-cygwin.patch - patch -p1 -i ${srcdir}/0005-Enable-CLI-styling-by-default-on-Cygwin.patch - patch -p1 -i ${srcdir}/0006-Move-thread_local_segv_handler-definition.patch - patch -p1 -i ${srcdir}/gdb-9.1-msysize.patch + patch -p1 -i ${srcdir}/0005-msysize.patch # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure