From fe07ffff5cbb562bd7be23c1184f1d42fd30dc0c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 14 Jun 2025 13:38:48 +0200 Subject: [PATCH] gcc: build for cygwin 0950-11.2.0-configure-msys2.patch: drop everything and patch the cygwin paths instead. One hunk re SUPPORTS_WEAK is dropped since I don't think that does anything for cygwin. 0951-11.2.0-msys2-spec.patch: compare everything and patch the cygwin files instead. I'm not sure if the multilib change does anything, but keeping it anyway. 0953-11.2.0-testsuite-msys2.patch: no longer needed, all conditions are true with the cygwin triplet. --- gcc/0950-11.2.0-configure-msys2.patch | 4836 ++----------------------- gcc/0951-11.2.0-msys2-spec.patch | 513 +-- gcc/0953-11.2.0-testsuite-msys2.patch | 759 ---- gcc/PKGBUILD | 55 +- 4 files changed, 429 insertions(+), 5734 deletions(-) delete mode 100644 gcc/0953-11.2.0-testsuite-msys2.patch diff --git a/gcc/0950-11.2.0-configure-msys2.patch b/gcc/0950-11.2.0-configure-msys2.patch index 1661c24a..8dd2387f 100644 --- a/gcc/0950-11.2.0-configure-msys2.patch +++ b/gcc/0950-11.2.0-configure-msys2.patch @@ -1,4574 +1,354 @@ -diff -Naur gcc-13.2.0-orig/ar-lib gcc-13.2.0/ar-lib ---- gcc-13.2.0-orig/ar-lib 2023-09-12 10:00:32.166602500 +0100 -+++ gcc-13.2.0/ar-lib 2023-09-12 10:49:47.224696800 +0100 -@@ -53,7 +53,7 @@ - MINGW*) - file_conv=mingw - ;; -- CYGWIN*) -+ CYGWIN*|MSYS*) - file_conv=cygwin - ;; - *) -diff -Naur gcc-13.2.0-orig/compile gcc-13.2.0/compile ---- gcc-13.2.0-orig/compile 2023-09-12 10:00:29.362694100 +0100 -+++ gcc-13.2.0/compile 2023-09-12 10:49:47.242139200 +0100 -@@ -53,7 +53,7 @@ - MINGW*) - file_conv=mingw - ;; -- CYGWIN*) -+ CYGWIN*|MSYS*) - file_conv=cygwin - ;; - *) -@@ -67,7 +67,7 @@ - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; -- cygwin/*) -+ cygwin/*|msys/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) -diff -Naur gcc-13.2.0-orig/config/dfp.m4 gcc-13.2.0/config/dfp.m4 ---- gcc-13.2.0-orig/config/dfp.m4 2023-09-12 10:00:29.284612000 +0100 -+++ gcc-13.2.0/config/dfp.m4 2023-09-12 10:49:47.242139200 +0100 -@@ -42,7 +42,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 gcc-13.2.0-orig/config/elf.m4 gcc-13.2.0/config/elf.m4 ---- gcc-13.2.0-orig/config/elf.m4 2023-09-12 10:00:29.237747900 +0100 -+++ gcc-13.2.0/config/elf.m4 2023-09-12 10:49:47.242139200 +0100 -@@ -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 gcc-13.2.0-orig/config/lthostflags.m4 gcc-13.2.0/config/lthostflags.m4 ---- gcc-13.2.0-orig/config/lthostflags.m4 2023-09-12 10:00:29.284612000 +0100 -+++ gcc-13.2.0/config/lthostflags.m4 2023-09-12 10:49:47.257763000 +0100 -@@ -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 gcc-13.2.0-orig/config/mmap.m4 gcc-13.2.0/config/mmap.m4 ---- gcc-13.2.0-orig/config/mmap.m4 2023-09-12 10:00:29.222101400 +0100 -+++ gcc-13.2.0/config/mmap.m4 2023-09-12 10:49:47.257763000 +0100 -@@ -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 gcc-13.2.0-orig/config/picflag.m4 gcc-13.2.0/config/picflag.m4 ---- gcc-13.2.0-orig/config/picflag.m4 2023-09-12 10:00:29.284612000 +0100 -+++ gcc-13.2.0/config/picflag.m4 2023-09-12 10:49:47.257763000 +0100 -@@ -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 gcc-13.2.0-orig/config/tcl.m4 gcc-13.2.0/config/tcl.m4 ---- gcc-13.2.0-orig/config/tcl.m4 2023-09-12 10:00:29.300222200 +0100 -+++ gcc-13.2.0/config/tcl.m4 2023-09-12 10:49:47.257763000 +0100 -@@ -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 gcc-13.2.0-orig/config.guess gcc-13.2.0/config.guess ---- gcc-13.2.0-orig/config.guess 2023-09-12 10:00:33.806843200 +0100 -+++ gcc-13.2.0/config.guess 2023-09-12 10:49:47.273384300 +0100 -@@ -914,6 +914,9 @@ - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-pc-cygwin - exit ;; -+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) -+ echo x86_64-unknown-msys -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" - exit ;; -diff -Naur gcc-13.2.0-orig/config.rpath gcc-13.2.0/config.rpath ---- gcc-13.2.0-orig/config.rpath 2023-09-12 10:00:31.698622000 +0100 -+++ gcc-13.2.0/config.rpath 2023-09-12 10:49:47.273384300 +0100 -@@ -109,7 +109,7 @@ - hardcode_minus_L=no - - case "$host_os" in -- cygwin* | mingw* | pw32*) -+ cygwin* | msys* | mingw* | pw32*) - # 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 @@ - ld_shlibs=no - fi - ;; -- cygwin* | mingw* | pw32*) -+ cygwin* | msys* | mingw* | pw32*) - # 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 @@ - ;; - bsdi4*) - ;; -- cygwin* | mingw* | pw32*) -+ cygwin* | msys* | mingw* | pw32*) - # 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 @@ - ;; - bsdi4*) - ;; -- cygwin* | mingw* | pw32*) -+ cygwin* | msys* | mingw* | pw32*) - shrext=.dll - ;; - darwin* | rhapsody*) -diff -Naur gcc-13.2.0-orig/configure gcc-13.2.0/configure ---- gcc-13.2.0-orig/configure 2023-09-12 10:02:34.333912600 +0100 -+++ gcc-13.2.0/configure 2023-09-12 10:49:47.273384300 +0100 -@@ -3140,7 +3140,7 @@ - # Configure extra directories which are host specific - - case "${host}" in -- *-cygwin*) -+ *-cygwin* | *-msys*) - configdirs="$configdirs libtermcap" ;; - esac - -@@ -3549,7 +3549,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* | bpf-* ) -+*-*-darwin* | *-*-cygwin* | *-*-msys* | *-*-mingw* | bpf-* ) - unsupported_languages="$unsupported_languages go" - ;; - esac -@@ -3581,7 +3581,7 @@ - # PR 46986 - noconfigdirs="$noconfigdirs target-libgo" - ;; -- *-*-cygwin* | *-*-mingw*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw*) - noconfigdirs="$noconfigdirs target-libgo" - ;; - bpf-*-*) -@@ -3862,7 +3862,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. -@@ -4012,7 +4012,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; } -@@ -8594,7 +8594,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) -@@ -8612,7 +8612,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 -@@ -8623,7 +8623,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 -@@ -8633,7 +8633,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 - -@@ -8939,6 +8939,7 @@ - case $target in - *mingw*) ;; - *cygwin*) ;; -+ *msys*) ;; - *) - case ${add_this_lang}:${language}:${host_shared} in - yes:jit:no) -@@ -9670,7 +9671,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 - -@@ -10214,7 +10215,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 gcc-13.2.0-orig/configure.ac gcc-13.2.0/configure.ac ---- gcc-13.2.0-orig/configure.ac 2023-09-12 10:00:20.192999900 +0100 -+++ gcc-13.2.0/configure.ac 2023-09-12 10:49:47.289006000 +0100 -@@ -417,7 +417,7 @@ - # Configure extra directories which are host specific - - case "${host}" in -- *-cygwin*) -+ *-cygwin* | *-msys*) - configdirs="$configdirs libtermcap" ;; - esac - -@@ -796,7 +796,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* | bpf-* ) -+*-*-darwin* | *-*-cygwin* | *-*-msys* | *-*-mingw* | bpf-* ) - unsupported_languages="$unsupported_languages go" - ;; - esac -@@ -825,7 +825,7 @@ - # PR 46986 - noconfigdirs="$noconfigdirs target-libgo" - ;; -- *-*-cygwin* | *-*-mingw*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw*) - noconfigdirs="$noconfigdirs target-libgo" - ;; - bpf-*-*) -@@ -1106,7 +1106,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. -@@ -1256,7 +1256,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" - ;; -@@ -1852,7 +1852,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 -@@ -1863,7 +1863,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 -@@ -1873,7 +1873,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 - ]) -@@ -2168,6 +2168,7 @@ - case $target in - *mingw*) ;; - *cygwin*) ;; -+ *msys*) ;; - *) - case ${add_this_lang}:${language}:${host_shared} in - yes:jit:no) -@@ -2819,7 +2820,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 - -@@ -3358,7 +3359,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 gcc-13.2.0-orig/contrib/config-list.mk gcc-13.2.0/contrib/config-list.mk ---- gcc-13.2.0-orig/contrib/config-list.mk 2023-09-12 10:00:33.713123900 +0100 -+++ gcc-13.2.0/contrib/config-list.mk 2023-09-12 10:49:47.289006000 +0100 -@@ -126,7 +126,7 @@ - TGT=`echo $@ | awk 'BEGIN { FS = "OPT" }; { print $$1 }'` && \ - TGT=`$(GCC_SRC_DIR)/config.sub $$TGT` && \ - case $$TGT in \ -- *-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix* | bpf-*-*) \ -+ *-*-darwin* | *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-aix* | bpf-*-*) \ - ADDITIONAL_LANGUAGES=""; \ - ;; \ - *) \ -diff -Naur gcc-13.2.0-orig/fixincludes/configure gcc-13.2.0/fixincludes/configure ---- gcc-13.2.0-orig/fixincludes/configure 2023-09-12 10:00:29.206505800 +0100 -+++ gcc-13.2.0/fixincludes/configure 2023-09-12 10:49:47.289006000 +0100 -@@ -5357,7 +5357,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;; -@@ -5414,7 +5414,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 gcc-13.2.0-orig/fixincludes/mkfixinc.sh gcc-13.2.0/fixincludes/mkfixinc.sh ---- gcc-13.2.0-orig/fixincludes/mkfixinc.sh 2023-09-12 10:00:29.206505800 +0100 -+++ gcc-13.2.0/fixincludes/mkfixinc.sh 2023-09-12 10:49:47.304627300 +0100 -@@ -12,6 +12,9 @@ - # Check for special fix rules for particular targets - case $machine in - i?86-*-cygwin* | \ -+ x86_64-*-cygwin* | \ -+ i?86-*-msys* | \ -+ x86_64-*-msys* | \ - i?86-*-mingw32* | \ - x86_64-*-mingw32* | \ - powerpc-*-eabisim* | \ -diff -Naur gcc-13.2.0-orig/gcc/ada/Makefile.rtl gcc-13.2.0/gcc/ada/Makefile.rtl ---- gcc-13.2.0-orig/gcc/ada/Makefile.rtl 2023-09-12 10:00:34.197376700 +0100 -+++ gcc-13.2.0/gcc/ada/Makefile.rtl 2023-09-12 10:49:47.304627300 +0100 -@@ -2025,15 +2025,15 @@ - EH_MECHANISM=-gcc - endif - --# Cygwin/Mingw32 --ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(target_os))),) -+# Cygwin/MSYS/Mingw32 -+ifeq ($(strip $(filter-out cygwin% msys% mingw32% pe,$(target_os))),) - # Cygwin provides a full Posix environment, and so we use the default - # versions g-socthi rather than the Windows-specific MinGW version. - # Ideally we would use all the default versions for Cygwin and none - # of the MinGW versions, but for historical reasons the Cygwin port - # has always been a CygMing frankenhybrid and it is a long-term project - # to disentangle them. -- ifeq ($(strip $(filter-out cygwin%,$(target_os))),) -+ ifeq ($(strip $(filter-out cygwin% msys%,$(target_os))),) - LIBGNAT_TARGET_PAIRS = \ - g-socthi.ads&5 - $as_echo_n "checking for library containing RegOpenKeyExA... " >&6; } -@@ -14343,7 +14346,7 @@ - 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, -@@ -14685,7 +14688,7 @@ - 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' -@@ -15270,7 +15273,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -16886,7 +16889,7 @@ - # 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 -@@ -16968,7 +16971,7 @@ - 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' -@@ -17430,7 +17433,7 @@ - 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++. -@@ -17545,7 +17548,7 @@ - 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' -@@ -17976,7 +17979,7 @@ - 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 -@@ -18877,14 +18880,14 @@ - # 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}`~ -@@ -18908,6 +18911,12 @@ +diff -Nur gcc-13.4.0.orig/gcc/configure gcc-13.4.0/gcc/configure +--- gcc-13.4.0.orig/gcc/configure 2025-06-13 18:58:03.644152200 +0200 ++++ gcc-13.4.0/gcc/configure 2025-06-13 19:17:22.955206000 +0200 +@@ -18986,7 +18986,7 @@ + case $host_os in + 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}' ++ 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" ;; -+ msys*) -+ # MSYS DLLs use 'msys-' prefix rather than 'lib' +@@ -22663,7 +22663,7 @@ + case $host_os in + 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}' + 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -19558,7 +19567,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -20780,7 +20789,7 @@ - esac - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' -@@ -21750,7 +21759,7 @@ - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) -+ mingw* | cygwin* | msys* | os2* | pw32* | 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 -@@ -22290,7 +22299,7 @@ - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - export_symbols_cmds_CXX='$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' - ;; - *) -@@ -22554,14 +22563,14 @@ - # 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}`~ -@@ -22584,6 +22593,11 @@ - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; -+ 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}' -+ -+ ;; mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -24865,7 +24879,7 @@ - test $ac_status = 0; }; } - then - case $target_os in -- win32 | pe | cygwin* | mingw32*) -+ win32 | pe | cygwin* | msys* | mingw32*) - # Need to check that we generated the correct relocation for the - # .debug_frame section. This was fixed for binutils 2.21. - gcc_cv_as_cfi_sections_directive=no -@@ -27060,7 +27074,7 @@ +diff -Nur gcc-13.4.0.orig/gcc/jit/Make-lang.in gcc-13.4.0/gcc/jit/Make-lang.in +--- gcc-13.4.0.orig/gcc/jit/Make-lang.in 2025-06-13 18:58:03.584758700 +0200 ++++ gcc-13.4.0/gcc/jit/Make-lang.in 2025-06-13 19:17:35.024629900 +0200 +@@ -46,7 +46,7 @@ - i[34567]86-*-* | x86_64-*-*) - case $target_os in -- cygwin*) -+ cygwin* | msys*) - # Full C++ conformance when using a shared libstdc++-v3 requires some - # support from the Cygwin DLL, which in more recent versions exports - # wrappers to aid in interposing and redirecting operators new, delete, -@@ -27086,7 +27100,7 @@ - - esac - case $target_os in -- cygwin* | pe | mingw32*) -+ cygwin* | msys* | pe | mingw32*) - # Recent binutils allows the three-operand form of ".comm" on PE. This - # definition is used unconditionally to initialise the default state of - # the target option variable that governs usage of the feature. -@@ -29465,7 +29479,7 @@ - - - case $target_os in -- win32 | pe | cygwin* | mingw32*) -+ win32 | pe | cygwin* | msys* | mingw32*) - section_flags=\"dr\" - function_type=".def foo; .scl 2; .type 32; .endef" - function_size="";; -@@ -30576,7 +30590,7 @@ - fi - - case $target_os in -- win32 | pe | cygwin* | mingw32*) -+ win32 | pe | cygwin* | msys* | mingw32*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking broken PE linker dwarf5 support" >&5 - $as_echo_n "checking broken PE linker dwarf5 support... " >&6; } - gcc_cv_ld_broken_pe_dwarf5=yes -diff -Naur gcc-13.2.0-orig/gcc/configure.ac gcc-13.2.0/gcc/configure.ac ---- gcc-13.2.0-orig/gcc/configure.ac 2023-09-12 10:00:38.287187200 +0100 -+++ gcc-13.2.0/gcc/configure.ac 2023-09-12 10:49:47.320248800 +0100 -@@ -2263,7 +2263,7 @@ - [enable -fno-omit-frame-pointer by default for x86])], [], - [ - case $target_os in --linux* | gnu* | darwin[[8912]]* | cygwin* | mingw*) -+linux* | gnu* | darwin[[8912]]* | cygwin* | msys* | mingw*) - # Enable -fomit-frame-pointer by default for these systems with DWARF2. - enable_frame_pointer=no - ;; -@@ -2295,7 +2295,7 @@ - of the registry key])],,) - - case $host_os in -- win32 | pe | cygwin* | mingw32*) -+ win32 | pe | cygwin* | msys* | mingw32*) - if test "x$enable_win32_registry" != xno; then - AC_SEARCH_LIBS(RegOpenKeyExA, advapi32,, [enable_win32_registry=no]) - fi -@@ -3350,7 +3350,7 @@ - .cfi_startproc - .cfi_endproc], - [case $target_os in -- win32 | pe | cygwin* | mingw32*) -+ win32 | pe | cygwin* | msys* | mingw32*) - # Need to check that we generated the correct relocation for the - # .debug_frame section. This was fixed for binutils 2.21. - gcc_cv_as_cfi_sections_directive=no -@@ -4682,7 +4682,7 @@ - i[34567]86-*-* | x86_64-*-*) - changequote([,])dnl - case $target_os in -- cygwin*) -+ cygwin* | msys*) - # Full C++ conformance when using a shared libstdc++-v3 requires some - # support from the Cygwin DLL, which in more recent versions exports - # wrappers to aid in interposing and redirecting operators new, delete, -@@ -4701,7 +4701,7 @@ - Cygwin DLL exports wrappers to support libstdc++ function replacement.]) - esac - case $target_os in -- cygwin* | pe | mingw32*) -+ cygwin* | msys* | pe | mingw32*) - # Recent binutils allows the three-operand form of ".comm" on PE. This - # definition is used unconditionally to initialise the default state of - # the target option variable that governs usage of the feature. -@@ -5504,7 +5504,7 @@ - [Define if your assembler supports the --gdwarf-5 option.])]) - - case $target_os in -- win32 | pe | cygwin* | mingw32*) -+ win32 | pe | cygwin* | msys* | mingw32*) - section_flags=\"dr\" - function_type=".def foo; .scl 2; .type 32; .endef" - function_size="";; -@@ -6298,7 +6298,7 @@ - fi - - case $target_os in -- win32 | pe | cygwin* | mingw32*) -+ win32 | pe | cygwin* | msys* | mingw32*) - AC_MSG_CHECKING(broken PE linker dwarf5 support) - gcc_cv_ld_broken_pe_dwarf5=yes - if test $in_tree_ld = yes ; then -diff -Naur gcc-13.2.0-orig/gcc/jit/Make-lang.in gcc-13.2.0/gcc/jit/Make-lang.in ---- gcc-13.2.0-orig/gcc/jit/Make-lang.in 2023-09-12 10:02:30.787765800 +0100 -+++ gcc-13.2.0/gcc/jit/Make-lang.in 2023-09-12 10:49:47.335871000 +0100 -@@ -48,8 +48,11 @@ + SHARED_PFX=lib ifneq (,$(filter %cygwin,$(target))) - SHARED_PFX=cyg - endif -+ifneq (,$(filter %msys,$(target))) +-SHARED_PFX=cyg +SHARED_PFX=msys- -+endif + endif --ifneq (,$(filter %-mingw% %-cygwin,$(target))) -+ifneq (,$(filter %-mingw% %-cygwin %-msys,$(target))) - LIBGCCJIT_FILENAME = $(SHARED_PFX)gccjit-$(LIBGCCJIT_VERSION_NUM).dll - LIBGCCJIT_IMPORT_LIB = libgccjit.dll.a - -@@ -144,7 +147,7 @@ - # Use strict warnings for this front end. - jit-warn = $(STRICT_WARN) - --ifneq (,$(filter %-mingw% %-cygwin,$(target))) -+ifneq (,$(filter %-mingw% %-cygwin %-msys,$(target))) - # Create import library - LIBGCCJIT_EXTRA_OPTS = -Wl,--out-implib,$(LIBGCCJIT_IMPORT_LIB) - else -@@ -183,7 +186,7 @@ - @$(call LINK_PROGRESS,$(INDEX.jit),end) - - # Create symlinks when not building for Windows --ifeq (,$(filter %-mingw% %-cygwin,$(target))) -+ifeq (,$(filter %-mingw% %-cygwin %-msys,$(target))) - - ifeq (,$(findstring darwin,$(host))) - # but only one level for Darwin, version info is embedded. -@@ -369,7 +372,7 @@ - $(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \ - $(DESTDIR)$(includedir)/libgccjit++.h - --ifneq (,$(filter %-mingw% %-cygwin,$(target))) -+ifneq (,$(filter %-mingw% %-cygwin %-msys,$(target))) - jit.install-common: installdirs jit.install-headers - # Install import library - $(INSTALL_PROGRAM) $(LIBGCCJIT_IMPORT_LIB) \ -diff -Naur gcc-13.2.0-orig/libatomic/configure gcc-13.2.0/libatomic/configure ---- gcc-13.2.0-orig/libatomic/configure 2023-09-12 10:00:34.150512000 +0100 -+++ gcc-13.2.0/libatomic/configure 2023-09-12 10:49:47.351490900 +0100 -@@ -5655,7 +5655,7 @@ - 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, -@@ -5997,7 +5997,7 @@ - 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' -@@ -6582,7 +6582,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -8467,7 +8467,7 @@ - # 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 -@@ -8549,7 +8549,7 @@ - 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' -@@ -9011,7 +9011,7 @@ - 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++. -@@ -9126,7 +9126,7 @@ - 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' -@@ -9557,7 +9557,7 @@ - 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 -@@ -10458,14 +10458,14 @@ - # 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}`~ -@@ -10489,6 +10489,12 @@ - - 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -11139,7 +11145,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -11753,7 +11759,7 @@ - - - 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 gcc-13.2.0-orig/libatomic/configure.tgt gcc-13.2.0/libatomic/configure.tgt ---- gcc-13.2.0-orig/libatomic/configure.tgt 2023-09-12 10:00:34.056811600 +0100 -+++ gcc-13.2.0/libatomic/configure.tgt 2023-09-12 10:49:47.351490900 +0100 -@@ -152,7 +152,7 @@ - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu \ - | *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly* \ - | *-*-solaris2* | *-*-sysv4* | *-*-irix6* | *-*-osf* | *-*-hpux11* \ -- | *-*-darwin* | *-*-aix* | *-*-cygwin*) -+ | *-*-darwin* | *-*-aix* | *-*-cygwin* | *-*-msys*) - # POSIX system. The OS is supported. - config_path="${config_path} posix" - ;; -diff -Naur gcc-13.2.0-orig/libbacktrace/configure gcc-13.2.0/libbacktrace/configure ---- gcc-13.2.0-orig/libbacktrace/configure 2023-09-12 10:00:29.003403600 +0100 -+++ gcc-13.2.0/libbacktrace/configure 2023-09-12 10:49:47.351490900 +0100 -@@ -6058,7 +6058,7 @@ - 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, -@@ -6400,7 +6400,7 @@ - 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' -@@ -6985,7 +6985,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -8602,7 +8602,7 @@ - # 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 -@@ -8684,7 +8684,7 @@ - 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' -@@ -9146,7 +9146,7 @@ - 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++. -@@ -9261,7 +9261,7 @@ - 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' -@@ -9692,7 +9692,7 @@ - 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 -@@ -10593,14 +10593,14 @@ - # 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}`~ -@@ -10624,6 +10624,12 @@ - - 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -11274,7 +11280,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -diff -Naur gcc-13.2.0-orig/libcc1/configure gcc-13.2.0/libcc1/configure ---- gcc-13.2.0-orig/libcc1/configure 2023-09-12 10:00:33.916192000 +0100 -+++ gcc-13.2.0/libcc1/configure 2023-09-12 10:49:47.367111900 +0100 -@@ -5319,7 +5319,7 @@ - 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, -@@ -5661,7 +5661,7 @@ - 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' -@@ -6246,7 +6246,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -7862,7 +7862,7 @@ - # 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 -@@ -7944,7 +7944,7 @@ - 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' -@@ -8406,7 +8406,7 @@ - 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++. -@@ -8521,7 +8521,7 @@ - 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' -@@ -8952,7 +8952,7 @@ - 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 -@@ -9853,14 +9853,14 @@ - # 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}`~ -@@ -9884,6 +9884,12 @@ - - 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -10534,7 +10540,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -12162,7 +12168,7 @@ - esac - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' -@@ -13132,7 +13138,7 @@ - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) -+ mingw* | cygwin* | msys* | os2* | pw32* | 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 -@@ -13672,7 +13678,7 @@ - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - export_symbols_cmds_CXX='$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' - ;; - *) -@@ -13936,14 +13942,14 @@ - # 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}`~ -@@ -13966,6 +13972,11 @@ - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - ;; -+ 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}' -+ -+ ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -diff -Naur gcc-13.2.0-orig/libdecnumber/configure gcc-13.2.0/libdecnumber/configure ---- gcc-13.2.0-orig/libdecnumber/configure 2023-09-12 10:00:30.979981600 +0100 -+++ gcc-13.2.0/libdecnumber/configure 2023-09-12 10:49:47.367111900 +0100 -@@ -4907,7 +4907,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 gcc-13.2.0-orig/libffi/acinclude.m4 gcc-13.2.0/libffi/acinclude.m4 ---- gcc-13.2.0-orig/libffi/acinclude.m4 2023-09-12 10:00:31.885430400 +0100 -+++ gcc-13.2.0/libffi/acinclude.m4 2023-09-12 10:49:47.382733500 +0100 -@@ -37,7 +37,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) - ac_cv_func_mmap_dev_zero=no ;; - *) - ac_cv_func_mmap_dev_zero=yes;; -@@ -69,7 +69,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* ) - ac_cv_func_mmap_anon=no ;; - *) - ac_cv_func_mmap_anon=yes;; -diff -Naur gcc-13.2.0-orig/libffi/configure gcc-13.2.0/libffi/configure ---- gcc-13.2.0-orig/libffi/configure 2023-09-12 10:00:31.901081500 +0100 -+++ gcc-13.2.0/libffi/configure 2023-09-12 11:07:15.711388100 +0100 -@@ -5845,7 +5845,7 @@ - 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, -@@ -6187,7 +6187,7 @@ - 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' -@@ -6772,7 +6772,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -8657,7 +8657,7 @@ - # 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 -@@ -8739,7 +8739,7 @@ - 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' -@@ -9201,7 +9201,7 @@ - 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++. -@@ -9316,7 +9316,7 @@ - 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' -@@ -9747,7 +9747,7 @@ - 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 -@@ -10648,14 +10648,14 @@ - # 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}`~ -@@ -10679,6 +10679,12 @@ - - 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -11329,7 +11335,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -12551,7 +12557,7 @@ - esac - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' -@@ -13521,7 +13527,7 @@ - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) -+ mingw* | cygwin* | msys* | os2* | pw32* | 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 -@@ -14061,7 +14067,7 @@ - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - export_symbols_cmds_CXX='$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' - ;; - *) -@@ -14325,14 +14331,14 @@ - # 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}`~ -@@ -14355,6 +14361,11 @@ - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - ;; -+ 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}' -+ -+ ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -15234,7 +15245,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) - ac_cv_func_mmap_dev_zero=no ;; - *) - ac_cv_func_mmap_dev_zero=yes;; -@@ -15291,7 +15302,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* ) - ac_cv_func_mmap_anon=no ;; - *) - ac_cv_func_mmap_anon=yes;; -@@ -16460,7 +16471,7 @@ - - if test "$enable_exec_static_tramp" = yes; then - case "$target" in -- *-cygwin*) -+ *-cygwin* | *-msys*) - ;; - *arm*-*-linux-* | aarch64*-*-linux-* | i*86-*-linux-* | x86_64-*-linux-*) - -diff -Naur gcc-13.2.0-orig/libffi/configure.ac gcc-13.2.0/libffi/configure.ac ---- gcc-13.2.0-orig/libffi/configure.ac 2023-09-12 10:00:31.885430400 +0100 -+++ gcc-13.2.0/libffi/configure.ac 2023-09-12 11:07:10.092722300 +0100 -@@ -367,7 +367,7 @@ - - if test "$enable_exec_static_tramp" = yes; then - case "$target" in -- *-cygwin*) -+ *-cygwin* | *-msys*) - ;; - *arm*-*-linux-* | aarch64*-*-linux-* | i*86-*-linux-* | x86_64-*-linux-*) - AC_DEFINE(FFI_EXEC_STATIC_TRAMP, 1, -diff -Naur gcc-13.2.0-orig/libffi/configure.host gcc-13.2.0/libffi/configure.host ---- gcc-13.2.0-orig/libffi/configure.host 2023-09-12 10:00:31.885430400 +0100 -+++ gcc-13.2.0/libffi/configure.host 2023-09-12 10:49:47.398354300 +0100 -@@ -6,7 +6,7 @@ - # THIS TABLE IS SORTED. KEEP IT THAT WAY. - # Most of the time we can define all the variables all at once... - case "${host}" in -- aarch64*-*-cygwin* | aarch64*-*-mingw* | aarch64*-*-win* ) -+ aarch64*-*-cygwin* | aarch64*-*-msys* | aarch64*-*-mingw* | aarch64*-*-win* ) - TARGET=ARM_WIN64; TARGETDIR=aarch64 - if test "${ax_cv_c_compiler_vendor}" = "microsoft"; then - MSVC=1 -@@ -30,7 +30,7 @@ - SOURCES="ffi.c arcompact.S" - ;; - -- arm*-*-cygwin* | arm*-*-mingw* | arm*-*-win* ) -+ arm*-*-cygwin* | arm*-*-msys* | arm*-*-mingw* | arm*-*-win* ) - TARGET=ARM_WIN32; TARGETDIR=arm - if test "${ax_cv_c_compiler_vendor}" = "microsoft"; then - MSVC=1 -@@ -83,8 +83,8 @@ - TARGET=X86_FREEBSD; TARGETDIR=x86 - ;; - -- i?86-*-cygwin* | i?86-*-mingw* | i?86-*-win* | i?86-*-os2* | i?86-*-interix* \ -- | x86_64-*-cygwin* | x86_64-*-mingw* | x86_64-*-win* ) -+ i?86-*-cygwin* | i?86-*-msys* | i?86-*-mingw* | i?86-*-win* | i?86-*-os2* | i?86-*-interix* \ -+ | x86_64-*-cygwin* | x86_64-*-msys* | x86_64-*-mingw* | x86_64-*-win* ) - TARGETDIR=x86 - if test $ac_cv_sizeof_size_t = 4; then - TARGET=X86_WIN32 -@@ -94,7 +94,7 @@ - if test "${ax_cv_c_compiler_vendor}" = "microsoft"; then - MSVC=1 - fi -- # All mingw/cygwin/win32 builds require -no-undefined for sharedlib. -+ # All mingw/cygwin/msys/win32 builds require -no-undefined for sharedlib. - # We must also check with_cross_host to decide if this is a native - # or cross-build and select where to install dlls appropriately. - if test -n "$with_cross_host" && -diff -Naur gcc-13.2.0-orig/libgcc/configure gcc-13.2.0/libgcc/configure ---- gcc-13.2.0-orig/libgcc/configure 2023-09-12 10:00:27.363163100 +0100 -+++ gcc-13.2.0/libgcc/configure 2023-09-12 10:49:47.398354300 +0100 -@@ -2384,6 +2384,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]*) -@@ -4775,7 +4777,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 gcc-13.2.0-orig/libgcc/gthr-posix.h gcc-13.2.0/libgcc/gthr-posix.h ---- gcc-13.2.0-orig/libgcc/gthr-posix.h 2023-09-12 10:00:27.363163100 +0100 -+++ gcc-13.2.0/libgcc/gthr-posix.h 2023-09-12 10:49:47.398354300 +0100 -@@ -82,7 +82,7 @@ - # define __GTHREAD_COND_INIT_FUNCTION __gthread_cond_init_function - #endif - --#if SUPPORTS_WEAK && GTHREAD_USE_WEAK -+#if SUPPORTS_WEAK && GTHREAD_USE_WEAK && !defined(__MINGW32__) - # ifndef __gthrw_pragma - # define __gthrw_pragma(pragma) - # endif -diff -Naur gcc-13.2.0-orig/libgo/config/libtool.m4 gcc-13.2.0/libgo/config/libtool.m4 ---- gcc-13.2.0-orig/libgo/config/libtool.m4 2023-09-12 10:00:20.880343200 +0100 -+++ gcc-13.2.0/libgo/config/libtool.m4 2023-09-12 10:49:47.413976100 +0100 -@@ -1496,7 +1496,7 @@ - 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, -@@ -1738,7 +1738,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -2209,14 +2209,14 @@ - # 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}`~ -@@ -2240,6 +2240,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}' -+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}' -@@ -2996,7 +3002,7 @@ - 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' -@@ -3280,7 +3286,7 @@ - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - 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*) -@@ -3355,7 +3361,7 @@ - aix*) - symcode='[[BCDT]]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; - hpux*) -@@ -3602,7 +3608,7 @@ - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) -+ mingw* | cygwin* | msys* | os2* | pw32* | 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 -@@ -3915,7 +3921,7 @@ - # 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 -@@ -3998,7 +4004,7 @@ - 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). - m4_if([$1], [GCJ], [], -@@ -4231,7 +4237,7 @@ - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - _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' - ;; - *) -@@ -4283,7 +4289,7 @@ - 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++. -@@ -4398,7 +4404,7 @@ - fi - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _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' -@@ -4771,7 +4777,7 @@ - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-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 -@@ -5715,7 +5721,7 @@ - esac - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _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 gcc-13.2.0-orig/libgo/config/ltmain.sh gcc-13.2.0/libgo/config/ltmain.sh ---- gcc-13.2.0-orig/libgo/config/ltmain.sh 2023-09-12 10:00:20.880343200 +0100 -+++ gcc-13.2.0/libgo/config/ltmain.sh 2023-09-12 10:49:47.413976100 +0100 -@@ -976,7 +976,7 @@ - - - case $host in -- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) -+ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc* | *solaris2* ) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; -@@ -1453,7 +1453,7 @@ - - # On Cygwin there's no "real" PIC flag so we must build both object types + ifneq (,$(filter %-mingw% %-cygwin,$(target))) +diff -Nur gcc-13.4.0.orig/libatomic/configure gcc-13.4.0/libatomic/configure +--- gcc-13.4.0.orig/libatomic/configure 2025-06-05 18:05:01.000000000 +0200 ++++ gcc-13.4.0/libatomic/configure 2025-06-13 19:17:22.780282400 +0200 +@@ -10485,7 +10485,7 @@ case $host_os in -- cygwin* | mingw* | pw32* | os2* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | os2* | cegcc*) - pic_mode=default - ;; - esac -@@ -2279,7 +2279,7 @@ - 'exit $?' - tstripme="$stripme" - case $host_os in -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - case $realname in - *.dll.a) - tstripme="" -@@ -2385,7 +2385,7 @@ - - # Do a test to see if this is really a libtool program. - case $host in -- *cygwin* | *mingw*) -+ *cygwin* | *msys* | *mingw*) - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - wrapper=$func_ltwrapper_scriptname_result -@@ -2460,7 +2460,7 @@ - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in -- */usr/bin/install*,*cygwin*) -+ */usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*) - case $file:$destfile in - *.exe:*.exe) - # this is ok -@@ -2595,7 +2595,7 @@ - $RM $export_symbols - ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - echo EXPORTS > "$output_objdir/$outputname.def" - cat "$export_symbols" >> "$output_objdir/$outputname.def" - ;; -@@ -2607,7 +2607,7 @@ - $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T - $MV "$nlist"T "$nlist" - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - echo EXPORTS > "$output_objdir/$outputname.def" - cat "$nlist" >> "$output_objdir/$outputname.def" - ;; -@@ -2663,7 +2663,7 @@ - } lt_dlsymlist; - " - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - 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 @@ - # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - 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 @@ - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; -- *cygwin* ) -+ *cygwin* | *msys*) - func_to_host_path_result=`cygpath -w "$1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; -@@ -3265,7 +3265,7 @@ - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; -- *cygwin* ) -+ *cygwin* | *msys*) - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; -@@ -3571,7 +3571,7 @@ - { - EOF - case "$host" in -- *mingw* | *cygwin* ) -+ *mingw* | *cygwin* | *msys*) - # make stdout use "unix" line endings - echo " setmode(1,_O_BINARY);" - ;; -@@ -4233,7 +4233,7 @@ - { - $opt_debug - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - # 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 @@ - ;; - esac - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; -@@ -4733,7 +4733,7 @@ - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; -@@ -4813,7 +4813,7 @@ - - -no-install) - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) - # 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 @@ - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - case $host in -- *cygwin* | *mingw* | *cegcc*) -+ *cygwin* | *msys* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded - notinst_deplibs="$notinst_deplibs $lib" - need_relink=no -@@ -5842,7 +5842,7 @@ - elif test -n "$soname_spec"; then - # bleh windows - case $host in -- *cygwin* | mingw* | *cegcc*) -+ *cygwin* | *msys* | mingw* | *cegcc*) - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" -@@ -6693,7 +6693,7 @@ - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) -@@ -7194,7 +7194,7 @@ - - orig_export_symbols= - case $host_os in -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - 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 @@ - - prog) - case $host in -- *cygwin*) func_stripname '' '.exe' "$output" -+ *cygwin* | *msys*) func_stripname '' '.exe' "$output" - output=$func_stripname_result.exe;; - esac - test -n "$vinfo" && \ -@@ -7823,7 +7823,7 @@ - esac - fi - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; -@@ -7901,7 +7901,7 @@ - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no - ;; -- *cygwin* | *mingw* ) -+ *cygwin* | *msys* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi -@@ -8029,14 +8029,14 @@ - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in -- *cygwin*) -+ *cygwin* | *msys*) - exeext=.exe - func_stripname '' '.exe' "$outputname" - outputname=$func_stripname_result ;; - *) exeext= ;; - esac - case $host in -- *cygwin* | *mingw* ) -+ *cygwin* | *msys* | *mingw* ) - func_dirname_and_basename "$output" "" "." - output_name=$func_basename_result - output_path=$func_dirname_result -@@ -8343,7 +8343,7 @@ - # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in -- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) -+ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then -diff -Naur gcc-13.2.0-orig/libgo/config/ltoptions.m4 gcc-13.2.0/libgo/config/ltoptions.m4 ---- gcc-13.2.0-orig/libgo/config/ltoptions.m4 2023-09-12 10:00:20.880343200 +0100 -+++ gcc-13.2.0/libgo/config/ltoptions.m4 2023-09-12 10:49:47.413976100 +0100 -@@ -126,7 +126,7 @@ - [enable_win32_dll=yes - - case $host in --*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) -+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) -diff -Naur gcc-13.2.0-orig/libgo/configure gcc-13.2.0/libgo/configure ---- gcc-13.2.0-orig/libgo/configure 2023-09-12 10:00:20.317942200 +0100 -+++ gcc-13.2.0/libgo/configure 2023-09-12 10:49:47.429597800 +0100 -@@ -5733,7 +5733,7 @@ - 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, -@@ -6075,7 +6075,7 @@ - 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' -@@ -6655,7 +6655,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -8629,7 +8629,7 @@ - # 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 -@@ -8711,7 +8711,7 @@ - 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' -@@ -9173,7 +9173,7 @@ - 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++. -@@ -9288,7 +9288,7 @@ - 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' -@@ -9719,7 +9719,7 @@ - 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 -@@ -10620,14 +10620,14 @@ - # 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}`~ -@@ -10651,6 +10651,12 @@ + 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}' ++ 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" ;; -+ msys*) -+ # MSYS DLLs use 'msys-' prefix rather than 'lib' +diff -Nur gcc-13.4.0.orig/libbacktrace/configure gcc-13.4.0/libbacktrace/configure +--- gcc-13.4.0.orig/libbacktrace/configure 2025-06-05 18:05:01.000000000 +0200 ++++ gcc-13.4.0/libbacktrace/configure 2025-06-13 19:17:22.780282400 +0200 +@@ -10620,7 +10620,7 @@ + case $host_os in + 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}' + 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -11277,7 +11283,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -12051,7 +12057,7 @@ - # 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 -@@ -12133,7 +12139,7 @@ - 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_GO='-DDLL_EXPORT' -@@ -12580,7 +12586,7 @@ - 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++. -@@ -12695,7 +12701,7 @@ - fi - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, GO) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_GO='-L$libdir' -@@ -13126,7 +13132,7 @@ - export_dynamic_flag_spec_GO=-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 -diff -Naur gcc-13.2.0-orig/libgomp/configure gcc-13.2.0/libgomp/configure ---- gcc-13.2.0-orig/libgomp/configure 2023-09-12 10:00:04.289481200 +0100 -+++ gcc-13.2.0/libgomp/configure 2023-09-12 10:49:47.429597800 +0100 -@@ -5668,7 +5668,7 @@ - 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, -@@ -6010,7 +6010,7 @@ - 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' -@@ -6595,7 +6595,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -8480,7 +8480,7 @@ - # 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 -@@ -8562,7 +8562,7 @@ - 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' -@@ -9024,7 +9024,7 @@ - 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++. -@@ -9139,7 +9139,7 @@ - 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' -@@ -9570,7 +9570,7 @@ - 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 -@@ -10471,14 +10471,14 @@ - # 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}`~ -@@ -10502,6 +10502,12 @@ 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -11152,7 +11158,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -11766,7 +11772,7 @@ - - - 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. -@@ -12374,7 +12380,7 @@ - # 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 -@@ -12456,7 +12462,7 @@ - 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_FC='-DDLL_EXPORT' -@@ -12903,7 +12909,7 @@ - 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++. -@@ -13018,7 +13024,7 @@ - fi - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, FC) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_FC='-L$libdir' -@@ -13437,7 +13443,7 @@ - export_dynamic_flag_spec_FC=-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 -@@ -14132,14 +14138,14 @@ - # 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}`~ -@@ -14162,6 +14168,11 @@ - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - ;; -+ 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}' -+ -+ ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -diff -Naur gcc-13.2.0-orig/libgomp/configure.tgt gcc-13.2.0/libgomp/configure.tgt ---- gcc-13.2.0-orig/libgomp/configure.tgt 2023-09-12 10:00:04.289481200 +0100 -+++ gcc-13.2.0/libgomp/configure.tgt 2023-09-12 10:49:47.445218800 +0100 -@@ -141,7 +141,7 @@ - esac - ;; - -- *-*-cygwin*) -+ *-*-cygwin* | *-*-msys*) - config_path="cygwin posix" - ;; - -diff -Naur gcc-13.2.0-orig/libiberty/configure gcc-13.2.0/libiberty/configure ---- gcc-13.2.0-orig/libiberty/configure 2023-09-12 10:00:32.213501100 +0100 -+++ gcc-13.2.0/libiberty/configure 2023-09-12 10:49:47.445218800 +0100 -@@ -5202,6 +5202,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]*) -@@ -6503,7 +6505,7 @@ - - - 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 -Naur gcc-13.2.0-orig/libiberty/configure.ac gcc-13.2.0/libiberty/configure.ac ---- gcc-13.2.0-orig/libiberty/configure.ac 2023-09-12 10:00:32.213501100 +0100 -+++ gcc-13.2.0/libiberty/configure.ac 2023-09-12 10:49:47.445218800 +0100 -@@ -566,7 +566,7 @@ - AC_SUBST(target_header_dir) - - case "${host}" in -- *-*-cygwin* | *-*-mingw*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw*) - AC_DEFINE(HAVE_SYS_ERRLIST) - AC_DEFINE(HAVE_SYS_NERR) - ;; -diff -Naur gcc-13.2.0-orig/libitm/configure gcc-13.2.0/libitm/configure ---- gcc-13.2.0-orig/libitm/configure 2023-09-12 10:00:29.503286200 +0100 -+++ gcc-13.2.0/libitm/configure 2023-09-12 10:49:47.460840500 +0100 -@@ -6330,7 +6330,7 @@ - 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, -@@ -6672,7 +6672,7 @@ - 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' -@@ -7257,7 +7257,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -9143,7 +9143,7 @@ - # 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 -@@ -9225,7 +9225,7 @@ - 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' -@@ -9687,7 +9687,7 @@ - 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++. -@@ -9802,7 +9802,7 @@ - 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' -@@ -10233,7 +10233,7 @@ - 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 -@@ -11134,14 +11134,14 @@ - # 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}`~ -@@ -11165,6 +11165,12 @@ - - 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -11815,7 +11821,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -13037,7 +13043,7 @@ - esac - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' -@@ -14007,7 +14013,7 @@ - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) -+ mingw* | cygwin* | msys* | os2* | pw32* | 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 -@@ -14547,7 +14553,7 @@ - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - export_symbols_cmds_CXX='$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' - ;; - *) -@@ -14811,14 +14817,14 @@ - # 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}`~ -@@ -14841,6 +14847,11 @@ - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - ;; -+ 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}' -+ -+ ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -16140,7 +16151,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;; -@@ -16197,7 +16208,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 gcc-13.2.0-orig/libobjc/configure gcc-13.2.0/libobjc/configure ---- gcc-13.2.0-orig/libobjc/configure 2023-09-12 10:00:20.224242100 +0100 -+++ gcc-13.2.0/libobjc/configure 2023-09-12 10:49:47.476461300 +0100 -@@ -3413,7 +3413,7 @@ - - - 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. -@@ -3436,7 +3436,7 @@ - # Darwin needs -single_module when linking libobjc - extra_ldflags_libobjc='$(lt_host_flags) -Wl,-single_module' - ;; -- *-cygwin*|*-mingw*) -+ *-cygwin*|*-msys*|*-mingw*) - # Tell libtool to build DLLs on Windows - extra_ldflags_libobjc='$(lt_host_flags)' - ;; -@@ -3933,7 +3933,7 @@ - enable_win32_dll=yes - - case $host in --*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) -+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. - set dummy ${ac_tool_prefix}as; ac_word=$2 -@@ -4976,7 +4976,7 @@ - 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, -@@ -5315,7 +5315,7 @@ - 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' -@@ -5942,7 +5942,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -7830,7 +7830,7 @@ - # 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 -@@ -7912,7 +7912,7 @@ - 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' -@@ -8374,7 +8374,7 @@ - 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++. -@@ -8489,7 +8489,7 @@ - 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' -@@ -8926,7 +8926,7 @@ - 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 -@@ -9830,14 +9830,14 @@ - # 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}`~ -@@ -9861,6 +9861,12 @@ - - 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -10514,7 +10520,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -diff -Naur gcc-13.2.0-orig/libobjc/configure.ac gcc-13.2.0/libobjc/configure.ac ---- gcc-13.2.0-orig/libobjc/configure.ac 2023-09-12 10:00:20.239835800 +0100 -+++ gcc-13.2.0/libobjc/configure.ac 2023-09-12 10:49:47.476461300 +0100 -@@ -153,7 +153,7 @@ - # Darwin needs -single_module when linking libobjc - extra_ldflags_libobjc='$(lt_host_flags) -Wl,-single_module' - ;; -- *-cygwin*|*-mingw*) -+ *-cygwin*|*-msys*|*-mingw*) - # Tell libtool to build DLLs on Windows - extra_ldflags_libobjc='$(lt_host_flags)' - ;; -diff -Naur gcc-13.2.0-orig/libphobos/configure gcc-13.2.0/libphobos/configure ---- gcc-13.2.0-orig/libphobos/configure 2023-09-12 10:00:33.447571000 +0100 -+++ gcc-13.2.0/libphobos/configure 2023-09-12 10:49:47.492082600 +0100 -@@ -6292,7 +6292,7 @@ - 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, -@@ -6634,7 +6634,7 @@ - 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' -@@ -7219,7 +7219,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -8835,7 +8835,7 @@ - # 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 -@@ -8917,7 +8917,7 @@ - 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' -@@ -9379,7 +9379,7 @@ - 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++. -@@ -9494,7 +9494,7 @@ - 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' -@@ -9925,7 +9925,7 @@ - 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 -@@ -10826,14 +10826,14 @@ - # 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}`~ -@@ -10857,6 +10857,12 @@ - - 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -11507,7 +11513,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -12306,7 +12312,7 @@ - # 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 -@@ -12388,7 +12394,7 @@ - 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_D='-DDLL_EXPORT' -@@ -12835,7 +12841,7 @@ - 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++. -@@ -12950,7 +12956,7 @@ - fi - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, D) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_D='-L$libdir' -@@ -13381,7 +13387,7 @@ - export_dynamic_flag_spec_D=-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 -@@ -14358,7 +14364,7 @@ - - druntime_target_posix="no" - case "$druntime_cv_target_os" in -- aix*|*bsd*|cygwin*|darwin*|dragonfly*|gnu*|linux*|skyos*|*solaris*|sysv*) -+ aix*|*bsd*|cygwin*|msys*|darwin*|dragonfly*|gnu*|linux*|skyos*|*solaris*|sysv*) - druntime_target_posix="yes" - ;; - esac -diff -Naur gcc-13.2.0-orig/libphobos/m4/druntime/os.m4 gcc-13.2.0/libphobos/m4/druntime/os.m4 ---- gcc-13.2.0-orig/libphobos/m4/druntime/os.m4 2023-09-12 10:00:32.369680900 +0100 -+++ gcc-13.2.0/libphobos/m4/druntime/os.m4 2023-09-12 10:49:47.492082600 +0100 -@@ -113,7 +113,7 @@ - - druntime_target_posix="no" - case "$druntime_cv_target_os" in -- aix*|*bsd*|cygwin*|darwin*|dragonfly*|gnu*|linux*|skyos*|*solaris*|sysv*) -+ aix*|*bsd*|cygwin*|msys*|darwin*|dragonfly*|gnu*|linux*|skyos*|*solaris*|sysv*) - druntime_target_posix="yes" - ;; - esac -diff -Naur gcc-13.2.0-orig/libquadmath/configure gcc-13.2.0/libquadmath/configure ---- gcc-13.2.0-orig/libquadmath/configure 2023-09-12 10:00:01.696294900 +0100 -+++ gcc-13.2.0/libquadmath/configure 2023-09-12 10:49:47.507705100 +0100 -@@ -5314,7 +5314,7 @@ - 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, -@@ -5656,7 +5656,7 @@ - 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' -@@ -6241,7 +6241,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -7864,7 +7864,7 @@ - # 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 -@@ -7946,7 +7946,7 @@ - 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' -@@ -8408,7 +8408,7 @@ - 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++. -@@ -8523,7 +8523,7 @@ - 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' -@@ -8960,7 +8960,7 @@ - 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 -@@ -9864,14 +9864,14 @@ - # 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}`~ -@@ -9895,6 +9895,12 @@ - - 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -10548,7 +10554,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -11177,7 +11183,7 @@ - - - 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 gcc-13.2.0-orig/libsanitizer/configure gcc-13.2.0/libsanitizer/configure ---- gcc-13.2.0-orig/libsanitizer/configure 2023-09-12 10:00:31.604870100 +0100 -+++ gcc-13.2.0/libsanitizer/configure 2023-09-12 10:49:47.507705100 +0100 -@@ -6901,7 +6901,7 @@ - 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, -@@ -7243,7 +7243,7 @@ - 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' -@@ -7828,7 +7828,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -9444,7 +9444,7 @@ - # 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 -@@ -9526,7 +9526,7 @@ - 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' -@@ -9988,7 +9988,7 @@ - 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++. -@@ -10103,7 +10103,7 @@ - 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' -@@ -10534,7 +10534,7 @@ - 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 -@@ -11435,14 +11435,14 @@ - # 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}`~ -@@ -11466,6 +11466,12 @@ - - 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -12116,7 +12122,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -13338,7 +13344,7 @@ - esac - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' -@@ -14308,7 +14314,7 @@ - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) -+ mingw* | cygwin* | msys* | os2* | pw32* | 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 -@@ -14848,7 +14854,7 @@ - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - export_symbols_cmds_CXX='$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' - ;; - *) -@@ -15112,14 +15118,14 @@ - # 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}`~ -@@ -15142,6 +15148,11 @@ - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - ;; -+ 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}' -+ -+ ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -diff -Naur gcc-13.2.0-orig/libssp/configure gcc-13.2.0/libssp/configure ---- gcc-13.2.0-orig/libssp/configure 2023-09-12 10:00:33.838085400 +0100 -+++ gcc-13.2.0/libssp/configure 2023-09-12 10:49:47.523325800 +0100 -@@ -5500,7 +5500,7 @@ - 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, -@@ -5842,7 +5842,7 @@ - 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' -@@ -6427,7 +6427,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -8050,7 +8050,7 @@ - # 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 -@@ -8132,7 +8132,7 @@ - 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' -@@ -8594,7 +8594,7 @@ - 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++. -@@ -8709,7 +8709,7 @@ - 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' -@@ -9146,7 +9146,7 @@ - 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 -@@ -10050,14 +10050,14 @@ - # 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}`~ -@@ -10081,6 +10081,12 @@ - - 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -10734,7 +10740,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -11363,7 +11369,7 @@ - - - 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 gcc-13.2.0-orig/libstdc++-v3/acinclude.m4 gcc-13.2.0/libstdc++-v3/acinclude.m4 ---- gcc-13.2.0-orig/libstdc++-v3/acinclude.m4 2023-09-12 10:00:19.630629200 +0100 -+++ gcc-13.2.0/libstdc++-v3/acinclude.m4 2023-09-12 10:49:47.523325800 +0100 -@@ -277,11 +277,13 @@ - # Note this is only for shared objects. - ac_ld_relro=no - if test x"$with_gnu_ld" = x"yes"; then -- # cygwin and mingw uses PE, which has no ELF relro support, -+ # cygwin, msys and mingw uses PE, which has no ELF relro support, - # multi target ld may confuse configure machinery - case "$host" in - *-*-cygwin*) - ;; -+ *-*-msys*) -+ ;; - *-*-mingw*) - ;; - *) -@@ -573,7 +575,7 @@ - if $GLIBCXX_IS_NATIVE && test $is_hosted = yes && - test $enable_symvers != no; then - case "$host" in -- *-*-cygwin*) -+ *-*-cygwin* | *-*-msys*) - enable_abi_check=no ;; - *) - enable_abi_check=yes ;; -@@ -1368,7 +1370,7 @@ - if test x"$enable_libstdcxx_time" = x"auto"; then - - case "${target_os}" in -- cygwin*) -+ cygwin* | msys*) - ac_has_clock_monotonic=yes - ac_has_clock_realtime=yes - ac_has_nanosleep=yes -@@ -2773,7 +2775,7 @@ - vtv_cygmin=no - if test $enable_vtable_verify = yes; then - case ${target_os} in -- cygwin*|mingw32*) -+ cygwin*|msys*|mingw32*) - VTV_CXXFLAGS="-fvtable-verify=std -Wl,-lvtv,-u_vtable_map_vars_start,-u_vtable_map_vars_end" - VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs" - vtv_cygmin=yes -diff -Naur gcc-13.2.0-orig/libstdc++-v3/configure gcc-13.2.0/libstdc++-v3/configure ---- gcc-13.2.0-orig/libstdc++-v3/configure 2023-09-12 10:00:19.630629200 +0100 -+++ gcc-13.2.0/libstdc++-v3/configure 2023-09-12 10:49:47.554570300 +0100 -@@ -6543,7 +6543,7 @@ - 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, -@@ -6885,7 +6885,7 @@ - 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' -@@ -7470,7 +7470,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -9221,7 +9221,7 @@ - # 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 -@@ -9303,7 +9303,7 @@ - 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' -@@ -9765,7 +9765,7 @@ - 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++. +diff -Nur gcc-13.4.0.orig/libcc1/configure gcc-13.4.0/libcc1/configure +--- gcc-13.4.0.orig/libcc1/configure 2025-06-05 18:03:02.000000000 +0200 ++++ gcc-13.4.0/libcc1/configure 2025-06-13 19:17:22.780282400 +0200 @@ -9880,7 +9880,7 @@ - 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' -@@ -10317,7 +10317,7 @@ - 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 -@@ -11221,14 +11221,14 @@ - # 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}`~ -@@ -11252,6 +11252,12 @@ + case $host_os in + 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}' ++ 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" ;; -+ msys*) -+ # MSYS DLLs use 'msys-' prefix rather than 'lib' +@@ -13963,7 +13963,7 @@ + case $host_os in + 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}' + 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -11905,7 +11911,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -13148,7 +13154,7 @@ - esac - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' -@@ -14118,7 +14124,7 @@ - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) -+ mingw* | cygwin* | msys* | os2* | pw32* | 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 -@@ -14658,7 +14664,7 @@ - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - export_symbols_cmds_CXX='$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' - ;; - *) -@@ -14922,14 +14928,14 @@ - # 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}`~ -@@ -14952,6 +14958,11 @@ - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; -+ 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}' -+ -+ ;; mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -15574,7 +15585,7 @@ +diff -Nur gcc-13.4.0.orig/libffi/configure gcc-13.4.0/libffi/configure +--- gcc-13.4.0.orig/libffi/configure 2025-06-05 18:03:02.000000000 +0200 ++++ gcc-13.4.0/libffi/configure 2025-06-13 19:17:22.764898800 +0200 +@@ -10675,7 +10675,7 @@ + case $host_os in + 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}' ++ 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" + ;; +@@ -14352,7 +14352,7 @@ + case $host_os in + 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}' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - 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. -@@ -18827,7 +18838,7 @@ - vtv_cygmin=no - if test $enable_vtable_verify = yes; then - case ${target_os} in -- cygwin*|mingw32*) -+ cygwin*|msys*|mingw32*) - VTV_CXXFLAGS="-fvtable-verify=std -Wl,-lvtv,-u_vtable_map_vars_start,-u_vtable_map_vars_end" - VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs" - vtv_cygmin=yes -@@ -20588,7 +20599,7 @@ - if test x"$enable_libstdcxx_time" = x"auto"; then + ;; + mingw* | cegcc*) +diff -Nur gcc-13.4.0.orig/libgfortran/configure gcc-13.4.0/libgfortran/configure +--- gcc-13.4.0.orig/libgfortran/configure 2025-06-05 18:05:01.000000000 +0200 ++++ gcc-13.4.0/libgfortran/configure 2025-06-13 19:17:22.954201800 +0200 +@@ -11852,7 +11852,7 @@ + case $host_os in + 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}' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - case "${target_os}" in -- cygwin*) -+ cygwin* | msys*) - ac_has_clock_monotonic=yes - ac_has_clock_realtime=yes - ac_has_nanosleep=yes -@@ -22341,11 +22352,13 @@ - # Note this is only for shared objects. - ac_ld_relro=no - if test x"$with_gnu_ld" = x"yes"; then -- # cygwin and mingw uses PE, which has no ELF relro support, -+ # cygwin, msys and mingw uses PE, which has no ELF relro support, - # multi target ld may confuse configure machinery - case "$host" in - *-*-cygwin*) - ;; -+ *-*-msys*) -+ ;; - *-*-mingw*) - ;; - *) -@@ -29595,11 +29608,13 @@ - # Note this is only for shared objects. - ac_ld_relro=no - if test x"$with_gnu_ld" = x"yes"; then -- # cygwin and mingw uses PE, which has no ELF relro support, -+ # cygwin, msys and mingw uses PE, which has no ELF relro support, - # multi target ld may confuse configure machinery - case "$host" in - *-*-cygwin*) - ;; -+ *-*-msys*) -+ ;; - *-*-mingw*) - ;; - *) -@@ -35530,11 +35545,13 @@ - # Note this is only for shared objects. - ac_ld_relro=no - if test x"$with_gnu_ld" = x"yes"; then -- # cygwin and mingw uses PE, which has no ELF relro support, -+ # cygwin, msys and mingw uses PE, which has no ELF relro support, - # multi target ld may confuse configure machinery - case "$host" in - *-*-cygwin*) - ;; -+ *-*-msys*) -+ ;; - *-*-mingw*) - ;; - *) -@@ -47464,11 +47481,13 @@ - # Note this is only for shared objects. - ac_ld_relro=no - if test x"$with_gnu_ld" = x"yes"; then -- # cygwin and mingw uses PE, which has no ELF relro support, -+ # cygwin, msys and mingw uses PE, which has no ELF relro support, - # multi target ld may confuse configure machinery - case "$host" in - *-*-cygwin*) - ;; -+ *-*-msys*) -+ ;; - *-*-mingw*) - ;; - *) -@@ -47752,11 +47771,13 @@ - # Note this is only for shared objects. - ac_ld_relro=no - if test x"$with_gnu_ld" = x"yes"; then -- # cygwin and mingw uses PE, which has no ELF relro support, -+ # cygwin, msys and mingw uses PE, which has no ELF relro support, - # multi target ld may confuse configure machinery - case "$host" in - *-*-cygwin*) - ;; -+ *-*-msys*) -+ ;; - *-*-mingw*) - ;; - *) -@@ -48038,7 +48059,7 @@ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; +@@ -15643,7 +15643,7 @@ + case $host_os in + 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}' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - fi - ;; -- *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-cygwin* | *-solaris*) -+ *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-cygwin* | *-msys* | *-solaris*) + ;; + mingw* | cegcc*) +diff -Nur gcc-13.4.0.orig/libgm2/configure gcc-13.4.0/libgm2/configure +--- gcc-13.4.0.orig/libgm2/configure 2025-06-05 18:03:02.000000000 +0200 ++++ gcc-13.4.0/libgm2/configure 2025-06-13 19:17:22.948697100 +0200 +@@ -11803,7 +11803,7 @@ + case $host_os in + 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}' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - # All these tests are for C++; save the language and the compiler flags. - # The CXXFLAGS thing is suspicious, but based on similar bits previously -@@ -48217,11 +48238,13 @@ - # Note this is only for shared objects. - ac_ld_relro=no - if test x"$with_gnu_ld" = x"yes"; then -- # cygwin and mingw uses PE, which has no ELF relro support, -+ # cygwin, msys and mingw uses PE, which has no ELF relro support, - # multi target ld may confuse configure machinery - case "$host" in - *-*-cygwin*) - ;; -+ *-*-msys*) -+ ;; - *-*-mingw*) - ;; - *) -@@ -54619,11 +54642,13 @@ - # Note this is only for shared objects. - ac_ld_relro=no - if test x"$with_gnu_ld" = x"yes"; then -- # cygwin and mingw uses PE, which has no ELF relro support, -+ # cygwin, msys and mingw uses PE, which has no ELF relro support, - # multi target ld may confuse configure machinery - case "$host" in - *-*-cygwin*) - ;; -+ *-*-msys*) -+ ;; - *-*-mingw*) - ;; - *) -@@ -60770,11 +60795,13 @@ - # Note this is only for shared objects. - ac_ld_relro=no - if test x"$with_gnu_ld" = x"yes"; then -- # cygwin and mingw uses PE, which has no ELF relro support, -+ # cygwin, msys and mingw uses PE, which has no ELF relro support, - # multi target ld may confuse configure machinery - case "$host" in - *-*-cygwin*) - ;; -+ *-*-msys*) -+ ;; - *-*-mingw*) - ;; - *) -@@ -60983,11 +61010,13 @@ - # Note this is only for shared objects. - ac_ld_relro=no - if test x"$with_gnu_ld" = x"yes"; then -- # cygwin and mingw uses PE, which has no ELF relro support, -+ # cygwin, msys and mingw uses PE, which has no ELF relro support, - # multi target ld may confuse configure machinery - case "$host" in - *-*-cygwin*) - ;; -+ *-*-msys*) -+ ;; - *-*-mingw*) - ;; - *) -@@ -69710,7 +69739,7 @@ - if $GLIBCXX_IS_NATIVE && test $is_hosted = yes && - test $enable_symvers != no; then - case "$host" in -- *-*-cygwin*) -+ *-*-cygwin* | *-*-msys*) - enable_abi_check=no ;; - *) - enable_abi_check=yes ;; -diff -Naur gcc-13.2.0-orig/libstdc++-v3/configure.host gcc-13.2.0/libstdc++-v3/configure.host ---- gcc-13.2.0-orig/libstdc++-v3/configure.host 2023-09-12 10:00:19.630629200 +0100 -+++ gcc-13.2.0/libstdc++-v3/configure.host 2023-09-12 10:49:47.554570300 +0100 -@@ -220,7 +220,7 @@ - # Plain BSD attempts to share FreeBSD files. - os_include_dir="os/bsd/freebsd" - ;; -- cygwin*) -+ cygwin* | msys*) - os_include_dir="os/newlib" - OPT_LDFLAGS="${OPT_LDFLAGS} \$(lt_host_flags)" - ;; -diff -Naur gcc-13.2.0-orig/libstdc++-v3/crossconfig.m4 gcc-13.2.0/libstdc++-v3/crossconfig.m4 ---- gcc-13.2.0-orig/libstdc++-v3/crossconfig.m4 2023-09-12 10:00:19.661847300 +0100 -+++ gcc-13.2.0/libstdc++-v3/crossconfig.m4 2023-09-12 10:49:47.554570300 +0100 -@@ -174,7 +174,7 @@ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; +@@ -15504,7 +15504,7 @@ + case $host_os in + 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}' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - GCC_CHECK_TLS - ;; -- *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-cygwin* | *-solaris*) -+ *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-cygwin* | *-msys* | *-solaris*) - GLIBCXX_CHECK_COMPILER_FEATURES - GLIBCXX_CHECK_LINKER_FEATURES - GLIBCXX_CHECK_MATH_SUPPORT -diff -Naur gcc-13.2.0-orig/libtool.m4 gcc-13.2.0/libtool.m4 ---- gcc-13.2.0-orig/libtool.m4 2023-09-12 10:00:29.347074800 +0100 -+++ gcc-13.2.0/libtool.m4 2023-09-12 10:49:47.570191000 +0100 -@@ -1493,7 +1493,7 @@ - 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, -@@ -1735,7 +1735,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -2206,14 +2206,14 @@ - # 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}`~ -@@ -2237,6 +2237,12 @@ + ;; + mingw* | cegcc*) +diff -Nur gcc-13.4.0.orig/libgo/config/libtool.m4 gcc-13.4.0/libgo/config/libtool.m4 +--- gcc-13.4.0.orig/libgo/config/libtool.m4 2025-06-05 18:03:02.000000000 +0200 ++++ gcc-13.4.0/libgo/config/libtool.m4 2025-06-13 19:17:22.764898800 +0200 +@@ -2236,7 +2236,7 @@ + case $host_os in + 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}' ++ 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"]) ;; -+ 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"]) -+ ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -@@ -3017,7 +3023,7 @@ - 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' -@@ -3306,7 +3312,7 @@ - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - 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*) -@@ -3381,7 +3387,7 @@ - aix*) - symcode='[[BCDT]]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; - hpux*) -@@ -3628,7 +3634,7 @@ - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) -+ mingw* | cygwin* | msys* | os2* | pw32* | 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 -@@ -3941,7 +3947,7 @@ - # 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 -@@ -4024,7 +4030,7 @@ - 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). - m4_if([$1], [GCJ], [], -@@ -4257,7 +4263,7 @@ - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - _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' - ;; - *) -@@ -4309,7 +4315,7 @@ - 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++. -@@ -4424,7 +4430,7 @@ - fi - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _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' -@@ -4797,7 +4803,7 @@ - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-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 -@@ -5741,7 +5747,7 @@ - esac - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _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 gcc-13.2.0-orig/libvtv/configure gcc-13.2.0/libvtv/configure ---- gcc-13.2.0-orig/libvtv/configure 2023-09-12 10:00:33.572529800 +0100 -+++ gcc-13.2.0/libvtv/configure 2023-09-12 10:49:47.585811400 +0100 -@@ -6796,7 +6796,7 @@ - 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, -@@ -7138,7 +7138,7 @@ - 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' -@@ -7723,7 +7723,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -9339,7 +9339,7 @@ - # 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 -@@ -9421,7 +9421,7 @@ - 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' -@@ -9883,7 +9883,7 @@ - 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++. -@@ -9998,7 +9998,7 @@ - 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' -@@ -10429,7 +10429,7 @@ - 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 -@@ -11330,14 +11330,14 @@ - # 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}`~ -@@ -11361,6 +11361,12 @@ - - 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -12011,7 +12017,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -13233,7 +13239,7 @@ - esac - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' -@@ -14203,7 +14209,7 @@ - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) -+ mingw* | cygwin* | msys* | os2* | pw32* | 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 -@@ -14743,7 +14749,7 @@ - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - export_symbols_cmds_CXX='$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' - ;; - *) -@@ -15007,14 +15013,14 @@ - # 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}`~ -@@ -15037,6 +15043,11 @@ - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - ;; -+ 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}' -+ -+ ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -15656,7 +15667,7 @@ - - - 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. -@@ -15788,7 +15799,7 @@ - fi - - case "$target_os" in -- cygwin*|mingw32*) -+ cygwin*|msys*|mingw32*) - vtv_cygmin="yes" - ;; - *) -diff -Naur gcc-13.2.0-orig/libvtv/configure.ac gcc-13.2.0/libvtv/configure.ac ---- gcc-13.2.0-orig/libvtv/configure.ac 2023-09-12 10:00:33.572529800 +0100 -+++ gcc-13.2.0/libvtv/configure.ac 2023-09-12 10:49:47.585811400 +0100 -@@ -190,7 +190,7 @@ - fi - - case "$target_os" in -- cygwin*|mingw32*) -+ cygwin*|msys*|mingw32*) - vtv_cygmin="yes" - ;; - *) -diff -Naur gcc-13.2.0-orig/libvtv/configure.tgt gcc-13.2.0/libvtv/configure.tgt ---- gcc-13.2.0-orig/libvtv/configure.tgt 2023-09-12 10:00:33.572529800 +0100 -+++ gcc-13.2.0/libvtv/configure.tgt 2023-09-12 10:49:47.585811400 +0100 -@@ -35,6 +35,9 @@ - x86_64-*-cygwin* | i?86-*-cygwin*) - VTV_SUPPORTED=yes - ;; -+ x86_64-*-msys* | i?86-*-msys*) -+ VTV_SUPPORTED=yes -+ ;; - x86_64-*-mingw* | i?86-*-mingw*) - VTV_SUPPORTED=yes - ;; -diff -Naur gcc-13.2.0-orig/ltmain.sh gcc-13.2.0/ltmain.sh ---- gcc-13.2.0-orig/ltmain.sh 2023-09-12 10:00:33.994298600 +0100 -+++ gcc-13.2.0/ltmain.sh 2023-09-12 10:49:47.601432900 +0100 -@@ -976,7 +976,7 @@ - - - case $host in -- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) -+ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc* | *solaris2* ) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; -@@ -1453,7 +1453,7 @@ - - # On Cygwin there's no "real" PIC flag so we must build both object types +diff -Nur gcc-13.4.0.orig/libgo/configure gcc-13.4.0/libgo/configure +--- gcc-13.4.0.orig/libgo/configure 2025-06-05 18:03:02.000000000 +0200 ++++ gcc-13.4.0/libgo/configure 2025-06-13 19:17:22.779277300 +0200 +@@ -10647,7 +10647,7 @@ case $host_os in -- cygwin* | mingw* | pw32* | os2* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | os2* | cegcc*) - pic_mode=default - ;; - esac -@@ -2279,7 +2279,7 @@ - 'exit $?' - tstripme="$stripme" - case $host_os in -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - case $realname in - *.dll.a) - tstripme="" -@@ -2385,7 +2385,7 @@ - - # Do a test to see if this is really a libtool program. - case $host in -- *cygwin* | *mingw*) -+ *cygwin* | *msys* | *mingw*) - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - wrapper=$func_ltwrapper_scriptname_result -@@ -2460,7 +2460,7 @@ - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in -- */usr/bin/install*,*cygwin*) -+ */usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*) - case $file:$destfile in - *.exe:*.exe) - # this is ok -@@ -2595,7 +2595,7 @@ - $RM $export_symbols - ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - echo EXPORTS > "$output_objdir/$outputname.def" - cat "$export_symbols" >> "$output_objdir/$outputname.def" - ;; -@@ -2607,7 +2607,7 @@ - $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T - $MV "$nlist"T "$nlist" - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - echo EXPORTS > "$output_objdir/$outputname.def" - cat "$nlist" >> "$output_objdir/$outputname.def" - ;; -@@ -2663,7 +2663,7 @@ - } lt_dlsymlist; - " - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - 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 @@ - # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - 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 @@ - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; -- *cygwin* ) -+ *cygwin* | *msys*) - func_to_host_path_result=`cygpath -w "$1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; -@@ -3265,7 +3265,7 @@ - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; -- *cygwin* ) -+ *cygwin* | *msys*) - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; -@@ -3571,7 +3571,7 @@ - { - EOF - case "$host" in -- *mingw* | *cygwin* ) -+ *mingw* | *cygwin* | *msys*) - # make stdout use "unix" line endings - echo " setmode(1,_O_BINARY);" - ;; -@@ -4233,7 +4233,7 @@ - { - $opt_debug - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - # 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 @@ - ;; - esac - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; -@@ -4733,7 +4733,7 @@ - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; -@@ -4813,7 +4813,7 @@ - - -no-install) - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) - # 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 @@ - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - case $host in -- *cygwin* | *mingw* | *cegcc*) -+ *cygwin* | *msys* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded - notinst_deplibs="$notinst_deplibs $lib" - need_relink=no -@@ -5842,7 +5842,7 @@ - elif test -n "$soname_spec"; then - # bleh windows - case $host in -- *cygwin* | mingw* | *cegcc*) -+ *cygwin* | *msys* | mingw* | *cegcc*) - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" -@@ -6693,7 +6693,7 @@ - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) -@@ -7194,7 +7194,7 @@ - - orig_export_symbols= - case $host_os in -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - 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 @@ - - prog) - case $host in -- *cygwin*) func_stripname '' '.exe' "$output" -+ *cygwin* | *msys*) func_stripname '' '.exe' "$output" - output=$func_stripname_result.exe;; - esac - test -n "$vinfo" && \ -@@ -7823,7 +7823,7 @@ - esac - fi - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; -@@ -7901,7 +7901,7 @@ - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no - ;; -- *cygwin* | *mingw* ) -+ *cygwin* | *msys* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi -@@ -8029,14 +8029,14 @@ - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in -- *cygwin*) -+ *cygwin* | *msys*) - exeext=.exe - func_stripname '' '.exe' "$outputname" - outputname=$func_stripname_result ;; - *) exeext= ;; - esac - case $host in -- *cygwin* | *mingw* ) -+ *cygwin* | *msys* | *mingw* ) - func_dirname_and_basename "$output" "" "." - output_name=$func_basename_result - output_path=$func_dirname_result -@@ -8343,7 +8343,7 @@ - # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in -- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) -+ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then -diff -Naur gcc-13.2.0-orig/lto-plugin/configure gcc-13.2.0/lto-plugin/configure ---- gcc-13.2.0-orig/lto-plugin/configure 2023-09-12 10:00:31.120599500 +0100 -+++ gcc-13.2.0/lto-plugin/configure 2023-09-12 10:49:47.601432900 +0100 -@@ -6651,7 +6651,7 @@ - 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, -@@ -6993,7 +6993,7 @@ - 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' -@@ -7578,7 +7578,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -9195,7 +9195,7 @@ - # 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 -@@ -9277,7 +9277,7 @@ - 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' -@@ -9739,7 +9739,7 @@ - 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++. -@@ -9854,7 +9854,7 @@ - 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' -@@ -10285,7 +10285,7 @@ - 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 -@@ -11186,14 +11186,14 @@ - # 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}`~ -@@ -11217,6 +11217,12 @@ + 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}' ++ 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" ;; -+ msys*) -+ # MSYS DLLs use 'msys-' prefix rather than 'lib' +diff -Nur gcc-13.4.0.orig/libgomp/configure gcc-13.4.0/libgomp/configure +--- gcc-13.4.0.orig/libgomp/configure 2025-06-05 18:05:01.000000000 +0200 ++++ gcc-13.4.0/libgomp/configure 2025-06-13 19:17:22.755391300 +0200 +@@ -10498,7 +10498,7 @@ + case $host_os in + 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}' + 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -11867,7 +11873,7 @@ - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; -@@ -12481,7 +12487,7 @@ - - - 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 gcc-13.2.0-orig/ltoptions.m4 gcc-13.2.0/ltoptions.m4 ---- gcc-13.2.0-orig/ltoptions.m4 2023-09-12 10:00:01.711915400 +0100 -+++ gcc-13.2.0/ltoptions.m4 2023-09-12 10:49:47.601432900 +0100 -@@ -126,7 +126,7 @@ - [enable_win32_dll=yes - - case $host in --*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) -+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) -diff -Naur gcc-13.2.0-orig/zlib/configure gcc-13.2.0/zlib/configure ---- gcc-13.2.0-orig/zlib/configure 2023-09-12 10:00:30.839391000 +0100 -+++ gcc-13.2.0/zlib/configure 2023-09-12 10:49:47.617053500 +0100 -@@ -4976,7 +4976,7 @@ - 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, -@@ -5318,7 +5318,7 @@ - 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' -@@ -5903,7 +5903,7 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -@@ -7793,7 +7793,7 @@ - # 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 -@@ -7875,7 +7875,7 @@ - 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' -@@ -8337,7 +8337,7 @@ - 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++. -@@ -8452,7 +8452,7 @@ - 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' -@@ -8889,7 +8889,7 @@ - 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 -@@ -9793,14 +9793,14 @@ - # 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}`~ -@@ -9824,6 +9824,12 @@ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; -+ msys*) -+ # MSYS DLLs use 'msys-' prefix rather than 'lib' +@@ -14159,7 +14159,7 @@ + case $host_os in + 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}' + 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*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -10477,7 +10483,7 @@ - lt_cv_dlopen_libs= - ;; -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; + ;; + mingw* | cegcc*) +diff -Nur gcc-13.4.0.orig/libitm/configure gcc-13.4.0/libitm/configure +--- gcc-13.4.0.orig/libitm/configure 2025-06-05 18:05:01.000000000 +0200 ++++ gcc-13.4.0/libitm/configure 2025-06-13 19:17:22.947696800 +0200 +@@ -11161,7 +11161,7 @@ + case $host_os in + 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}' ++ 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" + ;; +@@ -14838,7 +14838,7 @@ + case $host_os in + 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}' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + + ;; + mingw* | cegcc*) +diff -Nur gcc-13.4.0.orig/libobjc/configure gcc-13.4.0/libobjc/configure +--- gcc-13.4.0.orig/libobjc/configure 2025-06-05 18:03:02.000000000 +0200 ++++ gcc-13.4.0/libobjc/configure 2025-06-13 19:17:22.764898800 +0200 +@@ -9857,7 +9857,7 @@ + case $host_os in + 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}' ++ 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" + ;; +diff -Nur gcc-13.4.0.orig/libphobos/configure gcc-13.4.0/libphobos/configure +--- gcc-13.4.0.orig/libphobos/configure 2025-06-05 18:05:01.000000000 +0200 ++++ gcc-13.4.0/libphobos/configure 2025-06-13 19:17:22.747885500 +0200 +@@ -10853,7 +10853,7 @@ + case $host_os in + 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}' ++ 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" + ;; +diff -Nur gcc-13.4.0.orig/libquadmath/configure gcc-13.4.0/libquadmath/configure +--- gcc-13.4.0.orig/libquadmath/configure 2025-06-05 18:03:02.000000000 +0200 ++++ gcc-13.4.0/libquadmath/configure 2025-06-13 19:17:22.747885500 +0200 +@@ -9891,7 +9891,7 @@ + case $host_os in + 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}' ++ 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" + ;; +diff -Nur gcc-13.4.0.orig/libsanitizer/configure gcc-13.4.0/libsanitizer/configure +--- gcc-13.4.0.orig/libsanitizer/configure 2025-06-05 18:05:01.000000000 +0200 ++++ gcc-13.4.0/libsanitizer/configure 2025-06-13 19:17:22.907475200 +0200 +@@ -11462,7 +11462,7 @@ + case $host_os in + 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}' ++ 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" + ;; +@@ -15139,7 +15139,7 @@ + case $host_os in + 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}' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + + ;; + mingw* | cegcc*) +diff -Nur gcc-13.4.0.orig/libssp/configure gcc-13.4.0/libssp/configure +--- gcc-13.4.0.orig/libssp/configure 2025-06-05 18:03:03.000000000 +0200 ++++ gcc-13.4.0/libssp/configure 2025-06-13 19:17:22.741380200 +0200 +@@ -10077,7 +10077,7 @@ + case $host_os in + 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}' ++ 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" + ;; +diff -Nur gcc-13.4.0.orig/libstdc++-v3/configure gcc-13.4.0/libstdc++-v3/configure +--- gcc-13.4.0.orig/libstdc++-v3/configure 2025-06-13 18:58:03.533035000 +0200 ++++ gcc-13.4.0/libstdc++-v3/configure 2025-06-13 19:17:22.979307300 +0200 +@@ -11250,7 +11250,7 @@ + case $host_os in + 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}' ++ 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" + ;; +@@ -14951,7 +14951,7 @@ + case $host_os in + 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}' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + + ;; + mingw* | cegcc*) +diff -Nur gcc-13.4.0.orig/libtool.m4 gcc-13.4.0/libtool.m4 +--- gcc-13.4.0.orig/libtool.m4 2025-06-05 18:03:03.000000000 +0200 ++++ gcc-13.4.0/libtool.m4 2025-06-13 19:17:22.734376600 +0200 +@@ -2233,7 +2233,7 @@ + case $host_os in + 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}' ++ 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"]) + ;; +diff -Nur gcc-13.4.0.orig/libvtv/configure gcc-13.4.0/libvtv/configure +--- gcc-13.4.0.orig/libvtv/configure 2025-06-05 18:05:01.000000000 +0200 ++++ gcc-13.4.0/libvtv/configure 2025-06-13 19:17:22.955206000 +0200 +@@ -11357,7 +11357,7 @@ + case $host_os in + 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}' ++ 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" + ;; +@@ -15034,7 +15034,7 @@ + case $host_os in + 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}' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + + ;; + mingw* | cegcc*) +diff -Nur gcc-13.4.0.orig/lto-plugin/configure gcc-13.4.0/lto-plugin/configure +--- gcc-13.4.0.orig/lto-plugin/configure 2025-06-05 18:03:03.000000000 +0200 ++++ gcc-13.4.0/lto-plugin/configure 2025-06-13 19:17:22.740380400 +0200 +@@ -11213,7 +11213,7 @@ + case $host_os in + 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}' ++ 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" + ;; +diff -Nur gcc-13.4.0.orig/zlib/configure gcc-13.4.0/zlib/configure +--- gcc-13.4.0.orig/zlib/configure 2025-06-05 18:05:01.000000000 +0200 ++++ gcc-13.4.0/zlib/configure 2025-06-13 19:17:22.737380400 +0200 +@@ -9820,7 +9820,7 @@ + case $host_os in + 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}' ++ 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" + ;; diff --git a/gcc/0951-11.2.0-msys2-spec.patch b/gcc/0951-11.2.0-msys2-spec.patch index f5236960..8a9b5009 100644 --- a/gcc/0951-11.2.0-msys2-spec.patch +++ b/gcc/0951-11.2.0-msys2-spec.patch @@ -1,432 +1,109 @@ -diff -Naur gcc-13.2.0-orig/gcc/config/i386/msys.h gcc-13.2.0/gcc/config/i386/msys.h ---- gcc-13.2.0-orig/gcc/config/i386/msys.h 1970-01-01 01:00:00.000000000 +0100 -+++ gcc-13.2.0/gcc/config/i386/msys.h 2023-09-12 13:31:33.348712400 +0100 -@@ -0,0 +1,160 @@ -+/* Operating system specific defines to be used when targeting GCC for -+ hosting on Windows32, using a Unix style C library and tools. -+ Copyright (C) 1995-2023 Free Software Foundation, Inc. -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 3, or (at your option) -+any later version. -+ -+GCC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING3. If not see -+. */ -+ -+#define EXTRA_OS_CPP_BUILTINS() \ -+ do \ -+ { \ -+ builtin_define ("__CYGWIN__"); \ -+ builtin_define ("__MSYS__"); \ -+ if (!TARGET_64BIT) \ -+ builtin_define ("__CYGWIN32__"); \ -+ builtin_define_std ("unix"); \ -+ } \ -+ while (0) -+ -+#undef CPP_SPEC -+#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} \ -+ %{pthread:-D_REENTRANT} \ -+ %{mwin32:-DWIN32 -D_WIN32 -D__WIN32 -D__WIN32__ %{!ansi:-DWINNT}} \ -+ %{!nostdinc:%{!mno-win32:-idirafter ../include/w32api%s -idirafter ../../include/w32api%s}}\ -+" -+ -+#undef STARTFILE_SPEC -+#define STARTFILE_SPEC "\ -+ %{!shared: %{!mdll: crt0%O%s \ -+ %{pg:gcrt0%O%s}}}\ -+ %{shared:crtbeginS.o%s;:crtbegin.o%s} \ -+ %{fvtable-verify=none:%s; \ -+ fvtable-verify=preinit:vtv_start.o%s; \ -+ fvtable-verify=std:vtv_start.o%s}" -+ -+#undef ENDFILE_SPEC -+#define ENDFILE_SPEC \ -+ "%{mdaz-ftz:crtfastmath.o%s;Ofast|ffast-math|funsafe-math-optimizations:%{!shared:%{!mno-daz-ftz:crtfastmath.o%s}}} \ -+ %{!shared:%:if-exists(default-manifest.o%s)}\ -+ %{fvtable-verify=none:%s; \ -+ fvtable-verify=preinit:vtv_end.o%s; \ -+ fvtable-verify=std:vtv_end.o%s} \ -+ crtend.o%s" -+ -+/* Normally, -lgcc is not needed since everything in it is in the DLL, but we -+ want to allow things to be added to it when installing new versions of -+ GCC without making a new msys-2.0.dll, so we leave it. Profiling is handled -+ by calling the init function from main. */ -+ -+#ifdef ENABLE_SHARED_LIBGCC -+#define SHARED_LIBGCC_SPEC " \ -+ %{static|static-libgcc:-lgcc -lgcc_eh} \ -+ %{!static: \ -+ %{!static-libgcc: \ -+ -lgcc_s -lgcc \ -+ } \ -+ } " -+#else -+#define SHARED_LIBGCC_SPEC " -lgcc " -+#endif -+ -+#undef REAL_LIBGCC_SPEC -+#define REAL_LIBGCC_SPEC SHARED_LIBGCC_SPEC -+ -+/* We have to dynamic link to get to the system DLLs. All of libc, libm and -+ the Unix stuff is in msys-2.0.dll. The import library is called -+ 'libmsys-2.0.a'. For Windows applications, include more libraries, but -+ always include kernel32. We'd like to specific subsystem windows to -+ ld, but that doesn't work just yet. */ -+ -+#undef LIB_SPEC -+#define LIB_SPEC "\ -+ %{pg:-lgmon} \ -+ %{pthread: } \ -+ -lmsys-2.0 \ -+ %{mwindows:-lgdi32 -lcomdlg32} \ -+ %{fvtable-verify=preinit:-lvtv -lpsapi; \ -+ fvtable-verify=std:-lvtv -lpsapi} \ -+ -ladvapi32 -lshell32 -luser32 -lkernel32" -+ -+/* To implement C++ function replacement we always wrap the cxx -+ malloc-like operators. See N2800 #17.6.4.6 [replacement.functions] */ -+#undef CXX_WRAP_SPEC_LIST -+#define CXX_WRAP_SPEC_LIST " \ -+ --wrap _Znwj \ -+ --wrap _Znaj \ -+ --wrap _ZdlPv \ -+ --wrap _ZdaPv \ -+ --wrap _ZnwjRKSt9nothrow_t \ -+ --wrap _ZnajRKSt9nothrow_t \ -+ --wrap _ZdlPvRKSt9nothrow_t \ -+ --wrap _ZdaPvRKSt9nothrow_t \ -+" -+ -+#if defined (USE_CYGWIN_LIBSTDCXX_WRAPPERS) -+ -+#if USE_CYGWIN_LIBSTDCXX_WRAPPERS -+/* Default on, only explict -mno disables. */ -+#define CXX_WRAP_SPEC_OPT "!mno-use-libstdc-wrappers" -+#else -+/* Default off, only explict -m enables. */ -+#define CXX_WRAP_SPEC_OPT "muse-libstdc-wrappers" -+#endif -+ -+#define CXX_WRAP_SPEC "%{" CXX_WRAP_SPEC_OPT ":" CXX_WRAP_SPEC_LIST "}" -+ -+#else /* !defined (USE_CYGWIN_LIBSTDCXX_WRAPPERS) */ -+ -+#define CXX_WRAP_SPEC "" -+ -+#endif /* ?defined (USE_CYGWIN_LIBSTDCXX_WRAPPERS) */ -+ -+#define LINK_SPEC "\ -+ %{mwindows:--subsystem windows} \ -+ %{mconsole:--subsystem console} \ -+ " CXX_WRAP_SPEC " \ -+ %{shared: %{mdll: %eshared and mdll are not compatible}} \ -+ %{shared: --shared} %{mdll:--dll} \ -+ %{static:-Bstatic} %{!static:-Bdynamic} \ -+ %{shared|mdll: --enable-auto-image-base -e __msys_dll_entry@12} \ -+ --dll-search-prefix=msys- \ -+ %{rdynamic: --export-all-symbols} \ -+ %{!shared: %{!mdll: --large-address-aware --tsaware}}" -+ -+/* Binutils does not handle weak symbols from dlls correctly. For now, -+ do not use them unnecessarily in gthr-posix.h. */ -+#define GTHREAD_USE_WEAK 0 -+ -+/* Every program on MSYS links against msys-2.0.dll which contains -+ the pthread routines. There is no need to explicitly link them -+ and the -pthread flag is accepted only for compatibility. */ -+#undef GOMP_SELF_SPECS -+#define GOMP_SELF_SPECS "" -+#undef GTM_SELF_SPECS -+#define GTM_SELF_SPECS "" -+ -+/* This matches SHLIB_SONAME and SHLIB_SOVERSION in t-msys. */ -+#if DWARF2_UNWIND_INFO -+#define LIBGCC_EH_EXTN "" -+#else -+#define LIBGCC_EH_EXTN "-sjlj" -+#endif -+#define LIBGCC_SONAME "msys-gcc_s" LIBGCC_EH_EXTN "-1.dll" -+ -+/* Make stack executable to avoid DEP problems with trampolines. */ -+#define HAVE_ENABLE_EXECUTE_STACK -+#undef CHECK_EXECUTE_STACK_ENABLED -+#define CHECK_EXECUTE_STACK_ENABLED flag_setstackexecutable -diff -Naur gcc-13.2.0-orig/gcc/config/i386/msys-w64.h gcc-13.2.0/gcc/config/i386/msys-w64.h ---- gcc-13.2.0-orig/gcc/config/i386/msys-w64.h 1970-01-01 01:00:00.000000000 +0100 -+++ gcc-13.2.0/gcc/config/i386/msys-w64.h 2023-09-12 13:11:45.732746500 +0100 -@@ -0,0 +1,85 @@ -+/* Operating system specific defines to be used when targeting GCC for -+ hosting on Windows 32/64 via MSYS runtime, using GNU tools and -+ the Windows API Library. -+ Copyright (C) 2013-2023 Free Software Foundation, Inc. -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 3, or (at your option) -+any later version. -+ -+GCC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING3. If not see -+. */ -+ -+/* Enable multilib. */ -+ -+#undef ASM_SPEC -+#define ASM_SPEC "%{m32:--32} %{m64:--64}" -+ -+/* To implement C++ function replacement we always wrap the cxx -+ malloc-like operators. See N2800 #17.6.4.6 [replacement.functions] */ -+#undef CXX_WRAP_SPEC_LIST -+#define CXX_WRAP_SPEC_LIST " \ -+ --wrap _Znwm \ -+ --wrap _Znam \ -+ --wrap _ZdlPv \ -+ --wrap _ZdaPv \ -+ --wrap _ZnwmRKSt9nothrow_t \ -+ --wrap _ZnamRKSt9nothrow_t \ -+ --wrap _ZdlPvRKSt9nothrow_t \ -+ --wrap _ZdaPvRKSt9nothrow_t \ -+" -+ -+#undef SPEC_32 -+#undef SPEC_64 -+#define SPEC_32 "m32" -+#define SPEC_64 "!m32" -+ -+#undef SUB_LINK_ENTRY32 -+#undef SUB_LINK_ENTRY64 +diff -Nur gcc-13.4.0.orig/gcc/config/i386/cygwin-w64.h gcc-13.4.0/gcc/config/i386/cygwin-w64.h +--- gcc-13.4.0.orig/gcc/config/i386/cygwin-w64.h 2025-06-13 19:42:18.595032400 +0200 ++++ gcc-13.4.0/gcc/config/i386/cygwin-w64.h 2025-06-14 11:52:26.952239100 +0200 +@@ -45,8 +45,8 @@ + + #undef SUB_LINK_ENTRY32 + #undef SUB_LINK_ENTRY64 +-#define SUB_LINK_ENTRY32 "-e __cygwin_dll_entry@12" +-#define SUB_LINK_ENTRY64 "-e _cygwin_dll_entry" +#define SUB_LINK_ENTRY32 "-e __msys_dll_entry@12" +#define SUB_LINK_ENTRY64 "-e _msys_dll_entry" -+ -+#undef SUB_LINK_SPEC -+#undef SUB_LINK_ENTRY -+#define SUB_LINK_SPEC "%{" SPEC_64 ":-m i386pep} %{" SPEC_32 ":-m i386pe}" -+#define SUB_LINK_ENTRY "%{" SPEC_64 ":" SUB_LINK_ENTRY64 "} %{" SPEC_32 ":" SUB_LINK_ENTRY32 "}" -+ -+#undef MULTILIB_DEFAULTS -+#define MULTILIB_DEFAULTS { "m64" } -+ -+#undef LINK_SPEC -+#define LINK_SPEC SUB_LINK_SPEC "\ -+ %{mwindows:--subsystem windows} \ -+ %{mconsole:--subsystem console} \ -+ " CXX_WRAP_SPEC " \ -+ %{shared: %{mdll: %eshared and mdll are not compatible}} \ -+ %{shared: --shared} %{mdll:--dll} \ -+ %{static:-Bstatic} %{!static:-Bdynamic} \ -+ %{shared|mdll: " SUB_LINK_ENTRY " --enable-auto-image-base} \ -+ %(shared_libgcc_undefs) \ + + #undef SUB_LINK_SPEC + #undef SUB_LINK_ENTRY +@@ -66,7 +66,7 @@ + %{static:-Bstatic} %{!static:-Bdynamic} \ + %{shared|mdll: " SUB_LINK_ENTRY " --enable-auto-image-base} \ + %(shared_libgcc_undefs) \ +- --dll-search-prefix=cyg \ + --dll-search-prefix=msys- \ -+ %{rdynamic: --export-all-symbols} \ -+ %{!shared: %{!mdll: %{" SPEC_32 ":--large-address-aware} --tsaware}}" -+ -+/* MSYS64 will have a 64-bit long type. */ -+#undef LONG_TYPE_SIZE -+#undef LONG_TYPE_SIZE -+#define LONG_TYPE_SIZE (TARGET_64BIT ? 64 : 32) -+ -+/* Override default "long long unsigned int" from cygming.h. */ -+#undef SIZE_TYPE -+#define SIZE_TYPE (TARGET_64BIT ? "long unsigned int" : "unsigned int") -+#undef PTRDIFF_TYPE -+#define PTRDIFF_TYPE (TARGET_64BIT ? "long int" : "int") -+ -+#undef LIBGCC_SONAME + %{rdynamic: --export-all-symbols} \ + %{!shared: %{!mdll: %{" SPEC_32 ":--large-address-aware} --tsaware}}" + +@@ -82,4 +82,4 @@ + #define PTRDIFF_TYPE (TARGET_64BIT ? "long int" : "int") + + #undef LIBGCC_SONAME +-#define LIBGCC_SONAME "cyggcc_s-seh-1.dll" +#define LIBGCC_SONAME "msys-gcc_s-seh-1.dll" -diff -Naur gcc-13.2.0-orig/gcc/config/i386/t-msys-w64 gcc-13.2.0/gcc/config/i386/t-msys-w64 ---- gcc-13.2.0-orig/gcc/config/i386/t-msys-w64 1970-01-01 01:00:00.000000000 +0100 -+++ gcc-13.2.0/gcc/config/i386/t-msys-w64 2023-09-12 13:12:22.066839500 +0100 +diff -Nur gcc-13.4.0.orig/gcc/config/i386/cygwin.h gcc-13.4.0/gcc/config/i386/cygwin.h +--- gcc-13.4.0.orig/gcc/config/i386/cygwin.h 2025-06-13 19:42:18.764802800 +0200 ++++ gcc-13.4.0/gcc/config/i386/cygwin.h 2025-06-14 11:52:04.360286400 +0200 +@@ -22,6 +22,7 @@ + do \ + { \ + builtin_define ("__CYGWIN__"); \ ++ builtin_define ("__MSYS__"); \ + if (!TARGET_64BIT) \ + builtin_define ("__CYGWIN32__"); \ + builtin_define_std ("unix"); \ +@@ -83,7 +84,7 @@ + #define LIB_SPEC "\ + %{pg:-lgmon} \ + %{pthread: } \ +- -lcygwin \ ++ -lmsys-2.0 \ + %{mwindows:-lgdi32 -lcomdlg32} \ + %{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} \ +@@ -128,8 +129,8 @@ + %{shared: %{mdll: %eshared and mdll are not compatible}} \ + %{shared: --shared} %{mdll:--dll} \ + %{static:-Bstatic} %{!static:-Bdynamic} \ +- %{shared|mdll: --enable-auto-image-base -e __cygwin_dll_entry@12} \ +- --dll-search-prefix=cyg \ ++ %{shared|mdll: --enable-auto-image-base -e __msys_dll_entry@12} \ ++ --dll-search-prefix=msys- \ + %{rdynamic: --export-all-symbols} \ + %{!shared: %{!mdll: --large-address-aware --tsaware}}" + +@@ -151,7 +152,7 @@ + #else + #define LIBGCC_EH_EXTN "-sjlj" + #endif +-#define LIBGCC_SONAME "cyggcc_s" LIBGCC_EH_EXTN "-1.dll" ++#define LIBGCC_SONAME "msys-gcc_s" LIBGCC_EH_EXTN "-1.dll" + + /* Make stack executable to avoid DEP problems with trampolines. */ + #define HAVE_ENABLE_EXECUTE_STACK +diff -Nur gcc-13.4.0.orig/gcc/config/i386/t-cygwin-w64 gcc-13.4.0/gcc/config/i386/t-cygwin-w64 +--- gcc-13.4.0.orig/gcc/config/i386/t-cygwin-w64 2025-06-05 18:02:58.000000000 +0200 ++++ gcc-13.4.0/gcc/config/i386/t-cygwin-w64 2025-06-14 12:31:08.099855300 +0200 @@ -0,0 +1,3 @@ +MULTILIB_OPTIONS = m64/m32 +MULTILIB_DIRNAMES = 64 +MULTILIB_OSDIRNAMES = ../lib ../lib32 -diff -Naur gcc-13.2.0-orig/gcc/config.build gcc-13.2.0/gcc/config.build ---- gcc-13.2.0-orig/gcc/config.build 2023-09-12 12:53:16.894699700 +0100 -+++ gcc-13.2.0/gcc/config.build 2023-09-12 13:00:15.495551700 +0100 -@@ -57,6 +57,10 @@ - build_xm_file=i386/xm-cygwin.h - build_exeext=.exe - ;; -+ i[34567]86-*-msys* | x86_64-*-msys* ) -+ build_xm_file=i386/xm-cygwin.h -+ build_exeext=.exe -+ ;; - i[34567]86-*-mingw32* | x86_64-*-mingw*) - build_xm_file=i386/xm-mingw32.h - build_exeext=.exe -diff -Naur gcc-13.2.0-orig/gcc/config.gcc gcc-13.2.0/gcc/config.gcc ---- gcc-13.2.0-orig/gcc/config.gcc 2023-09-12 12:53:16.600217500 +0100 -+++ gcc-13.2.0/gcc/config.gcc 2023-09-12 13:44:28.139343300 +0100 -@@ -2123,6 +2123,43 @@ - use_gcc_stdint=wrap - tm_defines="${tm_defines} TARGET_CYGWIN64=1" - ;; -+i[34567]86-*-msys*) -+ tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/cygming.h i386/msys.h i386/cygwin-stdint.h" -+ xm_file=i386/xm-cygwin.h -+ tmake_file="${tmake_file} i386/t-cygming t-slibgcc" -+ target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.cc" -+ extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt" -+ extra_objs="${extra_objs} winnt.o winnt-stubs.o" -+ c_target_objs="${c_target_objs} msformat-c.o" -+ cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o" -+ d_target_objs="${d_target_objs} cygwin-d.o" -+ target_has_targetdm="yes" -+ if test x$enable_threads = xyes; then -+ thread_file='posix' -+ fi -+ default_use_cxa_atexit=yes -+ use_gcc_stdint=wrap -+ default_use_cxa_atexit=yes -+ ;; -+x86_64-*-msys*) -+ need_64bit_isa=yes -+ tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/cygming.h i386/msys.h i386/msys-w64.h i386/cygwin-stdint.h" -+ xm_file=i386/xm-cygwin.h -+ tmake_file="${tmake_file} i386/t-cygming t-slibgcc" -+ target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.cc" -+ extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt" -+ extra_objs="${extra_objs} winnt.o winnt-stubs.o" -+ c_target_objs="${c_target_objs} msformat-c.o" -+ cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o" -+ d_target_objs="${d_target_objs} cygwin-d.o" -+ target_has_targetdm="yes" -+ if test x$enable_threads = xyes; then -+ thread_file='posix' -+ fi -+ default_use_cxa_atexit=yes -+ use_gcc_stdint=wrap -+ tm_defines="${tm_defines} TARGET_CYGWIN64=1" -+ ;; - i[34567]86-*-mingw* | x86_64-*-mingw*) - tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/cygming.h" - xm_file=i386/xm-mingw32.h -@@ -5673,6 +5710,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-*-dragonfly* | x86_64-*-dragonfly*) -diff -Naur gcc-13.2.0-orig/gcc/config.host gcc-13.2.0/gcc/config.host ---- gcc-13.2.0-orig/gcc/config.host 2023-09-12 12:53:13.960945500 +0100 -+++ gcc-13.2.0/gcc/config.host 2023-09-12 13:02:58.203239500 +0100 -@@ -230,6 +230,13 @@ +\ No newline at end of file +diff -Nur gcc-13.4.0.orig/gcc/config.host gcc-13.4.0/gcc/config.host +--- gcc-13.4.0.orig/gcc/config.host 2025-06-05 18:02:58.000000000 +0200 ++++ gcc-13.4.0/gcc/config.host 2025-06-14 11:44:15.591776400 +0200 +@@ -228,7 +228,7 @@ + out_host_hook_obj=host-cygwin.o + host_xmake_file="${host_xmake_file} i386/x-cygwin" host_exeext=.exe - host_lto_plugin_soname=cyglto_plugin.dll - ;; -+ i[34567]86-*-msys* | x86_64-*-msys*) -+ host_xm_file=i386/xm-cygwin.h -+ out_host_hook_obj=host-cygwin.o -+ host_xmake_file="${host_xmake_file} i386/x-cygwin" -+ host_exeext=.exe +- host_lto_plugin_soname=cyglto_plugin.dll + host_lto_plugin_soname=msys-lto_plugin.dll -+ ;; + ;; i[34567]86-*-mingw32* | x86_64-*-mingw*) host_xm_file=i386/xm-mingw32.h - host_xmake_file="${host_xmake_file} ${host_xmake_mingw} i386/x-mingw32" -diff -Naur gcc-13.2.0-orig/libgcc/config/i386/t-msys gcc-13.2.0/libgcc/config/i386/t-msys ---- gcc-13.2.0-orig/libgcc/config/i386/t-msys 1970-01-01 01:00:00.000000000 +0100 -+++ gcc-13.2.0/libgcc/config/i386/t-msys 2023-09-12 13:14:31.324573000 +0100 -@@ -0,0 +1,19 @@ -+# If we are building next to winsup, this will let us find the real -+# limits.h when building libgcc2. Otherwise, winsup must be installed -+# first. -+LIBGCC2_INCLUDES += -I$(srcdir)/../winsup/include \ -+ -I$(srcdir)/../winsup/cygwin/include -+ -+# MSYS-specific parts of LIB_SPEC +diff -Nur gcc-13.4.0.orig/libgcc/config/i386/t-cygwin gcc-13.4.0/libgcc/config/i386/t-cygwin +--- gcc-13.4.0.orig/libgcc/config/i386/t-cygwin 2025-06-05 18:03:02.000000000 +0200 ++++ gcc-13.4.0/libgcc/config/i386/t-cygwin 2025-06-14 11:34:38.142763500 +0200 +@@ -5,14 +5,14 @@ + -I$(srcdir)/../winsup/cygwin/include + + # Cygwin-specific parts of LIB_SPEC +-SHLIB_LC = -lcygwin -ladvapi32 -lshell32 -luser32 -lkernel32 +SHLIB_LC = -lmsys-2.0 -ladvapi32 -lshell32 -luser32 -lkernel32 -+ -+# We have already included one of the t-{dw2,sjlj}-eh fragments for EH_MODEL -+SHLIB_EH_EXTENSION = $(subst -dw2,,-$(EH_MODEL)) -+ -+# MSYS uses different conventions than MinGW; override generic SHLIB_ def'ns here. -+SHLIB_IMPLIB = @shlib_base_name@$(SHLIB_EXT).a + + # We have already included one of the t-{dw2,sjlj}-eh fragments for EH_MODEL + SHLIB_EH_EXTENSION = $(subst -dw2,,-$(EH_MODEL)) + + # Cygwin uses different conventions than MinGW; override generic SHLIB_ def'ns here. + SHLIB_IMPLIB = @shlib_base_name@$(SHLIB_EXT).a +-SHLIB_SONAME = cyggcc_s$(SHLIB_EH_EXTENSION)-$(SHLIB_SOVERSION)$(SHLIB_EXT) +SHLIB_SONAME = msys-gcc_s$(SHLIB_EH_EXTENSION)-$(SHLIB_SOVERSION)$(SHLIB_EXT) -+# This must match the definitions of SHLIB_SONAME/SHLIB_SOVERSION and LIBGCC_SONAME. -+# We'd like to use SHLIB_SONAME here too, and we can, since -+# we don't rely on shlib_base_name substitution for it. -+SHLIB_MKMAP_OPTS = -v pe_dll=$(SHLIB_SONAME) -diff -Naur gcc-13.2.0-orig/libgcc/config.host gcc-13.2.0/libgcc/config.host ---- gcc-13.2.0-orig/libgcc/config.host 2023-09-12 12:51:10.404290400 +0100 -+++ gcc-13.2.0/libgcc/config.host 2023-09-12 13:37:04.237380300 +0100 -@@ -380,6 +380,9 @@ - i[34567]86-*-cygwin* | x86_64-*-cygwin*) - enable_execute_stack=config/i386/enable-execute-stack-mingw32.c - ;; -+i[34567]86-*-msys* | x86_64-*-msys*) -+ enable_execute_stack=config/i386/enable-execute-stack-mingw32.c -+ ;; - *) - enable_execute_stack=enable-execute-stack-empty.c; - ;; -@@ -837,6 +840,48 @@ - # FIXME - dj - t-chkstk used to be in here, need a 64-bit version of that - tmake_file="${tmake_file} ${tmake_eh_file} ${tmake_dlldir_file} i386/t-slibgcc-cygming i386/t-cygming i386/t-cygwin t-crtfm t-dfprules i386/t-chkstk" - ;; -+i[34567]86-*-msys*) -+ extra_parts="crtbegin.o crtbeginS.o crtend.o crtfastmath.o" -+ if test x$enable_vtable_verify = xyes; then -+ extra_parts="$extra_parts vtv_start.o vtv_end.o vtv_start_preinit.o vtv_end_preinit.o" -+ fi -+ # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h -+ if test x$ac_cv_sjlj_exceptions = xyes; then -+ tmake_eh_file="i386/t-sjlj-eh" -+ else -+ tmake_eh_file="i386/t-dw2-eh" -+ fi -+ # Shared libgcc DLL install dir depends on cross/native build. -+ if test x${build} = x${host} ; then -+ tmake_dlldir_file="i386/t-dlldir" -+ else -+ tmake_dlldir_file="i386/t-dlldir-x" -+ fi -+ tmake_file="${tmake_file} ${tmake_eh_file} ${tmake_dlldir_file} i386/t-slibgcc-cygming i386/t-cygming i386/t-msys t-crtfm i386/t-chkstk t-dfprules" -+ ;; -+x86_64-*-msys*) -+ extra_parts="crtbegin.o crtbeginS.o crtend.o crtfastmath.o" -+ if test x$enable_vtable_verify = xyes; then -+ extra_parts="$extra_parts vtv_start.o vtv_end.o vtv_start_preinit.o vtv_end_preinit.o" -+ fi -+ # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h -+ if test x$ac_cv_sjlj_exceptions = xyes; then -+ tmake_eh_file="i386/t-sjlj-eh" -+ elif test "${host_address}" = 32; then -+ # biarch -m32 with --disable-sjlj-exceptions -+ tmake_eh_file="i386/t-dw2-eh" -+ else -+ tmake_eh_file="i386/t-seh-eh" -+ fi -+ # Shared libgcc DLL install dir depends on cross/native build. -+ if test x${build} = x${host} ; then -+ tmake_dlldir_file="i386/t-dlldir" -+ else -+ tmake_dlldir_file="i386/t-dlldir-x" -+ fi -+ # FIXME - dj - t-chkstk used to be in here, need a 64-bit version of that -+ tmake_file="${tmake_file} ${tmake_eh_file} ${tmake_dlldir_file} i386/t-slibgcc-cygming i386/t-cygming i386/t-msys t-crtfm t-dfprules i386/t-chkstk" -+ ;; - i[34567]86-*-mingw*) - extra_parts="crtbegin.o crtend.o crtfastmath.o" - if test x$enable_vtable_verify = xyes; then + # This must match the definitions of SHLIB_SONAME/SHLIB_SOVERSION and LIBGCC_SONAME. + # We'd like to use SHLIB_SONAME here too, and we can, since + # we don't rely on shlib_base_name substitution for it. diff --git a/gcc/0953-11.2.0-testsuite-msys2.patch b/gcc/0953-11.2.0-testsuite-msys2.patch deleted file mode 100644 index aa061534..00000000 --- a/gcc/0953-11.2.0-testsuite-msys2.patch +++ /dev/null @@ -1,759 +0,0 @@ -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/abi/bitfield3.C gcc-11.2.0/gcc/testsuite/g++.dg/abi/bitfield3.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/abi/bitfield3.C 2021-11-29 16:32:00.115532200 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/abi/bitfield3.C 2021-11-29 16:49:32.556601800 +0100 -@@ -3,7 +3,7 @@ - // { dg-options "-O2" } - // Cygwin and mingw default to MASK_ALIGN_DOUBLE. Override to ensure - // 4-byte alignment. --// { dg-additional-options "-mno-align-double" { target i?86-*-cygwin* i?86-*-mingw* } } -+// { dg-additional-options "-mno-align-double" { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } - // As for mingw target the ms-bitfield switch is activated by default, - // make sure for this test that it is disabled. - // { dg-additional-options "-mno-ms-bitfields" { target i?86-*-mingw* } } -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/abi/rtti3.C gcc-11.2.0/gcc/testsuite/g++.dg/abi/rtti3.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/abi/rtti3.C 2021-11-29 16:32:00.162395900 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/abi/rtti3.C 2021-11-29 16:50:13.664297700 +0100 -@@ -2,7 +2,7 @@ - // necessarily the type info object - - // { dg-require-weak "" } --// { dg-skip-if "Linkonce not weak" { *-*-mingw* *-*-cygwin } } -+// { dg-skip-if "Linkonce not weak" { *-*-mingw* *-*-cygwin *-*-msys } } - // { dg-final { scan-assembler ".weak\[ \t\]_?_ZTSPP1A" { target { ! { *-*-darwin* hppa*-*-hpux* } } } } } - // { dg-final { scan-assembler-not ".weak\[ \t\]_?_ZTIPP1A" { target { ! { *-*-darwin* } } } } } - // { dg-final { scan-assembler ".weak_definition\[ \t\]_?_ZTSPP1A" { target { *-*-darwin* } } } } -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/abi/thunk4.C gcc-11.2.0/gcc/testsuite/g++.dg/abi/thunk4.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/abi/thunk4.C 2021-11-29 16:32:00.146775300 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/abi/thunk4.C 2021-11-29 16:50:13.664297700 +0100 -@@ -1,5 +1,5 @@ - // { dg-require-weak "" } --// { dg-skip-if "Linkonce not weak" { *-*-mingw* *-*-cygwin } } -+// { dg-skip-if "Linkonce not weak" { *-*-mingw* *-*-cygwin *-*-msys } } - // { dg-final { scan-assembler ".weak\[ \t\]_?_ZThn._N7Derived3FooEv" { target { ! { *-*-darwin* } } } } } - // { dg-final { scan-assembler ".weak_definition\[ \t\]_?_ZThn._N7Derived3FooEv" { target { *-*-darwin* } } } } - -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/compat/struct-layout-1_generate.c gcc-11.2.0/gcc/testsuite/g++.dg/compat/struct-layout-1_generate.c ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/compat/struct-layout-1_generate.c 2021-11-29 16:31:59.709376900 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/compat/struct-layout-1_generate.c 2021-11-29 16:49:32.556601800 +0100 -@@ -46,8 +46,8 @@ - const char *dg_options[] = { - "/* { dg-options \"%s%s-I%s -Wno-abi\" } */\n", - "/* { dg-options \"%s%s-I%s -mno-mmx -Wno-abi\" { target i?86-*-* x86_64-*-* } } */\n", --"/* { dg-options \"%s%s-I%s -fno-common\" { target hppa*-*-hpux* powerpc*-*-darwin* *-*-mingw32* *-*-cygwin* } } */\n", --"/* { dg-options \"%s%s-I%s -mno-mmx -fno-common -Wno-abi\" { target i?86-*-darwin* x86_64-*-darwin* i?86-*-mingw32* x86_64-*-mingw32* i?86-*-cygwin* } } */\n", -+"/* { dg-options \"%s%s-I%s -fno-common\" { target hppa*-*-hpux* powerpc*-*-darwin* *-*-mingw32* *-*-cygwin* *-*-msys* } } */\n", -+"/* { dg-options \"%s%s-I%s -mno-mmx -fno-common -Wno-abi\" { target i?86-*-darwin* x86_64-*-darwin* i?86-*-mingw32* x86_64-*-mingw32* i?86-*-cygwin* i?86-*-msys* } } */\n", - "/* { dg-options \"%s%s-I%s -mno-base-addresses\" { target mmix-*-* } } */\n", - "/* { dg-options \"%s%s-I%s -mlongcalls -mtext-section-literals\" { target xtensa*-*-* } } */\n" - #define NDG_OPTIONS (sizeof (dg_options) / sizeof (dg_options[0])) -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C gcc-11.2.0/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C 2021-11-29 16:31:58.598695500 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C 2021-11-29 16:50:13.664297700 +0100 -@@ -1,7 +1,7 @@ - // Test for conversion from stateless lambda to function pointer. - - // { dg-do compile { target c++11_only } } --// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZ1fvENKUlvE_cvPFvvEEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin } } } } } -+// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZ1fvENKUlvE_cvPFvvEEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin *-*-msys } } } } } - - inline void f() - { -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C gcc-11.2.0/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C 2021-11-29 16:31:58.614316700 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C 2021-11-29 16:50:13.664297700 +0100 -@@ -12,7 +12,7 @@ - // The call operator of that type is _ZZ1giENKUlvE_clEv. - - // { dg-final { scan-assembler "_ZZ1giENKUlvE_clEv" } } --// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZ1giENKUlvE_clEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin } } } } } -+// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZ1giENKUlvE_clEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin *-*-msys } } } } } - - algo([=]{return n+bef();}); - // The captured entities do not participate in -@@ -34,7 +34,7 @@ - // Type: ZN1S1fEiiEd0_UlvE_ - // Operator: _ZZN1S1fEiiEd0_NKUlvE_clEv - // { dg-final { scan-assembler "_ZZN1S1fEiiEd0_NKUlvE_clEv" } } --// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZN1S1fEiiEd0_NKUlvE_clEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin } } } } } -+// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZN1S1fEiiEd0_NKUlvE_clEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin *-*-msys } } } } } - []{return 1;}() - // Type: ZN1S1fEiiEd0_UlvE0_ - // Operator: _ZZN1S1fEiiEd0_NKUlvE0_clEv -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle6.C gcc-11.2.0/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle6.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle6.C 2021-11-29 16:31:58.614316700 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle6.C 2021-11-29 16:50:13.664297700 +0100 -@@ -12,4 +12,4 @@ - // Type of lambda in intializer of R::x: N1RIiE1xMUlvE_E - // Corresponding operator(): _ZNK1RIiE1xMUlvE_clEv - // { dg-final { scan-assembler "_ZNK1RIiE1xMUlvE_clEv" } } --// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZNK1RIiE1xMUlvE_clEv" { target { ! { *-*-mingw* *-*-cygwin } } } } } -+// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZNK1RIiE1xMUlvE_clEv" { target { ! { *-*-mingw* *-*-cygwin *-*-msys } } } } } -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllexport-MI1.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllexport-MI1.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllexport-MI1.C 2021-11-29 16:31:57.318016200 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllexport-MI1.C 2021-11-29 16:49:32.556601800 +0100 -@@ -1,4 +1,4 @@ --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw*} } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw*} } - // Test that non-virtual MI thunks are exported. - - -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllexport1.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllexport1.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllexport1.C 2021-11-29 16:31:57.349259000 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllexport1.C 2021-11-29 16:49:32.556601800 +0100 -@@ -1,5 +1,5 @@ - // Test that inline functions are exported with -fkeep-inline-functions. --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw*} } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw*} } - // { dg-options -fkeep-inline-functions } - - __attribute__((dllexport)) inline int foo (int a) { return a;} -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllexport3.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllexport3.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllexport3.C 2021-11-29 16:31:57.349259000 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllexport3.C 2021-11-29 17:07:33.561954000 +0100 -@@ -1,5 +1,5 @@ - // PR c++/42870 --// { dg-do compile { target i?86-*-cygwin *-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin i?86-*-msys *-*-mingw* } } - // { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZN2SaD1Ev" } } - - #define ATTRIBUTE __attribute__ ((dllexport)) -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport-MI1.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport-MI1.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport-MI1.C 2021-11-29 16:31:57.271152200 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport-MI1.C 2021-11-29 16:49:32.557598300 +0100 -@@ -1,4 +1,4 @@ --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - // Test handling of MI thunks in dllimported classes. - - // To build the dll and client app: -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport-initialized.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport-initialized.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport-initialized.C 2021-11-29 16:31:57.630443000 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport-initialized.C 2021-11-29 16:49:32.556601800 +0100 -@@ -1,3 +1,3 @@ --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - - __attribute__((dllimport)) int i __attribute__((unused)) = 0; // { dg-error "32:definition of .int i. is marked .dllimport." } -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport1.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport1.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport1.C 2021-11-29 16:31:57.333637200 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport1.C 2021-11-29 16:49:32.557598300 +0100 -@@ -1,5 +1,5 @@ - // PR c++/7910 --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - // { dg-options { -Wall -W } } - - class __attribute__((dllimport)) Foo -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport10.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport10.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport10.C 2021-11-29 16:31:57.661683500 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport10.C 2021-11-29 16:49:32.557598300 +0100 -@@ -1,7 +1,7 @@ - // PR c++/5287, c++/11021 - // Inherit a virtual method from a dllimport'd base class. - --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - - struct __attribute__((dllimport)) A - { -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport11.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport11.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport11.C 2021-11-29 16:31:57.302395300 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport11.C 2021-11-29 16:49:32.556601800 +0100 -@@ -1,6 +1,6 @@ - // PR target/23589 - // Template member functions do not get dllimport status of class. --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - - struct __attribute__((dllimport)) Foo - { -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport12.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport12.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport12.C 2021-11-29 16:31:57.427365600 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport12.C 2021-11-29 16:49:32.556601800 +0100 -@@ -1,7 +1,7 @@ - // PR target/27650 - // Don't use dllimport semantics on virtual methods when initializing - // vtables --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - - // Use import lib thunk for vtable entry of explicitly virtual method, - struct base -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport13.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport13.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport13.C 2021-11-29 16:31:57.349259000 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport13.C 2021-11-29 16:49:32.557598300 +0100 -@@ -1,7 +1,7 @@ - // PR c++/34749 - // Ensure dllimport is handled correctly for friends - --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - - int __declspec (dllimport) bar(); - int __declspec (dllimport) baz(); -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport2.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport2.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport2.C 2021-11-29 16:31:57.318016200 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport2.C 2021-11-29 16:49:32.556601800 +0100 -@@ -1,4 +1,4 @@ --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - // PR c++/9738 Dllimport attribute is overriden by later definition/redeclaration - - void __attribute__((dllimport)) Bar(void); -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport3.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport3.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport3.C 2021-11-29 16:31:57.599199900 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport3.C 2021-11-29 16:49:32.557598300 +0100 -@@ -1,4 +1,4 @@ --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - - // PR 10148 Dllimport attribute of object is overriden by later - // redefinition without attribute. -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport4.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport4.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport4.C 2021-11-29 16:31:57.567957600 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport4.C 2021-11-29 16:49:32.556601800 +0100 -@@ -1,5 +1,5 @@ - // Report error if dllimport attribute in definition itself. --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - - __attribute__((dllimport)) void bar () { } // { dg-error "definition" } - -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport5.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport5.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport5.C 2021-11-29 16:31:57.630443000 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport5.C 2021-11-29 16:49:32.557598300 +0100 -@@ -1,4 +1,4 @@ --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - // Report error if static symbol definition has dllimport attribute. - - __attribute__((dllimport)) -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport6.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport6.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport6.C 2021-11-29 16:31:57.677313500 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport6.C 2021-11-29 16:49:32.556601800 +0100 -@@ -1,4 +1,4 @@ --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - // Mark class static members as dllimport. - - struct Baz -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport7.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport7.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport7.C 2021-11-29 16:31:57.318016200 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport7.C 2021-11-29 16:49:32.556601800 +0100 -@@ -1,4 +1,4 @@ --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - - // Report errors on definition of dllimport'd static data member . - -@@ -19,7 +19,7 @@ - }; - - const int Bar::three = 3; // { dg-warning "redeclared without dllimport" } --// { dg-error "definition of static data" "C++ specific error" { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } .-1 } -+// { dg-error "definition of static data" "C++ specific error" { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } .-1 } - - const Baz Bar::null_baz; // { dg-warning "redeclared without dllimport" } - -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport8.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport8.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport8.C 2021-11-29 16:31:57.599199900 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport8.C 2021-11-29 16:49:32.556601800 +0100 -@@ -2,7 +2,7 @@ - // Ignore dllimport of static members if marked inlined. - // or if definition follows declaration in dllimported class. - --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - // { dg-options { -Wall -W } } - - struct __attribute__((dllimport)) Foo -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport9.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport9.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/dllimport9.C 2021-11-29 16:31:57.286773600 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/dllimport9.C 2021-11-29 16:49:32.557598300 +0100 -@@ -1,5 +1,5 @@ - // Handle dllimport attribute for functions declared inline. --// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } -+// { dg-do compile { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } } - // { dg-options { -W } } - - inline __attribute__((dllimport)) void bar() { } // { dg-warning "inline" } -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/selectany1.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/selectany1.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/selectany1.C 2021-11-29 16:31:57.521094200 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/selectany1.C 2021-11-29 16:37:36.184085400 +0100 -@@ -1,4 +1,4 @@ --// { dg-do compile { target i?86-pc-cygwin } } -+// { dg-do compile { target i?86-pc-cygwin i?86-pc-msys } } - // { dg-do compile { target i?86-*-mingw* x86_64-*-mingw* } } - - // Check that selectany attribute puts symbols into link-once sections. -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/selectany2.C gcc-11.2.0/gcc/testsuite/g++.dg/ext/selectany2.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/ext/selectany2.C 2021-11-29 16:31:57.286773600 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/ext/selectany2.C 2021-11-29 16:37:36.184085400 +0100 -@@ -1,4 +1,4 @@ --// { dg-do compile { target i?86-pc-cygwin } } -+// { dg-do compile { target i?86-pc-cygwin i?86-pc-msys } } - // { dg-do compile { target i?86-*-mingw* x86_64-*-mingw* } } - - // Check for errors with invalid usage of selectany attribute. -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/opt/vt1.C gcc-11.2.0/gcc/testsuite/g++.dg/opt/vt1.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/opt/vt1.C 2021-11-29 16:32:03.240896500 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/opt/vt1.C 2021-11-29 16:50:13.664297700 +0100 -@@ -1,7 +1,7 @@ - // Test whether vtable for S is not put into read-only section. - // { dg-do compile { target fpic } } - // { dg-options "-O2 -fpic -fno-rtti" } --// { dg-skip-if "No Windows PIC" { *-*-mingw* *-*-cygwin } } -+// { dg-skip-if "No Windows PIC" { *-*-mingw* *-*-cygwin *-*-msys } } - // Origin: Jakub Jelinek - - struct S -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/template/spec35.C gcc-11.2.0/gcc/testsuite/g++.dg/template/spec35.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.dg/template/spec35.C 2021-11-29 16:32:00.631036400 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.dg/template/spec35.C 2021-11-29 16:50:13.664297700 +0100 -@@ -24,6 +24,6 @@ - // { dg-final { scan-assembler-not ".glob(a|)l\[\t \]*_?_Z2f1IiEvT_" } } - f1(0); // Expected to have static linkage - -- // { dg-final { scan-assembler ".weak(_definition)?\[\t \]*_?_Z2f2IiEvT_" { target { ! { *-*-mingw* *-*-cygwin } } } } } -+ // { dg-final { scan-assembler ".weak(_definition)?\[\t \]*_?_Z2f2IiEvT_" { target { ! { *-*-mingw* *-*-cygwin *-*-msys } } } } } - f2(0); // Expected to have weak global linkage - } -diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C gcc-11.2.0/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C ---- gcc-11.2.0-orig/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C 2021-11-29 16:31:54.561915200 +0100 -+++ gcc-11.2.0/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C 2021-11-29 16:37:36.184085400 +0100 -@@ -1,4 +1,4 @@ --// { dg-do run { xfail i?86-pc-cygwin } } -+// { dg-do run { xfail i?86-pc-cygwin i?86-pc-msys } } - // Test that attributes weak and alias coexist. - // { dg-require-weak "" } - // { dg-require-alias "" } -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.dg/bf-ms-attrib.c gcc-11.2.0/gcc/testsuite/gcc.dg/bf-ms-attrib.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.dg/bf-ms-attrib.c 2021-11-29 16:31:46.975785100 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.dg/bf-ms-attrib.c 2021-11-29 16:43:00.090274000 +0100 -@@ -3,7 +3,7 @@ - posted to GCC-patches - http://gcc.gnu.org/ml/gcc-patches/2000-08/msg00577.html */ - --/* { dg-do run { target *-*-mingw* *-*-cygwin* } } */ -+/* { dg-do run { target *-*-mingw* *-*-cygwin* *-*-msys* } } */ - - /* We don't want the default "pedantic-errors" in this case, since we're - testing nonstandard stuff to begin with. */ -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.dg/bf-ms-layout-3.c gcc-11.2.0/gcc/testsuite/gcc.dg/bf-ms-layout-3.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.dg/bf-ms-layout-3.c 2021-11-29 16:31:49.479092400 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.dg/bf-ms-layout-3.c 2021-11-29 16:43:00.090274000 +0100 -@@ -1,5 +1,5 @@ - /* Test for MS bitfield layout */ --/* { dg-do run { target *-*-mingw* *-*-cygwin* i?86-*-* x86_64-*-* } } */ -+/* { dg-do run { target *-*-mingw* *-*-cygwin* *-*-msys* i?86-*-* x86_64-*-* } } */ - - extern void abort(); - -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.dg/bf-no-ms-layout.c gcc-11.2.0/gcc/testsuite/gcc.dg/bf-no-ms-layout.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.dg/bf-no-ms-layout.c 2021-11-29 16:31:50.182051100 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.dg/bf-no-ms-layout.c 2021-11-29 16:43:00.090274000 +0100 -@@ -5,7 +5,7 @@ - posted to GCC-patches - http://gcc.gnu.org/ml/gcc-patches/2000-08/msg00577.html */ - --/* { dg-do run { target *-*-mingw* *-*-cygwin* i?86-*-darwin } } */ -+/* { dg-do run { target *-*-mingw* *-*-cygwin* *-*-msys* i?86-*-darwin } } */ - /* { dg-options "-mno-ms-bitfields" } */ - - #include -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.dg/dll-3.c gcc-11.2.0/gcc/testsuite/gcc.dg/dll-3.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.dg/dll-3.c 2021-11-29 16:31:47.867770700 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.dg/dll-3.c 2021-11-29 16:37:36.184085400 +0100 -@@ -1,7 +1,7 @@ - /* Ensure dllexport overrides dllimport. */ - - /* { dg-do compile { target arm*-*-pe* } } */ --/* { dg-do compile { target i?86-pc-cygwin } } */ -+/* { dg-do compile { target i?86-pc-cygwin i?86-pc-msys } } */ - /* { dg-do compile { target i?86-*-mingw* x86_64-*-mingw*} } */ - - __declspec (dllimport) int foo1 (); -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.dg/dll-4.c gcc-11.2.0/gcc/testsuite/gcc.dg/dll-4.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.dg/dll-4.c 2021-11-29 16:31:52.134717100 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.dg/dll-4.c 2021-11-29 16:37:36.184085400 +0100 -@@ -1,5 +1,5 @@ - /* { dg-do compile { target arm*-*-pe* } } */ --/* { dg-do compile { target i?86-pc-cygwin } } */ -+/* { dg-do compile { target i?86-pc-cygwin i?86-pc-msys } } */ - /* { dg-do compile { target i?86-*-mingw* x86_64-*-mingw* } } */ - - __declspec (dllimport) int foo1; -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.dg/dll-5.c gcc-11.2.0/gcc/testsuite/gcc.dg/dll-5.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.dg/dll-5.c 2021-11-29 16:31:51.150581400 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.dg/dll-5.c 2021-11-29 16:37:36.184085400 +0100 -@@ -1,4 +1,4 @@ --/* { dg-do compile { target i?86-pc-cygwin } } */ -+/* { dg-do compile { target i?86-pc-cygwin i?86-pc-msys } } */ - /* { dg-do compile { target i?86-*-mingw* x86_64-*-mingw* } } */ - /* { dg-do compile { target arm*-*-pe* } } */ - -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.dg/dll-8.c gcc-11.2.0/gcc/testsuite/gcc.dg/dll-8.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.dg/dll-8.c 2021-11-29 16:31:46.087502800 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.dg/dll-8.c 2021-11-29 16:37:36.184085400 +0100 -@@ -1,4 +1,4 @@ --/* { dg-do compile { target i?86-pc-cygwin } } */ -+/* { dg-do compile { target i?86-pc-cygwin i?86-pc-msys } } */ - /* { dg-do compile { target i?86-*-mingw* x86_64-*-mingw*} } */ - /* { dg-options "-O3 -fwhole-program" } */ - /* { dg-final { scan-assembler "foo1" } } */ -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.dg/graphite/run-id-1.c gcc-11.2.0/gcc/testsuite/gcc.dg/graphite/run-id-1.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.dg/graphite/run-id-1.c 2021-11-29 16:31:50.885010700 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.dg/graphite/run-id-1.c 2021-11-29 16:43:00.090274000 +0100 -@@ -1,4 +1,4 @@ --/* { dg-options "-Wl,--stack,12582912" { target *-*-mingw* *-*-cygwin* } } */ -+/* { dg-options "-Wl,--stack,12582912" { target *-*-mingw* *-*-cygwin* *-*-msys* } } */ - /* { dg-require-effective-target size32plus } */ - /* { dg-require-stack-size "4*1000*1000" } */ - -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.dg/lto/20090914-2_0.c gcc-11.2.0/gcc/testsuite/gcc.dg/lto/20090914-2_0.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.dg/lto/20090914-2_0.c 2021-11-29 16:31:45.752462600 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.dg/lto/20090914-2_0.c 2021-11-29 16:43:00.090274000 +0100 -@@ -1,7 +1,7 @@ - /* { dg-lto-do run } */ - /* { dg-skip-if "x86 only" { ! { x86_64-*-* i?86-*-* } } } */ - /* { dg-skip-if "no .type" { *-*-darwin* } } */ --/* { dg-skip-if "no @function" { *-*-mingw* *-*-cygwin* } } */ -+/* { dg-skip-if "no @function" { *-*-mingw* *-*-cygwin* *-*-msys* } } */ - - /* Doesn't work without this dummy function with -fwhopr. */ - int foo(void) { } -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c gcc-11.2.0/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c 2021-11-29 16:31:48.541158800 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c 2021-11-29 16:49:32.556601800 +0100 -@@ -46,10 +46,10 @@ - /* CRIS and MSP430 keep the address in a register. */ - /* m68k sometimes puts the address in a register, depending on CPU and PIC. */ - --/* { dg-final { scan-assembler-times "foo" 5 { xfail hppa*-*-* ia64*-*-* sh*-*-* cris-*-* fido-*-* m68k-*-* i?86-*-mingw* i?86-*-cygwin* x86_64-*-mingw* visium-*-* nvptx*-*-* pdp11*-*-* msp430-*-* amdgcn*-*-* } } } */ -+/* { dg-final { scan-assembler-times "foo" 5 { xfail hppa*-*-* ia64*-*-* sh*-*-* cris-*-* fido-*-* m68k-*-* i?86-*-mingw* i?86-*-cygwin* i?86-*-msys* x86_64-*-mingw* visium-*-* nvptx*-*-* pdp11*-*-* msp430-*-* amdgcn*-*-* } } } */ - /* { dg-final { scan-assembler-times "foo,%r" 5 { target hppa*-*-* } } } */ - /* { dg-final { scan-assembler-times "= foo" 5 { target ia64*-*-* } } } */ --/* { dg-final { scan-assembler-times "call\[ \t\]*_foo" 5 { target i?86-*-mingw* i?86-*-cygwin* } } } */ -+/* { dg-final { scan-assembler-times "call\[ \t\]*_foo" 5 { target i?86-*-mingw* i?86-*-cygwin* i?86-*-msys* } } } */ - /* { dg-final { scan-assembler-times "call\[ \t\]*foo" 5 { target x86_64-*-mingw* } } } */ - /* { dg-final { scan-assembler-times "jsr|bsrf|blink\ttr?,r18" 5 { target sh*-*-* } } } */ - /* { dg-final { scan-assembler-times "Jsr \\\$r" 5 { target cris-*-* } } } */ -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-2.c gcc-11.2.0/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-2.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-2.c 2021-11-29 16:31:49.197252300 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-2.c 2021-11-29 16:43:00.090274000 +0100 -@@ -10,4 +10,4 @@ - - /* There should be a reference to conststaticvariable since it may - may be overriden at link time. */ --/* { dg-final { scan-tree-dump-times "conststaticvariable" 1 "optimized" { xfail { *-*-mingw* *-*-cygwin* } } } } */ -+/* { dg-final { scan-tree-dump-times "conststaticvariable" 1 "optimized" { xfail { *-*-mingw* *-*-cygwin* *-*-msys* } } } } */ -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/fastcall-1.c gcc-11.2.0/gcc/testsuite/gcc.target/i386/fastcall-1.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/fastcall-1.c 2021-11-29 16:32:16.686052200 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.target/i386/fastcall-1.c 2021-11-29 16:49:32.556601800 +0100 -@@ -1,4 +1,4 @@ --/* { dg-do compile { target i?86-*-mingw32* i?86-*-cygwin* } } */ -+/* { dg-do compile { target i?86-*-mingw32* i?86-*-cygwin* i?86-*-msys* } } */ - /* { dg-options "-std=gnu89" } */ - - void -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pad-4.c gcc-11.2.0/gcc/testsuite/gcc.target/i386/pad-4.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pad-4.c 2021-11-29 16:32:16.988650600 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.target/i386/pad-4.c 2021-11-29 16:50:13.664297700 +0100 -@@ -2,7 +2,7 @@ - /* { dg-require-effective-target ia32 } */ - /* { dg-require-effective-target fpic } */ - /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=atom" } } */ --/* { dg-skip-if "No Windows PIC" { *-*-mingw* *-*-cygwin } } */ -+/* { dg-skip-if "No Windows PIC" { *-*-mingw* *-*-cygwin *-*-msys } } */ - /* { dg-options "-O2 -fomit-frame-pointer -march=atom -fPIC" } */ - /* { dg-final { scan-assembler-times "nop" 8 } } */ - /* { dg-final { scan-assembler-not "rep" } } */ -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pic-1.c gcc-11.2.0/gcc/testsuite/gcc.target/i386/pic-1.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pic-1.c 2021-11-29 16:32:17.482191600 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.target/i386/pic-1.c 2021-11-29 16:50:13.664297700 +0100 -@@ -2,7 +2,7 @@ - /* { dg-do compile } */ - /* { dg-require-effective-target ia32 } */ - /* { dg-require-effective-target fpic } */ --/* { dg-skip-if "No Windows PIC" { *-*-mingw* *-*-cygwin } } */ -+/* { dg-skip-if "No Windows PIC" { *-*-mingw* *-*-cygwin *-*-msys } } */ - /* { dg-options "-fPIC" } */ - - /* Test verifies that %ebx is no longer fixed when generating PIC code on i686. */ -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pr25993.c gcc-11.2.0/gcc/testsuite/gcc.target/i386/pr25993.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pr25993.c 2021-11-29 16:32:16.146175000 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.target/i386/pr25993.c 2021-11-29 17:00:50.001181700 +0100 -@@ -1,5 +1,5 @@ - /* { dg-do assemble } */ --/* { dg-skip-if "" { "*-*-darwin*" "*-*-mingw*" "*-*-cygwin*" } } */ -+/* { dg-skip-if "" { "*-*-darwin*" "*-*-mingw*" "*-*-cygwin*" "*-*-msys*" } } */ - /* { dg-options "-std=c99 -x assembler-with-cpp" } */ - - #ifndef __ASSEMBLER__ -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pr40906-1.c gcc-11.2.0/gcc/testsuite/gcc.target/i386/pr40906-1.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pr40906-1.c 2021-11-29 16:32:18.167171900 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.target/i386/pr40906-1.c 2021-11-29 16:43:00.090274000 +0100 -@@ -1,7 +1,7 @@ - /* { dg-do run } */ - /* { dg-require-effective-target ia32 } */ - /* { dg-options "-O2 -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args" } */ --/* { dg-additional-options "-mno-accumulate-outgoing-args" { target { ! { *-*-mingw* *-*-cygwin* } } } } */ -+/* { dg-additional-options "-mno-accumulate-outgoing-args" { target { ! { *-*-mingw* *-*-cygwin* *-*-msys* } } } } */ - - void abort (void); - -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pr40906-2.c gcc-11.2.0/gcc/testsuite/gcc.target/i386/pr40906-2.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pr40906-2.c 2021-11-29 16:32:15.885904100 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.target/i386/pr40906-2.c 2021-11-29 16:43:00.090274000 +0100 -@@ -1,7 +1,7 @@ - /* { dg-do run } */ - /* { dg-require-effective-target ia32 } */ - /* { dg-options "-O2 -Wno-psabi -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args -m128bit-long-double" } */ --/* { dg-additional-options "-mno-accumulate-outgoing-args" { target { ! { *-*-mingw* *-*-cygwin* } } } } */ -+/* { dg-additional-options "-mno-accumulate-outgoing-args" { target { ! { *-*-mingw* *-*-cygwin* *-*-msys* } } } } */ - - void abort (void); - -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pr46226.c gcc-11.2.0/gcc/testsuite/gcc.target/i386/pr46226.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pr46226.c 2021-11-29 16:32:15.948389100 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.target/i386/pr46226.c 2021-11-29 16:43:00.090274000 +0100 -@@ -1,6 +1,6 @@ - /* { dg-do run } */ - /* { dg-options "-Os -fomit-frame-pointer -fno-asynchronous-unwind-tables" } */ --/* { dg-additional-options "-mno-accumulate-outgoing-args" { target { ! { *-*-mingw* *-*-cygwin* } } } } */ -+/* { dg-additional-options "-mno-accumulate-outgoing-args" { target { ! { *-*-mingw* *-*-cygwin* *-*-msys* } } } } */ - - extern void abort(void); - -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pr56564-1.c gcc-11.2.0/gcc/testsuite/gcc.target/i386/pr56564-1.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pr56564-1.c 2021-11-29 16:32:17.195959800 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.target/i386/pr56564-1.c 2021-11-29 16:43:00.090274000 +0100 -@@ -1,6 +1,6 @@ - /* PR target/56564 */ - /* { dg-do compile { target { fpic && lp64 } } } */ --/* { dg-skip-if "No symbol interposition for PIC" { *-*-mingw* *-*-cygwin* *-*-darwin* } } */ -+/* { dg-skip-if "No symbol interposition for PIC" { *-*-mingw* *-*-cygwin* *-*-msys* *-*-darwin* } } */ - /* { dg-options "-O3 -fpic -fdump-tree-optimized" } */ - - struct S { long a, b; } s = { 5, 6 }; -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pr56564-3.c gcc-11.2.0/gcc/testsuite/gcc.target/i386/pr56564-3.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/pr56564-3.c 2021-11-29 16:32:17.190979200 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.target/i386/pr56564-3.c 2021-11-29 16:43:00.090274000 +0100 -@@ -1,6 +1,6 @@ - /* PR target/56564 */ - /* { dg-do compile { target { fpic && lp64 } } } */ --/* { dg-skip-if "No symbol interposition for PIC" { *-*-mingw* *-*-cygwin* *-*-darwin* } } */ -+/* { dg-skip-if "No symbol interposition for PIC" { *-*-mingw* *-*-cygwin* *-*-msys* *-*-darwin* } } */ - /* { dg-options "-O3 -fpic -fdump-tree-optimized" } */ - - __thread struct S { long a, b; } s = { 5, 6 }; -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/sse-10.c gcc-11.2.0/gcc/testsuite/gcc.target/i386/sse-10.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/sse-10.c 2021-11-29 16:32:16.114932400 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.target/i386/sse-10.c 2021-11-29 16:43:00.090274000 +0100 -@@ -1,7 +1,7 @@ - /* PR 17930 */ - /* { dg-do run } */ - /* { dg-options "-O1 -msse2 -mfpmath=sse -fno-omit-frame-pointer" } */ --/* { dg-additional-options "-mno-accumulate-outgoing-args -mno-omit-leaf-frame-pointer" { target { ! { *-*-mingw* *-*-cygwin* } } } } */ -+/* { dg-additional-options "-mno-accumulate-outgoing-args -mno-omit-leaf-frame-pointer" { target { ! { *-*-mingw* *-*-cygwin* *-*-msys* } } } } */ - /* { dg-require-effective-target sse2 } */ - - #include "sse2-check.h" -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/stack-realign-win.c gcc-11.2.0/gcc/testsuite/gcc.target/i386/stack-realign-win.c ---- gcc-11.2.0-orig/gcc/testsuite/gcc.target/i386/stack-realign-win.c 2021-11-29 16:32:15.032050500 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.target/i386/stack-realign-win.c 2021-11-29 16:43:00.090274000 +0100 -@@ -1,4 +1,4 @@ --/* { dg-do compile { target *-*-mingw* *-*-cygwin* } } */ -+/* { dg-do compile { target *-*-mingw* *-*-cygwin* *-*-msys* } } */ - /* { dg-require-effective-target ia32 } */ - /* { dg-options "-msse -O" } */ - -diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.target/x86_64/abi/ms-sysv/ms-sysv.exp gcc-11.2.0/gcc/testsuite/gcc.target/x86_64/abi/ms-sysv/ms-sysv.exp ---- gcc-11.2.0-orig/gcc/testsuite/gcc.target/x86_64/abi/ms-sysv/ms-sysv.exp 2021-11-29 16:32:14.321921800 +0100 -+++ gcc-11.2.0/gcc/testsuite/gcc.target/x86_64/abi/ms-sysv/ms-sysv.exp 2021-11-29 17:13:15.000596100 +0100 -@@ -144,7 +144,7 @@ - runtest_ms_sysv "$cflags" "$gen_opts" - - # Skip unsupported -mcall-ms2sysv-xlogues on Windows -- if { ![istarget *-*-cygwin*] && ![istarget *-*-mingw*] } { -+ if { ![istarget *-*-cygwin*] && ![istarget *-*-msys*] && ![istarget *-*-mingw*] } { - runtest_ms_sysv "-mcall-ms2sysv-xlogues$cflags" "$gen_opts" - } - } -diff -Naur gcc-11.2.0-orig/gcc/testsuite/lib/g++.exp gcc-11.2.0/gcc/testsuite/lib/g++.exp ---- gcc-11.2.0-orig/gcc/testsuite/lib/g++.exp 2021-11-29 16:31:41.218990500 +0100 -+++ gcc-11.2.0/gcc/testsuite/lib/g++.exp 2021-11-29 17:13:44.996201200 +0100 -@@ -205,7 +205,7 @@ - - # Many hosts now default to a non-ASCII C locale, however, so - # they can set a charset encoding here if they need. -- if { [ishost "*-*-cygwin*"] } { -+ if { [ishost "*-*-cygwin*"] || [ishost "*-*-msys*"] } { - setenv LC_ALL C.ASCII - setenv LANG C.ASCII - } -diff -Naur gcc-11.2.0-orig/gcc/testsuite/lib/gcc-dg.exp gcc-11.2.0/gcc/testsuite/lib/gcc-dg.exp ---- gcc-11.2.0-orig/gcc/testsuite/lib/gcc-dg.exp 2021-11-29 16:31:41.203368700 +0100 -+++ gcc-11.2.0/gcc/testsuite/lib/gcc-dg.exp 2021-11-29 16:41:26.248499200 +0100 -@@ -40,7 +40,7 @@ - - # Many hosts now default to a non-ASCII C locale, however, so - # they can set a charset encoding here if they need. --if { [ishost "*-*-cygwin*"] } { -+if { [ishost "*-*-cygwin*"] || [ishost "*-*-msys*"] } { - setenv LC_ALL C.ASCII - setenv LANG C.ASCII - } -diff -Naur gcc-11.2.0-orig/gcc/testsuite/lib/objc.exp gcc-11.2.0/gcc/testsuite/lib/objc.exp ---- gcc-11.2.0-orig/gcc/testsuite/lib/objc.exp 2021-11-29 16:31:41.203368700 +0100 -+++ gcc-11.2.0/gcc/testsuite/lib/objc.exp 2021-11-29 16:41:26.248499200 +0100 -@@ -105,7 +105,7 @@ - - # Many hosts now default to a non-ASCII C locale, however, so - # they can set a charset encoding here if they need. -- if { [ishost "*-*-cygwin*"] } { -+ if { [ishost "*-*-cygwin*"] || [ishost "*-*-msys*"] } { - setenv LC_ALL C.ASCII - setenv LANG C.ASCII - } -diff -Naur gcc-11.2.0-orig/gcc/testsuite/lib/options.exp gcc-11.2.0/gcc/testsuite/lib/options.exp ---- gcc-11.2.0-orig/gcc/testsuite/lib/options.exp 2021-11-29 16:31:41.203368700 +0100 -+++ gcc-11.2.0/gcc/testsuite/lib/options.exp 2021-11-29 16:41:26.248499200 +0100 -@@ -20,7 +20,7 @@ - - # Many hosts now default to a non-ASCII C locale, however, so - # they can set a charset encoding here if they need. --if { [ishost "*-*-cygwin*"] } { -+if { [ishost "*-*-cygwin*"] || [ishost "*-*-msys*"] } { - setenv LC_ALL C.ASCII - setenv LANG C.ASCII - } -diff -Naur gcc-11.2.0-orig/gcc/testsuite/lib/target-libpath.exp gcc-11.2.0/gcc/testsuite/lib/target-libpath.exp ---- gcc-11.2.0-orig/gcc/testsuite/lib/target-libpath.exp 2021-11-29 16:31:41.218990500 +0100 -+++ gcc-11.2.0/gcc/testsuite/lib/target-libpath.exp 2021-11-29 16:42:40.206951900 +0100 -@@ -171,7 +171,7 @@ - } else { - setenv DYLD_LIBRARY_PATH "$ld_library_path" - } -- if { [istarget *-*-cygwin*] || [istarget *-*-mingw*] } { -+ if { [istarget *-*-cygwin*] || [istarget *-*-msys*] || [istarget *-*-mingw*] } { - if { $orig_path_saved } { - setenv PATH "$ld_library_path:$orig_path" - } else { -@@ -277,7 +277,7 @@ - - if { [istarget *-*-darwin*] } { - set shlib_ext "dylib" -- } elseif { [istarget *-*-cygwin*] || [istarget *-*-mingw*] } { -+ } elseif { [istarget *-*-cygwin*] || [istarget *-*-msys*] || [istarget *-*-mingw*] } { - set shlib_ext "dll" - } elseif { [istarget hppa*-*-hpux*] } { - set shlib_ext "sl" -diff -Naur gcc-11.2.0-orig/gcc/testsuite/lib/target-supports.exp gcc-11.2.0/gcc/testsuite/lib/target-supports.exp ---- gcc-11.2.0-orig/gcc/testsuite/lib/target-supports.exp 2021-11-29 16:31:41.187747200 +0100 -+++ gcc-11.2.0/gcc/testsuite/lib/target-supports.exp 2021-11-29 16:44:39.750478200 +0100 -@@ -304,7 +304,7 @@ - - # Windows targets Cygwin and MingW32 support it - -- if { [istarget *-*-cygwin*] || [istarget *-*-mingw*] } { -+ if { [istarget *-*-cygwin*] || [istarget *-*-msys*] || [istarget *-*-mingw*] } { - return 1 - } - -@@ -699,6 +699,11 @@ - return 0 - } - -+ # MSYS does not support -p. -+ if { [istarget *-*-msys*] && $test_what == "-p" } { -+ return 0 -+ } -+ - # uClibc does not have gcrt1.o. - if { [check_effective_target_uclibc] - && ($test_what == "-p" || $test_what == "-pg") } { -@@ -1137,7 +1142,7 @@ - # for trivial code, 0 otherwise. - - proc check_effective_target_pe_aligned_commons {} { -- if { [istarget *-*-cygwin*] || [istarget *-*-mingw*] } { -+ if { [istarget *-*-cygwin*] || [istarget *-*-msys*] || [istarget *-*-mingw*] } { - return [check_no_compiler_messages pe_aligned_commons object { - int foo; - } "-mpe-aligned-commons"] -@@ -2629,7 +2634,7 @@ - # Returns true iff "mkfifo" is available on the target system. - - proc check_mkfifo_available {} { -- if { [istarget *-*-cygwin*] } { -+ if { [istarget *-*-cygwin*] || [istarget *-*-msys*] } { - # Cygwin has mkfifo, but support is incomplete. - return 0 - } -@@ -8549,7 +8554,7 @@ - proc check_effective_target_automatic_stack_alignment { } { - # Ordinarily x86 supports automatic stack alignment ... - if { [istarget i?86*-*-*] || [istarget x86_64-*-*] } then { -- if { [istarget *-*-mingw*] || [istarget *-*-cygwin*] } { -+ if { [istarget *-*-mingw*] || [istarget *-*-cygwin*] || [istarget *-*-msys*] } { - # ... except Win64 SEH doesn't. Succeed for Win32 though. - return [check_effective_target_ilp32]; - } -diff -Naur gcc-11.2.0-orig/libffi/testsuite/lib/target-libpath.exp gcc-11.2.0/libffi/testsuite/lib/target-libpath.exp ---- gcc-11.2.0-orig/libffi/testsuite/lib/target-libpath.exp 2021-11-29 16:32:26.588682200 +0100 -+++ gcc-11.2.0/libffi/testsuite/lib/target-libpath.exp 2021-11-29 16:56:14.258512200 +0100 -@@ -175,7 +175,7 @@ - } else { - setenv DYLD_LIBRARY_PATH "$ld_library_path" - } -- if { [istarget *-*-cygwin*] || [istarget *-*-mingw*] } { -+ if { [istarget *-*-cygwin*] || [istarget *-*-msys*] || [istarget *-*-mingw*] } { - if { $orig_path_saved } { - setenv PATH "$ld_library_path:$orig_path" - } else { -@@ -271,7 +271,7 @@ - - if { [ istarget *-*-darwin* ] } { - set shlib_ext "dylib" -- } elseif { [ istarget *-*-cygwin* ] || [ istarget *-*-mingw* ] } { -+ } elseif { [ istarget *-*-cygwin* ] || [ istarget *-*-msys* ] || [ istarget *-*-mingw* ] } { - set shlib_ext "dll" - } elseif { [ istarget hppa*-*-hpux* ] } { - set shlib_ext "sl" -diff -Naur gcc-11.2.0-orig/libgomp/testsuite/lib/libgomp.exp gcc-11.2.0/libgomp/testsuite/lib/libgomp.exp ---- gcc-11.2.0-orig/libgomp/testsuite/lib/libgomp.exp 2021-11-29 16:32:36.634229900 +0100 -+++ gcc-11.2.0/libgomp/testsuite/lib/libgomp.exp 2021-11-29 16:56:51.718594500 +0100 -@@ -83,7 +83,7 @@ - - # Many hosts now default to a non-ASCII C locale, however, so - # they can set a charset encoding here if they need. -- if { [ishost "*-*-cygwin*"] } { -+ if { [ishost "*-*-cygwin*"] || [ishost "*-*-msys*"] } { - setenv LC_ALL C.ASCII - setenv LANG C.ASCII - } -diff -Naur gcc-11.2.0-orig/libstdc++-v3/testsuite/27_io/filesystem/path/concat/94063.cc gcc-11.2.0/libstdc++-v3/testsuite/27_io/filesystem/path/concat/94063.cc ---- gcc-11.2.0-orig/libstdc++-v3/testsuite/27_io/filesystem/path/concat/94063.cc 2021-11-29 16:32:28.766162200 +0100 -+++ gcc-11.2.0/libstdc++-v3/testsuite/27_io/filesystem/path/concat/94063.cc 2021-11-29 16:58:04.162728000 +0100 -@@ -15,7 +15,7 @@ - // with this library; see the file COPYING3. If not see - // . - --// { dg-do run { target { *-*-*mingw* || *-*-cygwin } } } -+// { dg-do run { target { *-*-*mingw* || *-*-cygwin || *-*-msys } } } - // { dg-require-effective-target c++17 } - - #include -diff -Naur gcc-11.2.0-orig/libstdc++-v3/testsuite/lib/libstdc++.exp gcc-11.2.0/libstdc++-v3/testsuite/lib/libstdc++.exp ---- gcc-11.2.0-orig/libstdc++-v3/testsuite/lib/libstdc++.exp 2021-11-29 16:32:27.482748500 +0100 -+++ gcc-11.2.0/libstdc++-v3/testsuite/lib/libstdc++.exp 2021-11-29 16:57:48.174417300 +0100 -@@ -113,7 +113,7 @@ - - # Many hosts now default to a non-ASCII C locale, however, so - # they can set a charset encoding here if they need. -- if { [ishost "*-*-cygwin*"] } { -+ if { [ishost "*-*-cygwin*"] || [ishost "*-*-msys*"] } { - setenv LC_ALL C.ASCII - setenv LANG C.ASCII - } diff --git a/gcc/PKGBUILD b/gcc/PKGBUILD index 529cf6f2..f30c44bd 100644 --- a/gcc/PKGBUILD +++ b/gcc/PKGBUILD @@ -10,7 +10,7 @@ pkgname=('gcc' 'gcc-libs') # NOTE: libtool must be rebuilt with each new gcc version. # FIXME: run compileall on /usr/share/gcc-${pkgver}/python/libstdcxx on the next version update pkgver=13.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('spdx:GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND GCC-exception-3.1 AND GFDL-1.3-or-later') @@ -38,8 +38,7 @@ source=(https://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/gcc-${pkgver}.tar.xz 0101-Cygwin-enable-libgccjit-not-just-for-MingW.patch 0102-Cygwin-testsuite-fixes-for-libgccjit.patch 0950-11.2.0-configure-msys2.patch - 0951-11.2.0-msys2-spec.patch - 0953-11.2.0-testsuite-msys2.patch) + 0951-11.2.0-msys2-spec.patch) sha256sums=('9c4ce6dbb040568fdc545588ac03c5cbc95a8dbf0c7aa490170843afb59ca8f5' 'bc788aa466a83184d285cc2f6c1ffc40c6ed416dd08c6999015262a53f1ab1b5' '704acfaeb11d24d3fe5aab34bc883c184ca93aff03d752016c9a50fdd82c5655' @@ -54,9 +53,8 @@ sha256sums=('9c4ce6dbb040568fdc545588ac03c5cbc95a8dbf0c7aa490170843afb59ca8f5' '83b6aea4a462ae80121fd68d42c6234d02e20865132197a10575bbf95fd33b7e' '929b2d0e26259bfc79a9d67a7cf28bbd8d26289ef0933094672b1e09a43d75cc' '3707b0aab99b203cbd9e513be46c7d4600de06e6c8344160b7fb1779061d08da' - '8a29a40ee426ee786da97656c35d2e9c17838b12c1b750cecf857760da273381' - 'eeb167fe5f12d122038cbc5d7f79f093ab40ace1f0973dd109aad2e1168cb8a8' - 'adb8baaa35dcfbea9ab60694262d0958e090495146d50df1a0844a977832aef9') + '646b6e802e46f932fa793e0e9348c7c98064e46a9bac76f4ad258b66b2b3bba9' + '82bc03f43fd7e103c1373433340d6654cbc771723db54430b18eff48a3935a45') # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -81,13 +79,8 @@ prepare() { cd ${srcdir}/gcc-${pkgver} # Remove files created by patches - rm -f config/mt-cygwin \ - gcc/ada/system-cygwin-x86_64.ads \ - libgomp/config/cygwin/plugin-suffix.h \ - libgcc/config/i386/t-msys \ - gcc/config/i386/msys.h \ - gcc/config/i386/msys-w64.h \ - gcc/config/i386/t-msys-w64 > /dev/null 2>&1 | true + rm -f libgomp/config/cygwin/plugin-suffix.h \ + > /dev/null 2>&1 # Cygwin patches apply_patch_with_msg \ @@ -108,8 +101,7 @@ prepare() { # MSYS2 Patches apply_patch_with_msg \ 0950-11.2.0-configure-msys2.patch \ - 0951-11.2.0-msys2-spec.patch \ - 0953-11.2.0-testsuite-msys2.patch + 0951-11.2.0-msys2-spec.patch # Do not run fixincludes #sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in @@ -119,7 +111,7 @@ prepare() { } build() { - mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM} + mkdir -p ${srcdir}/build-MSYS && cd ${srcdir}/build-MSYS case ${CARCH} in i686) @@ -145,8 +137,11 @@ build() { export lt_cv_deplibs_check_method='pass_all' + export MSYSTEM=CYGWIN + local CYGWIN_CHOST="${CHOST/-msys/-cygwin}" + ${srcdir}/gcc-${pkgver}/configure \ - --build=${CHOST} \ + --build=${CYGWIN_CHOST} \ --prefix=/usr \ --libexecdir=/usr/lib \ --enable-bootstrap \ @@ -184,12 +179,12 @@ build() { make # make documentation - #cd $CHOST/libstdc++-v3 + #cd $CYGWIN_CHOST/libstdc++-v3 #make doc-man-doxygen } #check() { -# cd ${srcdir}/build-${MSYSTEM} +# cd ${srcdir}/build-MSYS # # do not abort on error as some are "expected" # make -k check || true @@ -200,15 +195,16 @@ package_gcc-libs() { pkgdesc="Runtime libraries shipped by GCC" - cd ${srcdir}/build-${MSYSTEM} - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared + local CYGWIN_CHOST="${CHOST/-msys/-cygwin}" + cd ${srcdir}/build-MSYS + make -j1 -C $CYGWIN_CHOST/libgcc DESTDIR=${pkgdir} install-shared for lib in libgomp libstdc++-v3/src; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES + make -j1 -C $CYGWIN_CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - make -j1 -C $CHOST/libquadmath DESTDIR=${pkgdir} install-info + make -j1 -C $CYGWIN_CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install + make -j1 -C $CYGWIN_CHOST/libgomp DESTDIR=${pkgdir} install-info + make -j1 -C $CYGWIN_CHOST/libquadmath DESTDIR=${pkgdir} install-info make -j1 DESTDIR=${pkgdir} install-target-libquadmath #make -j1 DESTDIR=${pkgdir} install-target-libssp @@ -236,7 +232,8 @@ package_gcc() provides=('msys2-devel') conflicts=('gcc-fortran<=11.3.0-4') - cd ${srcdir}/build-${MSYSTEM} + cd ${srcdir}/build-MSYS + local CYGWIN_CHOST="${CHOST/-msys/-cygwin}" if check_option "strip" "n"; then export STRIP=true @@ -252,12 +249,12 @@ package_gcc() rm -f ${pkgdir}/usr/bin/*.dll rm -f ${pkgdir}/usr/lib/libiberty.a - # rm -f ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/libatomic{.dll,}.a + # rm -f ${pkgdir}/usr/lib/gcc/${CYGWIN_CHOST}/${pkgver}/libatomic{.dll,}.a rm -f ${pkgdir}/usr/share/info/{libgomp,libquadmath}.info rm -f ${pkgdir}/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo # remove static libraries - note libstdc++.a is needed for the binutils and glibc testsuite - #rm ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/lib{gomp,quadmath}{.dll,}.a + #rm ${pkgdir}/usr/lib/gcc/${CYGWIN_CHOST}/${pkgver}/lib{gomp,quadmath}{.dll,}.a # many packages expect this symlinks ln -s gcc ${pkgdir}/usr/bin/cc @@ -295,7 +292,7 @@ EOF # install the libstdc++ man pages # install -dm755 ${pkgdir}/usr/share/man/man3 # install -m644 -t ${pkgdir}/usr/share/man/man3 \ - # ${CHOST}/libstdc++-v3/doc/doxygen/man/man3/*.3 + # ${CYGWIN_CHOST}/libstdc++-v3/doc/doxygen/man/man3/*.3 # Install Runtime Library Exception install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \