Menu
▾
▴
[MinGW-cvs] [git push msys2-tools]Repository: msys2-tools branch, master, updated. 45ce6da114fafa2bded4de6dfe66fd6b9075057c
|
From: Alexx83 <no...@so...> - 2013-03-25 09:14:29
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: msys2-tools".
The branch, master has been updated
via 45ce6da114fafa2bded4de6dfe66fd6b9075057c (commit)
via f8551737465c2576a196311fe9e4de86e27bd67e (commit)
from be41dd878d6314b9b311cd0824c0e7ac102bd171 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sf.net/p/mingw/msys2-tools/ci/45ce6da114fafa2bded4de6dfe66fd6b9075057c/
commit 45ce6da114fafa2bded4de6dfe66fd6b9075057c
Author: Alexpux <ale...@gm...>
Date: Mon Mar 25 13:14:08 2013 +0400
Add MSYS2 GCC-4.8.0 patch for testsuite.
diff --git a/gcc/4.8.0/msys2-gcc-4.8.0-testsuite.patch b/gcc/4.8.0/msys2-gcc-4.8.0-testsuite.patch
new file mode 100644
index 0000000..08325f8
--- /dev/null
+++ b/gcc/4.8.0/msys2-gcc-4.8.0-testsuite.patch
@@ -0,0 +1,3343 @@
+diff -Naur gcc-cygwin/gcc/testsuite/g++.dg/abi/bitfield3.C gcc-msys2/gcc/testsuite/g++.dg/abi/bitfield3.C
+--- gcc-cygwin/gcc/testsuite/g++.dg/abi/bitfield3.C 2013-03-17 10:45:20 +0400
++++ gcc-msys2/gcc/testsuite/g++.dg/abi/bitfield3.C 2013-03-20 07:02:38 +0400
+@@ -1,9 +1,9 @@
+ // Test for oversized bitfield alignment in structs on IA-32
+ // { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } }
+ // { dg-options "-O2" }
+-// Cygwin and mingw default to MASK_ALIGN_DOUBLE. Override to ensure
++// Cygwin/MSYS 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-cygwin/gcc/testsuite/lib/g++.exp gcc-msys2/gcc/testsuite/lib/g++.exp
+--- gcc-cygwin/gcc/testsuite/lib/g++.exp 2013-03-17 10:45:10 +0400
++++ gcc-msys2/gcc/testsuite/lib/g++.exp 2013-03-20 07:02:38 +0400
+@@ -197,7 +197,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-cygwin/gcc/testsuite/lib/gcc-dg.exp gcc-msys2/gcc/testsuite/lib/gcc-dg.exp
+--- gcc-cygwin/gcc/testsuite/lib/gcc-dg.exp 2013-03-17 10:45:10 +0400
++++ gcc-msys2/gcc/testsuite/lib/gcc-dg.exp 2013-03-20 07:02:38 +0400
+@@ -36,7 +36,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-cygwin/gcc/testsuite/lib/gfortran.exp gcc-msys2/gcc/testsuite/lib/gfortran.exp
+--- gcc-cygwin/gcc/testsuite/lib/gfortran.exp 2013-03-17 10:45:10 +0400
++++ gcc-msys2/gcc/testsuite/lib/gfortran.exp 2013-03-20 07:02:38 +0400
+@@ -154,7 +154,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-cygwin/gcc/testsuite/lib/objc.exp gcc-msys2/gcc/testsuite/lib/objc.exp
+--- gcc-cygwin/gcc/testsuite/lib/objc.exp 2013-03-17 10:45:10 +0400
++++ gcc-msys2/gcc/testsuite/lib/objc.exp 2013-03-20 07:02:38 +0400
+@@ -104,7 +104,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-cygwin/gcc/testsuite/lib/options.exp gcc-msys2/gcc/testsuite/lib/options.exp
+--- gcc-cygwin/gcc/testsuite/lib/options.exp 2013-03-17 10:45:10 +0400
++++ gcc-msys2/gcc/testsuite/lib/options.exp 2013-03-20 07:02:38 +0400
+@@ -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-cygwin/gcc/testsuite/lib/target-libpath.exp gcc-msys2/gcc/testsuite/lib/target-libpath.exp
+--- gcc-cygwin/gcc/testsuite/lib/target-libpath.exp 2013-03-17 10:45:10 +0400
++++ gcc-msys2/gcc/testsuite/lib/target-libpath.exp 2013-03-20 07:02:38 +0400
+@@ -231,7 +231,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-cygwin/gcc/testsuite/lib/target-supports.exp gcc-msys2/gcc/testsuite/lib/target-supports.exp
+--- gcc-cygwin/gcc/testsuite/lib/target-supports.exp 2013-03-17 10:45:10 +0400
++++ gcc-msys2/gcc/testsuite/lib/target-supports.exp 2013-03-20 07:02:38 +0400
+@@ -232,9 +232,9 @@
+ return 1
+ }
+
+- # Windows targets Cygwin and MingW32 support it
++ # Windows targets Cygwin/MSYS and MingW32 support it
+
+- if { [istarget *-*-cygwin*] || [istarget *-*-mingw*] } {
++ if { [istarget *-*-cygwin*] || [istarget *-*-msys*] || [istarget *-*-mingw*] } {
+ return 1
+ }
+
+@@ -495,7 +495,7 @@
+ }
+
+ # cygwin does not support -p.
+- if { [istarget *-*-cygwin*] && $test_what == "-p" } {
++ if { ([istarget *-*-cygwin*] || [istarget *-*-msys*]) && $test_what == "-p" } {
+ return 0
+ }
+
+@@ -772,7 +772,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"]
+@@ -1571,8 +1571,8 @@
+ # Returns true iff "mkfifo" is available on the target system.
+
+ proc check_mkfifo_available {} {
+- if { [istarget *-*-cygwin*] } {
+- # Cygwin has mkfifo, but support is incomplete.
++ if { [istarget *-*-cygwin*] || [istarget *-*-msys*] } {
++ # Cygwin/MSYS has mkfifo, but support is incomplete.
+ return 0
+ }
+
+@@ -4768,7 +4768,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-4.8.0-cygwin/gcc/testsuite/g++.dg/abi/rtti3.C gcc-4.8.0/gcc/testsuite/g++.dg/abi/rtti3.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/abi/rtti3.C 2013-03-25 10:48:08 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/abi/rtti3.C 2013-03-25 10:54:36 +0400
+@@ -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* } } } } }
+ // { dg-final { scan-assembler-not ".weak\[ \t\]_?_ZTIPP1A" { target { ! { *-*-darwin* } } } } }
+ // { dg-final { scan-assembler ".weak_definition\[ \t\]_?_ZTSPP1A" { target { *-*-darwin* } } } }
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/abi/thunk4.C gcc-4.8.0/gcc/testsuite/g++.dg/abi/thunk4.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/abi/thunk4.C 2013-03-25 10:47:55 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/abi/thunk4.C 2013-03-25 10:54:57 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/compat/struct-layout-1_generate.c gcc-4.8.0/gcc/testsuite/g++.dg/compat/struct-layout-1_generate.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/compat/struct-layout-1_generate.c 2012-03-12 19:35:56 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/compat/struct-layout-1_generate.c 2013-03-25 10:55:49 +0400
+@@ -46,8 +46,8 @@
+ const char *dg_options[] = {
+ "/* { dg-options \"%s-I%s\" } */\n",
+ "/* { dg-options \"%s-I%s -mno-mmx -Wno-abi\" { target i?86-*-* x86_64-*-* } } */\n",
+-"/* { dg-options \"%s-I%s -fno-common\" { target hppa*-*-hpux* powerpc*-*-darwin* *-*-mingw32* *-*-cygwin* } } */\n",
+-"/* { dg-options \"%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-I%s -fno-common\" { target hppa*-*-hpux* powerpc*-*-darwin* *-*-mingw32* *-*-cygwin* *-*-msys* } } */\n",
++"/* { dg-options \"%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-I%s -mno-base-addresses\" { target mmix-*-* } } */\n",
+ "/* { dg-options \"%s-I%s -mlongcalls -mtext-section-literals\" { target xtensa*-*-* } } */\n"
+ #define NDG_OPTIONS (sizeof (dg_options) / sizeof (dg_options[0]))
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C gcc-4.8.0/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C 2011-02-21 20:34:17 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C 2013-03-25 10:57:15 +0400
+@@ -1,7 +1,7 @@
+ // Test for conversion from stateless lambda to function pointer.
+
+ // { dg-options -std=c++0x }
+-// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZ1fvENKUlvE_cvPFvvEEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin *-*-hpux10* } } } } }
++// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZ1fvENKUlvE_cvPFvvEEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin *-*-msys *-*-hpux10* } } } } }
+
+ inline void f()
+ {
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C gcc-4.8.0/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C 2010-03-24 02:29:53 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C 2013-03-25 10:58:10 +0400
+@@ -11,7 +11,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>
+@@ -33,7 +33,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
+@@ -54,7 +54,7 @@
+ // 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 } } } } }
+
+ void bar()
+ {
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllexport-MI1.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllexport-MI1.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllexport-MI1.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllexport-MI1.C 2013-03-25 11:01:02 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllexport1.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllexport1.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllexport1.C 2010-10-10 23:25:09 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllexport1.C 2013-03-25 11:00:41 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllexport3.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllexport3.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllexport3.C 2010-10-10 23:25:09 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllexport3.C 2013-03-25 11:01:09 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport-MI1.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport-MI1.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport-MI1.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport-MI1.C 2013-03-25 11:04:05 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport1.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport1.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport1.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport1.C 2013-03-25 11:03:58 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport10.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport10.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport10.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport10.C 2013-03-25 11:02:23 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport11.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport11.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport11.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport11.C 2013-03-25 11:02:16 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport12.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport12.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport12.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport12.C 2013-03-25 11:02:09 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport13.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport13.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport13.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport13.C 2013-03-25 11:02:01 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport2.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport2.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport2.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport2.C 2013-03-25 11:03:45 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport3.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport3.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport3.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport3.C 2013-03-25 11:03:38 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport4.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport4.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport4.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport4.C 2013-03-25 11:03:28 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport5.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport5.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport5.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport5.C 2013-03-25 11:03:22 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport6.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport6.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport6.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport6.C 2013-03-25 11:03:13 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport7.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport7.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport7.C 2010-11-08 14:49:38 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport7.C 2013-03-25 11:03:05 +0400
+@@ -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* } 21 }
++// { dg-error "definition of static data" "C++ specific error" { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* x86_64-*-mingw* } 21 }
+
+ const Baz Bar::null_baz; // { dg-warning "redeclared without dllimport" }
+
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport8.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport8.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport8.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport8.C 2013-03-25 11:02:39 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport9.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport9.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/dllimport9.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/dllimport9.C 2013-03-25 11:02:31 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/selectany1.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/selectany1.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/selectany1.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/selectany1.C 2013-03-25 11:05:08 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/selectany2.C gcc-4.8.0/gcc/testsuite/g++.dg/ext/selectany2.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/ext/selectany2.C 2011-01-07 18:12:43 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/ext/selectany2.C 2013-03-25 11:05:01 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.dg/opt/vt1.C gcc-4.8.0/gcc/testsuite/g++.dg/opt/vt1.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/opt/vt1.C 2009-10-23 21:37:13 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/opt/vt1.C 2013-03-25 11:06:03 +0400
+@@ -2,7 +2,7 @@
+ // { dg-do compile { target fpic } }
+ // { dg-options "-O2 -fpic -fno-rtti" }
+ // { dg-skip-if "requires unsupported run-time relocation" { spu-*-* } { "*" } { "" } }
+-// { dg-skip-if "No Windows PIC" { *-*-mingw* *-*-cygwin } { "*" } { "" } }
++// { dg-skip-if "No Windows PIC" { *-*-mingw* *-*-cygwin *-*-msys } { "*" } { "" } }
+ // Origin: Jakub Jelinek <ja...@re...>
+
+ struct S
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/template/spec35.C gcc-4.8.0/gcc/testsuite/g++.dg/template/spec35.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.dg/template/spec35.C 2009-10-23 21:37:13 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.dg/template/spec35.C 2013-03-25 11:06:42 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C gcc-4.8.0/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C
+--- gcc-4.8.0-cygwin/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C 2012-03-12 19:35:56 +0400
++++ gcc-4.8.0/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C 2013-03-25 11:08:00 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/gcc.dg/attr-ms_struct-1.c gcc-4.8.0/gcc/testsuite/gcc.dg/attr-ms_struct-1.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/attr-ms_struct-1.c 2006-09-09 04:27:47 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/attr-ms_struct-1.c 2013-03-25 11:10:10 +0400
+@@ -1,5 +1,5 @@
+ /* Test for MS structure sizes. */
+-/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* i?86-*-darwin* } } */
++/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* *-*-msys* i?86-*-darwin* } } */
+ /* { dg-require-effective-target ilp32 } */
+ /* { dg-options "-std=gnu99" } */
+
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/attr-ms_struct-2.c gcc-4.8.0/gcc/testsuite/gcc.dg/attr-ms_struct-2.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/attr-ms_struct-2.c 2006-09-09 04:27:47 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/attr-ms_struct-2.c 2013-03-25 11:09:57 +0400
+@@ -1,5 +1,5 @@
+ /* Test for MS structure sizes. */
+-/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* i?86-*-darwin* } } */
++/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* *-*-msys* i?86-*-darwin* } } */
+ /* { dg-require-effective-target ilp32 } */
+ /* { dg-options "-std=gnu99" } */
+
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/attr-ms_struct-packed1.c gcc-4.8.0/gcc/testsuite/gcc.dg/attr-ms_struct-packed1.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/attr-ms_struct-packed1.c 2006-06-12 03:09:58 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/attr-ms_struct-packed1.c 2013-03-25 11:10:22 +0400
+@@ -1,5 +1,5 @@
+ /* Test for MS structure with packed attribute. */
+-/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* i?86-*-darwin* } }
++/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* *-*-msys* i?86-*-darwin* } }
+ /* { dg-options "-std=gnu99" } */
+
+ extern void abort ();
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/bf-ms-attrib.c gcc-4.8.0/gcc/testsuite/gcc.dg/bf-ms-attrib.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/bf-ms-attrib.c 2012-02-23 22:10:53 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/bf-ms-attrib.c 2013-03-25 11:12:03 +0400
+@@ -3,7 +3,7 @@
+ posted to GCC-patches
+ http://gcc.gnu.org/ml/gcc-patches/2000-08/msg00577.html */
+
+-/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* } } */
++/* { dg-do run { target *-*-interix* *-*-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-4.8.0-cygwin/gcc/testsuite/gcc.dg/bf-ms-layout-2.c gcc-4.8.0/gcc/testsuite/gcc.dg/bf-ms-layout-2.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/bf-ms-layout-2.c 2012-02-23 22:10:53 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/bf-ms-layout-2.c 2013-03-25 11:11:34 +0400
+@@ -5,7 +5,7 @@
+ posted to GCC-patches
+ http://gcc.gnu.org/ml/gcc-patches/2000-08/msg00577.html */
+
+-/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* i?86-*-darwin* } } */
++/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* *-*-msys* i?86-*-darwin* } } */
+ /* { dg-options "-D_TEST_MS_LAYOUT" } */
+ /* This test uses the attribute instead of the command line option. */
+
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/bf-ms-layout-3.c gcc-4.8.0/gcc/testsuite/gcc.dg/bf-ms-layout-3.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/bf-ms-layout-3.c 2012-02-21 18:10:59 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/bf-ms-layout-3.c 2013-03-25 11:11:28 +0400
+@@ -1,5 +1,5 @@
+ /* Test for MS bitfield layout */
+-/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* i?86-*-* x86_64-*-* } } */
++/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* *-*-msys* i?86-*-* x86_64-*-* } } */
+
+ extern void abort();
+
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/bf-ms-layout.c gcc-4.8.0/gcc/testsuite/gcc.dg/bf-ms-layout.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/bf-ms-layout.c 2012-04-26 19:16:16 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/bf-ms-layout.c 2013-03-25 11:11:47 +0400
+@@ -5,7 +5,7 @@
+ posted to GCC-patches
+ http://gcc.gnu.org/ml/gcc-patches/2000-08/msg00577.html */
+
+-/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* i?86-*-darwin* } } */
++/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* *-*-msys* i?86-*-darwin* } } */
+ /* { dg-options "-mms-bitfields -D_TEST_MS_LAYOUT" } */
+
+ #include <stddef.h>
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/bf-no-ms-layout.c gcc-4.8.0/gcc/testsuite/gcc.dg/bf-no-ms-layout.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/bf-no-ms-layout.c 2006-06-12 10:53:33 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/bf-no-ms-layout.c 2013-03-25 11:12:12 +0400
+@@ -5,7 +5,7 @@
+ posted to GCC-patches
+ http://gcc.gnu.org/ml/gcc-patches/2000-08/msg00577.html */
+
+-/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* i?86-*-darwin } } */
++/* { dg-do run { target *-*-interix* *-*-mingw* *-*-cygwin* *-*-msys* i?86-*-darwin } } */
+ /* { dg-options "-mno-ms-bitfields" } */
+
+ #include <stddef.h>
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/dll-3.c gcc-4.8.0/gcc/testsuite/gcc.dg/dll-3.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/dll-3.c 2010-10-10 23:25:09 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/dll-3.c 2013-03-25 11:13:56 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/gcc.dg/dll-4.c gcc-4.8.0/gcc/testsuite/gcc.dg/dll-4.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/dll-4.c 2010-10-10 23:25:09 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/dll-4.c 2013-03-25 11:13:47 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/gcc.dg/dll-5.c gcc-4.8.0/gcc/testsuite/gcc.dg/dll-5.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/dll-5.c 2010-10-10 23:25:09 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/dll-5.c 2013-03-25 11:13:36 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/gcc.dg/dll-8.c gcc-4.8.0/gcc/testsuite/gcc.dg/dll-8.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/dll-8.c 2012-04-10 07:15:22 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/dll-8.c 2013-03-25 11:14:02 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/gcc.dg/graphite/run-id-1.c gcc-4.8.0/gcc/testsuite/gcc.dg/graphite/run-id-1.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/graphite/run-id-1.c 2011-10-27 02:14:43 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/graphite/run-id-1.c 2013-03-25 11:15:59 +0400
+@@ -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 } */
+
+ void abort (void);
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/lto/20090914-2_0.c gcc-4.8.0/gcc/testsuite/gcc.dg/lto/20090914-2_0.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/lto/20090914-2_0.c 2013-03-06 22:29:46 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/lto/20090914-2_0.c 2013-03-25 11:16:34 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c gcc-4.8.0/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c 2013-01-03 04:56:35 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c 2013-03-25 11:17:47 +0400
+@@ -47,10 +47,10 @@
+ /* CRIS keeps 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-*-* crisv32-*-* fido-*-* m68k-*-* i?86-*-mingw* i?86-*-cygwin* x86_64-*-mingw* } } } */
++/* { dg-final { scan-assembler-times "foo" 5 { xfail hppa*-*-* ia64*-*-* sh*-*-* cris-*-* crisv32-*-* fido-*-* m68k-*-* i?86-*-mingw* i?86-*-cygwin* i?86-*-msys* x86_64-*-mingw* } } } */
+ /* { 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-4.8.0-cygwin/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-2.c gcc-4.8.0/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-2.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-2.c 2011-08-07 11:45:57 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-2.c 2013-03-25 11:18:53 +0400
+@@ -10,5 +10,5 @@
+
+ /* 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* } } } } */
+ /* { dg-final { cleanup-tree-dump "optimized" } } */
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/bitfield1.c gcc-4.8.0/gcc/testsuite/gcc.target/i386/bitfield1.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/bitfield1.c 2011-07-09 23:25:11 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.target/i386/bitfield1.c 2013-03-25 11:20:44 +0400
+@@ -2,7 +2,7 @@
+ // { dg-do run }
+ // { dg-require-effective-target ia32 }
+ // { dg-options "-O2" }
+-// { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-interix* i?86-*-cygwin* i?86-*-mingw*} }
++// { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-interix* i?86-*-cygwin* i?86-*-msys* i?86-*-mingw*} }
+
+ extern void abort (void);
+ extern void exit (int);
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/bitfield2.c gcc-4.8.0/gcc/testsuite/gcc.target/i386/bitfield2.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/bitfield2.c 2011-07-09 23:25:11 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.target/i386/bitfield2.c 2013-03-25 11:20:58 +0400
+@@ -2,7 +2,7 @@
+ // { dg-do run }
+ // { dg-require-effective-target ia32 }
+ // { dg-options "-O2" }
+-// { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-interix* i?86-*-cygwin* i?86-*-mingw* } }
++// { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-interix* i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } }
+
+ extern void abort (void);
+ extern void exit (int);
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/fastcall-1.c gcc-4.8.0/gcc/testsuite/gcc.target/i386/fastcall-1.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/fastcall-1.c 2008-01-26 13:31:30 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.target/i386/fastcall-1.c 2013-03-25 11:21:23 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/pad-4.c gcc-4.8.0/gcc/testsuite/gcc.target/i386/pad-4.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/pad-4.c 2011-10-27 01:51:35 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.target/i386/pad-4.c 2013-03-25 11:22:03 +0400
+@@ -2,7 +2,7 @@
+ /* { dg-require-effective-target ia32 } */
+ /* { dg-require-effective-target fpic } */
+ /* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-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-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/pic-1.c gcc-4.8.0/gcc/testsuite/gcc.target/i386/pic-1.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/pic-1.c 2011-07-09 23:25:11 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.target/i386/pic-1.c 2013-03-25 11:22:33 +0400
+@@ -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" } */
+
+ int foo ()
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/pr25993.c gcc-4.8.0/gcc/testsuite/gcc.target/i386/pr25993.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/pr25993.c 2013-03-25 10:05:30 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.target/i386/pr25993.c 2013-03-25 11:23:08 +0400
+@@ -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-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/pr40906-1.c gcc-4.8.0/gcc/testsuite/gcc.target/i386/pr40906-1.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/pr40906-1.c 2011-10-20 17:04:34 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.target/i386/pr40906-1.c 2013-03-25 11:23:49 +0400
+@@ -1,7 +1,7 @@
+ /* { dg-do run } */
+ /* { dg-require-effective-target ia32 } */
+ /* { dg-options "-O2 -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args -mno-accumulate-outgoing-args" } */
+-/* { dg-options "-O2 -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args" { target *-*-mingw* *-*-cygwin* } } */
++/* { dg-options "-O2 -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args" { target *-*-mingw* *-*-cygwin* *-*-msys* } } */
+
+ void abort (void);
+
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/pr40906-2.c gcc-4.8.0/gcc/testsuite/gcc.target/i386/pr40906-2.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/pr40906-2.c 2011-10-20 17:04:34 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.target/i386/pr40906-2.c 2013-03-25 11:24:00 +0400
+@@ -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 -mno-accumulate-outgoing-args -m128bit-long-double" } */
+-/* { dg-options "-O2 -Wno-psabi -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args -m128bit-long-double" { target *-*-mingw* *-*-cygwin* } } */
++/* { dg-options "-O2 -Wno-psabi -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args -m128bit-long-double" { target *-*-mingw* *-*-cygwin* *-*-msys* } } */
+
+ void abort (void);
+
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/pr46226.c gcc-4.8.0/gcc/testsuite/gcc.target/i386/pr46226.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/pr46226.c 2011-10-20 17:04:34 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.target/i386/pr46226.c 2013-03-25 11:24:24 +0400
+@@ -1,6 +1,6 @@
+ /* { dg-do run } */
+ /* { dg-options "-Os -fomit-frame-pointer -mno-accumulate-outgoing-args -fno-asynchronous-unwind-tables" } */
+-/* { dg-options "-Os -fomit-frame-pointer -fno-asynchronous-unwind-tables" { target *-*-mingw* *-*-cygwin* } } */
++/* { dg-options "-Os -fomit-frame-pointer -fno-asynchronous-unwind-tables" { target *-*-mingw* *-*-cygwin* *-*-msys* } } */
+
+ extern void abort(void);
+
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/sse-10.c gcc-4.8.0/gcc/testsuite/gcc.target/i386/sse-10.c
+--- gcc-4.8.0-cygwin/gcc/testsuite/gcc.target/i386/sse-10.c 2010-05-19 20:10:05 +0400
++++ gcc-4.8.0/gcc/testsuite/gcc.target/i386/sse-10.c 2013-03-25 11:25:15 +0400
+@@ -1,7 +1,7 @@
+ /* PR 17930 */
+ /* { dg-do run } */
+ /* { dg-options "-O1 -msse2 -mfpmath=sse -mno-accumulate-outgoing-args -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" } */
+-/* { dg-options "-O1 -msse2 -mfpmath=sse -fno-omit-frame-pointer" { target *-*-mingw* *-*-cygwin* } } */
++/* { dg-options "-O1 -msse2 -mfpmath=sse -fno-omit-frame-pointer" { target *-*-mingw* *-*-cygwin* *-*-msys* } } */
+ /* { dg-require-effective-target sse2 } */
+
+ #include "sse2-check.h"
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gfortran.dg/chmod_1.f90 gcc-4.8.0/gcc/testsuite/gfortran.dg/chmod_1.f90
+--- gcc-4.8.0-cygwin/gcc/testsuite/gfortran.dg/chmod_1.f90 2009-05-10 05:14:50 +0400
++++ gcc-4.8.0/gcc/testsuite/gfortran.dg/chmod_1.f90 2013-03-25 11:26:24 +0400
+@@ -1,4 +1,4 @@
+-! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* spu-*-* } } } }
++! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* *-*-msys* spu-*-* } } } }
+ ! { dg-options "-std=gnu" }
+ ! See PR38956. Test fails on cygwin when user has Administrator rights
+ implicit none
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gfortran.dg/chmod_2.f90 gcc-4.8.0/gcc/testsuite/gfortran.dg/chmod_2.f90
+--- gcc-4.8.0-cygwin/gcc/testsuite/gfortran.dg/chmod_2.f90 2009-05-10 05:14:50 +0400
++++ gcc-4.8.0/gcc/testsuite/gfortran.dg/chmod_2.f90 2013-03-25 11:26:15 +0400
+@@ -1,4 +1,4 @@
+-! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* spu-*-* } } } }
++! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* *-*-msys* spu-*-* } } } }
+ ! { dg-options "-std=gnu" }
+ ! See PR38956. Test fails on cygwin when user has Administrator rights
+ implicit none
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gfortran.dg/chmod_3.f90 gcc-4.8.0/gcc/testsuite/gfortran.dg/chmod_3.f90
+--- gcc-4.8.0-cygwin/gcc/testsuite/gfortran.dg/chmod_3.f90 2009-05-10 05:14:50 +0400
++++ gcc-4.8.0/gcc/testsuite/gfortran.dg/chmod_3.f90 2013-03-25 11:26:33 +0400
+@@ -1,4 +1,4 @@
+-! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* spu-*-* } } } }
++! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* *-*-msys* spu-*-* } } } }
+ ! { dg-options "-std=gnu -fdefault-integer-8" }
+ ! See PR38956. Test fails on cygwin when user has Administrator rights
+ implicit none
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gfortran.dg/default_format_denormal_1.f90 gcc-4.8.0/gcc/testsuite/gfortran.dg/default_format_denormal_1.f90
+--- gcc-4.8.0-cygwin/gcc/testsuite/gfortran.dg/default_format_denormal_1.f90 2012-11-02 04:23:19 +0400
++++ gcc-4.8.0/gcc/testsuite/gfortran.dg/default_format_denormal_1.f90 2013-03-25 11:27:10 +0400
+@@ -1,4 +1,4 @@
+-! { dg-do run { xfail *-*-darwin[89]* *-*-cygwin* spu-*-* powerpc-ibm-aix* } }
++! { dg-do run { xfail *-*-darwin[89]* *-*-cygwin* *-*-msys* spu-*-* powerpc-ibm-aix* } }
+ ! Test XFAILed on these platforms because the system's printf() lacks
+ ! proper support for denormals.
+ !
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gfortran.dg/open_errors.f90 gcc-4.8.0/gcc/testsuite/gfortran.dg/open_errors.f90
+--- gcc-4.8.0-cygwin/gcc/testsuite/gfortran.dg/open_errors.f90 2009-05-10 05:14:50 +0400
++++ gcc-4.8.0/gcc/testsuite/gfortran.dg/open_errors.f90 2013-03-25 11:27:46 +0400
+@@ -1,4 +1,4 @@
+-! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* spu-*-* } } } }
++! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* *-*-msys* spu-*-* } } } }
+ ! PR30005 Enhanced error messages for OPEN
+ ! Submitted by Jerry DeLisle <jvd...@gc...>
+ ! See PR38956. Test fails on cygwin when user has Administrator rights
+diff -Naur gcc-4.8.0-cygwin/gcc/testsuite/gfortran.dg/winapi.f90 gcc-4.8.0/gcc/testsuite/gfortran.dg/winapi.f90
+--- gcc-4.8.0-cygwin/gcc/testsuite/gfortran.dg/winapi.f90 2009-08-14 06:35:32 +0400
++++ gcc-4.8.0/gcc/testsuite/gfortran.dg/winapi.f90 2013-03-25 11:28:17 +0400
+@@ -1,4 +1,4 @@
+-! { dg-do run { target *-*-cygwin* *-*-mingw* } }
++! { dg-do run { target *-*-cygwin* *-*-msys* *-*-mingw* } }
+ ! { dg-options "-lkernel32" }
+ ! Test case provided by Dennis Wassel.
+
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/closure_stdcall.c gcc-4.8.0/libffi/testsuite/libffi.call/closure_stdcall.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/closure_stdcall.c 2012-12-26 20:28:02 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/closure_stdcall.c 2013-03-25 11:30:04 +0400
+@@ -4,7 +4,7 @@
+ PR: none.
+ Originator: <twa...@de...> */
+
+-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
++/* { dg-do run { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } */
+ #include "ffitest.h"
+
+ static void
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/closure_thiscall.c gcc-4.8.0/libffi/testsuite/libffi.call/closure_thiscall.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/closure_thiscall.c 2012-12-26 20:28:02 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/closure_thiscall.c 2013-03-25 11:30:13 +0400
+@@ -4,7 +4,7 @@
+ PR: none.
+ Originator: <kt...@re...> */
+
+-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
++/* { dg-do run { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } */
+ #include "ffitest.h"
+
+ static void
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/cls_align_longdouble_split.c gcc-4.8.0/libffi/testsuite/libffi.call/cls_align_longdouble_split.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/cls_align_longdouble_split.c 2012-12-26 20:28:02 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/cls_align_longdouble_split.c 2013-03-25 11:30:51 +0400
+@@ -4,10 +4,10 @@
+ PR: none.
+ Originator: <ho...@ta...> 20031203 */
+
+-/* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
++/* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
+ /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
+ /* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */
+-/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
++/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
+
+ #include "ffitest.h"
+
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c gcc-4.8.0/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c 2012-12-26 20:28:02 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c 2013-03-25 11:31:19 +0400
+@@ -5,10 +5,10 @@
+ Originator: Blake Chaffin 6/18/2007
+ */
+
+-/* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
++/* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
+ /* { dg-do run { xfail strongarm*-*-* } } */
+ /* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */
+-/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
++/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
+
+ #include "ffitest.h"
+
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/cls_longdouble.c gcc-4.8.0/libffi/testsuite/libffi.call/cls_longdouble.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/cls_longdouble.c 2010-08-09 17:00:32 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/cls_longdouble.c 2013-03-25 11:32:06 +0400
+@@ -4,10 +4,10 @@
+ PR: none.
+ Originator: Blake Chaffin */
+
+-/* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
++/* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
+ /* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-* } } */
+ /* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */
+-/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
++/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
+
+ #include "ffitest.h"
+
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/fastthis1_win32.c gcc-4.8.0/libffi/testsuite/libffi.call/fastthis1_win32.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/fastthis1_win32.c 2012-12-26 20:28:02 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/fastthis1_win32.c 2013-03-25 11:32:43 +0400
+@@ -4,7 +4,7 @@
+ PR: none.
+ Originator: From the original ffitest.c */
+
+-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
++/* { dg-do run { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } */
+
+ #include "ffitest.h"
+
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/fastthis2_win32.c gcc-4.8.0/libffi/testsuite/libffi.call/fastthis2_win32.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/fastthis2_win32.c 2012-12-26 20:28:02 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/fastthis2_win32.c 2013-03-25 11:32:36 +0400
+@@ -4,7 +4,7 @@
+ PR: none.
+ Originator: From the original ffitest.c */
+
+-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
++/* { dg-do run { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } */
+
+ #include "ffitest.h"
+
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/fastthis3_win32.c gcc-4.8.0/libffi/testsuite/libffi.call/fastthis3_win32.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/fastthis3_win32.c 2012-12-26 20:28:02 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/fastthis3_win32.c 2013-03-25 11:32:49 +0400
+@@ -4,7 +4,7 @@
+ PR: none.
+ Originator: From the original ffitest.c */
+
+-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
++/* { dg-do run { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } */
+
+ #include "ffitest.h"
+
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/float2.c gcc-4.8.0/libffi/testsuite/libffi.call/float2.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/float2.c 2009-06-12 19:57:58 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/float2.c 2013-03-25 11:33:51 +0400
+@@ -4,8 +4,8 @@
+ PR: none.
+ Originator: From the original ffitest.c */
+
+-/* { dg-excess-errors "fails" { target x86_64-*-mingw* x86_64-*-cygwin* } } */
+-/* { dg-do run { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
++/* { dg-excess-errors "fails" { target x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
++/* { dg-do run { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
+
+ #include "ffitest.h"
+ #include "float.h"
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/huge_struct.c gcc-4.8.0/libffi/testsuite/libffi.call/huge_struct.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/huge_struct.c 2012-12-26 20:28:02 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/huge_struct.c 2013-03-25 11:34:17 +0400
+@@ -5,10 +5,10 @@
+ Originator: Blake Chaffin 6/18/2007
+ */
+
+-/* { dg-excess-errors "" { target x86_64-*-mingw* x86_64-*-cygwin* } } */
++/* { dg-excess-errors "" { target x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
+ /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
+ /* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */
+-/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
++/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
+
+ #include "ffitest.h"
+
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/many2_win32.c gcc-4.8.0/libffi/testsuite/libffi.call/many2_win32.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/many2_win32.c 2012-01-29 17:29:53 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/many2_win32.c 2013-03-25 11:34:51 +0400
+@@ -4,7 +4,7 @@
+ PR: none.
+ Originator: From the original ffitest.c */
+
+-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
++/* { dg-do run { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } */
+
+ #include "ffitest.h"
+ #include <float.h>
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/many_win32.c gcc-4.8.0/libffi/testsuite/libffi.call/many_win32.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/many_win32.c 2004-09-05 02:41:53 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/many_win32.c 2013-03-25 11:34:42 +0400
+@@ -4,7 +4,7 @@
+ PR: none.
+ Originator: From the original ffitest.c */
+
+-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
++/* { dg-do run { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } */
+
+ #include "ffitest.h"
+ #include <float.h>
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/return_ldl.c gcc-4.8.0/libffi/testsuite/libffi.call/return_ldl.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/return_ldl.c 2009-06-12 19:57:58 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/return_ldl.c 2013-03-25 11:35:24 +0400
+@@ -4,7 +4,7 @@
+ PR: none.
+ Originator: <and...@gc...> 20071113 */
+
+-/* { dg-do run { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
++/* { dg-do run { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
+ #include "ffitest.h"
+
+ static long double return_ldl(long double ldl)
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/strlen2_win32.c gcc-4.8.0/libffi/testsuite/libffi.call/strlen2_win32.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/strlen2_win32.c 2012-12-26 20:28:02 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/strlen2_win32.c 2013-03-25 11:36:00 +0400
+@@ -4,7 +4,7 @@
+ PR: none.
+ Originator: From the original ffitest.c */
+
+-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
++/* { dg-do run { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } */
+
+ #include "ffitest.h"
+
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/strlen_win32.c gcc-4.8.0/libffi/testsuite/libffi.call/strlen_win32.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/strlen_win32.c 2003-09-04 18:49:22 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/strlen_win32.c 2013-03-25 11:35:52 +0400
+@@ -4,7 +4,7 @@
+ PR: none.
+ Originator: From the original ffitest.c */
+
+-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
++/* { dg-do run { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } */
+
+ #include "ffitest.h"
+
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/struct1_win32.c gcc-4.8.0/libffi/testsuite/libffi.call/struct1_win32.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/struct1_win32.c 2012-12-26 20:28:02 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/struct1_win32.c 2013-03-25 11:36:29 +0400
+@@ -4,7 +4,7 @@
+ PR: none.
+ Originator: From the original ffitest.c */
+
+-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
++/* { dg-do run { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } */
+ #include "ffitest.h"
+
+ typedef struct
+diff -Naur gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/struct2_win32.c gcc-4.8.0/libffi/testsuite/libffi.call/struct2_win32.c
+--- gcc-4.8.0-cygwin/libffi/testsuite/libffi.call/struct2_win32.c 2012-12-26 20:28:02 +0400
++++ gcc-4.8.0/libffi/testsuite/libffi.call/struct2_win32.c 2013-03-25 11:36:20 +0400
+@@ -4,7 +4,7 @@
+ PR: none.
+ Originator: From the original ffitest.c */
+
+-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
++/* { dg-do run { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } */
+ #include "ffitest.h"
+
+ typedef struct
+diff -Naur gcc-cygwin/libgomp/testsuite/lib/libgomp.exp gcc-msys2/libgomp/testsuite/lib/libgomp.exp
+--- gcc-cygwin/libgomp/testsuite/lib/libgomp.exp 2013-03-17 10:46:02 +0400
++++ gcc-msys2/libgomp/testsuite/lib/libgomp.exp 2013-03-20 07:02:44 +0400
+@@ -69,7 +69,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-cygwin/libjava/testsuite/lib/libjava.exp gcc-msys2/libjava/testsuite/lib/libjava.exp
+--- gcc-cygwin/libjava/testsuite/lib/libjava.exp 2013-03-17 10:15:46 +0400
++++ gcc-msys2/libjava/testsuite/lib/libjava.exp 2013-03-20 07:02:44 +0400
+@@ -149,7 +149,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
+ }
+@@ -211,7 +211,7 @@
+
+ if { [istarget "*-*-darwin*"] } {
+ set so_extension "dylib"
+- } elseif { [istarget "*-*-cygwin*"] || [istarget "*-*-mingw*"] } {
++ } elseif { [istarget "*-*-cygwin*"] || [istarget "*-*-msys*"] || [istarget "*-*-mingw*"] } {
+ set so_extension "dll"
+ } else {
+ set so_extension "so"
+@@ -433,7 +433,7 @@
+ # Avoid libtool wrapper scripts when possible.
+ # but not if libtool warnings results in FAILs...
[truncated message content] |