Merge pull request #2760 from lazka/gdb11

gdb: Update to 11.1

gdb/0001-Teach-gdb-how-to-unwind-cygwin-_sigbe-and-sigdelayed.patch

@@ -1,8 +1,7 @@
-From 1822f7cf064bc795a31e8eeb736e48593abb5af2 Mon Sep 17 00:00:00 2001
+From 742a5dd1aec188e45edddc9491e46e31ac2cf887 Mon Sep 17 00:00:00 2001
 From: Jon Turney <jon.turney@dronecode.org.uk>
 Date: Tue, 12 Jan 2016 22:49:09 +0000
-Subject: [PATCH 1/5] Teach gdb how to unwind cygwin _sigbe and sigdelayed
+Subject: [PATCH] Teach gdb how to unwind cygwin _sigbe and sigdelayed frames
- frames
 
 The majority of functions in the cygwin DLL are wrapped by routines which use an
 an alternate stack to return via a signal handler if a signal occured while
@@ -42,15 +41,15 @@ as we unwind the stack.
 ---
  gdb/amd64-windows-tdep.c |  57 +++++++++-
  gdb/i386-windows-tdep.c  |  28 +++++
- gdb/windows-tdep.c       | 237 +++++++++++++++++++++++++++++++++++++++
+ gdb/windows-tdep.c       | 238 +++++++++++++++++++++++++++++++++++++++
  gdb/windows-tdep.h       |  20 ++++
- 4 files changed, 341 insertions(+), 1 deletion(-)
+ 4 files changed, 342 insertions(+), 1 deletion(-)
 
 diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
-index 3f9cbebc5d3..130d421be7e 100644
+index fe8a3a0b7ac..1d9121cf76d 100644
 --- a/gdb/amd64-windows-tdep.c
 +++ b/gdb/amd64-windows-tdep.c
-@@ -1208,11 +1208,66 @@ amd64_windows_auto_wide_charset (void)
+@@ -1272,13 +1272,68 @@ amd64_windows_auto_wide_charset (void)
    return "UTF-16";
  }
  
@@ -111,15 +110,17 @@ index 3f9cbebc5d3..130d421be7e 100644
  static void
  amd64_windows_init_abi_common (gdbarch_info info, struct gdbarch *gdbarch)
  {
-+
+   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+ 
 +  cygwin_sigwrapper_frame_unwind_set_sigbe_pattern (&amd64_sigbe);
 +  cygwin_sigwrapper_frame_unwind_set_sigdelayed_pattern (&amd64_sigdelayed);
 +  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 correctly handled
 diff --git a/gdb/i386-windows-tdep.c b/gdb/i386-windows-tdep.c
-index 4ffaa4562b5..26132f0a800 100644
+index b561d60e0f8..1da56866bff 100644
 --- a/gdb/i386-windows-tdep.c
 +++ b/gdb/i386-windows-tdep.c
 @@ -27,6 +27,7 @@
@@ -130,7 +131,7 @@ index 4ffaa4562b5..26132f0a800 100644
  
  /* Core file support.  */
  
-@@ -199,6 +200,30 @@ i386_windows_auto_wide_charset (void)
+@@ -101,6 +102,30 @@ i386_windows_auto_wide_charset (void)
    return "UTF-16";
  }
  
@@ -161,7 +162,7 @@ index 4ffaa4562b5..26132f0a800 100644
  /* 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)
+@@ -138,6 +163,9 @@ i386_windows_init_abi_common (struct gdbarch_info info, struct gdbarch *gdbarch)
  {
    struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
  
@@ -172,7 +173,7 @@ index 4ffaa4562b5..26132f0a800 100644
  
    set_gdbarch_skip_main_prologue (gdbarch, i386_skip_main_prologue);
 diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c
-index 019d4d18b64..a2c7a1efa97 100644
+index ca854390b7e..7ff1750990b 100644
 --- a/gdb/windows-tdep.c
 +++ b/gdb/windows-tdep.c
 @@ -33,6 +33,7 @@
@@ -183,7 +184,7 @@ index 019d4d18b64..a2c7a1efa97 100644
  #include "gdbcore.h"
  #include "coff/internal.h"
  #include "libcoff.h"
-@@ -1120,3 +1121,239 @@ even if their meaning is unknown."),
+@@ -1237,3 +1238,240 @@ even if their meaning is unknown."),
       isn't another convenience variable of the same name.  */
    create_internalvar_type_lazy ("_tlb", &tlb_funcs, NULL);
  }
@@ -416,6 +417,7 @@ index 019d4d18b64..a2c7a1efa97 100644
 +
 +const struct frame_unwind cygwin_sigwrapper_frame_unwind =
 +{
++  "cygwin_sigwrapper",
 +  NORMAL_FRAME,
 +  default_frame_unwind_stop_reason,
 +  &cygwin_sigwrapper_frame_this_id,
@@ -424,10 +426,10 @@ index 019d4d18b64..a2c7a1efa97 100644
 +  &cygwin_sigwrapper_frame_sniffer
 +};
 diff --git a/gdb/windows-tdep.h b/gdb/windows-tdep.h
-index 00ae7a6258e..9c2efcc0516 100644
+index bd2c7e7589f..835bb2253ad 100644
 --- a/gdb/windows-tdep.h
 +++ b/gdb/windows-tdep.h
-@@ -48,4 +48,24 @@ extern void cygwin_init_abi (struct gdbarch_info info,
+@@ -56,4 +56,24 @@ extern void cygwin_init_abi (struct gdbarch_info info,
  
  extern bool is_linked_with_cygwin_dll (bfd *abfd);
  
@@ -453,5 +455,5 @@ index 00ae7a6258e..9c2efcc0516 100644
 +
  #endif
 -- 
-2.31.1.windows.1
+2.34.1
 

gdb/1002-autoreconf.patch

@@ -0,0 +1,907 @@
+From 9bd1a66f317a70ff9b609d3fd45cfd27ed34581e Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 28 Dec 2021 09:29:23 +0100
+Subject: [PATCH 2/2] autoreconf
+
+---
+ bfd/configure               | 36 ++++++++++++++++++-----------
+ binutils/configure          | 30 +++++++++++++++----------
+ configure                   | 22 +++++++++---------
+ gas/configure               | 32 +++++++++++++++-----------
+ gdb/configure               | 10 ++++-----
+ gnulib/configure            |  8 +++----
+ gprof/configure             | 28 ++++++++++++++---------
+ intl/configure              |  2 ++
+ ld/configure                | 45 +++++++++++++++++++++++--------------
+ libctf/configure            | 32 +++++++++++++++++---------
+ libdecnumber/configure      |  3 ++-
+ libiberty/configure         |  2 +-
+ opcodes/configure           | 34 ++++++++++++++++++----------
+ readline/readline/configure |  2 +-
+ sim/configure               | 28 ++++++++++++++---------
+ zlib/configure              | 28 ++++++++++++++---------
+ 16 files changed, 208 insertions(+), 134 deletions(-)
+
+diff --git a/bfd/configure b/bfd/configure
+index daa51244369..051b4baf316 100755
+--- a/bfd/configure
++++ b/bfd/configure
+@@ -5592,7 +5592,7 @@ else
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+-  cygwin* | mingw* | cegcc*)
++  cygwin* | msys* | mingw* | cegcc*)
+     # 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,
+@@ -5934,7 +5934,7 @@ bsdi[45]*)
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-cygwin*)
++cygwin* | msys*)
+   # 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'
+@@ -6545,7 +6545,7 @@ case $host_os in
+ aix*)
+   symcode='[BCDT]'
+   ;;
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   symcode='[ABCDGISTW]'
+   ;;
+ hpux*)
+@@ -8129,7 +8129,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # 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
+@@ -8211,7 +8211,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+       fi
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # 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'
+@@ -8673,7 +8673,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+   extract_expsyms_cmds=
+ 
+   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++.
+@@ -8788,7 +8788,7 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    cygwin* | mingw* | pw32* | cegcc*)
++    cygwin* | msys* | mingw* | pw32* | cegcc*)
+       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+       # as there is no search path for DLLs.
+       hardcode_libdir_flag_spec='-L$libdir'
+@@ -9219,7 +9219,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+       export_dynamic_flag_spec=-rdynamic
+       ;;
+ 
+-    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
+@@ -10120,14 +10120,14 @@ bsdi[45]*)
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -10149,6 +10149,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"
++      ;;
++    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"
+       ;;
+     mingw* | cegcc*)
+@@ -10777,7 +10783,7 @@ else
+     lt_cv_dlopen_libs=
+     ;;
+ 
+-  cygwin*)
++  cygwin* | msys*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+     ;;
+@@ -12894,7 +12900,7 @@ _ACEOF
+ 
+ 
+ case "${host}" in
+-*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
++*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-msys* | *-*-windows*)
+ 
+ $as_echo "#define USE_BINARY_FOPEN 1" >>confdefs.h
+  ;;
+@@ -12973,7 +12979,7 @@ $as_echo "$bfd_cv_ld_as_needed" >&6; }
+ 
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
++*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -13127,6 +13133,10 @@ if test "$enable_shared" = "yes"; then
+     SHARED_LDFLAGS="-no-undefined"
+     SHARED_LIBADD="-L`pwd`/../libiberty -liberty $SHARED_LIBADD -lcygwin -lkernel32"
+   ;;
++  *-*-msys*)
++    SHARED_LDFLAGS="-no-undefined"
++    SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lmsys-2.0 -lkernel32"
++  ;;
+   esac
+ 
+   if test -n "$SHARED_LIBADD"; then
+diff --git a/configure b/configure
+index 3dd206525a7..022ec2c2540 100755
+--- a/configure
++++ b/configure
+@@ -3090,7 +3090,7 @@ fi
+ # Configure extra directories which are host specific
+ 
+ case "${host}" in
+-  *-cygwin*)
++  *-cygwin* | *-msys*)
+     configdirs="$configdirs libtermcap" ;;
+ esac
+ 
+@@ -3488,7 +3488,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
+@@ -3520,7 +3520,7 @@ if test x$enable_libgo = x; then
+ 	# PR 46986
+ 	noconfigdirs="$noconfigdirs target-libgo"
+ 	;;
+-    *-*-cygwin* | *-*-mingw*)
++    *-*-cygwin* | *-*-msys* | *-*-mingw*)
+ 	noconfigdirs="$noconfigdirs target-libgo"
+ 	;;
+     esac
+@@ -3788,7 +3788,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.
+@@ -3936,7 +3936,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; }
+@@ -6357,7 +6357,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)
+@@ -6375,7 +6375,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
+@@ -6386,7 +6386,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
+@@ -6396,7 +6396,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
+ 
+@@ -7360,7 +7360,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
+ 
+@@ -7894,7 +7894,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 5d89635c043..d5477e5dd51 100755
+--- a/gdb/configure
++++ b/gdb/configure
+@@ -9131,7 +9131,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"
+@@ -17098,7 +17098,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
+@@ -17790,7 +17790,7 @@ WIN32LDAPP=
+ 
+ 
+ case "${host}" in
+-*-*-cygwin* | *-*-mingw* )
++*-*-cygwin* | *-*-msys* | *-*-mingw* )
+     configdir="win"
+     ;;
+ *)
+@@ -17833,7 +17833,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
+@@ -17962,7 +17962,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/gnulib/configure b/gnulib/configure
+index 73a38082960..423d960a99f 100644
+--- a/gnulib/configure
++++ b/gnulib/configure
+@@ -7870,7 +7870,7 @@ else
+         # special semantics and is distinct from /, please report it to
+         # <bug-gnulib@gnu.org>.
+         case $host in
+-          *-cygwin | i370-ibm-openedition)
++          *-cygwin | *-msys | i370-ibm-openedition)
+             gl_cv_double_slash_root=yes ;;
+           *)
+             # Be optimistic and assume that / and // are the same when we
+@@ -19347,7 +19347,7 @@ else
+         # special semantics and is distinct from /, please report it to
+         # <bug-gnulib@gnu.org>.
+         case $host in
+-          *-cygwin | i370-ibm-openedition)
++          *-cygwin | *-msys | i370-ibm-openedition)
+             gl_cv_double_slash_root=yes ;;
+           *)
+             # Be optimistic and assume that / and // are the same when we
+@@ -19485,7 +19485,7 @@ else
+   case "$host_os" in
+          mingw*) # on this platform, dup2 always returns 0 for success
+            gl_cv_func_dup2_works="guessing no" ;;
+-         cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
++         cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0
+            gl_cv_func_dup2_works="guessing no" ;;
+          aix* | freebsd*)
+                  # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
+@@ -19819,7 +19819,7 @@ if ${gl_cv_func_fcntl_f_dupfd_works+:} false; then :
+ else
+   if test "$cross_compiling" = yes; then :
+   case $host_os in
+-            aix* | cygwin* | haiku*)
++            aix* | cygwin* | msys* | haiku*)
+                gl_cv_func_fcntl_f_dupfd_works="guessing no" ;;
+             *) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;;
+           esac
+diff --git a/intl/configure b/intl/configure
+index 2d0b2abec05..9ce51206f89 100755
+--- a/intl/configure
++++ b/intl/configure
+@@ -6838,6 +6838,8 @@ case "${host}" in
+ 	;;
+     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 --git a/libctf/configure b/libctf/configure
+index 82bcf13a606..1f781c4e0fa 100755
+--- a/libctf/configure
++++ b/libctf/configure
+@@ -6133,7 +6133,7 @@ else
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+-  cygwin* | mingw* | cegcc*)
++  cygwin* | msys* | mingw* | cegcc*)
+     # 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,
+@@ -6475,7 +6475,7 @@ bsdi[45]*)
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-cygwin*)
++cygwin* | msys*)
+   # 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'
+@@ -7086,7 +7086,7 @@ case $host_os in
+ aix*)
+   symcode='[BCDT]'
+   ;;
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   symcode='[ABCDGISTW]'
+   ;;
+ hpux*)
+@@ -8671,7 +8671,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # 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
+@@ -8753,7 +8753,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+       fi
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # 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'
+@@ -9215,7 +9215,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+   extract_expsyms_cmds=
+ 
+   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++.
+@@ -9330,7 +9330,7 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    cygwin* | mingw* | pw32* | cegcc*)
++    cygwin* | msys* | mingw* | pw32* | cegcc*)
+       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+       # as there is no search path for DLLs.
+       hardcode_libdir_flag_spec='-L$libdir'
+@@ -9761,7 +9761,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+       export_dynamic_flag_spec=-rdynamic
+       ;;
+ 
+-    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
+@@ -10662,14 +10662,14 @@ bsdi[45]*)
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -10691,6 +10691,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"
++      ;;
++    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"
+       ;;
+     mingw* | cegcc*)
+@@ -11319,7 +11325,7 @@ else
+     lt_cv_dlopen_libs=
+     ;;
+ 
+-  cygwin*)
++  cygwin* | msys*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+     ;;
+@@ -13434,6 +13440,10 @@ if test "$enable_shared" = "yes"; then
+       SHARED_LDFLAGS="-no-undefined"
+       CTF_LIBADD="$CTF_LIBADD -lcygwin"
+       ;;
++    *-*-msys*)
++      SHARED_LDFLAGS="-no-undefined"
++      CTF_LIBADD="$CTF_LIBADD -lmsys-2.0"
++      ;;
+   esac
+ fi
+ 
+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* | \
+-    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/libiberty/configure b/libiberty/configure
+index fffb91dd020..e24bc9d0bd0 100755
+--- a/libiberty/configure
++++ b/libiberty/configure
+@@ -6474,7 +6474,7 @@ fi
+ 
+ 
+ case "${host}" in
+-  *-*-cygwin* | *-*-mingw*)
++  *-*-cygwin* | *-*-msys* | *-*-mingw*)
+     $as_echo "#define HAVE_SYS_ERRLIST 1" >>confdefs.h
+ 
+     $as_echo "#define HAVE_SYS_NERR 1" >>confdefs.h
+diff --git a/opcodes/configure b/opcodes/configure
+index 3513e408ce1..ae963ae2320 100755
+--- a/opcodes/configure
++++ b/opcodes/configure
+@@ -5355,7 +5355,7 @@ else
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+-  cygwin* | mingw* | cegcc*)
++  cygwin* | msys* | mingw* | cegcc*)
+     # 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,
+@@ -5697,7 +5697,7 @@ bsdi[45]*)
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-cygwin*)
++cygwin* | msys*)
+   # 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'
+@@ -6308,7 +6308,7 @@ case $host_os in
+ aix*)
+   symcode='[BCDT]'
+   ;;
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   symcode='[ABCDGISTW]'
+   ;;
+ hpux*)
+@@ -7893,7 +7893,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # 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
+@@ -7975,7 +7975,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+       fi
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # 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'
+@@ -8437,7 +8437,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+   extract_expsyms_cmds=
+ 
+   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++.
+@@ -8552,7 +8552,7 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    cygwin* | mingw* | pw32* | cegcc*)
++    cygwin* | msys* | mingw* | pw32* | cegcc*)
+       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+       # as there is no search path for DLLs.
+       hardcode_libdir_flag_spec='-L$libdir'
+@@ -8983,7 +8983,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+       export_dynamic_flag_spec=-rdynamic
+       ;;
+ 
+-    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
+@@ -9884,14 +9884,14 @@ bsdi[45]*)
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -9913,6 +9913,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"
++      ;;
++    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"
+       ;;
+     mingw* | cegcc*)
+@@ -10541,7 +10547,7 @@ else
+     lt_cv_dlopen_libs=
+     ;;
+ 
+-  cygwin*)
++  cygwin* | msys*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+     ;;
+@@ -11956,7 +11962,7 @@ $as_echo "$bfd_cv_ld_as_needed" >&6; }
+ 
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
++*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -12132,6 +12138,10 @@ if test "$enable_shared" = "yes"; then
+       SHARED_LDFLAGS="-no-undefined"
+       SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty $SHARED_LIBADD"
+       ;;
++    *-*-msys*)
++      SHARED_LDFLAGS="-no-undefined"
++      SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lmsys-2.0"
++      ;;
+    *-*-darwin*)
+      SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib ${SHARED_LIBADD}"
+      SHARED_DEPENDENCIES="../bfd/libbfd.la"
+diff --git a/readline/readline/configure b/readline/readline/configure
+index 6ea4545e26f..2aec06a0d99 100755
+--- a/readline/readline/configure
++++ b/readline/readline/configure
+@@ -2615,7 +2615,7 @@ fi
+ CROSS_COMPILE=
+ if test "x$cross_compiling" = "xyes"; then
+     case "${host}" in
+-    *-cygwin*)
++    *-cygwin* | *-msys*)
+         cross_cache=${srcdir}/cross-build/cygwin.cache
+         ;;
+     *-mingw*)
+diff --git a/sim/configure b/sim/configure
+index 8dec72cf3b4..2cbf7dd32a4 100755
+--- a/sim/configure
++++ b/sim/configure
+@@ -5786,7 +5786,7 @@ else
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+-  cygwin* | mingw* | cegcc*)
++  cygwin* | msys* | mingw* | cegcc*)
+     # 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,
+@@ -6128,7 +6128,7 @@ bsdi[45]*)
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-cygwin*)
++cygwin* | msys*)
+   # 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'
+@@ -6781,7 +6781,7 @@ case $host_os in
+ aix*)
+   symcode='[BCDT]'
+   ;;
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   symcode='[ABCDGISTW]'
+   ;;
+ hpux*)
+@@ -9267,7 +9267,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # 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
+@@ -9349,7 +9349,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+       fi
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # 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'
+@@ -9811,7 +9811,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+   extract_expsyms_cmds=
+ 
+   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++.
+@@ -9926,7 +9926,7 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    cygwin* | mingw* | pw32* | cegcc*)
++    cygwin* | msys* | mingw* | pw32* | cegcc*)
+       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+       # as there is no search path for DLLs.
+       hardcode_libdir_flag_spec='-L$libdir'
+@@ -10357,7 +10357,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+       export_dynamic_flag_spec=-rdynamic
+       ;;
+ 
+-    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
+@@ -11258,14 +11258,14 @@ bsdi[45]*)
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -11287,6 +11287,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"
++      ;;
++    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"
+       ;;
+     mingw* | cegcc*)
+@@ -11915,7 +11921,7 @@ else
+     lt_cv_dlopen_libs=
+     ;;
+ 
+-  cygwin*)
++  cygwin* | msys*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+     ;;
+diff --git a/zlib/configure b/zlib/configure
+index 695819cd54b..802223416c5 100755
+--- a/zlib/configure
++++ b/zlib/configure
+@@ -4881,7 +4881,7 @@ else
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+-  cygwin* | mingw* | cegcc*)
++  cygwin* | msys* | mingw* | cegcc*)
+     # 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,
+@@ -5223,7 +5223,7 @@ bsdi[45]*)
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-cygwin*)
++cygwin* | msys*)
+   # 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'
+@@ -5834,7 +5834,7 @@ case $host_os in
+ aix*)
+   symcode='[BCDT]'
+   ;;
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   symcode='[ABCDGISTW]'
+   ;;
+ hpux*)
+@@ -7723,7 +7723,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # 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
+@@ -7805,7 +7805,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+       fi
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # 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'
+@@ -8267,7 +8267,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+   extract_expsyms_cmds=
+ 
+   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++.
+@@ -8382,7 +8382,7 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    cygwin* | mingw* | pw32* | cegcc*)
++    cygwin* | msys* | mingw* | pw32* | cegcc*)
+       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+       # as there is no search path for DLLs.
+       hardcode_libdir_flag_spec='-L$libdir'
+@@ -8819,7 +8819,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+       export_dynamic_flag_spec=-rdynamic
+       ;;
+ 
+-    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
+@@ -9723,14 +9723,14 @@ bsdi[45]*)
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -9752,6 +9752,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"
++      ;;
++    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"
+       ;;
+     mingw* | cegcc*)
+@@ -10383,7 +10389,7 @@ else
+     lt_cv_dlopen_libs=
+     ;;
+ 
+-  cygwin*)
++  cygwin* | msys*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+     ;;
+-- 
+2.34.1
+

gdb/PKGBUILD

@@ -1,9 +1,9 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=gdb
-pkgver=10.2
+pkgver=11.1
-pkgrel=3
+pkgrel=1
-_gcc_ver=10.2.0
+_gcc_ver=11.2.0
 pkgdesc="GNU Debugger (MSYS2 version)"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -19,28 +19,29 @@ 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-msysize.patch)
+        1001-msysize.patch
+        1002-autoreconf.patch)
 validpgpkeys=('F40ADB902B24264AA42E50BF92EDB04BFF325CF3')
-sha256sums=('aaa1223d534c9b700a8bec952d9748ee1977513f178727e1bee520ee000b4f29'
+sha256sums=('cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94'
             'SKIP'
             '2bbe7eddb1828c394d0ff99777058df79b1a596172603bb0e30d983fc1ea8785'
-            'bebb9adc23867939e4fb04639ef0da4c63aa09faad221f20c1d5fc810317f198'
+            '0f6bd95bf4c02e84b6f6e3fe99921d172082bbbbef130bf1dc45d11c478af4fb'
             'cbb6162bb222161906f1425e76f630b724bdfe807d11748803e887e2f6ec3b13'
             'cdf8e29386848652069754d95089c6fd3f93cad939a8eed6e6a9875550eac3e0'
             'caa97f691e22e10c0b57251f31ca79a17a25bb77a351dbb80ec47a95fa577d49'
-            '10193948948d6dd8334dff410e058d90dbaea8af66d74a2a9d058270a2a336ae')
+            'c985a240584d9bafadea72e242cb7e88cda83152c69890c354e48679a7f5e8e0'
+            '09bb012c032ce683fa404c537fe533d6d557fe473e3ae285eed65ea0728cb36d')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  patch -p1 -i ${srcdir}/1001-msysize.patch
+  patch -p1 -i ${srcdir}/1002-autoreconf.patch
+
   patch -p1 -i ${srcdir}/0001-Teach-gdb-how-to-unwind-cygwin-_sigbe-and-sigdelayed.patch
   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-msysize.patch
-
-  # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
 }
 
 build() {