Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

cross-gcc: remove msysize patches

Browse Source 
* 0950-11.2.0-configure-msys2.patch: replace with building for cygwin
  (the lto plugin DLL name changed, which we could patch back if it is a problem)
* 0951-11.2.0-msys2-spec.patch: not relevant for mingw
* 0953-11.2.0-testsuite-msys2.patch: not relevant for mingw
This commit is contained in:
Christoph Reiter 2024-08-04 12:42:07 +02:00
parent 07d9d4f9bd
commit 58029b34b9
4 changed files with 5 additions and 5779 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4574
mingw-w64-cross-gcc/0950-11.2.0-configure-msys2.patch
View File

File diff suppressed because it is too large Load Diff

431
mingw-w64-cross-gcc/0951-11.2.0-msys2-spec.patch
View File

@ -1,431 +0,0 @@
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
+<http://www.gnu.org/licenses/>. */
+
+#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
+<http://www.gnu.org/licenses/>. */
+
+/* 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
+#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) \
+ --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
+#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
@@ -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
@@ -2122,6 +2122,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
@@ -5672,6 +5709,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*)
--- gcc-13.3.0/gcc/config.host.orig 2024-06-09 12:26:23.587895800 +0200
+++ gcc-13.3.0/gcc/config.host 2024-06-09 12:28:07.469335000 +0200
@@ -230,6 +230,13 @@
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=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
+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
+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

759
mingw-w64-cross-gcc/0953-11.2.0-testsuite-msys2.patch
View File

@ -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 <lambda-sig>
@@ -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<int>::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 <jakub@redhat.com>
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 <stddef.h>
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
// <http://www.gnu.org/licenses/>.
-// { dg-do run { target { *-*-*mingw* || *-*-cygwin } } }
+// { dg-do run { target { *-*-*mingw* || *-*-cygwin || *-*-msys } } }
// { dg-require-effective-target c++17 }
#include <filesystem>
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
}

20
mingw-w64-cross-gcc/PKGBUILD
View File

@ -4,7 +4,7 @@ _realname=gcc
_mingw_suff=mingw-w64-cross
pkgname=("${_mingw_suff}-${_realname}")
pkgver=13.3.0
pkgrel=1
pkgrel=2
pkgdesc="Cross GCC for the MinGW-w64"
arch=('i686' 'x86_64')
url="https://gcc.gnu.org"
@ -37,9 +37,6 @@ source=(https://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/gcc-${pkgver}.tar.gz
0011-Cygwin-define-STD_UNIX.patch
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
0006-Windows-New-feature-to-allow-overriding.patch
0012-Handle-spaces-in-path-for-default-manifest.patch
0014-gcc-9-branch-clone_function_name_1-Retain-any-stdcall-suffix.patch
@ -60,9 +57,6 @@ sha256sums=('3a2b10cab86e32358fdac871546d57e2700e9bdb5875ef33fff5b601265b9e32'
'83b6aea4a462ae80121fd68d42c6234d02e20865132197a10575bbf95fd33b7e'
'c5aeab9609f90a8430c43bb50172b63c3155eb10082369f81fac58a395d2e2ee'
'3707b0aab99b203cbd9e513be46c7d4600de06e6c8344160b7fb1779061d08da'
'8a29a40ee426ee786da97656c35d2e9c17838b12c1b750cecf857760da273381'
'eded97d714c0ef9edda546b4796881dbe1bef4cae08dad09f79c7b38a07b514f'
'adb8baaa35dcfbea9ab60694262d0958e090495146d50df1a0844a977832aef9'
'a3637466910fae6145c947095051e3b91b16e4715d4abddc474eeb00539e9dc2'
'e98805ead7d78ee2a92f237894c4b2b7ddc1688e1b517d8c04f28d440202e40f'
'fd9bdecb2bbc4796bbc9f00b708dac42ef9e3464a06d6d27e5475cee117de5be'
@ -100,12 +94,6 @@ prepare() {
0101-Cygwin-enable-libgccjit-not-just-for-MingW.patch \
0102-Cygwin-testsuite-fixes-for-libgccjit.patch
# 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
# MinGW Patches
apply_patch_with_msg \
0006-Windows-New-feature-to-allow-overriding.patch \
@ -136,10 +124,12 @@ build() {
;;
esac
local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
../${_realname}-${pkgver}/configure \
--prefix=/opt \
--build=${CHOST} \
--host=${CHOST} \
--build=${CYGWIN_CHOST} \
--host=${CYGWIN_CHOST} \
--target=${_target} \
--libexecdir=/opt/lib \
--disable-bootstrap \