Menu
▾
▴
mingw-cvs — List for CVS update notification
This list is closed, nobody may subscribe to it.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(13) |
Feb
(2) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(38) |
Jul
(10) |
Aug
(70) |
Sep
(63) |
Oct
(61) |
Nov
(41) |
Dec
(28) |
| 2002 |
Jan
(43) |
Feb
(11) |
Mar
(9) |
Apr
(2) |
May
(97) |
Jun
(94) |
Jul
(13) |
Aug
(49) |
Sep
(41) |
Oct
(24) |
Nov
(55) |
Dec
(126) |
| 2003 |
Jan
(90) |
Feb
(75) |
Mar
(32) |
Apr
(24) |
May
(54) |
Jun
(54) |
Jul
(22) |
Aug
(4) |
Sep
(16) |
Oct
(8) |
Nov
(6) |
Dec
(13) |
| 2004 |
Jan
|
Feb
(17) |
Mar
(60) |
Apr
(21) |
May
(12) |
Jun
|
Jul
(13) |
Aug
|
Sep
(29) |
Oct
|
Nov
|
Dec
(2) |
| 2005 |
Jan
(22) |
Feb
(3) |
Mar
(2) |
Apr
(13) |
May
(82) |
Jun
(18) |
Jul
(30) |
Aug
(17) |
Sep
(3) |
Oct
(19) |
Nov
(4) |
Dec
(8) |
| 2006 |
Jan
(1) |
Feb
(6) |
Mar
(2) |
Apr
(40) |
May
|
Jun
(21) |
Jul
(1) |
Aug
(410) |
Sep
(3) |
Oct
|
Nov
(56) |
Dec
(7) |
| 2007 |
Jan
(19) |
Feb
|
Mar
(4) |
Apr
(8) |
May
(19) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
|
Oct
(4) |
Nov
(3) |
Dec
(2) |
| 2008 |
Jan
(13) |
Feb
(18) |
Mar
(12) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
(6) |
Mar
(8) |
Apr
(2) |
May
(2) |
Jun
|
Jul
|
Aug
(2) |
Sep
(11) |
Oct
(13) |
Nov
(17) |
Dec
(6) |
| 2010 |
Jan
(24) |
Feb
(10) |
Mar
(27) |
Apr
(20) |
May
(108) |
Jun
(8) |
Jul
(23) |
Aug
(38) |
Sep
(49) |
Oct
(17) |
Nov
(12) |
Dec
(14) |
| 2011 |
Jan
(17) |
Feb
(7) |
Mar
(28) |
Apr
(8) |
May
(20) |
Jun
(11) |
Jul
(7) |
Aug
(12) |
Sep
(4) |
Oct
(20) |
Nov
(19) |
Dec
(2) |
| 2012 |
Jan
(2) |
Feb
(6) |
Mar
(5) |
Apr
(24) |
May
(5) |
Jun
(4) |
Jul
(6) |
Aug
(18) |
Sep
(38) |
Oct
(26) |
Nov
(12) |
Dec
(6) |
| 2013 |
Jan
(19) |
Feb
(18) |
Mar
(44) |
Apr
(35) |
May
(18) |
Jun
(21) |
Jul
(10) |
Aug
(19) |
Sep
(44) |
Oct
(25) |
Nov
(1) |
Dec
(2) |
| 2014 |
Jan
(8) |
Feb
|
Mar
|
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
|
Aug
(3) |
Sep
|
Oct
(4) |
Nov
(4) |
Dec
(7) |
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(2) |
Jun
(4) |
Jul
(6) |
Aug
(2) |
Sep
(8) |
Oct
(2) |
Nov
(1) |
Dec
(3) |
| 2016 |
Jan
(7) |
Feb
(9) |
Mar
(5) |
Apr
(5) |
May
(9) |
Jun
(4) |
Jul
(20) |
Aug
(4) |
Sep
(7) |
Oct
(6) |
Nov
(9) |
Dec
(2) |
| 2017 |
Jan
(7) |
Feb
(7) |
Mar
(5) |
Apr
|
May
(1) |
Jun
(4) |
Jul
(12) |
Aug
(4) |
Sep
(1) |
Oct
(4) |
Nov
(11) |
Dec
(14) |
| 2018 |
Jan
(3) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
1
|
2
(2) |
|
3
|
4
|
5
(2) |
6
(4) |
7
(2) |
8
|
9
|
|
10
(2) |
11
|
12
(1) |
13
(2) |
14
(1) |
15
|
16
|
|
17
(2) |
18
|
19
(1) |
20
(1) |
21
(3) |
22
(2) |
23
|
|
24
(3) |
25
(7) |
26
(1) |
27
(5) |
28
|
29
|
30
|
|
31
(3) |
|
|
|
|
|
|
|
From: Alexx83 <no...@so...> - 2013-03-31 19:25:09
|
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-runtime".
The branch, msys2-1.0-dev has been updated
via 474e0773d65ec27f487914a068fe163fe3757bda (commit)
via 3349337a975c74e5cb7f7b748bbf5a3e52dbf72c (commit)
via 13e7dac6386c2c9bfea53b5c1514c77e5416a9fb (commit)
via 1b997ed2c5cd528afc9005e5b871f9b76a5cc54a (commit)
via 44feeb976a888e704015c764f561fa2bf3ded124 (commit)
via c962ea274dfe375fedbb4e6f05b5bde2ac363d3c (commit)
via edeeb8e485ccfa166ee42e67b80c0ab7edf6c845 (commit)
via e46882c82cb14dc6b80f02db12046acfb556c689 (commit)
from ffb22a884d927b778aabe4b3d8facc51dd83c4df (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-runtime/ci/474e0773d65ec27f487914a068fe163fe3757bda/
commit 474e0773d65ec27f487914a068fe163fe3757bda
Merge: ffb22a8 3349337
Author: Alexpux <ale...@gm...>
Date: Sun Mar 31 23:24:50 2013 +0400
Merge branch 'cygwin' into msys2-1.0-dev
-----------------------------------------------------------------------
Summary of changes:
include/opcode/ChangeLog | 5 ++
include/opcode/tic6x-opcode-table.h | 18 ++++----
winsup/cygwin/ChangeLog | 35 ++++++++++++++++
winsup/cygwin/cygthread.cc | 23 ++++++-----
winsup/cygwin/exceptions.cc | 2 +-
winsup/cygwin/pinfo.cc | 16 +++++--
winsup/cygwin/pinfo.h | 3 +-
winsup/cygwin/release/1.7.18 | 3 +
winsup/cygwin/sigproc.cc | 74 ++++++++++------------------------
winsup/cygwin/wincap.cc | 11 +++++-
winsup/cygwin/wincap.h | 4 +-
winsup/doc/faq-what.xml | 7 ++-
12 files changed, 118 insertions(+), 83 deletions(-)
hooks/post-receive
--
Repository: msys2-runtime
|
|
From: Alexx83 <no...@so...> - 2013-03-31 19:25:05
|
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-runtime".
The branch, cygwin has been updated
via 3349337a975c74e5cb7f7b748bbf5a3e52dbf72c (commit)
via 13e7dac6386c2c9bfea53b5c1514c77e5416a9fb (commit)
via 1b997ed2c5cd528afc9005e5b871f9b76a5cc54a (commit)
via 44feeb976a888e704015c764f561fa2bf3ded124 (commit)
via c962ea274dfe375fedbb4e6f05b5bde2ac363d3c (commit)
via edeeb8e485ccfa166ee42e67b80c0ab7edf6c845 (commit)
via e46882c82cb14dc6b80f02db12046acfb556c689 (commit)
from 2132256ec6add3eda2e6f30518240590c703d56b (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
include/opcode/ChangeLog | 5 ++
include/opcode/tic6x-opcode-table.h | 18 ++++----
winsup/cygwin/ChangeLog | 35 ++++++++++++++++
winsup/cygwin/cygthread.cc | 23 ++++++-----
winsup/cygwin/exceptions.cc | 2 +-
winsup/cygwin/pinfo.cc | 16 +++++--
winsup/cygwin/pinfo.h | 3 +-
winsup/cygwin/release/1.7.18 | 3 +
winsup/cygwin/sigproc.cc | 74 ++++++++++------------------------
winsup/cygwin/wincap.cc | 11 +++++-
winsup/cygwin/wincap.h | 4 +-
winsup/doc/ChangeLog | 5 ++
winsup/doc/faq-what.xml | 7 ++-
13 files changed, 123 insertions(+), 83 deletions(-)
hooks/post-receive
--
Repository: msys2-runtime
|
|
From: Alexx83 <no...@so...> - 2013-03-31 19:23:54
|
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-runtime".
The branch, cygwin has been updated
discards e2a191942065006b78e93d34bad3569001a40ded (commit)
This update discarded existing revisions and left the branch pointing at
a previous point in the repository history.
* -- * -- N (2132256ec6add3eda2e6f30518240590c703d56b)
\
O -- O -- O (e2a191942065006b78e93d34bad3569001a40ded)
The removed revisions are not necessarilly gone - if another reference
still refers to them they will stay in the repository.
No new revisions were added by this update.
Summary of changes:
winsup/doc/ChangeLog | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
hooks/post-receive
--
Repository: msys2-runtime
|
|
From: Alexx83 <no...@so...> - 2013-03-27 19:39:43
|
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-runtime".
The branch, msys2-1.0-dev has been updated
via ffb22a884d927b778aabe4b3d8facc51dd83c4df (commit)
via e2a191942065006b78e93d34bad3569001a40ded (commit)
via 2132256ec6add3eda2e6f30518240590c703d56b (commit)
via 78acbb22289aa6a898e859820f97ba54b8a7e886 (commit)
via 119600cde46dd050240d91bad705b344da460921 (commit)
via beb095f5e58e2e15aba64f31f232391d94e01ca5 (commit)
via e7f6af16a92ca1461bbc66fbbe904b21d68f8f4c (commit)
via e7992abe1fe6bcb7b9a6b3103b46adc1a4c06084 (commit)
via 88d21df654b3e9cac9363b72c838eb5209b3088e (commit)
via 3b1b023c9d65e0bca9816281e77fd7fcae85d1cd (commit)
from e5056c5fc4b4ad4d8fea9bd66cc95d3869e99aa0 (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-runtime/ci/ffb22a884d927b778aabe4b3d8facc51dd83c4df/
commit ffb22a884d927b778aabe4b3d8facc51dd83c4df
Merge: e5056c5 e2a1919
Author: Alexpux <ale...@gm...>
Date: Wed Mar 27 23:39:06 2013 +0400
Merge branch 'cygwin' into msys2-1.0-dev
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +
include/elf/ChangeLog | 5 +
include/elf/h8.h | 5 +-
include/opcode/ChangeLog | 33 +
include/opcode/h8300.h | 14 +-
include/opcode/tic6x-insn-formats.h | 424 +++++++++++++-
include/opcode/tic6x-opcode-table.h | 1170 ++++++++++++++++++++++++++++++++++-
include/opcode/tic6x.h | 123 ++++-
newlib/ChangeLog | 26 +
newlib/acconfig.h | 3 +
newlib/configure | 22 +
newlib/configure.in | 15 +
newlib/libc/stdio/fclose.c | 6 +-
newlib/libc/stdio/fputs.c | 24 +
newlib/libc/stdio/fputws.c | 30 +-
newlib/libc/stdio/freopen.c | 8 +-
newlib/libc/stdio/fwrite.c | 25 +
newlib/libc/stdio/local.h | 11 +-
newlib/libc/stdio/puts.c | 28 +
newlib/libc/stdio/vfprintf.c | 147 +++++-
newlib/libc/stdio/vfwprintf.c | 49 ++-
newlib/libc/stdio64/freopen64.c | 4 +-
newlib/newlib.hin | 3 +
src-release | 2 +-
winsup/cygwin/release/1.7.18 | 2 +-
winsup/doc/ChangeLog | 5 +
26 files changed, 2122 insertions(+), 67 deletions(-)
hooks/post-receive
--
Repository: msys2-runtime
|
|
From: Alexx83 <no...@so...> - 2013-03-27 19:39:39
|
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-runtime".
The branch, cygwin has been updated
via e2a191942065006b78e93d34bad3569001a40ded (commit)
via 2132256ec6add3eda2e6f30518240590c703d56b (commit)
via 78acbb22289aa6a898e859820f97ba54b8a7e886 (commit)
via 119600cde46dd050240d91bad705b344da460921 (commit)
from beb095f5e58e2e15aba64f31f232391d94e01ca5 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
include/opcode/ChangeLog | 8 +
include/opcode/tic6x-insn-formats.h | 424 +++++++++++++-
include/opcode/tic6x-opcode-table.h | 1123 +++++++++++++++++++++++++++++++++++
include/opcode/tic6x.h | 114 ++++-
newlib/ChangeLog | 26 +
newlib/acconfig.h | 3 +
newlib/configure | 22 +
newlib/configure.in | 15 +
newlib/libc/stdio/fclose.c | 6 +-
newlib/libc/stdio/fputs.c | 24 +
newlib/libc/stdio/fputws.c | 30 +-
newlib/libc/stdio/freopen.c | 8 +-
newlib/libc/stdio/fwrite.c | 25 +
newlib/libc/stdio/local.h | 11 +-
newlib/libc/stdio/puts.c | 28 +
newlib/libc/stdio/vfprintf.c | 147 +++++-
newlib/libc/stdio/vfwprintf.c | 49 ++-
newlib/libc/stdio64/freopen64.c | 4 +-
newlib/newlib.hin | 3 +
winsup/doc/ChangeLog | 5 +
20 files changed, 2043 insertions(+), 32 deletions(-)
hooks/post-receive
--
Repository: msys2-runtime
|
|
From: Alexx83 <no...@so...> - 2013-03-27 18:14:52
|
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 a34f22cb2a9824df292f7971ed052f3d9d551853 (commit)
from ddfd11a09cce1f8c38851b843c14a7f7a3b8ff4f (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/a34f22cb2a9824df292f7971ed052f3d9d551853/
commit a34f22cb2a9824df292f7971ed052f3d9d551853
Author: Alexpux <ale...@gm...>
Date: Wed Mar 27 22:14:36 2013 +0400
Add patches for gettext-0.18.1.1
diff --git a/gettext/gettext-0.18.1.1-autopoint-V.patch b/gettext/gettext-0.18.1.1-autopoint-V.patch
new file mode 100644
index 0000000..6848cd3
--- /dev/null
+++ b/gettext/gettext-0.18.1.1-autopoint-V.patch
@@ -0,0 +1,53 @@
+--- origsrc/gettext-0.18.1.1/gettext-tools/misc/autopoint.in 2010-06-06 08:49:57.000000000 -0400
++++ src/gettext-0.18.1.1/gettext-tools/misc/autopoint.in 2011-10-16 00:57:42.789133600 -0400
+@@ -161,9 +161,9 @@ Options:
+ --version print version information and exit
+ -f, --force force overwriting of files that already exist
+ -n, --dry-run print modifications but don't perform them"
+-# echo "\
+-# -V version copy the infrastructure of the specified gettext version
+-# (dangerous)"
++ echo "\
++ -V version copy the infrastructure of the specified gettext version
++ (dangerous)"
+ echo "
+ Report bugs to <bug...@gn...>."
+ }
+@@ -210,17 +210,17 @@ func_fatal_error ()
+ force=yes ;;
+ --help | --hel | --he | --h )
+ func_usage; exit 0 ;;
+-# -V ) # Some people put a space between -V and the version number.
+-# shift
+-# if test $# = 0; then
+-# func_usage 1>&2
+-# exit 1
+-# fi
+-# ver=$1;
+-# shift ;;
+-# -V*) # Some people omit the space between -V and the version number.
+-# ver=`echo "X$1" | sed -e 's/^X-V//'`
+-# shift ;;
++ -V ) # Some people put a space between -V and the version number.
++ shift
++ if test $# = 0; then
++ func_usage 1>&2
++ exit 1
++ fi
++ ver=$1;
++ shift ;;
++ -V*) # Some people omit the space between -V and the version number.
++ ver=`echo "X$1" | sed -e 's/^X-V//'`
++ shift ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v )
+ func_version
+ exit 0 ;;
+@@ -276,7 +276,7 @@ fi
+ if test -n "$xver"; then
+ if test -n "$ver"; then
+ if test "X$ver" != "X$xver"; then
+- func_fatal_error "Version mismatch: specified -V $ver but the package uses gettext version $xver"
++ echo "autopoint: warning: Version mismatch: specified -V $ver but the package uses gettext version $xver. Forcibly upgrading to $ver" 1>&2
+ fi
+ else
+ ver="$xver"
diff --git a/gettext/gettext-0.18.1.1-cygwin-error_h.patch b/gettext/gettext-0.18.1.1-cygwin-error_h.patch
new file mode 100644
index 0000000..5fef32b
--- /dev/null
+++ b/gettext/gettext-0.18.1.1-cygwin-error_h.patch
@@ -0,0 +1,34 @@
+Cygwin has exported error.h since 1.7.10.
+
+--- origsrc/gettext-0.18.1.1/gettext-tools/libgettextpo/error.h 2010-02-16 15:33:13.000000000 -0600
++++ src/gettext-0.18.1.1/gettext-tools/libgettextpo/error.h 2013-01-24 22:19:12.749318500 -0600
+@@ -49,14 +49,14 @@ extern void error_at_line (int __status,
+ /* If NULL, error will flush stdout, then print on stderr the program
+ name, a colon and a space. Otherwise, error will call this
+ function without parameters instead. */
+-extern DLL_VARIABLE void (*error_print_progname) (void);
++extern __declspec(dllimport) void (*error_print_progname) (void);
+
+ /* This variable is incremented each time `error' is called. */
+-extern DLL_VARIABLE unsigned int error_message_count;
++extern __declspec(dllimport) unsigned int error_message_count;
+
+ /* Sometimes we want to have at most one error per line. This
+ variable controls whether this mode is selected or not. */
+-extern DLL_VARIABLE int error_one_per_line;
++extern __declspec(dllimport) int error_one_per_line;
+
+ #ifdef __cplusplus
+ }
+--- origsrc/gettext-0.18.1.1/gettext-tools/woe32dll/gettextlib-exports.c 2010-06-06 07:49:58.000000000 -0500
++++ src/gettext-0.18.1.1/gettext-tools/woe32dll/gettextlib-exports.c 2013-01-24 21:17:39.584846100 -0600
+@@ -18,9 +18,6 @@
+ #include "woe32dll/export.h"
+
+ VARIABLE(argmatch_die)
+-VARIABLE(error_message_count)
+-VARIABLE(error_one_per_line)
+-VARIABLE(error_print_progname)
+ VARIABLE(error_with_progname)
+ VARIABLE(exit_failure)
+ VARIABLE(gl_array_list_implementation)
diff --git a/gettext/gettext-0.18.1.1-locale.patch b/gettext/gettext-0.18.1.1-locale.patch
new file mode 100644
index 0000000..6d80e36
--- /dev/null
+++ b/gettext/gettext-0.18.1.1-locale.patch
@@ -0,0 +1,152 @@
+--- old/gettext-0.18.1.1/gettext-runtime/intl/localename.c 2011-10-15 00:21:37.853133600 -0400
++++ new/gettext-0.18.1.1/gettext-runtime/intl/localename.c 2011-10-15 00:29:27.601133600 -0400
+@@ -59,7 +59,7 @@
+ # define WIN32_NATIVE
+ #endif
+
+-#if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
++#if defined WIN32_NATIVE /* WIN32 */
+ # define WIN32_LEAN_AND_MEAN
+ # include <windows.h>
+ /* List of language codes, sorted by value:
+@@ -1407,7 +1407,7 @@
+ #endif
+
+
+-#if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
++#if defined WIN32_NATIVE /* WIN32 */
+
+ /* Canonicalize a Win32 native locale name to a Unix locale name.
+ NAME is a sufficiently large buffer.
+@@ -2770,8 +2770,8 @@
+ setting of 'local'."
+ However it does not specify the exact format. Neither do SUSV2 and
+ ISO C 99. So we can use this feature only on selected systems (e.g.
+- those using GNU C Library). */
+-#if defined _LIBC || (defined __GLIBC__ && __GLIBC__ >= 2)
++ those using GNU C Library, or cygwin [1.5 and 1.7+]). */
++#if defined _LIBC || (defined __GLIBC__ && __GLIBC__ >= 2) || defined __CYGWIN__
+ # define HAVE_LOCALE_NULL
+ #endif
+
+@@ -2826,11 +2826,6 @@
+ Ignore invalid LANG value set by the Terminal application. */
+ if (strcmp (retval, "UTF-8") != 0)
+ #endif
+-#if defined __CYGWIN__
+- /* Cygwin.
+- Ignore dummy LANG value set by ~/.profile. */
+- if (strcmp (retval, "C.UTF-8") != 0)
+-#endif
+ return retval;
+ }
+
+@@ -2923,7 +2918,7 @@
+
+ # endif
+
+-# if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
++# if defined WIN32_NATIVE /* WIN32 */
+ {
+ LCID lcid;
+
+@@ -2933,6 +2928,23 @@
+ return gl_locale_name_from_win32_LCID (lcid);
+ }
+ # endif
++# if defined __CYGWIN__
++ {
++ /* Rarely arrive here. This function is called only when an earlier
++ * call to gl_locale_name_posix() or gl_locale_name_environ()
++ * returned NULL. That first function now simply delegates to
++ * setlocale (LC_*, NULL), which never fails on cygwin. But...for
++ * completeness, or when called after gl_locale_name_environ() and
++ * none are set, go ahead and specify the cygwin default. Cheat a bit
++ * to distinguish old cygwin (1.5 and below) from new cygwin (1.7+).
++ */
++# if PATH_MAX < 261 /* cygwin 1.5 or below */
++ return "C";
++# else /* PATH_MAX = 4096, cygwin 1.7 or above */
++ return "C.UTF-8";
++# endif
++ }
++# endif
+ #endif
+ }
+
+--- old/gettext-0.18.1.1/gettext-tools/gnulib-lib/localename.c 2011-10-15 00:21:37.853133600 -0400
++++ new/gettext-0.18.1.1/gettext-tools/gnulib-lib/localename.c 2011-10-15 00:29:27.601133600 -0400
+@@ -59,7 +59,7 @@
+ # define WIN32_NATIVE
+ #endif
+
+-#if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
++#if defined WIN32_NATIVE /* WIN32 */
+ # define WIN32_LEAN_AND_MEAN
+ # include <windows.h>
+ /* List of language codes, sorted by value:
+@@ -1407,7 +1407,7 @@
+ #endif
+
+
+-#if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
++#if defined WIN32_NATIVE /* WIN32 */
+
+ /* Canonicalize a Win32 native locale name to a Unix locale name.
+ NAME is a sufficiently large buffer.
+@@ -2770,8 +2770,8 @@
+ setting of 'local'."
+ However it does not specify the exact format. Neither do SUSV2 and
+ ISO C 99. So we can use this feature only on selected systems (e.g.
+- those using GNU C Library). */
+-#if defined _LIBC || (defined __GLIBC__ && __GLIBC__ >= 2)
++ those using GNU C Library, or cygwin [1.5 and 1.7+]). */
++#if defined _LIBC || (defined __GLIBC__ && __GLIBC__ >= 2) || defined __CYGWIN__
+ # define HAVE_LOCALE_NULL
+ #endif
+
+@@ -2826,11 +2826,6 @@
+ Ignore invalid LANG value set by the Terminal application. */
+ if (strcmp (retval, "UTF-8") != 0)
+ #endif
+-#if defined __CYGWIN__
+- /* Cygwin.
+- Ignore dummy LANG value set by ~/.profile. */
+- if (strcmp (retval, "C.UTF-8") != 0)
+-#endif
+ return retval;
+ }
+
+@@ -2923,7 +2918,7 @@
+
+ # endif
+
+-# if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
++# if defined WIN32_NATIVE /* WIN32 */
+ {
+ LCID lcid;
+
+@@ -2933,6 +2928,23 @@
+ return gl_locale_name_from_win32_LCID (lcid);
+ }
+ # endif
++# if defined __CYGWIN__
++ {
++ /* Rarely arrive here. This function is called only when an earlier
++ * call to gl_locale_name_posix() or gl_locale_name_environ()
++ * returned NULL. That first function now simply delegates to
++ * setlocale (LC_*, NULL), which never fails on cygwin. But...for
++ * completeness, or when called after gl_locale_name_environ() and
++ * none are set, go ahead and specify the cygwin default. Cheat a bit
++ * to distinguish old cygwin (1.5 and below) from new cygwin (1.7+).
++ */
++# if PATH_MAX < 261 /* cygwin 1.5 or below */
++ return "C";
++# else /* PATH_MAX = 4096, cygwin 1.7 or above */
++ return "C.UTF-8";
++# endif
++ }
++# endif
+ #endif
+ }
+
diff --git a/gettext/gettext-0.18.1.1-msys2.patch b/gettext/gettext-0.18.1.1-msys2.patch
new file mode 100644
index 0000000..ba628b4
--- /dev/null
+++ b/gettext/gettext-0.18.1.1-msys2.patch
@@ -0,0 +1,2019 @@
+diff -Naur gettext-0.18.1.1/build-aux/config.guess gettext-0.18.1.1-p/build-aux/config.guess
+--- gettext-0.18.1.1/build-aux/config.guess 2010-05-24 17:05:17.000000000 +0000
++++ gettext-0.18.1.1-p/build-aux/config.guess 2013-03-26 15:15:35.765625000 +0000
+@@ -801,6 +801,9 @@
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit ;;
++ i*:MSYS*:*)
++ echo ${UNAME_MACHINE}-pc-msys
++ exit ;;
+ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+@@ -841,6 +844,9 @@
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
++ echo x86_64-unknown-msys
++ exit ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit ;;
+diff -Naur gettext-0.18.1.1/build-aux/config.libpath gettext-0.18.1.1-p/build-aux/config.libpath
+--- gettext-0.18.1.1/build-aux/config.libpath 2010-02-16 21:31:27.000000000 +0000
++++ gettext-0.18.1.1-p/build-aux/config.libpath 2013-03-26 15:14:48.015625000 +0000
+@@ -56,7 +56,7 @@
+ bsdi[45]*)
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
+diff -Naur gettext-0.18.1.1/build-aux/config.rpath gettext-0.18.1.1-p/build-aux/config.rpath
+--- gettext-0.18.1.1/build-aux/config.rpath 2010-04-02 16:29:39.000000000 +0000
++++ gettext-0.18.1.1-p/build-aux/config.rpath 2013-03-26 15:14:38.250000000 +0000
+@@ -64,7 +64,7 @@
+ ;;
+ esac
+ ;;
+- mingw* | cygwin* | pw32* | os2* | cegcc*)
++ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ wl='-Wl,'
+@@ -138,7 +138,7 @@
+ hardcode_minus_L=no
+
+ case "$host_os" in
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+@@ -188,7 +188,7 @@
+ ld_shlibs=no
+ fi
+ ;;
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+@@ -332,7 +332,7 @@
+ ;;
+ bsdi[45]*)
+ ;;
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+@@ -523,7 +523,7 @@
+ bsdi[45]*)
+ library_names_spec='$libname$shrext'
+ ;;
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ shrext=.dll
+ library_names_spec='$libname.dll.a $libname.lib'
+ ;;
+diff -Naur gettext-0.18.1.1/build-aux/config.sub gettext-0.18.1.1-p/build-aux/config.sub
+--- gettext-0.18.1.1/build-aux/config.sub 2010-05-24 17:05:17.000000000 +0000
++++ gettext-0.18.1.1-p/build-aux/config.sub 2013-03-26 15:15:48.437500000 +0000
+@@ -1307,7 +1307,7 @@
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+diff -Naur gettext-0.18.1.1/build-aux/ltmain.sh gettext-0.18.1.1-p/build-aux/ltmain.sh
+--- gettext-0.18.1.1/build-aux/ltmain.sh 2010-06-06 12:49:57.000000000 +0000
++++ gettext-0.18.1.1-p/build-aux/ltmain.sh 2013-03-26 15:22:10.187500000 +0000
+@@ -805,7 +805,7 @@
+
+
+ case $host in
+- *cygwin* | *mingw* | *pw32* | *cegcc*)
++ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
+ ;;
+@@ -1276,7 +1276,7 @@
+
+ # On Cygwin there's no "real" PIC flag so we must build both object types
+ case $host_os in
+- cygwin* | mingw* | pw32* | os2* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | os2* | cegcc*)
+ pic_mode=default
+ ;;
+ esac
+@@ -2063,7 +2063,7 @@
+ 'exit $?'
+ tstripme="$stripme"
+ case $host_os in
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ case $realname in
+ *.dll.a)
+ tstripme=""
+@@ -2169,7 +2169,7 @@
+
+ # Do a test to see if this is really a libtool program.
+ case $host in
+- *cygwin* | *mingw*)
++ *cygwin* | *msys* | *mingw*)
+ if func_ltwrapper_executable_p "$file"; then
+ func_ltwrapper_scriptname "$file"
+ wrapper=$func_ltwrapper_scriptname_result
+@@ -2244,7 +2244,7 @@
+ # remove .exe since cygwin /usr/bin/install will append another
+ # one anyway
+ case $install_prog,$host in
+- */usr/bin/install*,*cygwin*)
++ */usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*)
+ case $file:$destfile in
+ *.exe:*.exe)
+ # this is ok
+@@ -2375,7 +2375,7 @@
+ $RM $export_symbols
+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ case $host in
+- *cygwin* | *mingw* | *cegcc* )
++ *cygwin* | *msys* | *mingw* | *cegcc* )
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+ ;;
+@@ -2387,7 +2387,7 @@
+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ eval '$MV "$nlist"T "$nlist"'
+ case $host in
+- *cygwin | *mingw* | *cegcc* )
++ *cygwin | msys* | *mingw* | *cegcc* )
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+ ;;
+@@ -2443,7 +2443,7 @@
+ } lt_dlsymlist;
+ "
+ case $host in
+- *cygwin* | *mingw* | *cegcc* )
++ *cygwin* | *msys* | *mingw* | *cegcc* )
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
+ /* DATA imports from DLLs on WIN32 con't be const, because
+ runtime relocations are performed -- see ld's documentation
+@@ -2529,7 +2529,7 @@
+ # Transform the symbol file into the correct name.
+ symfileobj="$output_objdir/${my_outputname}S.$objext"
+ case $host in
+- *cygwin* | *mingw* | *cegcc* )
++ *cygwin* | *msys* | *mingw* | *cegcc* )
+ if test -f "$output_objdir/$my_outputname.def"; then
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+@@ -3007,7 +3007,7 @@
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+- *cygwin* )
++ *cygwin* | *msys* )
+ func_to_host_path_tmp1=`cygpath -w "$1"`
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+@@ -3086,7 +3086,7 @@
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+- *cygwin* )
++ *cygwin* | *msys* )
+ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+@@ -3401,7 +3401,7 @@
+ {
+ EOF
+ case "$host" in
+- *mingw* | *cygwin* )
++ *mingw* | *cygwin* | *msys* )
+ # make stdout use "unix" line endings
+ echo " setmode(1,_O_BINARY);"
+ ;;
+@@ -4169,7 +4169,7 @@
+ {
+ $opt_debug
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
++ *-*-cygwin* | *-*-msys* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ # It is impossible to link a dll without this setting, and
+ # we shouldn't force the makefile maintainer to figure out
+ # which system we are compiling for in order to pass an extra
+@@ -4638,7 +4638,7 @@
+ ;;
+ esac
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
++ *-*-cygwin* | *-*-msys* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$dir:"*) ;;
+@@ -4658,7 +4658,7 @@
+ -l*)
+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
++ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+ # These systems don't actually have a C or math library (as such)
+ continue
+ ;;
+@@ -4735,7 +4735,7 @@
+
+ -no-install)
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
++ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+ # The PATH hackery in wrapper scripts is required on Windows
+ # and Darwin in order for the loader to find any dlls it needs.
+ func_warning "\`-no-install' is ignored for $host"
+@@ -5692,7 +5692,7 @@
+ if test -n "$library_names" &&
+ { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ case $host in
+- *cygwin* | *mingw* | *cegcc*)
++ *cygwin* | *msys* | *mingw* | *cegcc*)
+ # No point in relinking DLLs because paths are not encoded
+ notinst_deplibs="$notinst_deplibs $lib"
+ need_relink=no
+@@ -5762,7 +5762,7 @@
+ elif test -n "$soname_spec"; then
+ # bleh windows
+ case $host in
+- *cygwin* | mingw* | *cegcc*)
++ *cygwin* | *msys* | mingw* | *cegcc*)
+ func_arith $current - $age
+ major=$func_arith_result
+ versuffix="-$major"
+@@ -6612,7 +6612,7 @@
+ if test "$build_libtool_libs" = yes; then
+ if test -n "$rpath"; then
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
++ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+ # these systems don't actually have a c library (as such)!
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+@@ -7111,7 +7111,7 @@
+
+ orig_export_symbols=
+ case $host_os in
+- cygwin* | mingw* | cegcc*)
++ cygwin* | msys* | mingw* | cegcc*)
+ if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+ # exporting using user supplied symfile
+ if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+@@ -7623,7 +7623,7 @@
+
+ prog)
+ case $host in
+- *cygwin*) func_stripname '' '.exe' "$output"
++ *cygwin* | *msys*) func_stripname '' '.exe' "$output"
+ output=$func_stripname_result.exe;;
+ esac
+ test -n "$vinfo" && \
+@@ -7736,7 +7736,7 @@
+ esac
+ fi
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
++ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$libdir:"*) ;;
+@@ -7810,7 +7810,7 @@
+
+ wrappers_required=yes
+ case $host in
+- *cygwin* | *mingw* )
++ *cygwin* | *msys* | *mingw* )
+ if test "$build_libtool_libs" != yes; then
+ wrappers_required=no
+ fi
+@@ -7953,14 +7953,14 @@
+ esac
+ # test for cygwin because mv fails w/o .exe extensions
+ case $host in
+- *cygwin*)
++ *cygwin* | *msys*)
+ exeext=.exe
+ func_stripname '' '.exe' "$outputname"
+ outputname=$func_stripname_result ;;
+ *) exeext= ;;
+ esac
+ case $host in
+- *cygwin* | *mingw* )
++ *cygwin* | *msys* | *mingw* )
+ func_dirname_and_basename "$output" "" "."
+ output_name=$func_basename_result
+ output_path=$func_dirname_result
+@@ -8259,7 +8259,7 @@
+ # place dlname in correct position for cygwin
+ tdlname=$dlname
+ case $host,$output,$installed,$module,$dlname in
+- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
++ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ esac
+ $ECHO > $output "\
+ # $outputname - a libtool library file
+diff -Naur gettext-0.18.1.1/gettext-runtime/aclocal.m4 gettext-0.18.1.1-p/gettext-runtime/aclocal.m4
+--- gettext-0.18.1.1/gettext-runtime/aclocal.m4 2010-06-06 20:11:30.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/aclocal.m4 2013-03-26 15:27:47.699218800 +0000
+@@ -697,7 +697,7 @@
+ ;;
+
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++[*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32*)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+ AC_CHECK_TOOL(AS, as, false)
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
+@@ -818,7 +818,7 @@
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
+
+- cygwin* | mingw*)
++ cygwin* | msys* | mingw*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -1033,7 +1033,7 @@
+ lt_cv_dlopen_libs=
+ ;;
+
+- cygwin*)
++ cygwin* | msys*)
+ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
+@@ -1447,14 +1447,14 @@
+ # libtool to hard-code these into programs
+ ;;
+
+-cygwin* | mingw* | pw32*)
++cygwin* | msys* | mingw* | pw32*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+ case $GCC,$host_os in
+- yes,cygwin* | yes,mingw* | yes,pw32*)
++ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32*)
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+@@ -1474,6 +1474,11 @@
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
++ msys*)
++ # MSYS DLLs use 'msys-' prefix rather than 'lib'
++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++ ;;
+ mingw*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+@@ -2418,7 +2423,7 @@
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
+-cygwin*)
++cygwin* | msys*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+@@ -2634,7 +2639,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++*-*-beos* | *-*-cygwin* | *-*-msys* | *-*-pw32* | *-*-darwin*)
+ # These system don't have libm, or don't need it
+ ;;
+ *-ncr-sysv4.3*)
+@@ -3142,7 +3147,7 @@
+ esac
+ ;;
+
+- cygwin* | mingw* | pw32*)
++ cygwin* | msys* | mingw* | pw32*)
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -4818,7 +4823,7 @@
+ aix*)
+ symcode='[[BCDT]]'
+ ;;
+-cygwin* | mingw* | pw32*)
++cygwin* | msys* | mingw* | pw32*)
+ symcode='[[ABCDGISTW]]'
+ ;;
+ hpux*) # Its linker distinguishes data from code symbols
+@@ -5021,7 +5026,7 @@
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | cygwin* | os2* | pw32*)
++ mingw* | cygwin* | msys* | os2* | pw32*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -5306,7 +5311,7 @@
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | cygwin* | pw32* | os2*)
++ mingw* | cygwin* | msys* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -5379,7 +5384,7 @@
+ esac
+ ;;
+
+- mingw* | cygwin* | pw32* | os2*)
++ mingw* | cygwin* | msys* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ m4_if([$1], [GCJ], [],
+@@ -5572,7 +5577,7 @@
+ pw32*)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+- cygwin* | mingw*)
++ cygwin* | msys* | mingw*)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ ;;
+ *)
+@@ -5622,7 +5627,7 @@
+ # Just being paranoid about ensuring that cc_basename is set.
+ _LT_CC_BASENAME([$compiler])
+ case $host_os in
+- cygwin* | mingw* | pw32*)
++ cygwin* | msys* | mingw* | pw32*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+@@ -5708,7 +5713,7 @@
+ fi
+ ;;
+
+- cygwin* | mingw* | pw32*)
++ cygwin* | msys* | mingw* | pw32*)
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -6017,7 +6022,7 @@
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
+
+- cygwin* | mingw* | pw32*)
++ cygwin* | msys* | mingw* | pw32*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+diff -Naur gettext-0.18.1.1/gettext-runtime/configure gettext-0.18.1.1-p/gettext-runtime/configure
+--- gettext-0.18.1.1/gettext-runtime/configure 2010-06-06 20:11:32.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/configure 2013-03-26 15:36:28.777343800 +0000
+@@ -6464,7 +6464,7 @@
+
+
+ case "$host_os" in
+- mingw* | cygwin*)
++ mingw* | cygwin* | msys*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
+ $as_echo_n "checking for auto-import of symbols... " >&6; }
+ if test "${gl_cv_ld_autoimport+set}" = set; then :
+@@ -7049,7 +7049,7 @@
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
+
+- cygwin* | mingw* | cegcc*)
++ cygwin* | msys* | mingw* | cegcc*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -7383,7 +7383,7 @@
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
+-cygwin*)
++cygwin* | msys*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+@@ -7946,7 +7946,7 @@
+ aix*)
+ symcode='[BCDT]'
+ ;;
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+ symcode='[ABCDGISTW]'
+ ;;
+ hpux*)
+@@ -8971,7 +8971,7 @@
+ enable_win32_dll=yes
+
+ case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
++*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}as; ac_word=$2
+@@ -9837,7 +9837,7 @@
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | cygwin* | pw32* | os2* | cegcc*)
++ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -9906,7 +9906,7 @@
+ fi
+ ;;
+
+- mingw* | cygwin* | pw32* | os2* | cegcc*)
++ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+@@ -10368,7 +10368,7 @@
+ extract_expsyms_cmds=
+
+ case $host_os in
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+@@ -10455,7 +10455,7 @@
+ fi
+ ;;
+
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+@@ -10868,7 +10868,7 @@
+ export_dynamic_flag_spec=-rdynamic
+ ;;
+
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+@@ -11711,14 +11711,14 @@
+ # libtool to hard-code these into programs
+ ;;
+
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+ case $GCC,$host_os in
+- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+@@ -11741,6 +11741,11 @@
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
++ msys*)
++ # MSYS DLLs use 'msys-' prefix rather than 'lib'
++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+@@ -12371,7 +12376,7 @@
+ lt_cv_dlopen_libs=
+ ;;
+
+- cygwin*)
++ cygwin* | msys*)
+ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
+@@ -13138,7 +13143,7 @@
+
+
+ case "$host_os" in
+- mingw* | cygwin*) is_woe32=yes ;;
++ mingw* | cygwin* | msys*) is_woe32=yes ;;
+ *) is_woe32=no ;;
+ esac
+ if test $is_woe32 = yes; then
+@@ -14341,7 +14346,7 @@
+ else
+ case "$host_os" in
+ osf*) gl_use_threads=no ;;
+- cygwin*)
++ cygwin* | msys*)
+ case `uname -r` in
+ 1.[0-5].*) gl_use_threads=no ;;
+ *) gl_use_threads=yes ;;
+@@ -17348,7 +17353,7 @@
+
+ if test "$enable_shared" = yes; then
+ case "$host_os" in
+- mingw* | cygwin*) is_woe32dll=yes ;;
++ mingw* | cygwin* | msys*) is_woe32dll=yes ;;
+ *) is_woe32dll=no ;;
+ esac
+ else
+@@ -17358,7 +17363,7 @@
+
+
+ case "$host_os" in
+- mingw* | cygwin*) is_woe32=yes ;;
++ mingw* | cygwin* | msys*) is_woe32=yes ;;
+ *) is_woe32=no ;;
+ esac
+ WOE32=$is_woe32
+@@ -18397,7 +18402,7 @@
+ # special semantics and is distinct from /, please report it to
+ # <bug...@gn...>.
+ case $host in
+- *-cygwin | i370-ibm-openedition)
++ *-cygwin | *-msys | i370-ibm-openedition)
+ gl_cv_double_slash_root=yes ;;
+ *)
+ # Be optimistic and assume that / and // are the same when we
+@@ -22092,7 +22097,7 @@
+ # special semantics and is distinct from /, please report it to
+ # <bug...@gn...>.
+ case $host in
+- *-cygwin | i370-ibm-openedition)
++ *-cygwin | *-msys | i370-ibm-openedition)
+ gl_cv_double_slash_root=yes ;;
+ *)
+ # Be optimistic and assume that / and // are the same when we
+diff -Naur gettext-0.18.1.1/gettext-runtime/configure.ac gettext-0.18.1.1-p/gettext-runtime/configure.ac
+--- gettext-0.18.1.1/gettext-runtime/configure.ac 2010-06-06 12:49:57.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/configure.ac 2013-03-26 15:36:55.527343800 +0000
+@@ -75,7 +75,7 @@
+ dnl On mingw and Cygwin, we can activate special Makefile rules which add
+ dnl version information to the shared libraries and executables.
+ case "$host_os" in
+- mingw* | cygwin*) is_woe32=yes ;;
++ mingw* | cygwin* | msys*) is_woe32=yes ;;
+ *) is_woe32=no ;;
+ esac
+ AM_CONDITIONAL([WOE32], [test $is_woe32 = yes])
+diff -Naur gettext-0.18.1.1/gettext-runtime/gnulib-lib/Makefile.am gettext-0.18.1.1-p/gettext-runtime/gnulib-lib/Makefile.am
+--- gettext-0.18.1.1/gettext-runtime/gnulib-lib/Makefile.am 2010-06-03 21:35:21.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/gnulib-lib/Makefile.am 2013-03-26 15:37:59.431640700 +0000
+@@ -409,7 +409,7 @@
+ case '$(host_os)' in \
+ darwin[56]*) \
+ need_charset_alias=true ;; \
+- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
+ need_charset_alias=false ;; \
+ *) \
+ need_charset_alias=true ;; \
+diff -Naur gettext-0.18.1.1/gettext-runtime/gnulib-lib/Makefile.in gettext-0.18.1.1-p/gettext-runtime/gnulib-lib/Makefile.in
+--- gettext-0.18.1.1/gettext-runtime/gnulib-lib/Makefile.in 2010-06-06 20:11:37.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/gnulib-lib/Makefile.in 2013-03-26 15:38:43.041015700 +0000
+@@ -1601,7 +1601,7 @@
+ case '$(host_os)' in \
+ darwin[56]*) \
+ need_charset_alias=true ;; \
+- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
+ need_charset_alias=false ;; \
+ *) \
+ need_charset_alias=true ;; \
+diff -Naur gettext-0.18.1.1/gettext-runtime/gnulib-m4/double-slash-root.m4 gettext-0.18.1.1-p/gettext-runtime/gnulib-m4/double-slash-root.m4
+--- gettext-0.18.1.1/gettext-runtime/gnulib-m4/double-slash-root.m4 2010-02-16 21:31:29.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/gnulib-m4/double-slash-root.m4 2013-03-26 15:39:35.761718800 +0000
+@@ -16,7 +16,7 @@
+ # special semantics and is distinct from /, please report it to
+ # <bug...@gn...>.
+ case $host in
+- *-cygwin | i370-ibm-openedition)
++ *-cygwin | *-msys | i370-ibm-openedition)
+ gl_cv_double_slash_root=yes ;;
+ *)
+ # Be optimistic and assume that / and // are the same when we
+diff -Naur gettext-0.18.1.1/gettext-runtime/intl/Makefile.in gettext-0.18.1.1-p/gettext-runtime/intl/Makefile.in
+--- gettext-0.18.1.1/gettext-runtime/intl/Makefile.in 2010-06-06 12:49:57.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/intl/Makefile.in 2013-03-26 15:41:37.156250000 +0000
+@@ -414,7 +414,7 @@
+ case '@host_os@' in \
+ darwin[56]*) \
+ need_charset_alias=true ;; \
+- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
+ need_charset_alias=false ;; \
+ *) \
+ need_charset_alias=true ;; \
+@@ -500,7 +500,7 @@
+ case '@host_os@' in \
+ darwin[56]*) \
+ need_charset_alias=true ;; \
+- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
+ need_charset_alias=false ;; \
+ *) \
+ need_charset_alias=true ;; \
+diff -Naur gettext-0.18.1.1/gettext-runtime/libasprintf/aclocal.m4 gettext-0.18.1.1-p/gettext-runtime/libasprintf/aclocal.m4
+--- gettext-0.18.1.1/gettext-runtime/libasprintf/aclocal.m4 2010-06-06 20:11:09.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/libasprintf/aclocal.m4 2013-03-26 15:50:11.474609400 +0000
+@@ -697,7 +697,7 @@
+ ;;
+
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++[*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32*)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+ AC_CHECK_TOOL(AS, as, false)
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
+@@ -818,7 +818,7 @@
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
+
+- cygwin* | mingw*)
++ cygwin* | msys* | mingw*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -1033,7 +1033,7 @@
+ lt_cv_dlopen_libs=
+ ;;
+
+- cygwin*)
++ cygwin* | msys*)
+ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
+@@ -1447,14 +1447,14 @@
+ # libtool to hard-code these into programs
+ ;;
+
+-cygwin* | mingw* | pw32*)
++cygwin* | msys* | mingw* | pw32*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+ case $GCC,$host_os in
+- yes,cygwin* | yes,mingw* | yes,pw32*)
++ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32*)
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+@@ -1474,6 +1474,11 @@
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
++ msys*)
++ # MSYS DLLs use 'msys-' prefix rather than 'lib'
++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++ ;;
+ mingw*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+@@ -2418,7 +2423,7 @@
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
+-cygwin*)
++cygwin* | msys*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+@@ -2634,7 +2639,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++*-*-beos* | *-*-cygwin* | *-*-msys* | *-*-pw32* | *-*-darwin*)
+ # These system don't have libm, or don't need it
+ ;;
+ *-ncr-sysv4.3*)
+@@ -3142,7 +3147,7 @@
+ esac
+ ;;
+
+- cygwin* | mingw* | pw32*)
++ cygwin* | msys* | mingw* | pw32*)
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -4818,7 +4823,7 @@
+ aix*)
+ symcode='[[BCDT]]'
+ ;;
+-cygwin* | mingw* | pw32*)
++cygwin* | msys* | mingw* | pw32*)
+ symcode='[[ABCDGISTW]]'
+ ;;
+ hpux*) # Its linker distinguishes data from code symbols
+@@ -5021,7 +5026,7 @@
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | cygwin* | os2* | pw32*)
++ mingw* | cygwin* | msys* | os2* | pw32*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -5306,7 +5311,7 @@
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | cygwin* | pw32* | os2*)
++ mingw* | cygwin* | msys* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -5379,7 +5384,7 @@
+ esac
+ ;;
+
+- mingw* | cygwin* | pw32* | os2*)
++ mingw* | cygwin* | msys* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ m4_if([$1], [GCJ], [],
+@@ -5572,7 +5577,7 @@
+ pw32*)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+- cygwin* | mingw*)
++ cygwin* | msys* | mingw*)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ ;;
+ *)
+@@ -5622,7 +5627,7 @@
+ # Just being paranoid about ensuring that cc_basename is set.
+ _LT_CC_BASENAME([$compiler])
+ case $host_os in
+- cygwin* | mingw* | pw32*)
++ cygwin* | msys* | mingw* | pw32*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+@@ -5708,7 +5713,7 @@
+ fi
+ ;;
+
+- cygwin* | mingw* | pw32*)
++ cygwin* | msys* | mingw* | pw32*)
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -6017,7 +6022,7 @@
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
+
+- cygwin* | mingw* | pw32*)
++ cygwin* | msys* | mingw* | pw32*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+diff -Naur gettext-0.18.1.1/gettext-runtime/libasprintf/configure gettext-0.18.1.1-p/gettext-runtime/libasprintf/configure
+--- gettext-0.18.1.1/gettext-runtime/libasprintf/configure 2010-06-06 20:11:10.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/libasprintf/configure 2013-03-26 15:57:02.115234400 +0000
+@@ -4797,7 +4797,7 @@
+
+
+ case "$host_os" in
+- mingw* | cygwin*)
++ mingw* | cygwin* | msys*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
+ $as_echo_n "checking for auto-import of symbols... " >&6; }
+ if test "${gl_cv_ld_autoimport+set}" = set; then :
+@@ -5511,7 +5511,7 @@
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
+
+- cygwin* | mingw* | cegcc*)
++ cygwin* | msys* | mingw* | cegcc*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -5845,7 +5845,7 @@
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
+-cygwin*)
++cygwin* | msys*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+@@ -6408,7 +6408,7 @@
+ aix*)
+ symcode='[BCDT]'
+ ;;
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+ symcode='[ABCDGISTW]'
+ ;;
+ hpux*)
+@@ -8228,7 +8228,7 @@
+ enable_win32_dll=yes
+
+ case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
++*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}as; ac_word=$2
+@@ -9094,7 +9094,7 @@
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | cygwin* | pw32* | os2* | cegcc*)
++ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -9163,7 +9163,7 @@
+ fi
+ ;;
+
+- mingw* | cygwin* | pw32* | os2* | cegcc*)
++ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+@@ -9625,7 +9625,7 @@
+ extract_expsyms_cmds=
+
+ case $host_os in
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+@@ -9712,7 +9712,7 @@
+ fi
+ ;;
+
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+@@ -10125,7 +10125,7 @@
+ export_dynamic_flag_spec=-rdynamic
+ ;;
+
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+@@ -10968,14 +10968,14 @@
+ # libtool to hard-code these into programs
+ ;;
+
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+ case $GCC,$host_os in
+- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+@@ -10998,6 +10998,11 @@
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
++ msys*)
++ # MSYS DLLs use 'msys-' prefix rather than 'lib'
++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+@@ -11628,7 +11633,7 @@
+ lt_cv_dlopen_libs=
+ ;;
+
+- cygwin*)
++ cygwin* | msys*)
+ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
+@@ -12684,7 +12689,7 @@
+ esac
+ ;;
+
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+@@ -13638,7 +13643,7 @@
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | cygwin* | os2* | pw32* | cegcc*)
++ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -14171,7 +14176,7 @@
+ pw32*)
+ export_symbols_cmds_CXX="$ltdll_cmds"
+ ;;
+- cygwin* | mingw* | cegcc*)
++ cygwin* | msys* | mingw* | cegcc*)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ *)
+@@ -14429,14 +14434,14 @@
+ # libtool to hard-code these into programs
+ ;;
+
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+ case $GCC,$host_os in
+- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+@@ -14459,6 +14464,11 @@
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
++ msys*)
++ # MSYS DLLs use 'msys-' prefix rather than 'lib'
++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+@@ -15057,7 +15067,7 @@
+ case "$host_os" in
+ # On Cygwin, without -no-undefined, a warning is emitted and only a static
+ # library is built.
+- beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;;
++ beos* | mingw* | cygwin* | msys*) LTNOUNDEF='-no-undefined' ;;
+ *) LTNOUNDEF='' ;;
+ esac
+
+diff -Naur gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac gettext-0.18.1.1-p/gettext-runtime/libasprintf/configure.ac
+--- gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac 2010-06-06 12:49:57.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/libasprintf/configure.ac 2013-03-26 16:01:33.958984400 +0000
+@@ -44,7 +44,7 @@
+ case "$host_os" in
+ # On Cygwin, without -no-undefined, a warning is emitted and only a static
+ # library is built.
+- beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;;
++ beos* | mingw* | cygwin* | msys*) LTNOUNDEF='-no-undefined' ;;
+ *) LTNOUNDEF='' ;;
+ esac
+ AC_SUBST([LTNOUNDEF])
+diff -Naur gettext-0.18.1.1/gettext-runtime/m4/intl.m4 gettext-0.18.1.1-p/gettext-runtime/m4/intl.m4
+--- gettext-0.18.1.1/gettext-runtime/m4/intl.m4 2010-06-06 12:49:57.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/m4/intl.m4 2013-03-26 16:02:50.859375000 +0000
+@@ -113,7 +113,7 @@
+ dnl exported variables _also_ in the static library.
+ if test "$enable_shared" = yes; then
+ case "$host_os" in
+- mingw* | cygwin*) is_woe32dll=yes ;;
++ mingw* | cygwin* | msys*) is_woe32dll=yes ;;
+ *) is_woe32dll=no ;;
+ esac
+ else
+@@ -125,7 +125,7 @@
+ dnl On mingw and Cygwin, we can activate special Makefile rules which add
+ dnl version information to the shared libraries and executables.
+ case "$host_os" in
+- mingw* | cygwin*) is_woe32=yes ;;
++ mingw* | cygwin* | msys*) is_woe32=yes ;;
+ *) is_woe32=no ;;
+ esac
+ WOE32=$is_woe32
+diff -Naur gettext-0.18.1.1/gettext-runtime/m4/threadlib.m4 gettext-0.18.1.1-p/gettext-runtime/m4/threadlib.m4
+--- gettext-0.18.1.1/gettext-runtime/m4/threadlib.m4 2010-06-06 12:49:57.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/m4/threadlib.m4 2013-03-26 16:05:46.406250000 +0000
+@@ -61,7 +61,7 @@
+ dnl bugs that lead to endless loops or crashes. See
+ dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
+ osf*) gl_use_threads=no ;;
+- cygwin*)
++ cygwin* | msys*)
+ case `uname -r` in
+ 1.[0-5].*) gl_use_threads=no ;;
+ *) gl_use_threads=yes ;;
+diff -Naur gettext-0.18.1.1/gettext-tools/aclocal.m4 gettext-0.18.1.1-p/gettext-tools/aclocal.m4
+--- gettext-0.18.1.1/gettext-tools/aclocal.m4 2010-06-06 20:12:15.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/aclocal.m4 2013-03-26 16:29:01.439453200 +0000
+@@ -697,7 +697,7 @@
+ ;;
+
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++[*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32*)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+ AC_CHECK_TOOL(AS, as, false)
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
+@@ -818,7 +818,7 @@
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
+
+- cygwin* | mingw*)
++ cygwin* | msys* | mingw*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -1033,7 +1033,7 @@
+ lt_cv_dlopen_libs=
+ ;;
+
+- cygwin*)
++ cygwin* | msys*)
+ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
+@@ -1447,14 +1447,14 @@
+ # libtool to hard-code these into programs
+ ;;
+
+-cygwin* | mingw* | pw32*)
++cygwin* | msys* | mingw* | pw32*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+ case $GCC,$host_os in
+- yes,cygwin* | yes,mingw* | yes,pw32*)
++ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32*)
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+@@ -1474,6 +1474,11 @@
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
++ msys*)
++ # MSYS DLLs use 'msys-' prefix rather than 'lib'
++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++ ;;
+ mingw*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+@@ -2418,7 +2423,7 @@
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
+-cygwin*)
++cygwin* | msys*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+@@ -2634,7 +2639,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++*-*-beos* | *-*-cygwin* | *-*-msys* | *-*-pw32* | *-*-darwin*)
+ # These system don't have libm, or don't need it
+ ;;
+ *-ncr-sysv4.3*)
+@@ -3142,7 +3147,7 @@
+ esac
+ ;;
+
+- cygwin* | mingw* | pw32*)
++ cygwin* | msys* | mingw* | pw32*)
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -4818,7 +4823,7 @@
+ aix*)
+ symcode='[[BCDT]]'
+ ;;
+-cygwin* | mingw* | pw32*)
++cygwin* | msys* | mingw* | pw32*)
+ symcode='[[ABCDGISTW]]'
+ ;;
+ hpux*) # Its linker distinguishes data from code symbols
+@@ -5021,7 +5026,7 @@
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | cygwin* | os2* | pw32*)
++ mingw* | cygwin* | msys* | os2* | pw32*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -5306,7 +5311,7 @@
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | cygwin* | pw32* | os2*)
++ mingw* | cygwin* | msys* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -5379,7 +5384,7 @@
+ esac
+ ;;
+
+- mingw* | cygwin* | pw32* | os2*)
++ mingw* | cygwin* | msys* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ m4_if([$1], [GCJ], [],
+@@ -5572,7 +5577,7 @@
+ pw32*)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+- cygwin* | mingw*)
++ cygwin* | msys* | mingw*)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ ;;
+ *)
+@@...
[truncated message content] |
|
From: Alexx83 <no...@so...> - 2013-03-27 17:18:47
|
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 ddfd11a09cce1f8c38851b843c14a7f7a3b8ff4f (commit)
from 559fb399c3aa244b833d4ca349b12717748e3ec4 (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/ddfd11a09cce1f8c38851b843c14a7f7a3b8ff4f/
commit ddfd11a09cce1f8c38851b843c14a7f7a3b8ff4f
Author: Alexpux <ale...@gm...>
Date: Wed Mar 27 21:18:34 2013 +0400
Add patches for findutils-4.5.11
diff --git a/findutils/findutils-4.5.11-1.src.patch b/findutils/findutils-4.5.11-1.src.patch
new file mode 100644
index 0000000..4a6312d
--- /dev/null
+++ b/findutils/findutils-4.5.11-1.src.patch
@@ -0,0 +1,19 @@
+--- origsrc/findutils-4.5.11/gl/lib/mountlist.c 2012-12-15 14:42:45.000000000 +0100
++++ src/findutils-4.5.11/gl/lib/mountlist.c 2013-03-20 10:23:25.297229338 +0100
+@@ -163,11 +163,16 @@
+ we grant an exception to any with "bind" in its list of mount options.
+ I.e., those are *not* dummy entries. */
+ #ifdef MOUNTED_GETMNTENT1
++#ifdef HAVE_HASMNTOPT
+ # define ME_DUMMY(Fs_name, Fs_type, Fs_ent) \
+ (ME_DUMMY_0 (Fs_name, Fs_type) \
+ || (strcmp (Fs_type, "none") == 0 \
+ && !hasmntopt (Fs_ent, "bind")))
+ #else
++# define ME_DUMMY(Fs_name, Fs_type, Fs_ent) \
++ (ME_DUMMY_0 (Fs_name, Fs_type) || strcmp (Fs_type, "none") == 0)
++#endif
++#else
+ # define ME_DUMMY(Fs_name, Fs_type) \
+ (ME_DUMMY_0 (Fs_name, Fs_type) || strcmp (Fs_type, "none") == 0)
+ #endif
diff --git a/findutils/findutils-4.5.11-msys2.patch b/findutils/findutils-4.5.11-msys2.patch
new file mode 100644
index 0000000..3db05a3
--- /dev/null
+++ b/findutils/findutils-4.5.11-msys2.patch
@@ -0,0 +1,359 @@
+diff -Naur findutils-4.5.11-orig/build-aux/config.guess findutils-4.5.11/build-aux/config.guess
+--- findutils-4.5.11-orig/build-aux/config.guess 2012-12-15 13:47:58.000000000 +0000
++++ findutils-4.5.11/build-aux/config.guess 2013-03-27 16:25:09.447265600 +0000
+@@ -808,6 +808,9 @@
+ *:MINGW64*:*)
+ echo ${UNAME_MACHINE}-pc-mingw64
+ exit ;;
++ i*:MSYS*:*)
++ echo ${UNAME_MACHINE}-pc-msys
++ exit ;;
+ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+@@ -851,6 +854,9 @@
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
++ echo x86_64-unknown-msys
++ exit ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit ;;
+diff -Naur findutils-4.5.11-orig/build-aux/config.rpath findutils-4.5.11/build-aux/config.rpath
+--- findutils-4.5.11-orig/build-aux/config.rpath 2012-12-15 13:47:59.000000000 +0000
++++ findutils-4.5.11/build-aux/config.rpath 2013-03-27 16:30:22.589843800 +0000
+@@ -64,7 +64,7 @@
+ ;;
+ esac
+ ;;
+- mingw* | cygwin* | pw32* | os2* | cegcc*)
++ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ wl='-Wl,'
+@@ -138,7 +138,7 @@
+ hardcode_minus_L=no
+
+ case "$host_os" in
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+@@ -188,7 +188,7 @@
+ ld_shlibs=no
+ fi
+ ;;
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+@@ -332,7 +332,7 @@
+ ;;
+ bsdi[45]*)
+ ;;
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+@@ -523,7 +523,7 @@
+ bsdi[45]*)
+ library_names_spec='$libname$shrext'
+ ;;
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ shrext=.dll
+ library_names_spec='$libname.dll.a $libname.lib'
+ ;;
+diff -Naur findutils-4.5.11-orig/configure findutils-4.5.11/configure
+--- findutils-4.5.11-orig/configure 2013-02-02 13:35:44.000000000 +0000
++++ findutils-4.5.11/configure 2013-03-27 16:29:07.650390600 +0000
+@@ -6844,7 +6844,7 @@
+ else
+ case "$host_os" in
+ osf*) gl_use_threads=no ;;
+- cygwin*)
++ cygwin* | msys*)
+ case `uname -r` in
+ 1.[0-5].*) gl_use_threads=no ;;
+ *) gl_use_threads=yes ;;
+@@ -8294,7 +8294,7 @@
+ # special semantics and is distinct from /, please report it to
+ # <bug...@gn...>.
+ case $host in
+- *-cygwin | i370-ibm-openedition)
++ *-cygwin | *-msys* | i370-ibm-openedition)
+ gl_cv_double_slash_root=yes ;;
+ *)
+ # Be optimistic and assume that / and // are the same when we
+@@ -10945,7 +10945,7 @@
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_getcwd_null="guessing yes";;
+ # Guess yes on Cygwin.
+- cygwin*) gl_cv_func_getcwd_null="guessing yes";;
++ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_getcwd_null="guessing no";;
+ esac
+@@ -16017,7 +16017,7 @@
+ case "$host_os" in
+ # Guess yes on platforms where we know the result.
+ *-gnu* | freebsd* | netbsd* | openbsd* \
+- | hpux* | solaris* | cygwin* | mingw*)
++ | hpux* | solaris* | cygwin* | msys* | mingw*)
+ ac_cv_func_malloc_0_nonnull=yes ;;
+ # If we don't know, assume the worst.
+ *) ac_cv_func_malloc_0_nonnull=no ;;
+@@ -19074,7 +19074,7 @@
+
+ case "$host_os" in
+ # Guess no on Cygwin.
+- cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
++ cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;;
+ # Guess yes otherwise.
+ *) gl_cv_func_btowc_nul="guessing yes" ;;
+ esac
+@@ -20199,7 +20199,7 @@
+ # special semantics and is distinct from /, please report it to
+ # <bug...@gn...>.
+ case $host in
+- *-cygwin | i370-ibm-openedition)
++ *-cygwin | *-msys | i370-ibm-openedition)
+ gl_cv_double_slash_root=yes ;;
+ *)
+ # Be optimistic and assume that / and // are the same when we
+@@ -20296,7 +20296,7 @@
+ case "$host_os" in
+ mingw*) # on this platform, dup2 always returns 0 for success
+ gl_cv_func_dup2_works="guessing no" ;;
+- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
++ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0
+ gl_cv_func_dup2_works="guessing no" ;;
+ linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
+ # closed fd may yield -EBADF instead of -1 / errno=EBADF.
+@@ -27168,7 +27168,7 @@
+ case "$host_os" in
+ # Guess yes on platforms where we know the result.
+ *-gnu* | freebsd* | netbsd* | openbsd* \
+- | hpux* | solaris* | cygwin* | mingw*)
++ | hpux* | solaris* | cygwin* | msys* | mingw*)
+ ac_cv_func_malloc_0_nonnull=yes ;;
+ # If we don't know, assume the worst.
+ *) ac_cv_func_malloc_0_nonnull=no ;;
+@@ -30937,7 +30937,7 @@
+ case "$host_os" in
+ # Guess yes on platforms where we know the result.
+ *-gnu* | freebsd* | netbsd* | openbsd* \
+- | hpux* | solaris* | cygwin* | mingw*)
++ | hpux* | solaris* | cygwin* | msys* | mingw*)
+ ac_cv_func_realloc_0_nonnull=yes ;;
+ # If we don't know, assume the worst.
+ *) ac_cv_func_realloc_0_nonnull=no ;;
+@@ -42385,7 +42385,7 @@
+
+ case "$host_os" in
+ mingw*) REPLACE_SETLOCALE=1 ;;
+- cygwin*)
++ cygwin* | msys*)
+ case `uname -r` in
+ 1.5.*) REPLACE_SETLOCALE=1 ;;
+ esac
+@@ -43791,7 +43791,7 @@
+ gnu[0-9]* | \
+ linux-* | linux | \
+ freebsd2.2* | freebsd[3-9]* | freebsd[1-9][0-9]* | \
+- cygwin | \
++ cygwin | msys | \
+ mingw*)
+
+ $as_echo "#define UNLINK_CANNOT_UNLINK_DIR 1" >>confdefs.h
+@@ -44465,13 +44465,13 @@
+
+ case "$host_os" in
+ # Guess no on Solaris <= 9 and Cygwin.
+- solaris2.[1-9] | solaris2.[1-9].* | cygwin*)
++ solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*)
+ gl_cv_func_wctob_works="guessing no" ;;
+ # Guess yes otherwise.
+ *) gl_cv_func_wctob_works="guessing yes" ;;
+ esac
+ case "$host_os" in
+- cygwin*)
++ cygwin* | msys*)
+ if test "$cross_compiling" = yes; then :
+ :
+ else
+diff -Naur findutils-4.5.11-orig/gl/lib/Makefile.am findutils-4.5.11/gl/lib/Makefile.am
+--- findutils-4.5.11-orig/gl/lib/Makefile.am 2012-12-15 13:46:36.000000000 +0000
++++ findutils-4.5.11/gl/lib/Makefile.am 2013-03-27 16:31:37.093750000 +0000
+@@ -1209,7 +1209,7 @@
+ case '$(host_os)' in \
+ darwin[56]*) \
+ need_charset_alias=true ;; \
+- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
+ need_charset_alias=false ;; \
+ *) \
+ need_charset_alias=true ;; \
+diff -Naur findutils-4.5.11-orig/gl/lib/Makefile.in findutils-4.5.11/gl/lib/Makefile.in
+--- findutils-4.5.11-orig/gl/lib/Makefile.in 2013-02-02 13:35:38.000000000 +0000
++++ findutils-4.5.11/gl/lib/Makefile.in 2013-03-27 16:31:53.000000000 +0000
+@@ -2624,7 +2624,7 @@
+ case '$(host_os)' in \
+ darwin[56]*) \
+ need_charset_alias=true ;; \
+- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
+ need_charset_alias=false ;; \
+ *) \
+ need_charset_alias=true ;; \
+diff -Naur findutils-4.5.11-orig/gl/m4/btowc.m4 findutils-4.5.11/gl/m4/btowc.m4
+--- findutils-4.5.11-orig/gl/m4/btowc.m4 2012-12-15 13:42:45.000000000 +0000
++++ findutils-4.5.11/gl/m4/btowc.m4 2013-03-27 16:34:52.292968800 +0000
+@@ -49,7 +49,7 @@
+ changequote(,)dnl
+ case "$host_os" in
+ # Guess no on Cygwin.
+- cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
++ cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;;
+ # Guess yes otherwise.
+ *) gl_cv_func_btowc_nul="guessing yes" ;;
+ esac
+diff -Naur findutils-4.5.11-orig/gl/m4/double-slash-root.m4 findutils-4.5.11/gl/m4/double-slash-root.m4
+--- findutils-4.5.11-orig/gl/m4/double-slash-root.m4 2012-12-15 13:42:45.000000000 +0000
++++ findutils-4.5.11/gl/m4/double-slash-root.m4 2013-03-27 16:35:15.277343800 +0000
+@@ -16,7 +16,7 @@
+ # special semantics and is distinct from /, please report it to
+ # <bug...@gn...>.
+ case $host in
+- *-cygwin | i370-ibm-openedition)
++ *-cygwin | *-msys | i370-ibm-openedition)
+ gl_cv_double_slash_root=yes ;;
+ *)
+ # Be optimistic and assume that / and // are the same when we
+diff -Naur findutils-4.5.11-orig/gl/m4/dup2.m4 findutils-4.5.11/gl/m4/dup2.m4
+--- findutils-4.5.11-orig/gl/m4/dup2.m4 2012-12-15 13:42:45.000000000 +0000
++++ findutils-4.5.11/gl/m4/dup2.m4 2013-03-27 16:35:31.714843800 +0000
+@@ -46,7 +46,7 @@
+ [case "$host_os" in
+ mingw*) # on this platform, dup2 always returns 0 for success
+ gl_cv_func_dup2_works="guessing no" ;;
+- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
++ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0
+ gl_cv_func_dup2_works="guessing no" ;;
+ linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
+ # closed fd may yield -EBADF instead of -1 / errno=EBADF.
+diff -Naur findutils-4.5.11-orig/gl/m4/getcwd.m4 findutils-4.5.11/gl/m4/getcwd.m4
+--- findutils-4.5.11-orig/gl/m4/getcwd.m4 2012-12-15 13:42:45.000000000 +0000
++++ findutils-4.5.11/gl/m4/getcwd.m4 2013-03-27 16:36:00.199218800 +0000
+@@ -49,7 +49,7 @@
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_getcwd_null="guessing yes";;
+ # Guess yes on Cygwin.
+- cygwin*) gl_cv_func_getcwd_null="guessing yes";;
++ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_getcwd_null="guessing no";;
+ esac
+diff -Naur findutils-4.5.11-orig/gl/m4/printf.m4 findutils-4.5.11/gl/m4/printf.m4
+--- findutils-4.5.11-orig/gl/m4/printf.m4 2012-12-15 13:42:45.000000000 +0000
++++ findutils-4.5.11/gl/m4/printf.m4 2013-03-27 16:36:41.292968800 +0000
+@@ -735,7 +735,7 @@
+ openbsd*) gl_cv_func_printf_directive_ls="guessing no";;
+ irix*) gl_cv_func_printf_directive_ls="guessing no";;
+ solaris*) gl_cv_func_printf_directive_ls="guessing no";;
+- cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
++ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";;
+ beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
+ *) gl_cv_func_printf_directive_ls="guessing yes";;
+ esac
+@@ -812,7 +812,7 @@
+ [
+ changequote(,)dnl
+ case "$host_os" in
+- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
++ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";;
+ netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
+ mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
+ *) gl_cv_func_printf_flag_grouping="guessing yes";;
+@@ -1464,7 +1464,7 @@
+ darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+ darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ # Guess yes on Cygwin.
+- cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
++ cygwin*| msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ # Guess yes on Solaris >= 2.6.
+ solaris2.[0-5] | solaris2.[0-5].*)
+ gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+diff -Naur findutils-4.5.11-orig/gl/m4/realloc.m4 findutils-4.5.11/gl/m4/realloc.m4
+--- findutils-4.5.11-orig/gl/m4/realloc.m4 2012-12-15 13:42:45.000000000 +0000
++++ findutils-4.5.11/gl/m4/realloc.m4 2013-03-27 16:36:58.996093800 +0000
+@@ -30,7 +30,7 @@
+ [case "$host_os" in
+ # Guess yes on platforms where we know the result.
+ *-gnu* | freebsd* | netbsd* | openbsd* \
+- | hpux* | solaris* | cygwin* | mingw*)
++ | hpux* | solaris* | cygwin* | msys* | mingw*)
+ ac_cv_func_realloc_0_nonnull=yes ;;
+ # If we don't know, assume the worst.
+ *) ac_cv_func_realloc_0_nonnull=no ;;
+diff -Naur findutils-4.5.11-orig/gl/m4/setlocale.m4 findutils-4.5.11/gl/m4/setlocale.m4
+--- findutils-4.5.11-orig/gl/m4/setlocale.m4 2012-12-15 13:42:45.000000000 +0000
++++ findutils-4.5.11/gl/m4/setlocale.m4 2013-03-27 16:37:19.511718800 +0000
+@@ -14,7 +14,7 @@
+ mingw*) REPLACE_SETLOCALE=1 ;;
+ dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL)
+ dnl is then still "C".
+- cygwin*)
++ cygwin* | msys*)
+ case `uname -r` in
+ 1.5.*) REPLACE_SETLOCALE=1 ;;
+ esac
+diff -Naur findutils-4.5.11-orig/gl/m4/threadlib.m4 findutils-4.5.11/gl/m4/threadlib.m4
+--- findutils-4.5.11-orig/gl/m4/threadlib.m4 2012-12-15 13:42:45.000000000 +0000
++++ findutils-4.5.11/gl/m4/threadlib.m4 2013-03-27 16:37:49.589843800 +0000
+@@ -68,7 +68,7 @@
+ dnl bugs that lead to endless loops or crashes. See
+ dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
+ osf*) gl_use_threads=no ;;
+- cygwin*)
++ cygwin* | msys*)
+ case `uname -r` in
+ 1.[0-5].*) gl_use_threads=no ;;
+ *) gl_use_threads=yes ;;
+diff -Naur findutils-4.5.11-orig/gl/m4/unlinkdir.m4 findutils-4.5.11/gl/m4/unlinkdir.m4
+--- findutils-4.5.11-orig/gl/m4/unlinkdir.m4 2012-12-15 13:42:45.000000000 +0000
++++ findutils-4.5.11/gl/m4/unlinkdir.m4 2013-03-27 16:38:13.511718800 +0000
+@@ -24,7 +24,7 @@
+ gnu[[0-9]]* | \
+ linux-* | linux | \
+ freebsd2.2* | freebsd[[3-9]]* | freebsd[[1-9]][[0-9]]* | \
+- cygwin | \
++ cygwin | msys | \
+ mingw*)
+ AC_DEFINE([UNLINK_CANNOT_UNLINK_DIR], [1],
+ [Define to 1 if unlink (dir) cannot possibly succeed.]);;
+diff -Naur findutils-4.5.11-orig/gl/m4/wctob.m4 findutils-4.5.11/gl/m4/wctob.m4
+--- findutils-4.5.11-orig/gl/m4/wctob.m4 2012-12-15 13:42:45.000000000 +0000
++++ findutils-4.5.11/gl/m4/wctob.m4 2013-03-27 16:38:38.949218800 +0000
+@@ -29,14 +29,14 @@
+ changequote(,)dnl
+ case "$host_os" in
+ # Guess no on Solaris <= 9 and Cygwin.
+- solaris2.[1-9] | solaris2.[1-9].* | cygwin*)
++ solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*)
+ gl_cv_func_wctob_works="guessing no" ;;
+ # Guess yes otherwise.
+ *) gl_cv_func_wctob_works="guessing yes" ;;
+ esac
+ changequote([,])dnl
+ case "$host_os" in
+- cygwin*)
++ cygwin* | msys*)
+ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE([[
+ #include <locale.h>
-----------------------------------------------------------------------
Summary of changes:
findutils/findutils-4.5.11-1.src.patch | 19 ++
findutils/findutils-4.5.11-msys2.patch | 359 ++++++++++++++++++++++++++++++++
2 files changed, 378 insertions(+), 0 deletions(-)
create mode 100644 findutils/findutils-4.5.11-1.src.patch
create mode 100644 findutils/findutils-4.5.11-msys2.patch
hooks/post-receive
--
Repository: msys2-tools
|
|
From: Alexx83 <no...@so...> - 2013-03-27 05:28:17
|
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 559fb399c3aa244b833d4ca349b12717748e3ec4 (commit)
from 6565f58c1fbc376f00dcb1497b3674b37370c083 (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/559fb399c3aa244b833d4ca349b12717748e3ec4/
commit 559fb399c3aa244b833d4ca349b12717748e3ec4
Author: Alexpux <ale...@gm...>
Date: Wed Mar 27 09:27:59 2013 +0400
Add patches for openssl-1.0.1e
diff --git a/openssl/openssl-1.0.1e-cygwin64.patch b/openssl/openssl-1.0.1e-cygwin64.patch
new file mode 100644
index 0000000..a55271c
--- /dev/null
+++ b/openssl/openssl-1.0.1e-cygwin64.patch
@@ -0,0 +1,121 @@
+diff -Naur openssl-1.0.1e/Configure openssl-1.0.1e-cygwin/Configure
+--- openssl-1.0.1e/Configure 2013-02-11 15:26:04.000000000 +0000
++++ openssl-1.0.1e-cygwin/Configure 2013-03-27 04:58:53.265625000 +0000
+@@ -550,6 +550,7 @@
+ "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",
+ "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:coff:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
+ "debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
++"Cygwin-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -O3 -Wall:::CYGWIN32::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:mingw64:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
+
+ # NetWare from David Ward (ds...@no...)
+ # requires either MetroWerks NLM development tools, or gcc / nlmconv
+diff -Naur openssl-1.0.1e/engines/ccgost/Makefile openssl-1.0.1e-cygwin/engines/ccgost/Makefile
+--- openssl-1.0.1e/engines/ccgost/Makefile 2013-02-11 15:26:04.000000000 +0000
++++ openssl-1.0.1e-cygwin/engines/ccgost/Makefile 2013-03-27 04:58:53.281250000 +0000
+@@ -45,7 +45,11 @@
+ set -e; \
+ echo installing $(LIBNAME); \
+ pfx=lib; \
+- if [ "$(PLATFORM)" != "Cygwin" ]; then \
++ case "$(PLATFORM)" in Cygwin*) \
++ sfx=".so"; \
++ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
++ ;; \
++ *) \
+ case "$(CFLAGS)" in \
+ *DSO_BEOS*) sfx=".so";; \
+ *DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \
+@@ -54,10 +58,7 @@
+ *) sfx=".bad";; \
+ esac; \
+ cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
+- else \
+- sfx=".so"; \
+- cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
+- fi; \
++ esac; \
+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
+ fi
+diff -Naur openssl-1.0.1e/engines/Makefile openssl-1.0.1e-cygwin/engines/Makefile
+--- openssl-1.0.1e/engines/Makefile 2013-02-11 15:26:04.000000000 +0000
++++ openssl-1.0.1e-cygwin/engines/Makefile 2013-03-27 05:03:58.596679600 +0000
+@@ -111,7 +111,11 @@
+ for l in $(LIBNAMES); do \
+ ( echo installing $$l; \
+ pfx=lib; \
+- if [ "$(PLATFORM)" != "Cygwin" ]; then \
++ case "$(PLATFORM)" in Cygwin*) \
++ sfx=".so"; \
++ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
++ ;; \
++ *) \
+ case "$(CFLAGS)" in \
+ *DSO_BEOS*) sfx=".so";; \
+ *DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \
+@@ -120,10 +124,7 @@
+ *) sfx=".bad";; \
+ esac; \
+ cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+- else \
+- sfx=".so"; \
+- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+- fi; \
++ esac; \
+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+ done; \
+diff -Naur openssl-1.0.1e/Makefile.org openssl-1.0.1e-cygwin/Makefile.org
+--- openssl-1.0.1e/Makefile.org 2013-02-11 15:26:04.000000000 +0000
++++ openssl-1.0.1e-cygwin/Makefile.org 2013-03-27 04:58:53.265625000 +0000
+@@ -325,9 +325,9 @@
+ done; \
+ fi; \
+ ( set -x; rm -f lib$$i$(SHLIB_EXT) ); \
+- if [ "$(PLATFORM)" = "Cygwin" ]; then \
++ case "$(PLATFORM)" in Cygwin*) \
+ ( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
+- fi; \
++ esac; \
+ done
+
+ link-shared:
+@@ -570,11 +570,7 @@
+ do \
+ if [ -f "$$i" -o -f "$$i.a" ]; then \
+ ( echo installing $$i; \
+- if [ "$(PLATFORM)" != "Cygwin" ]; then \
+- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+- else \
++ case "$(PLATFORM)" in Cygwin*) \
+ c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
+ cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+@@ -582,7 +578,12 @@
+ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+- fi ); \
++ ;; \
++ *) \
++ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
++ esac ); \
+ if expr $(PLATFORM) : 'mingw' > /dev/null; then \
+ ( case $$i in \
+ *crypto*) i=libeay32.dll;; \
+@@ -642,9 +643,9 @@
+ @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
+ here="`pwd`"; \
+ filecase=; \
+- if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
++ case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*) \
+ filecase=-i; \
+- fi; \
++ esac; \
+ set -e; for i in doc/apps/*.pod; do \
+ fn=`basename $$i .pod`; \
+ sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
diff --git a/openssl/openssl-1.0.1e-msys2.patch b/openssl/openssl-1.0.1e-msys2.patch
new file mode 100644
index 0000000..e005065
--- /dev/null
+++ b/openssl/openssl-1.0.1e-msys2.patch
@@ -0,0 +1,437 @@
+diff -Naur openssl-1.0.1e-cygwin/config openssl-1.0.1e-msys/config
+--- openssl-1.0.1e-cygwin/config 2013-02-11 15:26:04.000000000 +0000
++++ openssl-1.0.1e-msys/config 2013-03-26 19:46:33.236328100 +0000
+@@ -358,7 +358,9 @@
+ esac
+ exit 0
+ ;;
+-
++ MSYS*)
++ echo "${MACHINE}-whatever-msys"; exit 0;
++ ;;
+ *"CRAY T3E")
+ echo "t3e-cray-unicosmk"; exit 0;
+ ;;
+@@ -834,6 +836,7 @@
+ mips-sony-newsos4) OUT="newsos4-gcc" ;;
+ *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
+ *-*-cygwin) OUT="Cygwin" ;;
++ *-*-msys) OUT="Msys" ;;
+ t3e-cray-unicosmk) OUT="cray-t3e" ;;
+ j90-cray-unicos) OUT="cray-j90" ;;
+ nsr-tandem-nsk) OUT="tandem-c89" ;;
+diff -Naur openssl-1.0.1e-cygwin/Configure openssl-1.0.1e-msys/Configure
+--- openssl-1.0.1e-cygwin/Configure 2013-03-27 04:58:53.265625000 +0000
++++ openssl-1.0.1e-msys/Configure 2013-03-26 20:17:23.732421900 +0000
+@@ -552,6 +552,11 @@
+ "debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
+ "Cygwin-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -O3 -Wall:::CYGWIN32::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:mingw64:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
+
++# MSYS
++"Msys", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:coff:dlfcn:msys-shared:-D_WINDLL:-shared:.dll.a",
++"debug-Msys", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:msys-shared:-D_WINDLL:-shared:.dll.a",
++"Msys-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -O3 -Wall:::CYGWIN32::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:mingw64:dlfcn:msys-shared:-D_WINDLL:-shared:.dll.a",
++
+ # NetWare from David Ward (ds...@no...)
+ # requires either MetroWerks NLM development tools, or gcc / nlmconv
+ # NetWare defaults socket bio to WinSock sockets. However,
+@@ -1123,7 +1128,7 @@
+
+ my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
+
+-$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/);
++$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "Msys" || $target eq "DJGPP" || $target =~ /^mingw/);
+ $exe_ext=".nlm" if ($target =~ /netware/);
+ $exe_ext=".pm" if ($target =~ /vos/);
+ $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");
+diff -Naur openssl-1.0.1e-cygwin/demos/engines/rsaref/Makefile openssl-1.0.1e-msys/demos/engines/rsaref/Makefile
+--- openssl-1.0.1e-cygwin/demos/engines/rsaref/Makefile 2013-02-11 15:02:48.000000000 +0000
++++ openssl-1.0.1e-msys/demos/engines/rsaref/Makefile 2013-03-26 20:07:21.025390600 +0000
+@@ -36,6 +36,7 @@
+
+ darwin: install $(SHLIB).darwin
+ cygwin: install $(SHLIB).cygwin
++msys: install $(SHLIB).msys
+ gnu: install $(SHLIB).gnu
+ alpha-osf1: install $(SHLIB).alpha-osf1
+ tru64: install $(SHLIB).tru64
+@@ -67,6 +68,12 @@
+ SHAREDCMD='$(CC)'; \
+ $(LINK_SO)
+ touch $(SHLIB).cygwin
++$(SHLIB).msys: $(LIB) install/librsaref.a
++ ALLSYMSFLAGS='--whole-archive' \
++ SHAREDFLAGS='-shared -Wl,-Bsymbolic -Wl,--out-implib,$(LIBNAME).dll.a' \
++ SHAREDCMD='$(CC)'; \
++ $(LINK_SO)
++ touch $(SHLIB).msys
+ $(SHLIB).gnu: $(LIB) install/librsaref.a
+ ALLSYMSFLAGS='--whole-archive' \
+ SHAREDFLAGS='-shared -Wl,-soname=$(SHLIB)' \
+diff -Naur openssl-1.0.1e-cygwin/engines/ccgost/Makefile openssl-1.0.1e-msys/engines/ccgost/Makefile
+--- openssl-1.0.1e-cygwin/engines/ccgost/Makefile 2013-03-27 04:58:53.281250000 +0000
++++ openssl-1.0.1e-msys/engines/ccgost/Makefile 2013-03-26 20:13:34.955078100 +0000
+@@ -49,6 +49,10 @@
+ sfx=".so"; \
+ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
+ ;; \
++ Msys*) \
++ sfx=".so"; \
++ cp msys-$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
++ ;; \
+ *) \
+ case "$(CFLAGS)" in \
+ *DSO_BEOS*) sfx=".so";; \
+diff -Naur openssl-1.0.1e-cygwin/engines/Makefile openssl-1.0.1e-msys/engines/Makefile
+--- openssl-1.0.1e-cygwin/engines/Makefile 2013-03-27 05:03:58.596679600 +0000
++++ openssl-1.0.1e-msys/engines/Makefile 2013-03-26 20:11:59.808593800 +0000
+@@ -115,6 +115,10 @@
+ sfx=".so"; \
+ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+ ;; \
++ Msys*) \
++ sfx=".so"; \
++ cp msys-$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
++ ;; \
+ *) \
+ case "$(CFLAGS)" in \
+ *DSO_BEOS*) sfx=".so";; \
+@@ -124,7 +128,7 @@
+ *) sfx=".bad";; \
+ esac; \
+ cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+- esac; \
++ esac; \
+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+ done; \
+diff -Naur openssl-1.0.1e-cygwin/Makefile openssl-1.0.1e-msys/Makefile
+--- openssl-1.0.1e-cygwin/Makefile 2013-02-11 15:26:04.000000000 +0000
++++ openssl-1.0.1e-msys/Makefile 2013-03-26 20:00:37.626953100 +0000
+@@ -330,6 +330,9 @@
+ if [ "$(PLATFORM)" = "Cygwin" ]; then \
+ ( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
+ fi; \
++ if [ "$(PLATFORM)" = "Msys" ]; then \
++ ( set -x; rm -f msys-$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
++ fi; \
+ done
+
+ link-shared:
+@@ -572,19 +575,29 @@
+ do \
+ if [ -f "$$i" -o -f "$$i.a" ]; then \
+ ( echo installing $$i; \
+- if [ "$(PLATFORM)" != "Cygwin" ]; then \
++ case "$(PLATFORM)" in Cygwin*) \
++ c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
++ cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
++ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
+ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+- else \
+- c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
++ ;; \
++ Msys*) \
++ c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/msys-\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
+ cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
+ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+- fi ); \
++ ;; \
++ *) \
++ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
++ esac ); \
+ if expr $(PLATFORM) : 'mingw' > /dev/null; then \
+ ( case $$i in \
+ *crypto*) i=libeay32.dll;; \
+diff -Naur openssl-1.0.1e-cygwin/Makefile.org openssl-1.0.1e-msys/Makefile.org
+--- openssl-1.0.1e-cygwin/Makefile.org 2013-03-27 04:58:53.265625000 +0000
++++ openssl-1.0.1e-msys/Makefile.org 2013-03-26 19:52:02.767578100 +0000
+@@ -328,6 +328,9 @@
+ case "$(PLATFORM)" in Cygwin*) \
+ ( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
+ esac; \
++ case "$(PLATFORM)" in Msys*) \
++ ( set -x; rm -f msys-$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
++ esac; \
+ done
+
+ link-shared:
+@@ -579,6 +582,15 @@
+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+ ;; \
++ Msys*) \
++ c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/msys-\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
++ cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
++ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
++ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
++ ;; \
+ *) \
+ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+@@ -643,7 +655,7 @@
+ @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
+ here="`pwd`"; \
+ filecase=; \
+- case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*) \
++ case "$(PLATFORM)" in DJGPP|Cygwin*|Msys*|mingw*) \
+ filecase=-i; \
+ esac; \
+ set -e; for i in doc/apps/*.pod; do \
+diff -Naur openssl-1.0.1e-cygwin/Makefile.shared openssl-1.0.1e-msys/Makefile.shared
+--- openssl-1.0.1e-cygwin/Makefile.shared 2013-02-11 15:26:04.000000000 +0000
++++ openssl-1.0.1e-msys/Makefile.shared 2013-03-26 20:04:54.736328100 +0000
+@@ -311,6 +311,62 @@
+ fi; \
+ $(LINK_APP)
+
++link_o.msys:
++ @ $(CALC_VERSIONS); \
++ INHIBIT_SYMLINKS=yes; \
++ SHLIB=msys-$(LIBNAME); \
++ base=-Wl,--enable-auto-image-base; \
++ deffile=; \
++ if expr $(PLATFORM) : 'mingw' > /dev/null; then \
++ SHLIB=$(LIBNAME)eay32; base=; \
++ if test -f $(LIBNAME)eay32.def; then \
++ deffile=$(LIBNAME)eay32.def; \
++ fi; \
++ fi; \
++ SHLIB_SUFFIX=.dll; \
++ LIBVERSION="$(LIBVERSION)"; \
++ SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \
++ ALLSYMSFLAGS='-Wl,--whole-archive'; \
++ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
++ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base $$deffile -Wl,-s,-Bsymbolic"; \
++ $(LINK_SO_O)
++#for mingw target if def-file is in use dll-name should match library-name
++link_a.msys:
++ @ $(CALC_VERSIONS); \
++ INHIBIT_SYMLINKS=yes; \
++ SHLIB=msys-$(LIBNAME); SHLIB_SOVER=-$(LIBVERSION); SHLIB_SUFFIX=.dll; \
++ dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; extras=; \
++ base=-Wl,--enable-auto-image-base; \
++ if expr $(PLATFORM) : 'mingw' > /dev/null; then \
++ case $(LIBNAME) in \
++ crypto) SHLIB=libeay;; \
++ ssl) SHLIB=ssleay;; \
++ esac; \
++ SHLIB_SOVER=32; \
++ extras="$(LIBNAME).def"; \
++ $(PERL) util/mkdef.pl 32 $$SHLIB > $$extras; \
++ base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
++ fi; \
++ dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
++ $(PERL) util/mkrc.pl $$dll_name | \
++ $(CROSS_COMPILE)windres -o rc.o; \
++ extras="$$extras rc.o"; \
++ ALLSYMSFLAGS='-Wl,--whole-archive'; \
++ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
++ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-s,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a $$extras"; \
++ [ -f apps/$$dll_name ] && rm apps/$$dll_name; \
++ [ -f test/$$dll_name ] && rm test/$$dll_name; \
++ $(LINK_SO_A) || exit 1; \
++ rm $$extras; \
++ cp -p $$dll_name apps/; \
++ cp -p $$dll_name test/
++link_app.msys:
++ @if expr "$(CFLAGS)" : '.*OPENSSL_USE_APPLINK' > /dev/null; then \
++ LIBDEPS="$(TOP)/crypto/applink.o $${LIBDEPS:-$(LIBDEPS)}"; \
++ export LIBDEPS; \
++ fi; \
++ $(LINK_APP)
++
+ link_o.alpha-osf1:
+ @ if $(DETECT_GNU_LD); then \
+ $(DO_GNU_SO); \
+@@ -591,7 +647,7 @@
+ expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
+ $(SYMLINK_SO)
+ # The following lines means those specific architectures do no symlinks
+-symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos:
++symlink.cygwin symlink.msys symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos:
+
+ # Compatibility targets
+ link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu
+@@ -609,6 +665,10 @@
+ link_a.cygwin-shared: link_a.cygwin
+ link_app.cygwin-shared: link_app.cygwin
+ symlink.cygwin-shared: symlink.cygwin
++link_o.msys-shared: link_o.msys
++link_a.msys-shared: link_a.msys
++link_app.msys-shared: link_app.msys
++symlink.msys-shared: symlink.msys
+ link_o.alpha-osf1-shared: link_o.alpha-osf1
+ link_a.alpha-osf1-shared: link_a.alpha-osf1
+ link_app.alpha-osf1-shared: link_app.alpha-osf1
+diff -Naur openssl-1.0.1e-cygwin/util/msys.sh openssl-1.0.1e-msys/util/msys.sh
+--- openssl-1.0.1e-cygwin/util/msys.sh 1970-01-01 00:00:00.000000000 +0000
++++ openssl-1.0.1e-msys/util/msys.sh 2013-03-26 20:15:33.357421900 +0000
+@@ -0,0 +1,154 @@
++#!/bin/bash
++#
++# This script configures, builds and packs the binary package for
++# the Cygwin net distribution version of OpenSSL
++#
++
++# Uncomment when debugging
++#set -x
++
++CONFIG_OPTIONS="--prefix=/usr shared zlib no-idea no-rc5"
++INSTALL_PREFIX=/tmp/install/INSTALL
++
++VERSION=
++SHLIB_VERSION_NUMBER=
++SUBVERSION=$1
++
++function cleanup()
++{
++ rm -rf ${INSTALL_PREFIX}/etc
++ rm -rf ${INSTALL_PREFIX}/usr
++}
++
++function get_openssl_version()
++{
++ eval `grep '^VERSION=' Makefile`
++ if [ -z "${VERSION}" ]
++ then
++ echo "Error: Couldn't retrieve OpenSSL version from Makefile."
++ echo " Check value of variable VERSION in Makefile."
++ exit 1
++ fi
++ eval `grep '^SHLIB_VERSION_NUMBER=' Makefile`
++ if [ -z "${SHLIB_VERSION_NUMBER}" ]
++ then
++ echo "Error: Couldn't retrieve OpenSSL shared lib version from Makefile."
++ echo " Check value of variable SHLIB_VERSION_NUMBER in Makefile."
++ exit 1
++ fi
++}
++
++function base_install()
++{
++ mkdir -p ${INSTALL_PREFIX}
++ cleanup
++ make install INSTALL_PREFIX="${INSTALL_PREFIX}"
++}
++
++function doc_install()
++{
++ DOC_DIR=${INSTALL_PREFIX}/usr/share/doc/openssl
++
++ mkdir -p ${DOC_DIR}
++ cp CHANGES CHANGES.SSLeay INSTALL LICENSE NEWS README ${DOC_DIR}
++
++ create_cygwin_readme
++}
++
++function certs_install()
++{
++ CERTS_DIR=${INSTALL_PREFIX}/usr/ssl/certs
++
++ mkdir -p ${CERTS_DIR}
++ cp -rp certs/* ${CERTS_DIR}
++}
++
++function create_cygwin_readme()
++{
++ README_DIR=${INSTALL_PREFIX}/usr/share/doc/Cygwin
++ README_FILE=${README_DIR}/openssl-${VERSION}.README
++
++ mkdir -p ${README_DIR}
++ cat > ${README_FILE} <<- EOF
++ The Cygwin version has been built using the following configure:
++
++ ./config ${CONFIG_OPTIONS}
++
++ The IDEA and RC5 algorithms are disabled due to patent and/or
++ licensing issues.
++ EOF
++}
++
++function create_profile_files()
++{
++ PROFILE_DIR=${INSTALL_PREFIX}/etc/profile.d
++
++ mkdir -p $PROFILE_DIR
++ cat > ${PROFILE_DIR}/openssl.sh <<- "EOF"
++ export MANPATH="${MANPATH}:/usr/ssl/man"
++ EOF
++ cat > ${PROFILE_DIR}/openssl.csh <<- "EOF"
++ if ( $?MANPATH ) then
++ setenv MANPATH "${MANPATH}:/usr/ssl/man"
++ else
++ setenv MANPATH ":/usr/ssl/man"
++ endif
++ EOF
++}
++
++if [ -z "${SUBVERSION}" ]
++then
++ echo "Usage: $0 subversion"
++ exit 1
++fi
++
++if [ ! -f config ]
++then
++ echo "You must start this script in the OpenSSL toplevel source dir."
++ exit 1
++fi
++
++./config ${CONFIG_OPTIONS}
++
++get_openssl_version
++
++make depend || exit 1
++
++make || exit 1
++
++base_install
++
++doc_install
++
++certs_install
++
++create_cygwin_readme
++
++create_profile_files
++
++cd ${INSTALL_PREFIX}
++chmod u+w usr/lib/engines/*.so
++strip usr/bin/*.exe usr/bin/*.dll usr/lib/engines/*.so
++chmod u-w usr/lib/engines/*.so
++
++# Runtime package
++tar cjf libopenssl${SHLIB_VERSION_NUMBER//[!0-9]/}-${VERSION}-${SUBVERSION}.tar.bz2 \
++ usr/bin/msys*dll
++# Base package
++find etc usr/bin/openssl.exe usr/bin/c_rehash usr/lib/engines usr/share/doc \
++ usr/ssl/certs usr/ssl/man/man[157] usr/ssl/misc usr/ssl/openssl.cnf \
++ usr/ssl/private \
++ -empty -o \! -type d |
++tar cjfT openssl-${VERSION}-${SUBVERSION}.tar.bz2 -
++# Development package
++find usr/include usr/lib/*.a usr/lib/pkgconfig usr/ssl/man/man3 \
++ -empty -o \! -type d |
++tar cjfT openssl-devel-${VERSION}-${SUBVERSION}.tar.bz2 -
++
++ls -l openssl-${VERSION}-${SUBVERSION}.tar.bz2
++ls -l openssl-devel-${VERSION}-${SUBVERSION}.tar.bz2
++ls -l libopenssl${SHLIB_VERSION_NUMBER//[!0-9]/}-${VERSION}-${SUBVERSION}.tar.bz2
++
++cleanup
++
++exit 0
-----------------------------------------------------------------------
Summary of changes:
openssl/openssl-1.0.1e-cygwin64.patch | 121 +++++++++
openssl/openssl-1.0.1e-msys2.patch | 437 +++++++++++++++++++++++++++++++++
2 files changed, 558 insertions(+), 0 deletions(-)
create mode 100644 openssl/openssl-1.0.1e-cygwin64.patch
create mode 100644 openssl/openssl-1.0.1e-msys2.patch
hooks/post-receive
--
Repository: msys2-tools
|
|
From: Alexx83 <no...@so...> - 2013-03-26 19:35:01
|
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 6565f58c1fbc376f00dcb1497b3674b37370c083 (commit)
from 6529be9295457005b9e68f6df86919ddf7c107bf (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/6565f58c1fbc376f00dcb1497b3674b37370c083/
commit 6565f58c1fbc376f00dcb1497b3674b37370c083
Author: Alexpux <ale...@gm...>
Date: Tue Mar 26 23:34:43 2013 +0400
Add patches for Perl-5.14.4
diff --git a/perl/msys2-perl.patch b/perl/msys2-perl.patch
new file mode 100644
index 0000000..4344f92
--- /dev/null
+++ b/perl/msys2-perl.patch
@@ -0,0 +1,131 @@
+diff -Naur perl-5.14.4/configpm ../perl-5.14.4/configpm
+--- perl-5.14.4/configpm 2012-12-19 12:25:23.000000000 +0000
++++ ../perl-5.14.4/configpm 2013-03-24 11:26:08.205078200 +0000
+@@ -203,7 +203,7 @@
+ print " $date\n" if defined $date;
+
+ my @env = map { "$_=\"$ENV{$_}\"" } sort grep {/^PERL/} keys %ENV;
+- push @env, "CYGWIN=\"$ENV{CYGWIN}\"" if $^O eq 'cygwin' and $ENV{CYGWIN};
++ push @env, "MSYS=\"$ENV{MSYS}\"" if $^O eq 'cygwin' and $ENV{MSYS};
+
+ if (@env) {
+ print " \%ENV:\n";
+diff -Naur perl-5.14.4/Configure ../perl-5.14.4/Configure
+--- perl-5.14.4/Configure 2013-03-24 09:31:31.509765700 +0000
++++ ../perl-5.14.4/Configure 2013-03-24 11:26:08.220703200 +0000
+@@ -3243,6 +3243,9 @@
+ cygwin*) osname=cygwin
+ osvers="$3"
+ ;;
++ msys*) osname=cygwin
++ osvers="$3"
++ ;;
+ *dc.osx) osname=dcosx
+ osvers="$3"
+ ;;
+@@ -8247,10 +8250,10 @@
+ dflt=libperl.$so
+ ;;
+ cygwin*) # ld links now against the dll directly
+- majmin="cygperl5_${patchlevel}_${subversion}.${so}"
++ majmin="msys-perl5_${patchlevel}_${subversion}.${so}"
+ majonly=`echo $patchlevel $subversion |
+ $awk '{printf "%03d%03d", $1, $2}'`
+- majonly=cygperl5.$majonly.$so
++ majonly=msys-perl5.$majonly.$so
+ dflt=$majmin
+ ;;
+ *) # Try to guess based on whether libc has major.minor.
+diff -Naur perl-5.14.4/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm ../perl-5.14.4/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm
+--- perl-5.14.4/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm 2012-12-19 12:25:23.000000000 +0000
++++ ../perl-5.14.4/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm 2013-03-24 11:26:08.236328200 +0000
+@@ -132,7 +132,7 @@
+ {
+ 'grade' => 'FAIL',
+ 'dist' => 'CPANPLUS-0.042',
+- 'platform' => 'cygwin-multi-64int',
++ 'platform' => 'msys-multi-64int',
+ 'details' => 'http://nntp.x.perl.org/group/perl.cpan.testers/99371'
+ ...
+ },
+diff -Naur perl-5.14.4/Cross/Makefile-cross-SH ../perl-5.14.4/Cross/Makefile-cross-SH
+--- perl-5.14.4/Cross/Makefile-cross-SH 2012-12-19 12:25:23.000000000 +0000
++++ ../perl-5.14.4/Cross/Makefile-cross-SH 2013-03-24 11:26:08.236328200 +0000
+@@ -959,7 +959,7 @@
+ -rm -f perl.third lib*.so.perl.third perl.3log t/perl.third t/perl.3log
+ -rm -f perl.pixie lib*.so.perl.pixie lib*.so.Addrs
+ -rm -f perl.Addrs perl.Counts t/perl.Addrs t/perl.Counts *perl.xok
+- -rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump
++ -rm -f cygwin.c libperl*.def libperl*.dll msys-perl*.dll *.exe.stackdump
+ -rm -f perl$(EXE_EXT) miniperl$(EXE_EXT) $(LIBPERL) libperl.* microperl
+ -rm -f config.over
+
+diff -Naur perl-5.14.4/ext/DynaLoader/DynaLoader_pm.PL ../perl-5.14.4/ext/DynaLoader/DynaLoader_pm.PL
+--- perl-5.14.4/ext/DynaLoader/DynaLoader_pm.PL 2012-12-19 12:25:24.000000000 +0000
++++ ../perl-5.14.4/ext/DynaLoader/DynaLoader_pm.PL 2013-03-24 11:26:08.236328200 +0000
+@@ -438,7 +438,7 @@
+ push(@names,"$_.$dl_dlext") unless m/\.$dl_dlext$/o;
+ push(@names,"$_.$dl_so") unless m/\.$dl_so$/o;
+ <<$^O-eq-cygwin>>
+- push(@names,"cyg$_.$dl_so") unless m:/:;
++ push(@names,"msys-$_.$dl_so") unless m:/:;
+ <</$^O-eq-cygwin>>
+ push(@names,"lib$_.$dl_so") unless m:/:;
+ push(@names,"$_.a") if !m/\.a$/ and $dlsrc eq "dl_dld.xs";
+diff -Naur perl-5.14.4/t/io/fs.t ../perl-5.14.4/t/io/fs.t
+--- perl-5.14.4/t/io/fs.t 2012-12-19 12:25:24.000000000 +0000
++++ ../perl-5.14.4/t/io/fs.t 2013-03-24 11:26:08.251953200 +0000
+@@ -44,7 +44,7 @@
+ $needs_fh_reopen = 1 if (defined &Win32::IsWin95 && Win32::IsWin95());
+
+ my $skip_mode_checks =
+- $^O eq 'cygwin' && $ENV{CYGWIN} !~ /ntsec/;
++ $^O eq 'cygwin' && $ENV{MSYS} !~ /ntsec/;
+
+ plan tests => 51;
+
+@@ -413,7 +413,7 @@
+ # check if rename() can be used to just change case of filename
+ SKIP: {
+ skip "Works in Cygwin only if check_case is set to relaxed", 1
+- if ($ENV{'CYGWIN'} && ($ENV{'CYGWIN'} =~ /check_case:(?:adjust|strict)/));
++ if ($ENV{'MSYS'} && ($ENV{'MSYS'} =~ /check_case:(?:adjust|strict)/));
+
+ chdir "./$tmpdir";
+ open(FH,'>x') || die "Can't create x";
+diff -Naur perl-5.14.4/t/op/groups.t ../perl-5.14.4/t/op/groups.t
+--- perl-5.14.4/t/op/groups.t 2012-12-19 12:25:24.000000000 +0000
++++ ../perl-5.14.4/t/op/groups.t 2013-03-24 11:29:19.166992200 +0000
+@@ -284,7 +284,7 @@
+
+ # Test if this is Cygwin
+ sub cygwin_nt {
+- return $Config::Config{myuname} =~ /^cygwin_nt/i;
++ return $Config::Config{myuname} =~ /^msys_nt/i;
+ }
+
+ # Get perl's supplementary groups and the number of times each gid
+diff -Naur perl-5.14.4/t/op/stat.t ../perl-5.14.4/t/op/stat.t
+--- perl-5.14.4/t/op/stat.t 2012-12-19 12:25:24.000000000 +0000
++++ ../perl-5.14.4/t/op/stat.t 2013-03-24 11:29:40.479492200 +0000
+@@ -107,7 +107,7 @@
+ SKIP: {
+ skip "No link count", 1 if $Config{dont_use_nlink};
+ skip "Cygwin9X fakes hard links by copying", 1
+- if $Config{myuname} =~ /^cygwin_(?:9\d|me)\b/i;
++ if $Config{myuname} =~ /^msys_(?:9\d|me)\b/i;
+
+ is($nlink, 2, 'Link count on hard linked file' );
+ }
+diff -Naur perl-5.14.4/utils/perlbug.PL ../perl-5.14.4/utils/perlbug.PL
+--- perl-5.14.4/utils/perlbug.PL 2012-12-19 12:25:24.000000000 +0000
++++ ../perl-5.14.4/utils/perlbug.PL 2013-03-24 11:26:08.251953200 +0000
+@@ -763,7 +763,7 @@
+ my @env =
+ qw(PATH LD_LIBRARY_PATH LANG PERL_BADLANG SHELL HOME LOGDIR LANGUAGE);
+ push @env, $Config{ldlibpthname} if $Config{ldlibpthname} ne '';
+- push @env, grep /^(?:PERL|LC_|LANG|CYGWIN)/, keys %ENV;
++ push @env, grep /^(?:PERL|LC_|LANG|MSYS)/, keys %ENV;
+ my %env;
+ @env{@env} = @env;
+ for my $env (sort keys %env) {
diff --git a/perl/pl-CYG07-cygwin_vendorarchautorebase-2.patch b/perl/pl-CYG07-cygwin_vendorarchautorebase-2.patch
new file mode 100644
index 0000000..51b8c74
--- /dev/null
+++ b/perl/pl-CYG07-cygwin_vendorarchautorebase-2.patch
@@ -0,0 +1,129 @@
+difforig perl-5.14.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
+
+diff -u perl-5.14.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm.orig perl-5.14.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
+--- perl-5.14.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm.orig 2012-02-07 09:21:23.910375000 -0600
++++ perl-5.14.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm 2012-07-11 08:32:59.944125000 -0500
+@@ -9,7 +9,7 @@
+ require ExtUtils::MM_Win32;
+ our @ISA = qw( ExtUtils::MM_Unix );
+
+-our $VERSION = '6.57_05';
++our $VERSION = '6.57_07';
+
+
+ =head1 NAME
+@@ -100,41 +100,99 @@
+
+ =item maybe_command
+
+-If our path begins with F</cygdrive/> then we use C<ExtUtils::MM_Win32>
+-to determine if it may be a command. Otherwise we use the tests
+-from C<ExtUtils::MM_Unix>.
++Determine whether a file is native to Cygwin by checking whether it
++resides inside the Cygwin installation (using Windows paths). If so,
++use C<ExtUtils::MM_Unix> to determine if it may be a command.
++Otherwise use the tests from C<ExtUtils::MM_Win32>.
+
+ =cut
+
+ sub maybe_command {
+ my ($self, $file) = @_;
+
+- if ($file =~ m{^/cygdrive/}i) {
+- return ExtUtils::MM_Win32->maybe_command($file);
+- }
++ my $cygpath = Cygwin::posix_to_win_path('/', 1);
++ my $filepath = Cygwin::posix_to_win_path($file, 1);
+
+- return $self->SUPER::maybe_command($file);
++ return (substr($filepath,0,length($cygpath)) eq $cygpath)
++ ? $self->SUPER::maybe_command($file) # Unix
++ : ExtUtils::MM_Win32->maybe_command($file); # Win32
+ }
+
+ =item dynamic_lib
+
+ Use the default to produce the *.dll's.
+-But for new archdir dll's use the same rebase address if the old exists.
++Add the dll size to F<$vendorarch/auto/.rebase>, which stores the
++next available imagebase.
++
++If an old dll exists and .rebase is empty, use the same rebase address
++for new archdir dll's.
+
+ =cut
+
+ sub dynamic_lib {
+ my($self, %attribs) = @_;
+ my $s = ExtUtils::MM_Unix::dynamic_lib($self, %attribs);
++ return '' unless $s;
++ return $s unless %{$self->{XS}};
++
+ my $ori = "$self->{INSTALLARCHLIB}/auto/$self->{FULLEXT}/$self->{BASEEXT}.$self->{DLEXT}";
++ my $rebase = "$self->{INSTALLVENDORARCH}/auto/.rebase";
++ my $imagebase = '';
++ my $rebaseverstr = -f '/bin/rebase' ? `/bin/rebase -V 2>&1` : '0';
++ my ($rebasever) = $rebaseverstr =~ /rebase version ([0-9.]+)/;
++ $rebasever =~ s/(\d\.\d+)\./$1/;
++ if (-f $rebase and $rebasever < 3.02) {
++ $imagebase = `/bin/cat $rebase`;
++ chomp $imagebase;
++ }
+ if (-e $ori) {
+- my $imagebase = `/bin/objdump -p $ori | /bin/grep ImageBase | /bin/cut -c12-`;
+- chomp $imagebase;
+- if ($imagebase gt "40000000") {
+- my $LDDLFLAGS = $self->{LDDLFLAGS};
+- $LDDLFLAGS =~ s/-Wl,--enable-auto-image-base/-Wl,--image-base=0x$imagebase/;
+- $s =~ s/ \$\(LDDLFLAGS\) / $LDDLFLAGS /m;
+- }
++ $imagebase = `/bin/objdump -p $ori | /bin/grep ImageBase | /bin/cut -c12-`;
++ chomp $imagebase;
++ if ($imagebase gt "40000000" and $imagebase lt "80000000") {
++ my $LDDLFLAGS = $self->{LDDLFLAGS};
++ $LDDLFLAGS =~ s/-Wl,--enable-auto-image-base/-Wl,--image-base=0x$imagebase/;
++ $s =~ s/ \$\(LDDLFLAGS\) / $LDDLFLAGS /m;
++ }
++ } elsif ($imagebase gt "40000000" and $imagebase lt "80000000") {
++ my $LDDLFLAGS = $self->{LDDLFLAGS};
++ $LDDLFLAGS =~ s/-Wl,--enable-auto-image-base/-Wl,--image-base=0x$imagebase/ or
++ $LDDLFLAGS .= " -Wl,--image-base=0x$imagebase";
++ $s =~ s/ \$\(INST_DYNAMIC_DEP\)/ \$(INST_DYNAMIC_DEP) _rebase/;
++ $s =~ s/ \$\(LDDLFLAGS\) / $LDDLFLAGS /m;
++ # Here we create all DLL's per project with the same imagebase. With rebase 3.0.2 we do better
++ $s .= "\t/bin/rebase -v -b 0x$imagebase \$@ | ";
++ $s .= "\$(FULLPERL) -n _rebase > \$(INSTALLVENDORARCH)/auto/.rebase\n";
++ # Need a tempfile, because gmake expands $_ in the perl cmdline
++ $s .= "\n_rebase : \$(OBJECT)\n";
++ $s .= "\t\$(NOECHO) \$(ECHO) '/new base = (.+), new size = (.+)/ && printf \"%x\\n\",hex(\$1)+hex(\$2);' > _rebase\n";
++ } else {
++ if ($rebasever < 3.02) { # new rebase 3.0.2 with database
++ warn "Hint: run perlrebase to initialize $rebase or upgrade to rebase 3.0.2\n";
++ }
++ }
++ $s;
++}
++
++=item install
++
++Rebase dll's with the global rebase database after installation.
++
++=cut
++
++sub install {
++ my($self, %attribs) = @_;
++ my $s = ExtUtils::MM_Unix::install($self, %attribs);
++ return '' unless $s;
++ return $s unless %{$self->{XS}};
++
++ my $rebaseverstr = -f '/bin/rebase' ? `/bin/rebase -V 2>&1` : '0';
++ my ($rebasever) = $rebaseverstr =~ /rebase version ([0-9.]+)/;
++ $rebasever =~ s/(\d\.\d+)\./$1/;
++ if ($rebasever > 3.01) { # new rebase 3.0.2 with database
++ my $INSTALLDIRS = $self->{INSTALLDIRS};
++ my $INSTALLLIB = $self->{"INSTALL". ($INSTALLDIRS eq 'perl' ? 'ARCHLIB' : uc($INSTALLDIRS)."ARCH")};
++ my $dll = "$INSTALLLIB/auto/$self->{FULLEXT}/$self->{BASEEXT}.$self->{DLEXT}";
++ $s =~ s|^(pure_install :: pure_\$\(INSTALLDIRS\)_install\n\t)\$\(NOECHO\) \$\(NOOP\)\n|$1\$(CHMOD) \$(PERM_RWX) \$(DESTDIR)$dll\n\ttest -n "\$(DESTDIR)\" \|\| /bin/rebase -s $dll\n|m;
+ }
+ $s;
+ }
diff --git a/perl/pl-CYG08-b722195e_CYG17_utf8_paths.patch b/perl/pl-CYG08-b722195e_CYG17_utf8_paths.patch
new file mode 100644
index 0000000..307e0d3
--- /dev/null
+++ b/perl/pl-CYG08-b722195e_CYG17_utf8_paths.patch
@@ -0,0 +1,375 @@
+From: Reini Urban <ru...@x-...>
+Subject: [PATCH] CYG17 utf8 paths
+Author: Reini Urban <ru...@x-...>
+Date: Tue Apr 12 12:19:36 2011 +0200
+commit b722195e24a6c67310eb30e8f18601966a96ba78
+
+ CYG17 utf8 paths
+
+ Use cygwin_conv_path since cygwin-1.7 and support native utf-8 paths.
+
+diff --git a/cygwin/cygwin.c b/cygwin/cygwin.c
+index aa6938d..3206f91 100644
+--- a/cygwin/cygwin.c
++++ b/cygwin/cygwin.c
+@@ -10,9 +10,13 @@
+ #include <unistd.h>
+ #include <process.h>
+ #include <sys/cygwin.h>
++#include <cygwin/version.h>
+ #include <mntent.h>
+ #include <alloca.h>
+ #include <dlfcn.h>
++#if (CYGWIN_VERSION_API_MINOR >= 181)
++#include <wchar.h>
++#endif
+
+ /*
+ * pp_system() implemented via spawn()
+@@ -125,7 +129,7 @@ do_spawn (char *cmd)
+ return do_spawnvp("sh",command);
+ }
+
+- Newx (PL_Argv,(s-cmd)/2+2,const char*);
++ Newx (PL_Argv,(s-cmd)/2+2,char*);
+ PL_Cmd=savepvn (cmd,s-cmd);
+ a=PL_Argv;
+ for (s=PL_Cmd; *s;) {
+@@ -143,6 +147,44 @@ do_spawn (char *cmd)
+ return do_spawnvp(PL_Argv[0],(const char * const *)PL_Argv);
+ }
+
++#if (CYGWIN_VERSION_API_MINOR >= 181)
++char*
++wide_to_utf8(const wchar_t *wbuf)
++{
++ char *buf;
++ int wlen = 0;
++ char *oldlocale = setlocale(LC_CTYPE, NULL);
++ setlocale(LC_CTYPE, "utf-8");
++
++ /* uvuni_to_utf8(buf, chr) or Encoding::_bytes_to_utf8(sv, "UCS-2BE"); */
++ wlen = wcsrtombs(NULL, (const wchar_t **)&wbuf, wlen, NULL);
++ buf = (char *) safemalloc(wlen+1);
++ wcsrtombs(buf, (const wchar_t **)&wbuf, wlen, NULL);
++
++ if (oldlocale) setlocale(LC_CTYPE, oldlocale);
++ else setlocale(LC_CTYPE, "C");
++ return buf;
++}
++
++wchar_t*
++utf8_to_wide(const char *buf)
++{
++ wchar_t *wbuf;
++ mbstate_t mbs;
++ char *oldlocale = setlocale(LC_CTYPE, NULL);
++ int wlen = sizeof(wchar_t)*strlen(buf);
++
++ setlocale(LC_CTYPE, "utf-8");
++ wbuf = (wchar_t *) safemalloc(wlen);
++ /* utf8_to_uvuni(pathname, wpath) or Encoding::_utf8_to_bytes(sv, "UCS-2BE"); */
++ wlen = mbsrtowcs(wbuf, (const char**)&buf, wlen, &mbs);
++
++ if (oldlocale) setlocale(LC_CTYPE, oldlocale);
++ else setlocale(LC_CTYPE, "C");
++ return wbuf;
++}
++#endif /* cygwin 1.7 */
++
+ /* see also Cwd.pm */
+ XS(Cygwin_cwd)
+ {
+@@ -194,7 +236,12 @@ XS(XS_Cygwin_winpid_to_pid)
+
+ pid = (pid_t)SvIV(ST(0));
+
+- if ((RETVAL = cygwin32_winpid_to_pid(pid)) > 0) {
++#if (CYGWIN_VERSION_API_MINOR >= 181)
++ RETVAL = cygwin_winpid_to_pid(pid);
++#else
++ RETVAL = cygwin32_winpid_to_pid(pid);
++#endif
++ if (RETVAL > 0) {
+ XSprePUSH; PUSHi((IV)RETVAL);
+ XSRETURN(1);
+ }
+@@ -202,34 +249,91 @@ XS(XS_Cygwin_winpid_to_pid)
+ }
+
+ XS(XS_Cygwin_win_to_posix_path)
++
+ {
+ dXSARGS;
+ int absolute_flag = 0;
+ STRLEN len;
+ int err;
+- char *pathname, *buf;
++ char *src_path;
++ char *posix_path;
++ int isutf8 = 0;
+
+ if (items < 1 || items > 2)
+ Perl_croak(aTHX_ "Usage: Cygwin::win_to_posix_path(pathname, [absolute])");
+
+- pathname = SvPV(ST(0), len);
++ src_path = SvPV(ST(0), len);
+ if (items == 2)
+ absolute_flag = SvTRUE(ST(1));
+
+ if (!len)
+ Perl_croak(aTHX_ "can't convert empty path");
+- buf = (char *) safemalloc (len + 260 + 1001);
++ isutf8 = SvUTF8(ST(0));
+
++#if (CYGWIN_VERSION_API_MINOR >= 181)
++ /* Check utf8 flag and use wide api then.
++ Size calculation: On overflow let cygwin_conv_path calculate the final size.
++ */
++ if (isutf8) {
++ int what = absolute_flag ? CCP_WIN_W_TO_POSIX : CCP_WIN_W_TO_POSIX | CCP_RELATIVE;
++ int wlen = sizeof(wchar_t)*(len + 260 + 1001);
++ wchar_t *wpath = (wchar_t *) safemalloc(sizeof(wchar_t)*len);
++ wchar_t *wbuf = (wchar_t *) safemalloc(wlen);
++ if (!IN_BYTES) {
++ mbstate_t mbs;
++ char *oldlocale = setlocale(LC_CTYPE, NULL);
++ setlocale(LC_CTYPE, "utf-8");
++ /* utf8_to_uvuni(src_path, wpath) or Encoding::_utf8_to_bytes(sv, "UCS-2BE"); */
++ wlen = mbsrtowcs(wpath, (const char**)&src_path, wlen, &mbs);
++ if (wlen > 0)
++ err = cygwin_conv_path(what, wpath, wbuf, wlen);
++ if (oldlocale) setlocale(LC_CTYPE, oldlocale);
++ else setlocale(LC_CTYPE, "C");
++ } else { /* use bytes; assume already ucs-2 encoded bytestream */
++ err = cygwin_conv_path(what, src_path, wbuf, wlen);
++ }
++ if (err == ENOSPC) { /* our space assumption was wrong, not enough space */
++ int newlen = cygwin_conv_path(what, wpath, wbuf, 0);
++ wbuf = (wchar_t *) realloc(&wbuf, newlen);
++ err = cygwin_conv_path(what, wpath, wbuf, newlen);
++ wlen = newlen;
++ }
++ /* utf16_to_utf8(*p, *d, bytlen, *newlen) */
++ posix_path = (char *) safemalloc(wlen*3);
++ Perl_utf16_to_utf8(aTHX_ (U8*)&wpath, (U8*)posix_path, (I32)wlen*2, (I32*)&len);
++ /*
++ wlen = wcsrtombs(NULL, (const wchar_t **)&wbuf, wlen, NULL);
++ posix_path = (char *) safemalloc(wlen+1);
++ wcsrtombs(posix_path, (const wchar_t **)&wbuf, wlen, NULL);
++ */
++ } else {
++ int what = absolute_flag ? CCP_WIN_A_TO_POSIX : CCP_WIN_A_TO_POSIX | CCP_RELATIVE;
++ posix_path = (char *) safemalloc (len + 260 + 1001);
++ err = cygwin_conv_path(what, src_path, posix_path, len + 260 + 1001);
++ if (err == ENOSPC) { /* our space assumption was wrong, not enough space */
++ int newlen = cygwin_conv_path(what, src_path, posix_path, 0);
++ posix_path = (char *) realloc(&posix_path, newlen);
++ err = cygwin_conv_path(what, src_path, posix_path, newlen);
++ }
++ }
++#else
++ posix_path = (char *) safemalloc (len + 260 + 1001);
+ if (absolute_flag)
+- err = cygwin_conv_to_full_posix_path(pathname, buf);
++ err = cygwin_conv_to_full_posix_path(src_path, posix_path);
+ else
+- err = cygwin_conv_to_posix_path(pathname, buf);
++ err = cygwin_conv_to_posix_path(src_path, posix_path);
++#endif
+ if (!err) {
+- ST(0) = sv_2mortal(newSVpv(buf, 0));
+- safefree(buf);
+- XSRETURN(1);
++ EXTEND(SP, 1);
++ ST(0) = sv_2mortal(newSVpv(posix_path, 0));
++ if (isutf8) { /* src was utf-8, so result should also */
++ /* TODO: convert ANSI (local windows encoding) to utf-8 on cygwin-1.5 */
++ SvUTF8_on(ST(0));
++ }
++ safefree(posix_path);
++ XSRETURN(1);
+ } else {
+- safefree(buf);
++ safefree(posix_path);
+ XSRETURN_UNDEF;
+ }
+ }
+@@ -240,29 +344,80 @@ XS(XS_Cygwin_posix_to_win_path)
+ int absolute_flag = 0;
+ STRLEN len;
+ int err;
+- char *pathname, *buf;
++ char *src_path, *win_path;
++ int isutf8 = 0;
+
+ if (items < 1 || items > 2)
+ Perl_croak(aTHX_ "Usage: Cygwin::posix_to_win_path(pathname, [absolute])");
+
+- pathname = SvPV(ST(0), len);
++ src_path = SvPVx(ST(0), len);
+ if (items == 2)
+ absolute_flag = SvTRUE(ST(1));
+
+ if (!len)
+ Perl_croak(aTHX_ "can't convert empty path");
+- buf = (char *) safemalloc(len + 260 + 1001);
+-
++ isutf8 = SvUTF8(ST(0));
++#if (CYGWIN_VERSION_API_MINOR >= 181)
++ /* Check utf8 flag and use wide api then.
++ Size calculation: On overflow let cygwin_conv_path calculate the final size.
++ */
++ if (isutf8) {
++ int what = absolute_flag ? CCP_POSIX_TO_WIN_W : CCP_POSIX_TO_WIN_W | CCP_RELATIVE;
++ int wlen = sizeof(wchar_t)*(len + 260 + 1001);
++ wchar_t *wpath = (wchar_t *) safemalloc(sizeof(wchar_t)*len);
++ wchar_t *wbuf = (wchar_t *) safemalloc(wlen);
++ char *oldlocale = setlocale(LC_CTYPE, NULL);
++ setlocale(LC_CTYPE, "utf-8");
++ if (!IN_BYTES) {
++ mbstate_t mbs;
++ /* utf8_to_uvuni(src_path, wpath) or Encoding::_utf8_to_bytes(sv, "UCS-2BE"); */
++ wlen = mbsrtowcs(wpath, (const char**)&src_path, wlen, &mbs);
++ if (wlen > 0)
++ err = cygwin_conv_path(what, wpath, wbuf, wlen);
++ } else { /* use bytes; assume already ucs-2 encoded bytestream */
++ err = cygwin_conv_path(what, src_path, wbuf, wlen);
++ }
++ if (err == ENOSPC) { /* our space assumption was wrong, not enough space */
++ int newlen = cygwin_conv_path(what, wpath, wbuf, 0);
++ wbuf = (wchar_t *) realloc(&wbuf, newlen);
++ err = cygwin_conv_path(what, wpath, wbuf, newlen);
++ wlen = newlen;
++ }
++ /* also see utf8.c: Perl_utf16_to_utf8() or Encoding::_bytes_to_utf8(sv, "UCS-2BE"); */
++ wlen = wcsrtombs(NULL, (const wchar_t **)&wbuf, wlen, NULL);
++ win_path = (char *) safemalloc(wlen+1);
++ wcsrtombs(win_path, (const wchar_t **)&wbuf, wlen, NULL);
++ if (oldlocale) setlocale(LC_CTYPE, oldlocale);
++ else setlocale(LC_CTYPE, "C");
++ } else {
++ int what = absolute_flag ? CCP_POSIX_TO_WIN_A : CCP_POSIX_TO_WIN_A | CCP_RELATIVE;
++ win_path = (char *) safemalloc(len + 260 + 1001);
++ err = cygwin_conv_path(what, src_path, win_path, len + 260 + 1001);
++ if (err == ENOSPC) { /* our space assumption was wrong, not enough space */
++ int newlen = cygwin_conv_path(what, src_path, win_path, 0);
++ win_path = (char *) realloc(&win_path, newlen);
++ err = cygwin_conv_path(what, src_path, win_path, newlen);
++ }
++ }
++#else
++ if (isutf8)
++ Perl_warn(aTHX_ "can't convert utf8 path");
++ win_path = (char *) safemalloc(len + 260 + 1001);
+ if (absolute_flag)
+- err = cygwin_conv_to_full_win32_path(pathname, buf);
++ err = cygwin_conv_to_full_win32_path(src_path, win_path);
+ else
+- err = cygwin_conv_to_win32_path(pathname, buf);
++ err = cygwin_conv_to_win32_path(src_path, win_path);
++#endif
+ if (!err) {
+- ST(0) = sv_2mortal(newSVpv(buf, 0));
+- safefree(buf);
+- XSRETURN(1);
++ EXTEND(SP, 1);
++ ST(0) = sv_2mortal(newSVpv(win_path, 0));
++ if (isutf8) {
++ SvUTF8_on(ST(0));
++ }
++ safefree(win_path);
++ XSRETURN(1);
+ } else {
+- safefree(buf);
++ safefree(win_path);
+ XSRETURN_UNDEF;
+ }
+ }
+@@ -293,24 +448,22 @@ XS(XS_Cygwin_mount_flags)
+ {
+ dXSARGS;
+ char *pathname;
+- char flags[260];
++ char flags[PATH_MAX];
++ flags[0] = '\0';
+
+ if (items != 1)
+- Perl_croak(aTHX_ "Usage: Cygwin::mount_flags(mnt_dir|'/cygwin')");
++ Perl_croak(aTHX_ "Usage: Cygwin::mount_flags( mnt_dir | '/cygdrive' )");
+
+ pathname = SvPV_nolen(ST(0));
+
+- /* TODO: Check for cygdrive registry setting,
+- * and then use CW_GET_CYGDRIVE_INFO
+- */
+ if (!strcmp(pathname, "/cygdrive")) {
+- char user[260];
+- char system[260];
+- char user_flags[260];
+- char system_flags[260];
++ char user[PATH_MAX];
++ char system[PATH_MAX];
++ char user_flags[PATH_MAX];
++ char system_flags[PATH_MAX];
+
+- cygwin_internal (CW_GET_CYGDRIVE_INFO, user, system, user_flags,
+- system_flags);
++ cygwin_internal (CW_GET_CYGDRIVE_INFO, user, system,
++ user_flags, system_flags);
+
+ if (strlen(user) > 0) {
+ sprintf(flags, "%s,cygdrive,%s", user_flags, user);
+@@ -323,6 +476,7 @@ XS(XS_Cygwin_mount_flags)
+
+ } else {
+ struct mntent *mnt;
++ int found = 0;
+ setmntent (0, 0);
+ while ((mnt = getmntent (0))) {
+ if (!strcmp(pathname, mnt->mnt_dir)) {
+@@ -331,12 +485,42 @@ XS(XS_Cygwin_mount_flags)
+ strcat(flags, ",");
+ strcat(flags, mnt->mnt_opts);
+ }
++ found++;
+ break;
+ }
+ }
+ endmntent (0);
+- ST(0) = sv_2mortal(newSVpv(flags, 0));
+- XSRETURN(1);
++
++ /* Check if arg is the current volume moint point if not default,
++ * and then use CW_GET_CYGDRIVE_INFO also.
++ */
++ if (!found) {
++ char user[PATH_MAX];
++ char system[PATH_MAX];
++ char user_flags[PATH_MAX];
++ char system_flags[PATH_MAX];
++
++ cygwin_internal (CW_GET_CYGDRIVE_INFO, user, system,
++ user_flags, system_flags);
++
++ if (strlen(user) > 0) {
++ if (strcmp(user,pathname)) {
++ sprintf(flags, "%s,cygdrive,%s", user_flags, user);
++ found++;
++ }
++ } else {
++ if (strcmp(user,pathname)) {
++ sprintf(flags, "%s,cygdrive,%s", system_flags, system);
++ found++;
++ }
++ }
++ }
++ if (found) {
++ ST(0) = sv_2mortal(newSVpv(flags, 0));
++ XSRETURN(1);
++ } else {
++ XSRETURN_UNDEF;
++ }
+ }
+ }
+
diff --git a/perl/pl-CYG10-95f6fab9_skip_testing_cygwin_utf8_readdir_with_Win32_ANSI_API.patch b/perl/pl-CYG10-95f6fab9_skip_testing_cygwin_utf8_readdir_with_Win32_ANSI_API.patch
new file mode 100644
index 0000000..b6a1ccf
--- /dev/null
+++ b/perl/pl-CYG10-95f6fab9_skip_testing_cygwin_utf8_readdir_with_Win32_ANSI_API.patch
@@ -0,0 +1,183 @@
+From: Reini Urban <ru...@x-...>
+Subject: [PATCH] skip testing cygwin utf8 readdir() with Win32 ANSI API
+Author: Reini Urban <ru...@x-...>
+Date: Tue Apr 12 12:29:30 2011 +0200
+
+diff --git a/cpan/Win32/t/Unicode.t b/cpan/Win32/t/Unicode.t
+index 3570142..154372b 100644
+--- a/cpan/Win32/t/Unicode.t
++++ b/cpan/Win32/t/Unicode.t
+@@ -1,85 +1,88 @@
+-use strict;
+-use Test;
+-use Cwd qw(cwd);
+-use Win32;
+-
+-BEGIN {
+- unless (defined &Win32::BuildNumber && Win32::BuildNumber() >= 820 or $] >= 5.008009) {
+- print "1..0 # Skip: Needs ActivePerl 820 or Perl 5.8.9 or later\n";
+- exit 0;
+- }
+- if ((((Win32::FsType())[1] & 4) == 0) || (Win32::FsType() =~ /^FAT/)) {
+- print "1..0 # Skip: Filesystem doesn't support Unicode\n";
+- exit 0;
+- }
+- unless ((Win32::GetOSVersion())[1] > 4) {
+- print "1..0 # Skip: Unicode support requires Windows 2000 or later\n";
+- exit 0;
+- }
+-}
+-
+-my $home = Win32::GetCwd();
+-my $cwd = cwd(); # may be a Cygwin path
+-my $dir = "Foo \x{394}\x{419} Bar \x{5E7}\x{645} Baz";
+-my $file = "$dir\\xyzzy \x{394}\x{419} plugh \x{5E7}\x{645}";
+-
+-sub cleanup {
+- chdir($home);
+- my $ansi = Win32::GetANSIPathName($file);
+- unlink($ansi) if -f $ansi;
+- $ansi = Win32::GetANSIPathName($dir);
+- rmdir($ansi) if -d $ansi;
+-}
+-
+-cleanup();
+-END { cleanup() }
+-
+-plan test => 12;
+-
+-# Create Unicode directory
+-Win32::CreateDirectory($dir);
+-ok(-d Win32::GetANSIPathName($dir));
+-
+-# Create Unicode file
+-Win32::CreateFile($file);
+-ok(-f Win32::GetANSIPathName($file));
+-
+-# readdir() returns ANSI form of Unicode filename
+-ok(opendir(my $dh, Win32::GetANSIPathName($dir)));
+-while ($_ = readdir($dh)) {
+- next if /^\./;
+- ok($file, Win32::GetLongPathName("$dir\\$_"));
+-}
+-closedir($dh);
+-
+-# Win32::GetLongPathName() of the absolute path restores the Unicode dir name
+-my $full = Win32::GetFullPathName($dir);
+-my $long = Win32::GetLongPathName($full);
+-
+-ok($long, Win32::GetLongPathName($home)."\\$dir");
+-
+-# We can Win32::SetCwd() into the Unicode directory
+-ok(Win32::SetCwd($dir));
+-
+-my $w32dir = Win32::GetCwd();
+-# cwd() also returns a usable ANSI directory name
+-my $subdir = cwd();
+-
+-# change back to home directory to make sure relative paths
+-# in @INC continue to work
+-ok(chdir($home));
+-ok(Win32::GetCwd(), $home);
+-
+-ok(Win32::GetLongPathName($w32dir), $long);
+-
+-# cwd() on Cygwin returns a mapped path that we need to translate
+-# back to a Windows path. Invoking `cygpath` on $subdir doesn't work.
+-if ($^O eq "cygwin") {
+- $subdir = Cygwin::posix_to_win_path($subdir, 1);
+-}
+-$subdir =~ s,/,\\,g;
+-ok(Win32::GetLongPathName($subdir), $long);
+-
+-# We can chdir() into the Unicode directory if we use the ANSI name
+-ok(chdir(Win32::GetANSIPathName($dir)));
+-ok(Win32::GetLongPathName(Win32::GetCwd()), $long);
++use strict;
++use Test;
++use Cwd qw(cwd);
++use Config qw(%Config);
++use Win32;
++
++BEGIN {
++ unless (defined &Win32::BuildNumber && Win32::BuildNumber() >= 820 or $] >= 5.008009) {
++ print "1..0 # Skip: Needs ActivePerl 820 or Perl 5.8.9 or later\n";
++ exit 0;
++ }
++ if ((((Win32::FsType())[1] & 4) == 0) || (Win32::FsType() =~ /^FAT/)) {
++ print "1..0 # Skip: Filesystem doesn't support Unicode\n";
++ exit 0;
++ }
++ unless ((Win32::GetOSVersion())[1] > 4) {
++ print "1..0 # Skip: Unicode support requires Windows 2000 or later\n";
++ exit 0;
++ }
++}
++
++my $home = Win32::GetCwd();
++my $cwd = cwd(); # may be a Cygwin path
++my $dir = "Foo \x{394}\x{419} Bar \x{5E7}\x{645} Baz";
++my $file = "$dir\\xyzzy \x{394}\x{419} plugh \x{5E7}\x{645}";
++
++sub cleanup {
++ chdir($home);
++ my $ansi = Win32::GetANSIPathName($file);
++ unlink($ansi) if -f $ansi;
++ $ansi = Win32::GetANSIPathName($dir);
++ rmdir($ansi) if -d $ansi;
++}
++
++cleanup();
++END { cleanup() }
++
++plan test => 12;
++
++# Create Unicode directory
++Win32::CreateDirectory($dir);
++ok(-d Win32::GetANSIPathName($dir));
++
++# Create Unicode file
++Win32::CreateFile($file);
++ok(-f Win32::GetANSIPathName($file));
++
++# readdir() returns ANSI form of Unicode filename
++# but on cygwin-1.7 the utf-8 form.
++ok(opendir(my $dh, Win32::GetANSIPathName($dir)));
++while ($_ = readdir($dh)) {
++ next if /^\./;
++ skip($^O eq 'cygwin' and $Config{osvers} ge "1.7" ? "do not test cygwin utf8 readdir()" : 0,
++ $file, Win32::GetLongPathName("$dir\\$_"));
++}
++closedir($dh);
++
++# Win32::GetLongPathName() of the absolute path restores the Unicode dir name
++my $full = Win32::GetFullPathName($dir);
++my $long = Win32::GetLongPathName($full);
++
++ok($long, Win32::GetLongPathName($home)."\\$dir");
++
++# We can Win32::SetCwd() into the Unicode directory
++ok(Win32::SetCwd($dir));
++
++my $w32dir = Win32::GetCwd();
++# cwd() also returns a usable ANSI directory name
++my $subdir = cwd();
++
++# change back to home directory to make sure relative paths
++# in @INC continue to work
++ok(chdir($home));
++ok(Win32::GetCwd(), $home);
++
++ok(Win32::GetLongPathName($w32dir), $long);
++
++# cwd() on Cygwin returns a mapped path that we need to translate
++# back to a Windows path. Invoking `cygpath` on $subdir doesn't work.
++if ($^O eq "cygwin") {
++ $subdir = Cygwin::posix_to_win_path($subdir, 1);
++}
++$subdir =~ s,/,\\,g;
++ok(Win32::GetLongPathName($subdir), $long);
++
++# We can chdir() into the Unicode directory if we use the ANSI name
++ok(chdir(Win32::GetANSIPathName($dir)));
++ok(Win32::GetLongPathName(Win32::GetCwd()), $long);
diff --git a/perl/pl-CYG11-fabf0235_Fix_test_50_on_cygwin_WINDOWS.patch b/perl/pl-CYG11-fabf0235_Fix_test_50_on_cygwin_WINDOWS.patch
new file mode 100644
index 0000000..6da22e6
--- /dev/null
+++ b/perl/pl-CYG11-fabf0235_Fix_test_50_on_cygwin_WINDOWS.patch
@@ -0,0 +1,39 @@
+commit fabf0235d1f46ea9484846b2c6792dd1182f54a2
+Author: Reini Urban <ru...@x-...>
+Date: Tue Apr 12 12:33:16 2011 +0200
+
+ Fix test 50 on cygwin: \WINDOWS
+
+diff --git a/cpan/Win32API-File/t/file.t b/cpan/Win32API-File/t/file.t
+index 0039b57..9a0dd88 100644
+--- a/cpan/Win32API-File/t/file.t
++++ b/cpan/Win32API-File/t/file.t
+@@ -24,7 +24,7 @@ END {print "not ok 1\n" unless $loaded;}
+ # the ../lib directory in @INC will no longer work once
+ # we chdir() into the TEMP directory.
+
+-require Win32 unless defined &Win32::FormatMessage;
++use Win32;
+ use File::Spec;
+ use Carp;
+ use Carp::Heavy;
+@@ -342,8 +342,9 @@ if( !$ok ) {
+ }
+ print $ok ? "" : "not ", "ok ", ++$test, "\n"; # ok 49
+
+-$ok= -f $let.substr($ENV{WINDIR},3)."/win.ini";
+-$ok or print "# ",fileLastError(),"\n";
++my $path = $ENV{WINDIR};
++$ok= -f $let.substr($path,$^O eq 'cygwin'?2:3)."/win.ini";
++$ok or print "# ",$let.substr($path,3)."/win.ini ",fileLastError(),"\n";
+ print $ok ? "" : "not ", "ok ", ++$test, "\n"; # ok 50
+
+ $ok= DefineDosDevice( DDD_REMOVE_DEFINITION|DDD_EXACT_MATCH_ON_REMOVE
+@@ -351,7 +352,6 @@ $ok= DefineDosDevice( DDD_REMOVE_DEFINITION|DDD_EXACT_MATCH_ON_REMOVE
+ $ok or print "# $let,$dev: ",fileLastError(),"\n";
+ print $ok ? "" : "not ", "ok ", ++$test, "\n"; # ok 51
+
+-my $path = $ENV{WINDIR};
+ my $attrs = GetFileAttributes( $path );
+ $ok= $attrs != INVALID_FILE_ATTRIBUTES;
+ $ok or print "# $path gave invalid attribute value, attrs=$attrs: ",fileLastError(),"\n";
diff --git a/perl/pl-CYG12-3691eaa7_Export_store_cop_label_for_the_perl_compiler.patch b/perl/pl-CYG12-3691eaa7_Export_store_cop_label_for_the_perl_compiler.patch
new file mode 100644
index 0000000..1ea4c5e
--- /dev/null
+++ b/perl/pl-CYG12-3691eaa7_Export_store_cop_label_for_the_perl_compiler.patch
@@ -0,0 +1,107 @@
+commit 3691eaa79cc6a196b6a424b4c7abc6c8f5a481e2
+Author: Reini Urban <ru...@x-...>
+Date: Tue Apr 12 14:14:01 2011 +0200
+
+ Export store_cop_label for the perl compiler
+
+diff --git a/embed.fnc b/embed.fnc
+index b891b43..9067a89 100644
+--- a/embed.fnc
++++ b/embed.fnc
+@@ -2440,8 +2440,8 @@ Apon |void |sys_init3 |NN int* argc|NN char*** argv|NN char*** env
+ Apon |void |sys_term
+ ApoM |const char *|fetch_cop_label|NN COP *const cop \
+ |NULLOK STRLEN *len|NULLOK U32 *flags
+-: Only used in op.c
+-xpoM |void|store_cop_label \
++: Only used in op.c and the perl compiler
++EXpoM |void|store_cop_label \
+ |NN COP *const cop|NN const char *label|STRLEN len|U32 flags
+
+ xpo |int |keyword_plugin_standard|NN char* keyword_ptr|STRLEN keyword_len|NN OP** op_ptr
+diff --git a/ext/XS-APItest/APItest.xs b/ext/XS-APItest/APItest.xs
+index 0ce4d51..4298e7d 100644
+--- a/ext/XS-APItest/APItest.xs
++++ b/ext/XS-APItest/APItest.xs
+@@ -2328,6 +2328,26 @@ test_cophh()
+ #undef msvpvs
+ #undef msviv
+
++void
++test_coplabel()
++ PREINIT:
++ COP *cop;
++ char *label;
++ int len, utf8;
++ CODE:
++ cop = &PL_compiling;
++ Perl_store_cop_label(aTHX_ cop, "foo", 3, 0);
++ label = Perl_fetch_cop_label(aTHX_ cop, &len, &utf8);
++ if (strcmp(label,"foo")) croak("fail # fetch_cop_label label");
++ if (len != 3) croak("fail # fetch_cop_label len");
++ if (utf8) croak("fail # fetch_cop_label utf8");
++ Perl_store_cop_label(aTHX_ cop, "foä", 3, SVf_UTF8);
++ label = Perl_fetch_cop_label(aTHX_ cop, &len, &utf8);
++ if (strcmp(label,"foä")) croak("fail # fetch_cop_label label");
++ if (len != 3) croak("fail # fetch_cop_label len");
++ if (!utf8) croak("fail # fetch_cop_label utf8");
++
++
+ HV *
+ example_cophh_2hv()
+ PREINIT:
+diff --git a/ext/XS-APItest/t/coplabel.t b/ext/XS-APItest/t/coplabel.t
+new file mode 100644
+index 0000000..8f0e0e3
+--- /dev/null
++++ b/ext/XS-APItest/t/coplabel.t
+@@ -0,0 +1,10 @@
++use warnings;
++use strict;
++use Test::More tests => 1;
++
++use XS::APItest;
++
++XS::APItest::test_coplabel();
++ok 1;
++
++1;
+diff --git a/global.sym b/global.sym
+old mode 100644
+new mode 100755
+diff --git a/hv.c b/hv.c
+index ed5061f..e0ea3e2 100644
+--- a/hv.c
++++ b/hv.c
+@@ -3391,6 +3391,15 @@ Perl_refcounted_he_inc(pTHX_ struct refcounted_he *he)
+ return he;
+ }
+
++/*
++=for apidoc fetch_cop_label
++
++Returns the label attached to a cop.
++The flags pointer may be set to C<SVf_UTF8> or 0.
++
++=cut
++*/
++
+ /* pp_entereval is aware that labels are stored with a key ':' at the top of
+ the linked list. */
+ const char *
+@@ -3427,6 +3436,15 @@ Perl_fetch_cop_label(pTHX_ COP *const cop, STRLEN *len, U32 *flags) {
+ return chain->refcounted_he_data + 1;
+ }
+
++/*
++=for apidoc store_cop_label
++
++Save a label into a C<cop_hints_hash>. You need to set flags to C<SVf_UTF8>
++for a utf-8 label.
++
++=cut
++*/
++
+ void
+ Perl_store_cop_label(pTHX_ COP *const cop, const char *label, STRLEN len,
+ U32 flags)
diff --git a/perl/pl-CYG13-31abdf84_APItest_coplabel_fix_warnings.patch b/perl/pl-CYG13-31abdf84_APItest_coplabel_fix_warnings.patch
new file mode 100644
index 0000000..6158821
--- /dev/null
+++ b/perl/pl-CYG13-31abdf84_APItest_coplabel_fix_warnings.patch
@@ -0,0 +1,19 @@
+commit 31abdf84ad3d78de345ff0851a765076f87b01e5
+Author: Reini Urban <ru...@x-...>
+Date: Tue Apr 12 14:27:18 2011 +0200
+
+ APItest coplabel: fix warnings
+
+diff --git a/ext/XS-APItest/APItest.xs b/ext/XS-APItest/APItest.xs
+index 4298e7d..4efb22b 100644
+--- a/ext/XS-APItest/APItest.xs
++++ b/ext/XS-APItest/APItest.xs
+@@ -2333,7 +2333,7 @@ test_coplabel()
+ PREINIT:
+ COP *cop;
+ char *label;
+- int len, utf8;
++ STRLEN len; U32 utf8;
+ CODE:
+ cop = &PL_compiling;
+ Perl_store_cop_label(aTHX_ cop, "foo", 3, 0);
diff --git a/perl/pl-Cygwin-sync_winenv.patch b/perl/pl-Cygwin-sync_winenv.patch
new file mode 100644
index 0000000..1384464
--- /dev/null
+++ b/perl/pl-Cygwin-sync_winenv.patch
@@ -0,0 +1,314 @@
+commit a994b04e42ae3d8b8eccbbd85c6ac73f762a2acf
+Author: Reini Urban <ru...@x-...>
+Date: Wed Feb 8 12:41:45 2012 -0600
+
+ added Cygwin::sync_winenv. Revise cygwin POD
+
+ Cygwin::sync_winenv should fix [CPAN #65052], ADODB missing
+ %COMMONPROGRAMFILES%.
+ sync_winenv code and solution by Chris Day.
+
+diff --git a/README.cygwin b/README.cygwin
+index 0888140..910b3fb 100644
+--- a/README.cygwin
++++ b/README.cygwin
+@@ -1,5 +1,5 @@
+ If you read this file _as_is_, just ignore the funny characters you
+-see. It is written in the POD format (see pod/perlpod.pod) which is
++see. It is written in the POD format (see F<pod/perlpod.pod>) which is
+ specially designed to be readable as is.
+
+ =head1 NAME
+@@ -31,7 +31,7 @@ L<http://www.cygwin.com/>
+
+ A recent net or commercial release of Cygwin is required.
+
+-At the time this document was last updated, Cygwin 1.5.24 was current.
++At the time this document was last updated, Cygwin 1.7.10 was current.
+
+
+ =head2 Cygwin Configuration
+@@ -41,8 +41,8 @@ that Perl builds cleanly. These changes are B<not> required for normal
+ Perl usage.
+
+ B<NOTE:> The binaries that are built will run on all Win32 versions.
+-They do not depend on your host system (Win9x/WinME, WinNT/Win2K)
+-or your Cygwin configuration (I<ntea>, I<ntsec>, binary/text mounts).
++They do not depend on your host system (WinXP/Win2K/Win7) or your
++Cygwin configuration (binary/text mounts, cvgserver).
+ The only dependencies come from hard-coded pathnames like C</usr/local>.
+ However, your host system and Cygwin configuration will affect Perl's
+ runtime behavior (see L</"TEST">).
+@@ -52,7 +52,7 @@ runtime behavior (see L</"TEST">).
+ =item * C<PATH>
+
+ Set the C<PATH> environment variable so that Configure finds the Cygwin
+-versions of programs. Any Windows directories should be removed or
++versions of programs. Any not-needed Windows directories should be removed or
+ moved to the end of your C<PATH>.
+
+ =item * I<nroff>
+@@ -60,28 +60,13 @@ moved to the end of your C<PATH>.
+ If you do not have I<nroff> (which is part of the I<groff> package),
+ Configure will B<not> prompt you to install I<man> pages.
+
+-=item * Permissions
+-
+-On WinNT with either the I<ntea> or I<ntsec> C<CYGWIN> settings, directory
+-and file permissions may not be set correctly. Since the build process
+-creates directories and files, to be safe you may want to run a
+-C<chmod -R +w *> on the entire Perl source tree.
+-
+-Also, it is a well known WinNT "feature" that files created by a login
+-that is a member of the I<Administrators> group will be owned by the
+-I<Administrators> group. Depending on your umask, you may find that you
+-can not write to files that you just created (because you are no longer
+-the owner). When using the I<ntsec> C<CYGWIN> setting, this is not an
+-issue because it "corrects" the ownership to what you would expect on
+-a UNIX system.
+-
+ =back
+
+ =head1 CONFIGURE PERL ON CYGWIN
+
+ The default options gathered by Configure with the assistance of
+ F<hints/cygwin.sh> will build a Perl that supports dynamic loading
+-(which requires a shared F<libperl.dll>).
++(which requires a shared F<cygperl5_16.dll>).
+
+ This will run Configure and keep a record:
+
+@@ -122,17 +107,6 @@ DES crypt port by Corinna Vinschen.
+
+ Alternatively, the crypt libraries in GNU libc have been ported to Cygwin.
+
+-The DES based Ultra Fast Crypt port was done by Alexey Truhan:
+-
+- ftp://ftp.franken.de/pub/win32/develop/gnuwin32/cygwin/porters/Okhapkin_Sergey/cw32crypt-dist-0.tgz
+-
+-NOTE: There are various export restrictions on DES implementations,
+-see the glibc README for more details.
+-
+-The MD5 port was done by Andy Piper:
+-
+- ftp://ftp.franken.de/pub/win32/develop/gnuwin32/cygwin/porters/Okhapkin_Sergey/libcrypt.tgz
+-
+ =item * C<-lgdbm_compat> (C<use GDBM_File>)
+
+ GDBM is available for Cygwin.
+@@ -143,8 +117,7 @@ NOTE: The GDBM library only works on NTFS partitions.
+
+ BerkeleyDB is available for Cygwin.
+
+-NOTE: The BerkeleyDB library only completely works on NTFS partitions
+-and db-4.3 is flawed.
++NOTE: The BerkeleyDB library only completely works on NTFS partitions.
+
+ =item * C<cygserver> (C<use IPC::SysV>)
+
+@@ -177,10 +150,11 @@ prompts you or you can define (undefine) symbols on the command line.
+
+ Undefining this symbol forces Perl to be compiled statically.
+
+-=item * C<-Uusemymalloc>
++=item * C<-Dusemymalloc>
+
+-By default Perl uses the C<malloc()> included with the Perl source. If you
+-want to force Perl to build with the system C<malloc()> undefine this symbol.
++By default Perl does not use the C<malloc()> included with the Perl source,
++because it was slower and not entirely thread-safe. If you want to force
++Perl to build with the old -Dusemymalloc define this.
+
+ =item * C<-Uuseperlio>
+
+@@ -190,12 +164,13 @@ default; it is not recommended to disable PerlIO.
+ =item * C<-Dusemultiplicity>
+
+ Multiplicity is required when embedding Perl in a C program and using
+-more than one interpreter instance. This works with the Cygwin port.
++more than one interpreter instance. This is only required when you build
++a not-threaded perl with C<-Uuseithreads>.
+
+-=item * C<-Duse64bitint>
++=item * C<-Uuse64bitint>
+
+-By default Perl uses 32 bit integers. If you want to use larger 64
+-bit integers, define this symbol.
++By default Perl uses 64 bit integers. If you want to use smaller 32 bit
++integers, define this symbol.
+
+ =item * C<-Duselongdouble>
+
+@@ -203,12 +178,11 @@ I<gcc> supports long doubles (12 bytes). However, several additional
+ long double math functions are necessary to use them within Perl
+ (I<{atan2, cos, exp, floor, fmod, frexp, isnan, log, modf, pow, sin, sqrt}l,
+ strtold>).
+-These are B<not> yet available with Cygwin.
++These are B<not> yet available with newlib, the Cygwin libc.
+
+-=item * C<-Dusethreads>
++=item * C<-Uuseithreads>
+
+-POSIX threads are implemented in Cygwin, define this symbol if you want
+-a threaded perl.
++Define this symbol if you want not-threaded faster perl.
+
+ =item * C<-Duselargefiles>
+
+@@ -217,9 +191,9 @@ this will be correctly detected and defined by Configure.
+
+ =item * C<-Dmksymlinks>
+
+-Use this to build perl outside of the source tree. This works with Cygwin.
+-Details can be found in the F<INSTALL> document. This is the recommended
+-way to build perl from sources.
++Use this to build perl outside of the source tree. Details can be
++found in the F<INSTALL> document. This is the recommended way to
++build perl from sources.
+
+ =back
+
+@@ -349,29 +323,25 @@ to portability, more information can be found in the Cygwin documentation.
+
+ =item * Pathnames
+
+-Cygwin pathnames can be separated by forward (F</>) or backward (F<\\>)
+-slashes. They may also begin with drive letters (F<C:>) or Universal
+-Naming Codes (F<//UNC>). DOS device names (F<aux>, F<con>, F<prn>,
+-F<com*>, F<lpt?>, F<nul>) are invalid as base filenames. However, they
+-can be used in extensions (e.g., F<hello.aux>). Names may contain all
+-printable characters except these:
+-
+- : * ? " < > |
++Cygwin pathnames are separated by forward (F</>) slashes, Universal
++Naming Codes (F<//UNC>) are also supported Since cygwin-1.7 non-POSIX
++pathnames are disencouraged. Names may contain all printable
++characters.
+
+ File names are case insensitive, but case preserving. A pathname that
+-contains a backslash or drive letter is a Win32 pathname (and not subject
+-to the translations applied to POSIX style pathnames).
++contains a backslash or drive letter is a Win32 pathname, and not
++subject to the translations applied to POSIX style pathnames, but
++cygwin will warn you, so better convert them to POSIX.
+
+ For conversion we have C<Cygwin::win_to_posix_path()> and
+ C<Cygwin::posix_to_win_path()>.
+
+-Pathnames may not contain Unicode characters. C<Cygwin> still uses the
+-ANSI API calls and no Unicode calls because of newlib deficiencies.
+-There's an unofficial unicode patch for cygwin at
+-L<http://www.okisoft.co.jp/esc/utf8-cygwin/>
++Since cygwin-1.7 pathnames are UTF-8 encoded.
+
+ =item * Text/Binary
+
++Since cywgin-1.7 textmounts are deprecated and stronlgy discouraged.
++
+ When a file is opened it is in either text or binary mode. In text mode
+ a file is subject to CR/LF/Ctrl-Z translations. With Cygwin, the default
+ mode for an C<open()> is determined by the mode of the mount that underlies
+@@ -411,8 +381,8 @@ extension transparent by looking for F<foo.exe> when you ask for F<foo>
+ (unless a F<foo> also exists). Cygwin does not require a F<.exe>
+ extension, but I<gcc> adds it automatically when building a program.
+ However, when accessing an executable as a normal file (e.g., I<cp>
+-in a makefile) the F<.exe> is not transparent. The I<install> included
+-with Cygwin automatically appends a F<.exe> when necessary.
++in a makefile) the F<.exe> is not transparent. The I<install> program
++included with Cygwin automatically appends a F<.exe> when necessary.
+
+ =item * Cygwin vs. Windows process ids
+
+@@ -428,6 +398,28 @@ to translate between them.
+ Under Cygwin, $^E is the same as $!. When using L<Win32 API Functions|Win32>,
+ use C<Win32::GetLastError()> to get the last Windows error.
+
++=item * rebase errors on fork or system
++
++Using C<fork()> or C<system()> out to another perl after loading multiple dlls
++may result on a DLL baseaddress conflict. The internal cygwin error
++looks like like the following:
++
++ C:\CYGWIN\BIN\PERL.EXE: *** couldn't allocate memory 0x10000(4128768) for 'C:\CYGWIN\LIB\PERL5\5.6.1\CYGWIN-MULTI\AUTO\SOCKET\SOCKET.DLL' alignment, Win32 error 8
++
++ 200 [main] perl 377147 sync_with_child: child -395691(0xB8) died before initialization with status code 0x1
++ 1370 [main] perl 377147 sync_with_child: *** child state child loading dlls
++
++It helps if not too many DLLs are loaded in memory so the available address space is larger,
++e.g. stopping the MS Internet Explorer might help.
++
++Use the perlrebase or rebase utilities to resolve the conflicting dll addresses.
++The rebase package is included in the Cygwin setup. Use F<setup.exe>
++from L<http://www.cygwin.com/setup.exe> to install it.
++
++1. kill all perl processes and run C<perlrebase> or
++
++2. kill all cygwin processes and services, start dash from cmd.exe and run C<rebaseall>.
++
+ =item * C<chown()>
+
+ On WinNT C<chown()> can change a file's user and group IDs. On Win9x C<chown()>
+@@ -448,18 +440,6 @@ of the file being edited C<perl -i.bak> because of windowish restrictions,
+ therefore Perl adds the suffix C<.bak> automatically if you use C<perl -i>
+ without specifying a backup extension.
+
+-Using C<fork()> after loading multiple dlls may fail with an internal cygwin
+-error like the following:
+-
+- C:\CYGWIN\BIN\PERL.EXE: *** couldn't allocate memory 0x10000(4128768) for 'C:\CYGWIN\LIB\PERL5\5.6.1\CYGWIN-MULTI\AUTO\SOCKET\SOCKET.DLL' alignment, Win32 error 8
+-
+- 200 [main] perl 377147 sync_with_child: child -395691(0xB8) died before initialization with status code 0x1
+- 1370 [main] perl 377147 sync_with_child: *** child state child loading dlls
+-
+-Use the rebase utility to resolve the conflicting dll addresses. The
+-rebase package is included in the Cygwin netrelease. Use setup.exe from
+-L<http://www.cygwin.com/setup.exe> to install it and run rebaseall.
+-
+ =back
+
+ =head2 Prebuilt methods:
+@@ -529,6 +509,17 @@ User mounts override system mounts.
+ Returns true if the given cygwin path is binary mounted, false if the
+ path is mounted in textmode.
+
++=item C<Cygwin::sync_winenv>
++
++Cygwin does not initialize all original Win32 environment variables.
++See the bottom of this page L<http://cygwin.com/cygwin-ug-net/setup-env.html>
++for "Restricted Win32 environment".
++
++Certain Win32 programs called from cygwin program might need some environment
++variable, such as e.g. ADODB needs %COMMONPROGRAMFILES%.
++Call Cygwin::sync_winenv() to copy all Win32 environment variables to your
++process and note that cygwin will warn on every encounter of non-POSIX paths.
++
+ =back
+
+ =head1 INSTALL PERL ON CYGWIN
+@@ -781,4 +772,4 @@ Jerry D. Hedden <jdh...@cp...>.
+
+ =head1 HISTORY
+
+-Last updated: 2007-09-25
++Last updated: 2012-02-08
+diff --git a/cygwin/cygwin.c b/cygwin/cygwin.c
+index 0f5fe1d..9419e83 100644
+--- a/cygwin/cygwin.c
++++ b/cygwin/cygwin.c
+@@ -538,6 +538,8 @@ XS(XS_Cygwin_is_binmount)
+ XSRETURN(1);
+ }
+
++XS(XS_Cygwin_sync_winenv){ cygwin_internal(CW_SYNC_WINENV); }
++
+ void
+ init_os_extras(void)
+ {
+@@ -553,6 +555,7 @@ init_os_extras(void)
+ newXSproto("Cygwin::mount_table", XS_Cygwin_mount_table, file, "");
+ newXSproto("Cygwin::mount_flags", XS_Cygwin_mount_flags, file, "$");
+ newXSproto("Cygwin::is_binmount", XS_Cygwin_is_binmount, file, "$");
++ newXS("Cygwin::sync_winenv", XS_Cygwin_sync_winenv, file);
+
+ /* Initialize Win32CORE if it has been statically linked. */
+ handle = dlopen(NULL, RTLD_LAZY);
diff --git a/perl/pl-commit-0c612ce.patch b/perl/pl-commit-0c612ce.patch
new file mode 100644
index 0000000..e7edaea
--- /dev/null
+++ b/perl/pl-commit-0c612ce.patch
@@ -0,0 +1,41 @@
+commit 0c612ce8203a9badc077399e8421a9a0e5183a94
+Author: Reini Urban <ru...@x-...>
+Date: Fri Dec 17 11:02:08 2010 +0100
+
+ Fix building static extensions on cygwin, -UUSEIMPORTLIB
+
+ Similar to the outstanding Dynaloader problem
+ undefined reference to `__imp__PL_stack_sp'
+ when linking against the static libperl.a, not against the .dll.a importlib,
+ the same problem remains for all other static core extensions (tested with Cwd)
+ so fix it at the central place for LINKTYPE=static.
+
+diff -u perl-5.14.2/make_ext.pl.orig perl-5.14.2/make_ext.pl
+--- perl-5.14.2/make_ext.pl.orig 2011-09-26 04:44:34.000000000 -0500
++++ perl-5.14.2/make_ext.pl 2012-03-20 10:02:06.156250000 -0500
+@@ -286,7 +286,7 @@
+ } else {
+ $makefile = 'Makefile';
+ }
+-
++
+ if (!-f $makefile) {
+ if (!-f 'Makefile.PL') {
+ print "\nCreating Makefile.PL in $ext_dir for $mname\n";
+@@ -373,6 +373,16 @@
+ ) : ()),
+ );
+
++sub MY::cflags {
++ package MY;
++ my $flags = $_[0]->SUPER::cflags(@_);
++ my $linktype = $_[0]->{LINKTYPE};
++ if ($linktype eq 'static' and $flags =~ /-DUSEIMPORTLIB/m) {
++ $flags =~ s/-DUSEIMPORTLIB/-UUSEIMPORTLIB/m;
++ }
++ $flags;
++}
++
+ # ex: set ro:
+ EOM
+ close $fh or die "Can't close Makefile.PL: $!";
diff --git a/perl/pl-commit-1bac5ec.patch b/perl/pl-commit-1bac5ec.patch
new file mode 100644
index 0000000..61bcf30
--- /dev/null
+++ b/perl/pl-commit-1bac5ec.patch
@@ -0,0 +1,33 @@
+commit 1bac5ecc108e6bb05752e5aef66c6890163aff39
+Author: Brian Fraser <fra...@gm...>
+Date: Mon Sep 26 13:48:52 2011 -0700
+
+ sv.c: S_anonymise_cv_maybe UTF8 cleanup.
+
+diff --git a/sv.c b/sv.c
+index d71f901..a3a2c74 100644
+--- a/sv.c
++++ b/sv.c
+@@ -5893,7 +5893,6 @@ Perl_sv_replace(pTHX_ register SV *const sv, register SV *const nsv)
+ STATIC void
+ S_anonymise_cv_maybe(pTHX_ GV *gv, CV* cv)
+ {
+- char *stash;
+ SV *gvname;
+ GV *anongv;
+
+@@ -5913,10 +5912,10 @@ S_anonymise_cv_maybe(pTHX_ GV *gv, CV* cv)
+ }
+
+ /* if not, anonymise: */
+- stash = GvSTASH(gv) && HvNAME(GvSTASH(gv))
+- ? HvENAME(GvSTASH(gv)) : NULL;
+- gvname = Perl_newSVpvf(aTHX_ "%s::__ANON__",
+- stash ? stash : "__ANON__");
++ gvname = (GvSTASH(gv) && HvNAME(GvSTASH(gv)) && HvENAME(GvSTASH(gv)))
++ ? newSVhek(HvENAME_HEK(GvSTASH(gv)))
++ : newSVpvn_flags( "__ANON__", 8, 0 );
++ sv_catpvs(gvname, "::__ANON__");
+ anongv = gv_fetchsv(gvname, GV_ADDMULTI, SVt_PVCV);
+ SvREFCNT_dec(gvname);
+
diff --git a/perl/pl-cygwin-auto-image-base.patch b/perl/pl-cygwin-auto-image-base.patch
new file mode 100644
index 0000000..44f1a40
--- /dev/null
+++ b/perl/pl-cygwin-auto-image-base.patch
@@ -0,0 +1,11 @@
+--- origsrc/perl-5.14.4/Makefile.SH 2012-12-19 06:25:23.000000000 -0600
++++ src/perl-5.14.4/Makefile.SH 2013-03-13 13:03:54.186100300 -0500
+@@ -61,7 +61,7 @@ true)
+ -install_name \$(shrpdir)/\$@"
+ ;;
+ cygwin*)
+- shrpldflags="$shrpldflags -Wl,--out-implib=libperl.dll.a -Wl,--image-base,0x52000000"
++ shrpldflags="$shrpldflags -Wl,--out-implib=libperl.dll.a"
+ linklibperl="-L. -lperl"
+ ;;
+ sunos*)
diff --git a/perl/pl-cygwin-check-libs.patch b/perl/pl-cygwin-check-libs.patch
new file mode 100644
index 0000000..8a7b351
--- /dev/null
+++ b/perl/pl-cygwin-check-libs.patch
@@ -0,0 +1,14 @@
+--- perl-5.14.4-RC2-1/origsrc/perl-5.14.4-RC2/Configure 2012-12-19 06:25:23.000000000 -0600
++++ perl-5.14.4-RC2-1/src/perl-5.14.4-RC2/Configure 2013-03-10 22:54:46.714474300 -0500
+@@ -4973,6 +4973,11 @@ for thislib in $libswanted; do
+ $test -f "$xxx" && libstyle=shared
+ fi
+ if test ! -f "$xxx"; then
++ xxx=$thisdir/lib$thislib.dll.a
++ $test -f "$xxx" && eval $libscheck
++ $test -f "$xxx" && libstyle=shared
++ fi
++ if test ! -f "$xxx"; then
+ xxx=$thisdir/lib$thislib$_a
+ $test -f "$xxx" && eval $libscheck
+ $test -f "$xxx" && libstyle=static
diff --git a/perl/pl-cygwin_patchlevelh.patch b/perl/pl-cygwin_patchlevelh.patch
new file mode 100644
index 0000000..3f14f4b
--- /dev/null
+++ b/perl/pl-cygwin_patchlevelh.patch
@@ -0,0 +1,19 @@
+difforig perl-5.14.2/patchlevel.h
+
+diff -u perl-5.14.2/patchlevel.h.orig perl-5.14.2/patchlevel.h
+--- perl-5.14.2/patchlevel.h.orig 2011-09-26 04:44:34.000000000 -0500
++++ perl-5.14.2/patchlevel.h 2012-03-20 10:09:37.109375000 -0500
+@@ -137,6 +137,13 @@
+ ,"uncommitted-changes"
+ #endif
+ PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
++ ,"Bug#55162 File::Spec::case_tolerant performance"
++ ,"CYG07 $vendorarch/auto/.rebase"
++ ,"CYG15 static Win32CORE"
++ ,"CYG17 cyg-1.7 paths-utf8"
++ ,"0c612ce82 Fix building static extensions on cygwin, -UUSEIMPORTLIB"
++ ,"1bac5ecc1 Fix 64-bit threading sv.c: S_anonymise_cv_maybe"
++ ,"Cygwin::sync_winenv added"
+ ,NULL
+ };
+
diff --git a/perl/pl-hints-cygwin.patch b/perl/pl-hints-cygwin.patch
new file mode 100644
index 0000000..5add4b0
--- /dev/null
+++ b/perl/pl-hints-cygwin.patch
@@ -0,0 +1,13 @@
+difforig buildperl/hints/cygwin.sh
+
+diff -u buildperl/hints/cygwin.sh.orig buildperl/hints/cygwin.sh
+--- buildperl/hints/cygwin.sh.orig 2011-09-19 08:18:22.000000000 -0500
++++ buildperl/hints/cygwin.sh 2012-03-23 09:33:16.687500000 -0500
+@@ -31,6 +31,7 @@
+ man3ext='3pm'
+ test -z "$use64bitint" && use64bitint='define'
+ test -z "$usethreads" && usethreads='define'
++test -z "$usemymalloc" && usemymalloc='undef'
+ ccflags="$ccflags -DPERL_USE_SAFE_PUTENV -U__STRICT_ANSI__"
+ # - otherwise i686-cygwin
+ archname='cygwin'
-----------------------------------------------------------------------
Summary of changes:
perl/msys2-perl.patch | 131 +++++++
perl/pl-CYG07-cygwin_vendorarchautorebase-2.patch | 129 +++++++
perl/pl-CYG08-b722195e_CYG17_utf8_paths.patch | 375 ++++++++++++++++++++
...g_cygwin_utf8_readdir_with_Win32_ANSI_API.patch | 183 ++++++++++
...11-fabf0235_Fix_test_50_on_cygwin_WINDOWS.patch | 39 ++
...ort_store_cop_label_for_the_perl_compiler.patch | 107 ++++++
...13-31abdf84_APItest_coplabel_fix_warnings.patch | 19 +
perl/pl-Cygwin-sync_winenv.patch | 314 ++++++++++++++++
perl/pl-commit-0c612ce.patch | 41 +++
perl/pl-commit-1bac5ec.patch | 33 ++
perl/pl-cygwin-auto-image-base.patch | 11 +
perl/pl-cygwin-check-libs.patch | 14 +
perl/pl-cygwin_patchlevelh.patch | 19 +
perl/pl-hints-cygwin.patch | 13 +
14 files changed, 1428 insertions(+), 0 deletions(-)
create mode 100644 perl/msys2-perl.patch
create mode 100644 perl/pl-CYG07-cygwin_vendorarchautorebase-2.patch
create mode 100644 perl/pl-CYG08-b722195e_CYG17_utf8_paths.patch
create mode 100644 perl/pl-CYG10-95f6fab9_skip_testing_cygwin_utf8_readdir_with_Win32_ANSI_API.patch
create mode 100644 perl/pl-CYG11-fabf0235_Fix_test_50_on_cygwin_WINDOWS.patch
create mode 100644 perl/pl-CYG12-3691eaa7_Export_store_cop_label_for_the_perl_compiler.patch
create mode 100644 perl/pl-CYG13-31abdf84_APItest_coplabel_fix_warnings.patch
create mode 100644 perl/pl-Cygwin-sync_winenv.patch
create mode 100644 perl/pl-commit-0c612ce.patch
create mode 100644 perl/pl-commit-1bac5ec.patch
create mode 100644 perl/pl-cygwin-auto-image-base.patch
create mode 100644 perl/pl-cygwin-check-libs.patch
create mode 100644 perl/pl-cygwin_patchlevelh.patch
create mode 100644 perl/pl-hints-cygwin.patch
hooks/post-receive
--
Repository: msys2-tools
|
|
From: Keith M. <no...@so...> - 2013-03-25 22:08:26
|
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: mingw-get".
The branch, master has been updated
via bcf20bf8f9c5a45e3c93efd67f42632bb0e677fa (commit)
via b240cc932da7a4880dcbf3c089c8bd3d3e7e905b (commit)
via e5b5366f23986a489892ac12d6a85ff69a8cb58e (commit)
via 33be8212468490398bc937012ae55d9d9a81e5a5 (commit)
via 189aa0b355bca13a984f67a3821df5167cf95cfb (commit)
from efe6f672016dad72fb26b29399cccc40e57efc03 (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/mingw-get/ci/bcf20bf8f9c5a45e3c93efd67f42632bb0e677fa/
commit bcf20bf8f9c5a45e3c93efd67f42632bb0e677fa
Author: Keith Marshall <kei...@us...>
Date: Mon Mar 25 15:21:20 2013 +0000
Adapt DMH for use in setup tool.
--HG--
rename : src/dmh.cpp => src/dmhcore.cpp
rename : src/guidmh.cpp => src/dmhguix.cpp
diff --git a/ChangeLog b/ChangeLog
index 6abb6ea..b337b91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2013-03-25 Keith Marshall <kei...@us...>
+
+ Adapt DMH for use in setup tool.
+
+ * src/dmh.cpp: File renamed to...
+ * src/dmhcore.cpp: ...this; some code rearranged, to facilitate...
+ [IMPLEMENTATION_LEVEL == PACKAGE_BASE_COMPONENT]: ...marking of code
+ sections which are required in the base package build, but which may
+ be filtered out of the build context for the setup tool.
+
+ * src/guidmh.cpp: File renamed to this...
+ * src/dmhguix.cpp: ...this; also add marking for...
+ [IMPLEMENTATION_LEVEL == PACKAGE_BASE_COMPONENT]: ...sections which
+ may be filtered out of the build context for the setup tool.
+ (dmhTypePTY::printf): Improve stratagem for output.
+
+ * Makefile.in (CORE_DLL_OBJECTS, GUIMAIN_OBJECTS): Adjust references
+ to renamed source files.
+
2013-03-22 Keith Marshall <kei...@us...>
Enable context hooks for build time code filtering.
diff --git a/Makefile.in b/Makefile.in
index 996f82a..e7ed2ea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -77,7 +77,7 @@ LDFLAGS = @LDFLAGS@
GUI_LDFLAGS = -mwindows $(LDFLAGS)
LIBS = -Wl,-Bstatic -llua -lz -lbz2 -llzma -Wl,-Bdynamic -lwininet
-CORE_DLL_OBJECTS = climain.$(OBJEXT) pkgshow.$(OBJEXT) dmh.$(OBJEXT) \
+CORE_DLL_OBJECTS = climain.$(OBJEXT) pkgshow.$(OBJEXT) dmhcore.$(OBJEXT) \
pkgbind.$(OBJEXT) pkginet.$(OBJEXT) pkgstrm.$(OBJEXT) pkgname.$(OBJEXT) \
pkgexec.$(OBJEXT) pkgfind.$(OBJEXT) pkginfo.$(OBJEXT) pkgspec.$(OBJEXT) \
pkgopts.$(OBJEXT) sysroot.$(OBJEXT) pkghash.$(OBJEXT) pkgkeys.$(OBJEXT) \
@@ -90,7 +90,7 @@ CLI_EXE_OBJECTS = \
clistub.$(OBJEXT) version.$(OBJEXT) approot.$(OBJEXT) getopt.$(OBJEXT)
GUIMAIN_OBJECTS = \
- guimain.$(OBJEXT) guiexec.$(OBJEXT) guidmh.$(OBJEXT) \
+ guimain.$(OBJEXT) guiexec.$(OBJEXT) dmhguix.$(OBJEXT) \
approot.$(OBJEXT) pkgview.$(OBJEXT) pkgtree.$(OBJEXT) pkglist.$(OBJEXT) \
pkgdata.$(OBJEXT) pkgnget.$(OBJEXT) guimain.res.$(OBJEXT)
diff --git a/src/dmh.cpp b/src/dmhcore.cpp
similarity index 95%
rename from src/dmh.cpp
rename to src/dmhcore.cpp
index b78253b..b3f73f4 100644
--- a/src/dmh.cpp
+++ b/src/dmhcore.cpp
@@ -1,10 +1,10 @@
/*
- * dmh.cpp
+ * dmhcore.cpp
*
* $Id$
*
* Written by Keith Marshall <kei...@us...>
- * Copyright (C) 2009, 2010, 2011, 2012, MinGW.org Project
+ * Copyright (C) 2009-2013, MinGW.org Project
*
*
* Implementation of the core components of, and the CLI specific
@@ -30,6 +30,7 @@
#include <stdarg.h>
#include "dmhcore.h"
+#include "pkgimpl.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -40,6 +41,15 @@
*/
EXTERN_C void dmh_setpty( HWND );
+/* This pointer stores the address of the message handler
+ * class instance, after initialisation.
+ */
+static dmhTypeGeneric *dmh = NULL;
+
+/* Initialisation requires this constructor.
+ */
+dmhTypeGeneric::dmhTypeGeneric( const char* name ):progname( name ){}
+
/* Implementation of the dmh_exception class.
*/
static const char *unspecified_error = "Unspecified error";
@@ -61,6 +71,29 @@ const char* dmh_exception::what() const throw()
return message;
}
+/* Establish the format to be used for the prefix string, which is
+ * attached to TTY and PTY notifications.
+ */
+const char *dmhTypeGeneric::notification_format = "%s: *** %s *** ";
+
+const char *dmhTypeGeneric::severity_tag( dmh_severity code )
+{
+ /* Helper function to assign labels to the known severity codes.
+ */
+ static const char *severity[] =
+ {
+ /* Labels to identify message severity...
+ */
+ "INFO", /* DMH_INFO */
+ "WARNING", /* DMH_WARNING */
+ "ERROR", /* DMH_ERROR */
+ "FATAL" /* DMH_FATAL */
+ };
+ return severity[code];
+}
+
+#if IMPLEMENTATION_LEVEL == PACKAGE_BASE_COMPONENT
+
class dmhTypeTTY: public dmhTypeGeneric
{
/* Diagnostic message handler for use in console applications.
@@ -75,18 +108,12 @@ class dmhTypeTTY: public dmhTypeGeneric
inline int emit_and_flush( int );
};
-/* Constructors serve to initialise the message handler,
+/* Constructor serves to initialise the message handler,
* simply creating the class instance, and storing the specified
- * program name within it.
+ * program name within its dmhTypeGeneric component.
*/
-dmhTypeGeneric::dmhTypeGeneric( const char* name ):progname( name ){}
dmhTypeTTY::dmhTypeTTY( const char* name ):dmhTypeGeneric( name ){}
-/* This pointer stores the address of the message handler
- * class instance, after initialisation.
- */
-static dmhTypeGeneric *dmh = NULL;
-
#define client GetModuleHandle( NULL )
static inline dmhTypeGeneric *dmh_init_gui( const char *progname )
{
@@ -167,27 +194,6 @@ inline int dmhTypeTTY::emit_and_flush( int status )
return status;
}
-const char *dmhTypeGeneric::severity_tag( dmh_severity code )
-{
- /* Helper function to assign labels to the known severity codes.
- */
- static const char *severity[] =
- {
- /* Labels to identify message severity...
- */
- "INFO", /* DMH_INFO */
- "WARNING", /* DMH_WARNING */
- "ERROR", /* DMH_ERROR */
- "FATAL" /* DMH_FATAL */
- };
- return severity[code];
-}
-
-/* Establish the format to be used for the prefix string, which is
- * attached to TTY and PTY notifications.
- */
-const char *dmhTypeGeneric::notification_format = "%s: *** %s *** ";
-
int dmhTypeTTY::notify( const dmh_severity code, const char *fmt, va_list argv )
{
/* Message dispatcher for console class applications.
@@ -211,6 +217,8 @@ int dmhTypeTTY::printf( const char *fmt, va_list argv )
return emit_and_flush( vfprintf( stderr, fmt, argv ) );
}
+#endif /* IMPLEMENTATION_LEVEL == PACKAGE_BASE_COMPONENT */
+
EXTERN_C uint16_t dmh_control( const uint16_t request, const uint16_t mask )
{
/* Public helper to access and manipulate the control channel for
diff --git a/src/guidmh.cpp b/src/dmhguix.cpp
similarity index 95%
rename from src/guidmh.cpp
rename to src/dmhguix.cpp
index a5f4bda..e163376 100644
--- a/src/guidmh.cpp
+++ b/src/dmhguix.cpp
@@ -1,14 +1,14 @@
/*
- * guidmh.cpp
+ * dmhguix.cpp
*
* $Id$
*
* Written by Keith Marshall <kei...@us...>
- * Copyright (C) 2009, 2010, 2011, 2012, MinGW.org Project
+ * Copyright (C) 2009-2013, MinGW.org Project
*
*
- * Implementation of the GUI specific API for the DMH_SUBSYSTEM_GUI
- * diagnostic message handling subsystem.
+ * Implementation of GUI specific API extensions, providing support
+ * for the DMH_SUBSYSTEM_GUI diagnostic message handling subsystem.
*
*
* This is free software. Permission is granted to copy, modify and
@@ -30,6 +30,7 @@
#include <stdarg.h>
#include "dmhcore.h"
+#include "pkgimpl.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -166,8 +167,13 @@ int dmhTypePTY::printf( const char *fmt, va_list argv )
* terminate and flush it to the EDITTEXT control.
*/
*caret = '\0';
- SendMessage( console_hook, EM_SETSEL, 0, (LPARAM)(-1) );
- SendMessage( console_hook, EM_REPLACESEL, FALSE, (LPARAM)(console_buffer) );
+ SendMessage( console_hook, WM_SETTEXT, 0, (LPARAM)(console_buffer) );
+
+ /* As we write it, ensure that the last line written remains visible,
+ * with the caret positioned after it.
+ */
+ SendMessage( console_hook, EM_SETSEL, caret - console_buffer, (LPARAM)(-1) );
+ SendMessage( console_hook, EM_SCROLLCARET, (WPARAM)(0), (LPARAM)(0) );
/* Finally, we repaint the display window, and return the output
* character count.
@@ -263,6 +269,8 @@ class dmhTypeGUI: public dmhTypeGeneric
dmhTypePTY *console_hook;
};
+#if IMPLEMENTATION_LEVEL == PACKAGE_BASE_COMPONENT
+
EXTERN_C
dmhTypeGeneric *dmh_init_gui( const char * ) __declspec(dllexport);
dmhTypeGeneric *dmh_init_gui( const char *progname )
@@ -273,6 +281,8 @@ dmhTypeGeneric *dmh_init_gui( const char *progname )
return new dmhTypeGUI( progname );
}
+#endif /* IMPLEMENTATION_LEVEL == PACKAGE_BASE_COMPONENT */
+
/* Constructor serves to initialise the message handler,
* creating the class instance, and storing the specified
* program name within it.
https://sf.net/p/mingw/mingw-get/ci/b240cc932da7a4880dcbf3c089c8bd3d3e7e905b/
commit b240cc932da7a4880dcbf3c089c8bd3d3e7e905b
Author: Keith Marshall <kei...@us...>
Date: Fri Mar 22 14:09:07 2013 +0000
Enable context hooks for build time code filtering.
diff --git a/ChangeLog b/ChangeLog
index 322e16d..6abb6ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-03-22 Keith Marshall <kei...@us...>
+
+ Enable context hooks for build time code filtering.
+
+ * src/pkgimpl.h: New file; it defines...
+ (PACKAGE_BASE_COMPONENT, SETUP_TOOL_COMPONENT): ...these contexts;
+ either of these may be selected, by defining as manifest value for...
+ (IMPLEMENTATION_LEVEL): ...this; default is PACKAGE_BASE_COMPONENT.
+
+ * src/pkgbase.h: Include pkgimpl.h
+ [IMPLEMENTATION_LEVEL != PACKAGE_BASE_COMPONENT]: Occlude content.
+
2013-03-21 Keith Marshall <kei...@us...>
Specify additional files for clean-up.
diff --git a/src/pkgbase.h b/src/pkgbase.h
index beb1d15..14b2ebe 100644
--- a/src/pkgbase.h
+++ b/src/pkgbase.h
@@ -27,6 +27,8 @@
* arising from the use of this software.
*
*/
+#include "pkgimpl.h"
+#if IMPLEMENTATION_LEVEL == PACKAGE_BASE_COMPONENT
#define PKGBASE_H 1
#include <tinyxml.h>
@@ -560,4 +562,5 @@ bool safe_strcmp( strcmp_function strcmp, const char *value, const char *proto )
# define pkg_strcmp( A, B ) safe_strcmp( strcmp, (A), (B) )
#endif
+#endif /* PACKAGE_BASE_COMPONENT */
#endif /* PKGBASE_H: $RCSfile$: end of file */
diff --git a/src/pkgimpl.h b/src/pkgimpl.h
new file mode 100644
index 0000000..12208fc
--- /dev/null
+++ b/src/pkgimpl.h
@@ -0,0 +1,39 @@
+#ifndef PKGIMPL_H
+/*
+ * pkgimpl.h
+ *
+ * $Id$
+ *
+ * Written by Keith Marshall <kei...@us...>
+ * Copyright (C) 2013, MinGW.org Project
+ *
+ *
+ * This header provides a set of macros defining implementation
+ * levels for selective compilation of modules which may be used
+ * in multiple distinct contexts.
+ *
+ *
+ * This is free software. Permission is granted to copy, modify and
+ * redistribute this software, under the provisions of the GNU General
+ * Public License, Version 3, (or, at your option, any later version),
+ * as published by the Free Software Foundation; see the file COPYING
+ * for licensing details.
+ *
+ * Note, in particular, that this software is provided "as is", in the
+ * hope that it may prove useful, but WITHOUT WARRANTY OF ANY KIND; not
+ * even an implied WARRANTY OF MERCHANTABILITY, nor of FITNESS FOR ANY
+ * PARTICULAR PURPOSE. Under no circumstances will the author, or the
+ * MinGW Project, accept liability for any damages, however caused,
+ * arising from the use of this software.
+ *
+ */
+#define PKGIMPL_H
+
+#ifndef IMPLEMENTATION_LEVEL
+#define IMPLEMENTATION_LEVEL PACKAGE_BASE_COMPONENT
+#endif
+
+#define PACKAGE_BASE_COMPONENT 0x0100
+#define SETUP_TOOL_COMPONENT 0x0101
+
+#endif /* !defined PKGIMPL_H: $RCSfile$: end of file */
https://sf.net/p/mingw/mingw-get/ci/e5b5366f23986a489892ac12d6a85ff69a8cb58e/
commit e5b5366f23986a489892ac12d6a85ff69a8cb58e
Author: Keith Marshall <kei...@us...>
Date: Thu Mar 21 15:21:16 2013 +0000
Specify additional files for clean-up.
diff --git a/ChangeLog b/ChangeLog
index 60a8da7..322e16d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2013-03-21 Keith Marshall <kei...@us...>
+ Specify additional files for clean-up.
+
+ * Makefile.in (distclean): Additionally specify...
+ (build.tag, build.time): ...these, as removable files.
+
+2013-03-21 Keith Marshall <kei...@us...>
+
Add a missing distribution dependency.
* Makefile.in (srcdist): Explicitly require...
diff --git a/Makefile.in b/Makefile.in
index 34ec52b..996f82a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -393,7 +393,7 @@ clean:
rm -f *.$(OBJEXT) *.d *.dll $(BIN_PROGRAMS) $(LIBEXEC_PROGRAMS)
distclean: clean
- rm -f config.* version.c
+ rm -f config.* version.c build.tag build.time
maintainer-clean: distclean
rm -f README NEWS INSTALL readme.txt Makefile pkginfo.c
https://sf.net/p/mingw/mingw-get/ci/33be8212468490398bc937012ae55d9d9a81e5a5/
commit 33be8212468490398bc937012ae55d9d9a81e5a5
Author: Keith Marshall <kei...@us...>
Date: Thu Mar 21 14:33:22 2013 +0000
Add a missing distribution dependency.
diff --git a/ChangeLog b/ChangeLog
index cac5058..60a8da7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2013-03-21 Keith Marshall <kei...@us...>
+ Add a missing distribution dependency.
+
+ * Makefile.in (srcdist): Explicitly require...
+ (pkginfo.c): ...this; previously, it was only an implicit build time
+ requirement, and may not have persisted until distribution time.
+
+2013-03-21 Keith Marshall <kei...@us...>
+
Implement by-name association of resource scripts with programs.
* src/guidata.rc: Renamed as...
diff --git a/Makefile.in b/Makefile.in
index f8dbb30..34ec52b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -298,7 +298,7 @@ licdist:
$(PACKAGE_DISTNAME)$(SCMTAG)-lic.$(TAREXT)
rm -rf share
-srcdist: srcdist-doc
+srcdist: srcdist-doc pkginfo.c
rm -rf ${PACKAGE_DISTROOT} && mkdir ${PACKAGE_DISTROOT}
cd ${PACKAGE_DISTROOT}; for file in $(SRCDIST_FILES); do \
test -f ${abs_top_srcdir}/$$file \
https://sf.net/p/mingw/mingw-get/ci/189aa0b355bca13a984f67a3821df5167cf95cfb/
commit 189aa0b355bca13a984f67a3821df5167cf95cfb
Author: Keith Marshall <kei...@us...>
Date: Thu Mar 21 13:15:12 2013 +0000
Implement by-name association of resource scripts with programs.
--HG--
rename : src/guidata.rc => src/guimain.rc
diff --git a/ChangeLog b/ChangeLog
index fc61b36..cac5058 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-03-21 Keith Marshall <kei...@us...>
+
+ Implement by-name association of resource scripts with programs.
+
+ * src/guidata.rc: Renamed as...
+ * src/guimain.rc: ...this, reflecting its association with...
+ * src/guimain.cpp: ...this program source.
+
+ * Makefile.in (GUIMAIN_OBJECTS): Update dependency...
+ (%.$OBJEXT:%.rc): ...replacing use of this pattern rule...
+ (%.res.$OBJEXT:%.rc): ...with this.
+
2013-01-18 Keith Marshall <kei...@us...>
Make GUI support visual styles in current Windows versions.
diff --git a/Makefile.in b/Makefile.in
index 44cfba5..f8dbb30 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,9 +90,9 @@ CLI_EXE_OBJECTS = \
clistub.$(OBJEXT) version.$(OBJEXT) approot.$(OBJEXT) getopt.$(OBJEXT)
GUIMAIN_OBJECTS = \
- guimain.$(OBJEXT) guidata.$(OBJEXT) guiexec.$(OBJEXT) guidmh.$(OBJEXT) \
+ guimain.$(OBJEXT) guiexec.$(OBJEXT) guidmh.$(OBJEXT) \
approot.$(OBJEXT) pkgview.$(OBJEXT) pkgtree.$(OBJEXT) pkglist.$(OBJEXT) \
- pkgdata.$(OBJEXT) pkgnget.$(OBJEXT)
+ pkgdata.$(OBJEXT) pkgnget.$(OBJEXT) guimain.res.$(OBJEXT)
GUIMAIN_LIBS = -lwtklite -lcomctl32
@@ -139,9 +139,12 @@ sinclude *.d
$(CXX) $(DEPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $<
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
-%.$(OBJEXT): %.rc
+%.res.$(OBJEXT): %.rc
+ test ! -f $*.d || mv $*.d $*.d.bak
$(CC) $(DEPFLAGS) $(RC_INCLUDES) -DRC_INVOKED -xc-header $<
+ sed 's,$*\.$(OBJEXT):,$@:,' $*.d > $*.res.d; rm -f $*.d
$(RC_SCRIPT) $< | $(RC) $(RC_INCLUDES) -o $@
+ test ! -f $*.d.bak || mv $*.d.bak $*.d
%.$(OBJEXT): %.ico
echo $* ICON $*.ico | $(RC) -I ${srcdir}/icons -o $@
@@ -165,8 +168,7 @@ time-stamp:
%.c: %.c.in
$(VERSION_SCRIPT) $< > $@
-version.c: Makefile build.time
-guidata.$(OBJEXT): Makefile build.time
+version.c guimain.res.$(OBJEXT): Makefile build.time
# Installation tools and directory paths...
#
diff --git a/src/guidata.rc b/src/guimain.rc
similarity index 100%
rename from src/guidata.rc
rename to src/guimain.rc
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 58 ++++++++++++++++++++++++++++++++
Makefile.in | 18 +++++----
src/{dmh.cpp => dmhcore.cpp} | 70 +++++++++++++++++++++-----------------
src/{guidmh.cpp => dmhguix.cpp} | 22 +++++++++---
src/{guidata.rc => guimain.rc} | 0
src/pkgbase.h | 3 ++
src/{approot.h => pkgimpl.h} | 30 +++++++----------
7 files changed, 138 insertions(+), 63 deletions(-)
rename src/{dmh.cpp => dmhcore.cpp} (95%)
rename src/{guidmh.cpp => dmhguix.cpp} (95%)
rename src/{guidata.rc => guimain.rc} (100%)
copy src/{approot.h => pkgimpl.h} (62%)
hooks/post-receive
--
Repository: mingw-get
|
|
From: Alexx83 <no...@so...> - 2013-03-25 14:50:56
|
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 6529be9295457005b9e68f6df86919ddf7c107bf (commit)
from fb86e40fe049015ca370e790c928eb1c0ffb0b11 (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/6529be9295457005b9e68f6df86919ddf7c107bf/
commit 6529be9295457005b9e68f6df86919ddf7c107bf
Author: Alexpux <ale...@gm...>
Date: Mon Mar 25 18:50:41 2013 +0400
Update NCURSES patch
diff --git a/ncurses/ncurses-5.9-20130209-msys.patch b/ncurses/ncurses-5.9-20130324-msys2.patch
similarity index 78%
rename from ncurses/ncurses-5.9-20130209-msys.patch
rename to ncurses/ncurses-5.9-20130324-msys2.patch
index e651358..05d92d7 100644
--- a/ncurses/ncurses-5.9-20130209-msys.patch
+++ b/ncurses/ncurses-5.9-20130324-msys2.patch
@@ -1,7 +1,7 @@
-diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4
---- ncurses-5.9-20130209/aclocal.m4 2013-02-09 21:55:03.000000000 +0400
-+++ ncurses-5.9-20130209-p/aclocal.m4 2013-02-13 10:19:04.438476500 +0400
-@@ -2127,7 +2127,7 @@
+diff -Naur ncurses-5.9-20130324/aclocal.m4 ncurses-orig/aclocal.m4
+--- ncurses-5.9-20130324/aclocal.m4 2013-03-25 01:10:41.000000000 +0400
++++ ncurses-orig/aclocal.m4 2013-03-25 15:42:23.863333573 +0400
+@@ -2128,7 +2128,7 @@
;;
*)
case $cf_cv_system_name in #(vi
@@ -10,7 +10,7 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4
;;
*)
mkdir conftest.src conftest.bin conftest.lib
-@@ -3087,7 +3087,7 @@
+@@ -3089,7 +3089,7 @@
AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
case $cf_cv_shlib_version in #(vi
@@ -19,19 +19,19 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4
TINFO_NAME=$TINFO_ARG_SUFFIX
TINFO_SUFFIX=.dll
;;
-@@ -3183,6 +3183,11 @@
- Libs_To_Make="$Libs_To_Make ../lib/cyg${cf_dir}${cf_cygsuf}"
- continue
- ;;
-+ msysdll) #(vi
-+ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
-+ Libs_To_Make="$Libs_To_Make ../lib/msys-${cf_dir}${cf_cygsuf}"
-+ continue
-+ ;;
- mingw)
- cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
- Libs_To_Make="$Libs_To_Make ../lib/lib${cf_dir}${cf_cygsuf}"
-@@ -3630,7 +3635,7 @@
+@@ -3172,6 +3172,11 @@
+ Libs_To_Make="$Libs_To_Make ../lib/cyg${cf_libname}${cf_cygsuf}"
+ continue
+ ;;
++ msysdll) #(vi
++ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
++ Libs_To_Make="$Libs_To_Make ../lib/msys-${cf_libname}${cf_cygsuf}"
++ continue
++ ;;
+ mingw)
+ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
+ Libs_To_Make="$Libs_To_Make ../lib/lib${cf_libname}${cf_cygsuf}"
+@@ -3664,7 +3669,7 @@
$2='.a'
$3=[$]$2
;;
@@ -40,7 +40,7 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4
$2='.dll'
$3='.dll.a'
;;
-@@ -4467,7 +4472,7 @@
+@@ -4501,7 +4506,7 @@
AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
if test "$cross_compiling" = yes ; then
case $target_alias in #(vi
@@ -49,7 +49,7 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4
cf_cv_mixedcase=no
;;
*)
-@@ -4624,7 +4629,7 @@
+@@ -4658,7 +4663,7 @@
profile) $2='obj_p' ;;
shared)
case $cf_cv_system_name in #(vi
@@ -58,7 +58,7 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4
$2='objects' ;;
*)
$2='obj_s' ;;
-@@ -5367,6 +5372,25 @@
+@@ -5401,6 +5406,25 @@
CF_EOF
chmod +x mk_shared_lib.sh
;;
@@ -84,7 +84,7 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4
darwin*) #(vi
cf_try_cflags="no-cpp-precomp"
CC_SHARED_OPTS="-dynamic"
-@@ -6667,7 +6691,7 @@
+@@ -6701,7 +6725,7 @@
# special hack to add -no-undefined (which libtool should do for itself)
LT_UNDEF=
case "$cf_cv_system_name" in #(vi
@@ -93,7 +93,7 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4
LT_UNDEF=-no-undefined
;;
esac
-@@ -6993,7 +7017,7 @@
+@@ -7028,7 +7052,7 @@
aix[[4-7]]*) #(vi
cf_xopen_source="-D_ALL_SOURCE"
;;
@@ -102,10 +102,10 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4
cf_XOPEN_SOURCE=600
;;
darwin[[0-8]].*) #(vi
-diff -Naur ncurses-5.9-20130209/Ada95/aclocal.m4 ncurses-5.9-20130209-p/Ada95/aclocal.m4
---- ncurses-5.9-20130209/Ada95/aclocal.m4 2013-01-27 02:15:40.000000000 +0400
-+++ ncurses-5.9-20130209-p/Ada95/aclocal.m4 2013-02-13 10:29:39.240234300 +0400
-@@ -1248,7 +1248,7 @@
+diff -Naur ncurses-5.9-20130324/Ada95/aclocal.m4 ncurses-orig/Ada95/aclocal.m4
+--- ncurses-5.9-20130324/Ada95/aclocal.m4 2013-03-10 01:39:08.000000000 +0400
++++ ncurses-orig/Ada95/aclocal.m4 2013-03-25 15:40:21.533333572 +0400
+@@ -1249,7 +1249,7 @@
;;
*)
case $cf_cv_system_name in #(vi
@@ -114,7 +114,7 @@ diff -Naur ncurses-5.9-20130209/Ada95/aclocal.m4 ncurses-5.9-20130209-p/Ada95/ac
;;
*)
mkdir conftest.src conftest.bin conftest.lib
-@@ -1783,7 +1783,7 @@
+@@ -1785,7 +1785,7 @@
$2='.a'
$3=[$]$2
;;
@@ -123,7 +123,7 @@ diff -Naur ncurses-5.9-20130209/Ada95/aclocal.m4 ncurses-5.9-20130209-p/Ada95/ac
$2='.dll'
$3='.dll.a'
;;
-@@ -1979,7 +1979,7 @@
+@@ -1981,7 +1981,7 @@
AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
if test "$cross_compiling" = yes ; then
case $target_alias in #(vi
@@ -132,7 +132,7 @@ diff -Naur ncurses-5.9-20130209/Ada95/aclocal.m4 ncurses-5.9-20130209-p/Ada95/ac
cf_cv_mixedcase=no
;;
*)
-@@ -2471,7 +2471,7 @@
+@@ -2473,7 +2473,7 @@
profile) $2='obj_p' ;;
shared)
case $cf_cv_system_name in #(vi
@@ -141,7 +141,7 @@ diff -Naur ncurses-5.9-20130209/Ada95/aclocal.m4 ncurses-5.9-20130209-p/Ada95/ac
$2='objects' ;;
*)
$2='obj_s' ;;
-@@ -2941,6 +2941,25 @@
+@@ -2943,6 +2943,25 @@
CF_EOF
chmod +x mk_shared_lib.sh
;;
@@ -167,7 +167,7 @@ diff -Naur ncurses-5.9-20130209/Ada95/aclocal.m4 ncurses-5.9-20130209-p/Ada95/ac
darwin*) #(vi
cf_try_cflags="no-cpp-precomp"
CC_SHARED_OPTS="-dynamic"
-@@ -3685,7 +3704,7 @@
+@@ -3688,7 +3707,7 @@
aix[[4-7]]*) #(vi
cf_xopen_source="-D_ALL_SOURCE"
;;
@@ -176,9 +176,9 @@ diff -Naur ncurses-5.9-20130209/Ada95/aclocal.m4 ncurses-5.9-20130209-p/Ada95/ac
cf_XOPEN_SOURCE=600
;;
darwin[[0-8]].*) #(vi
-diff -Naur ncurses-5.9-20130209/Ada95/configure ncurses-5.9-20130209-p/Ada95/configure
---- ncurses-5.9-20130209/Ada95/configure 2013-01-27 02:16:48.000000000 +0400
-+++ ncurses-5.9-20130209-p/Ada95/configure 2013-02-13 10:31:48.255859300 +0400
+diff -Naur ncurses-5.9-20130324/Ada95/configure ncurses-orig/Ada95/configure
+--- ncurses-5.9-20130324/Ada95/configure 2013-01-27 02:16:48.000000000 +0400
++++ ncurses-orig/Ada95/configure 2013-03-25 15:40:21.536666906 +0400
@@ -2673,7 +2673,7 @@
if test "$cross_compiling" = yes ; then
@@ -270,10 +270,10 @@ diff -Naur ncurses-5.9-20130209/Ada95/configure ncurses-5.9-20130209-p/Ada95/con
;;
esac
fi
-diff -Naur ncurses-5.9-20130209/config.guess ncurses-5.9-20130209-p/config.guess
---- ncurses-5.9-20130209/config.guess 2012-10-06 15:54:45.000000000 +0400
-+++ ncurses-5.9-20130209-p/config.guess 2013-02-13 10:20:52.329101500 +0400
-@@ -805,6 +805,9 @@
+diff -Naur ncurses-5.9-20130324/config.guess ncurses-orig/config.guess
+--- ncurses-5.9-20130324/config.guess 2013-02-10 18:28:37.000000000 +0400
++++ ncurses-orig/config.guess 2013-03-25 15:40:21.550000237 +0400
+@@ -799,6 +799,9 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
@@ -283,7 +283,7 @@ diff -Naur ncurses-5.9-20130209/config.guess ncurses-5.9-20130209-p/config.guess
*:MINGW64*:*)
echo ${UNAME_MACHINE}-pc-mingw64
exit ;;
-@@ -851,6 +854,9 @@
+@@ -845,6 +848,9 @@
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
@@ -293,10 +293,10 @@ diff -Naur ncurses-5.9-20130209/config.guess ncurses-5.9-20130209-p/config.guess
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit ;;
-diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
---- ncurses-5.9-20130209/configure 2013-02-09 21:55:28.000000000 +0400
-+++ ncurses-5.9-20130209-p/configure 2013-02-13 12:18:49.913085900 +0400
-@@ -4401,7 +4401,7 @@
+diff -Naur ncurses-5.9-20130324/configure ncurses-orig/configure
+--- ncurses-5.9-20130324/configure 2013-03-25 03:40:56.000000000 +0400
++++ ncurses-orig/configure 2013-03-25 15:43:56.216666904 +0400
+@@ -4402,7 +4402,7 @@
# special hack to add -no-undefined (which libtool should do for itself)
LT_UNDEF=
case "$cf_cv_system_name" in #(vi
@@ -305,7 +305,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
LT_UNDEF=-no-undefined
;;
esac
-@@ -5409,6 +5409,25 @@
+@@ -5427,6 +5427,25 @@
CF_EOF
chmod +x mk_shared_lib.sh
;;
@@ -331,7 +331,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
darwin*) #(vi
cf_try_cflags="no-cpp-precomp"
CC_SHARED_OPTS="-dynamic"
-@@ -6876,14 +6895,14 @@
+@@ -6894,14 +6913,14 @@
BROKEN_LINKER=1
elif test "$DFT_LWR_MODEL" = shared ; then
case $cf_cv_system_name in #(vi
@@ -346,9 +346,9 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
- test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6
+ test -n "$verbose" && echo " cygwin/msys linker is broken anyway" 1>&6
- echo "${as_me:-configure}:6888: testing cygwin linker is broken anyway ..." 1>&5
+ echo "${as_me:-configure}:6906: testing cygwin linker is broken anyway ..." 1>&5
-@@ -6928,7 +6947,7 @@
+@@ -6946,7 +6965,7 @@
aix[4-7]*) #(vi
cf_xopen_source="-D_ALL_SOURCE"
;;
@@ -357,7 +357,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
cf_XOPEN_SOURCE=600
;;
darwin[0-8].*) #(vi
-@@ -11768,7 +11787,17 @@
+@@ -11786,7 +11805,17 @@
TEST_LIBS="-lpthread $TEST_LIBS"
TEST_LIBS2="-lpthread $TEST_LIBS2"
else
@@ -376,7 +376,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
fi
cat >>confdefs.h <<\EOF
-@@ -19409,7 +19438,7 @@
+@@ -19427,7 +19456,7 @@
;;
*)
case $cf_cv_system_name in #(vi
@@ -385,7 +385,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
;;
*)
mkdir conftest.src conftest.bin conftest.lib
-@@ -19769,7 +19798,7 @@
+@@ -19787,7 +19816,7 @@
DFT_LIB_SUFFIX='.a'
DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
;;
@@ -394,7 +394,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
DFT_LIB_SUFFIX='.dll'
DFT_DEP_SUFFIX='.dll.a'
;;
-@@ -19809,7 +19838,7 @@
+@@ -19827,7 +19856,7 @@
profile) DFT_OBJ_SUBDIR='obj_p' ;;
shared)
case $cf_cv_system_name in #(vi
@@ -403,7 +403,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
DFT_OBJ_SUBDIR='objects' ;;
*)
DFT_OBJ_SUBDIR='obj_s' ;;
-@@ -19849,7 +19878,7 @@
+@@ -19871,7 +19900,7 @@
CXX_LIB_SUFFIX='.a'
CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
;;
@@ -412,7 +412,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
CXX_LIB_SUFFIX='.dll'
CXX_DEP_SUFFIX='.dll.a'
;;
-@@ -19978,8 +20007,8 @@
+@@ -20001,8 +20030,8 @@
if test "$DFT_LWR_MODEL" = shared ; then
case $cf_cv_system_name in #(vi
@@ -423,7 +423,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
TINFO_SUFFIX=.dll
;;
esac
-@@ -20293,7 +20322,7 @@
+@@ -20316,7 +20345,7 @@
profile) cf_subdir='obj_p' ;;
shared)
case $cf_cv_system_name in #(vi
@@ -432,7 +432,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
cf_subdir='objects' ;;
*)
cf_subdir='obj_s' ;;
-@@ -21603,7 +21632,7 @@
+@@ -21637,7 +21666,7 @@
cf_prefix=$LIB_PREFIX
case $cf_cv_shlib_version in #(vi
@@ -441,7 +441,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
TINFO_NAME=$TINFO_ARG_SUFFIX
TINFO_SUFFIX=.dll
;;
-@@ -21660,7 +21689,7 @@
+@@ -21694,7 +21723,7 @@
cf_suffix='.a'
cf_depsuf=$cf_suffix
;;
@@ -450,19 +450,19 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
cf_suffix='.dll'
cf_depsuf='.dll.a'
;;
-@@ -21750,6 +21779,11 @@
- Libs_To_Make="$Libs_To_Make ../lib/cyg${cf_dir}${cf_cygsuf}"
- continue
- ;;
-+ msysdll) #(vi
-+ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
-+ Libs_To_Make="$Libs_To_Make ../lib/msys-${cf_dir}${cf_cygsuf}"
-+ continue
-+ ;;
- mingw)
- cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
- Libs_To_Make="$Libs_To_Make ../lib/lib${cf_dir}${cf_cygsuf}"
-@@ -21834,7 +21868,7 @@
+@@ -21771,6 +21800,11 @@
+ Libs_To_Make="$Libs_To_Make ../lib/cyg${cf_libname}${cf_cygsuf}"
+ continue
+ ;;
++ msysdll) #(vi
++ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
++ Libs_To_Make="$Libs_To_Make ../lib/msys-${cf_libname}${cf_cygsuf}"
++ continue
++ ;;
+ mingw)
+ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
+ Libs_To_Make="$Libs_To_Make ../lib/lib${cf_libname}${cf_cygsuf}"
+@@ -21899,7 +21933,7 @@
cf_suffix='.a'
cf_depsuf=$cf_suffix
;;
@@ -471,7 +471,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
cf_suffix='.dll'
cf_depsuf='.dll.a'
;;
-@@ -21869,7 +21903,7 @@
+@@ -21934,7 +21968,7 @@
profile) cf_subdir='obj_p' ;;
shared)
case $cf_cv_system_name in #(vi
@@ -480,10 +480,10 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure
cf_subdir='objects' ;;
*)
cf_subdir='obj_s' ;;
-diff -Naur ncurses-5.9-20130209/configure.in ncurses-5.9-20130209-p/configure.in
---- ncurses-5.9-20130209/configure.in 2013-01-27 00:59:15.000000000 +0400
-+++ ncurses-5.9-20130209-p/configure.in 2013-02-13 11:22:20.655273400 +0400
-@@ -671,10 +671,10 @@
+diff -Naur ncurses-5.9-20130324/configure.in ncurses-orig/configure.in
+--- ncurses-5.9-20130324/configure.in 2013-03-17 03:32:24.000000000 +0400
++++ ncurses-orig/configure.in 2013-03-25 15:40:21.566666904 +0400
+@@ -682,10 +682,10 @@
BROKEN_LINKER=1
elif test "$DFT_LWR_MODEL" = shared ; then
case $cf_cv_system_name in #(vi
@@ -496,7 +496,7 @@ diff -Naur ncurses-5.9-20130209/configure.in ncurses-5.9-20130209-p/configure.in
;;
esac
fi
-@@ -1156,7 +1156,17 @@
+@@ -1167,7 +1167,17 @@
CF_ADD_LIB(pthread,TEST_LIBS)
CF_ADD_LIB(pthread,TEST_LIBS2)
else
@@ -515,7 +515,7 @@ diff -Naur ncurses-5.9-20130209/configure.in ncurses-5.9-20130209-p/configure.in
fi
AC_DEFINE(USE_REENTRANT,1,[Define to 1 to use experimental reentrant feature])
CF_NCURSES_ABI_6
-@@ -1765,8 +1775,8 @@
+@@ -1780,8 +1790,8 @@
if test "$DFT_LWR_MODEL" = shared ; then
case $cf_cv_system_name in #(vi
@@ -526,9 +526,9 @@ diff -Naur ncurses-5.9-20130209/configure.in ncurses-5.9-20130209-p/configure.in
TINFO_SUFFIX=.dll
;;
esac
-diff -Naur ncurses-5.9-20130209/misc/shlib ncurses-5.9-20130209-p/misc/shlib
---- ncurses-5.9-20130209/misc/shlib 2007-01-13 20:09:52.000000000 +0300
-+++ ncurses-5.9-20130209-p/misc/shlib 2013-02-13 10:34:24.400390600 +0400
+diff -Naur ncurses-5.9-20130324/misc/shlib ncurses-orig/misc/shlib
+--- ncurses-5.9-20130324/misc/shlib 2007-01-13 20:09:52.000000000 +0300
++++ ncurses-orig/misc/shlib 2013-03-25 15:40:21.570000238 +0400
@@ -93,7 +93,7 @@
if test -n "$SHLIB_HOST" ; then
system="$SHLIB_HOST"
@@ -556,10 +556,10 @@ diff -Naur ncurses-5.9-20130209/misc/shlib ncurses-5.9-20130209-p/misc/shlib
variable=PATH
;;
.beos*)
-diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk
---- ncurses-5.9-20130209/mk-1st.awk 2012-02-26 00:22:09.000000000 +0400
-+++ ncurses-5.9-20130209-p/mk-1st.awk 2013-02-13 16:47:29.754882800 +0400
-@@ -70,7 +70,7 @@
+diff -Naur ncurses-5.9-20130324/mk-1st.awk ncurses-orig/mk-1st.awk
+--- ncurses-5.9-20130324/mk-1st.awk 2013-03-12 15:09:40.000000000 +0400
++++ ncurses-orig/mk-1st.awk 2013-03-25 15:40:21.570000238 +0400
+@@ -71,7 +71,7 @@
}
# see imp_name
function imp_name_of(a_name) {
@@ -568,7 +568,7 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk
result = sprintf("%s%s%s.a", prefix, a_name, suffix);
} else {
result = "";
-@@ -81,6 +81,8 @@
+@@ -82,6 +82,8 @@
function abi_name_of(a_name) {
if (ShlibVerInfix == "cygdll") {
result = sprintf("%s%s$(ABI_VERSION)%s", "cyg", a_name, suffix);
@@ -577,7 +577,7 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk
} else if (ShlibVerInfix == "mingw") {
result = sprintf("%s%s$(ABI_VERSION)%s", prefix, a_name, suffix);
} else if (ShlibVerInfix == "yes") {
-@@ -94,6 +96,8 @@
+@@ -95,6 +97,8 @@
function rel_name_of(a_name) {
if (ShlibVerInfix == "cygdll") {
result = sprintf("%s%s$(REL_VERSION)%s", "cyg", a_name, suffix);
@@ -586,7 +586,7 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk
} else if (ShlibVerInfix == "mingw") {
result = sprintf("%s%s$(REL_VERSION)%s", prefix, a_name, suffix);
} else if (ShlibVerInfix == "yes") {
-@@ -112,7 +116,7 @@
+@@ -113,7 +117,7 @@
} else {
if ( ShlibVer == "rel" ) {
result = rel_name_of(a_name);
@@ -595,7 +595,7 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk
result = abi_name_of(a_name);
} else {
result = lib_name_of(a_name);
-@@ -153,7 +157,7 @@
+@@ -169,7 +173,7 @@
printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(%s) $(LDFLAGS)\n", objs, shlib_list
}
function sharedlinks(directory) {
@@ -604,7 +604,7 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk
printf "\tcd %s && (", directory
if ( DoLinks == "reverse" ) {
if ( ShlibVer == "rel" ) {
-@@ -327,7 +331,7 @@
+@@ -365,7 +369,7 @@
print "install \\"
print "install.libs \\"
@@ -613,7 +613,7 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk
dst_dirs = "$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)";
printf "install.%s :: %s $(LIBRARIES)\n", name, dst_dirs
-@@ -348,7 +352,7 @@
+@@ -386,7 +390,7 @@
if ( overwrite == "yes" && name == "ncurses" )
{
@@ -622,7 +622,7 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk
ovr_name = sprintf("libcurses%s.a", suffix)
printf "\t@echo linking %s to %s\n", imp_name, ovr_name
printf "\tcd $(DESTDIR)$(libdir) && ("
-@@ -369,7 +373,7 @@
+@@ -407,7 +411,7 @@
print "uninstall \\"
print "uninstall.libs \\"
printf "uninstall.%s ::\n", name
@@ -631,10 +631,10 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk
printf "\t@echo uninstalling $(DESTDIR)$(bindir)/%s\n", end_name
printf "\t-@rm -f $(DESTDIR)$(bindir)/%s\n", end_name
-diff -Naur ncurses-5.9-20130209/test/aclocal.m4 ncurses-5.9-20130209-p/test/aclocal.m4
---- ncurses-5.9-20130209/test/aclocal.m4 2013-02-10 02:36:13.000000000 +0400
-+++ ncurses-5.9-20130209-p/test/aclocal.m4 2013-02-13 10:35:05.967773400 +0400
-@@ -1807,7 +1807,7 @@
+diff -Naur ncurses-5.9-20130324/test/aclocal.m4 ncurses-orig/test/aclocal.m4
+--- ncurses-5.9-20130324/test/aclocal.m4 2013-03-10 01:41:33.000000000 +0400
++++ ncurses-orig/test/aclocal.m4 2013-03-25 15:40:21.570000238 +0400
+@@ -1809,7 +1809,7 @@
AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
if test "$cross_compiling" = yes ; then
case $target_alias in #(vi
@@ -643,7 +643,7 @@ diff -Naur ncurses-5.9-20130209/test/aclocal.m4 ncurses-5.9-20130209-p/test/aclo
cf_cv_mixedcase=no
;;
*)
-@@ -3168,7 +3168,7 @@
+@@ -3171,7 +3171,7 @@
aix[[4-7]]*) #(vi
cf_xopen_source="-D_ALL_SOURCE"
;;
@@ -652,9 +652,9 @@ diff -Naur ncurses-5.9-20130209/test/aclocal.m4 ncurses-5.9-20130209-p/test/aclo
cf_XOPEN_SOURCE=600
;;
darwin[[0-8]].*) #(vi
-diff -Naur ncurses-5.9-20130209/test/configure ncurses-5.9-20130209-p/test/configure
---- ncurses-5.9-20130209/test/configure 2013-02-10 02:38:20.000000000 +0400
-+++ ncurses-5.9-20130209-p/test/configure 2013-02-13 10:35:29.983398400 +0400
+diff -Naur ncurses-5.9-20130324/test/configure ncurses-orig/test/configure
+--- ncurses-5.9-20130324/test/configure 2013-02-10 02:38:20.000000000 +0400
++++ ncurses-orig/test/configure 2013-03-25 15:40:21.573333571 +0400
@@ -2394,7 +2394,7 @@
if test "$cross_compiling" = yes ; then
-----------------------------------------------------------------------
Summary of changes:
...msys.patch => ncurses-5.9-20130324-msys2.patch} | 198 ++++++++++----------
1 files changed, 99 insertions(+), 99 deletions(-)
rename ncurses/{ncurses-5.9-20130209-msys.patch => ncurses-5.9-20130324-msys2.patch} (78%)
hooks/post-receive
--
Repository: msys2-tools
|
|
From: Alexx83 <no...@so...> - 2013-03-25 11:21:23
|
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 fb86e40fe049015ca370e790c928eb1c0ffb0b11 (commit)
from 45ce6da114fafa2bded4de6dfe66fd6b9075057c (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/fb86e40fe049015ca370e790c928eb1c0ffb0b11/
commit fb86e40fe049015ca370e790c928eb1c0ffb0b11
Author: Alexpux <ale...@gm...>
Date: Mon Mar 25 15:21:08 2013 +0400
Move MSYS2 spec for GCC-4.8.0 to new patch
diff --git a/gcc/4.8.0/gcc-4.8.0-msys2-spec.patch b/gcc/4.8.0/gcc-4.8.0-msys2-spec.patch
new file mode 100644
index 0000000..9105bfa
--- /dev/null
+++ b/gcc/4.8.0/gcc-4.8.0-msys2-spec.patch
@@ -0,0 +1,404 @@
+diff -Naur gcc-cygwin/gcc/config/i386/msys-w64.h gcc-msys2/gcc/config/i386/msys-w64.h
+--- gcc-cygwin/gcc/config/i386/msys-w64.h 1970-01-01 04:00:00 +0400
++++ gcc-msys2/gcc/config/i386/msys-w64.h 2013-03-20 09:07:27 +0400
+@@ -0,0 +1,84 @@
++/* 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 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
++#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-cygwin/gcc/config/i386/msys.h gcc-msys2/gcc/config/i386/msys.h
+--- gcc-cygwin/gcc/config/i386/msys.h 1970-01-01 04:00:00 +0400
++++ gcc-msys2/gcc/config/i386/msys.h 2013-03-20 09:14:21 +0400
+@@ -0,0 +1,152 @@
++/* 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-2013 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 ("__unix__"); \
++ builtin_define ("__unix"); \
++ } \
++ while (0)
++
++#undef CPP_SPEC
++#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} \
++ %{!ansi:-Dunix} %{pthread: } \
++ -D__MSYS__ \
++ %{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}}}\
++ crtbegin.o%s"
++
++#undef ENDFILE_SPEC
++#define ENDFILE_SPEC \
++ "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.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} \
++ -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 not recognized. */
++#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"
++
++/* We should find a way to not have to update this manually. */
++#define LIBGCJ_SONAME "msys-gcj" /*LIBGCC_EH_EXTN*/ "-14.dll"
++
+diff -Naur gcc-cygwin/gcc/config/i386/t-msys-w64 gcc-msys2/gcc/config/i386/t-msys-w64
+--- gcc-cygwin/gcc/config/i386/t-msys-w64 1970-01-01 04:00:00 +0400
++++ gcc-msys2/gcc/config/i386/t-msys-w64 2013-03-20 07:02:36 +0400
+@@ -0,0 +1,3 @@
++MULTILIB_OPTIONS = m64/m32
++MULTILIB_DIRNAMES = 64
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+diff -Naur gcc-cygwin/libgcc/config/i386/t-msys gcc-msys2/libgcc/config/i386/t-msys
+--- gcc-cygwin/libgcc/config/i386/t-msys 1970-01-01 04:00:00 +0400
++++ gcc-msys2/libgcc/config/i386/t-msys 2013-03-20 07:02:44 +0400
+@@ -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-cygwin/gcc/config.build gcc-msys2/gcc/config.build
+--- gcc-cygwin/gcc/config.build 2013-03-20 06:44:50 +0400
++++ gcc-msys2/gcc/config.build 2013-03-20 08:30:07 +0400
+@@ -64,6 +64,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-cygwin/gcc/config.gcc gcc-msys2/gcc/config.gcc
+--- gcc-cygwin/gcc/config.gcc 2013-03-20 06:44:50 +0400
++++ gcc-msys2/gcc/config.gcc 2013-03-20 08:34:27 +0400
+@@ -1468,6 +1468,35 @@
+ 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 dbxcoff.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="\$(srcdir)/config/i386/winnt.c"
++ extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt"
++ 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"
++ if test x$enable_threads = xyes; then
++ thread_file='posix'
++ fi
++ use_gcc_stdint=wrap
++ ;;
++x86_64-*-msys*)
++ need_64bit_isa=yes
++ tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.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 i386/t-msys-w64"
++ target_gtfiles="\$(srcdir)/config/i386/winnt.c"
++ extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt"
++ 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"
++ if test x$enable_threads = xyes; then
++ thread_file='posix'
++ fi
++ use_gcc_stdint=wrap
++ ;;
+ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h"
+ xm_file=i386/xm-mingw32.h
+@@ -3720,6 +3750,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-*-freebsd* | x86_64-*-freebsd*)
+diff -Naur gcc-cygwin/gcc/config.host gcc-msys2/gcc/config.host
+--- gcc-cygwin/gcc/config.host 2013-03-20 06:44:50 +0400
++++ gcc-msys2/gcc/config.host 2013-03-20 08:37:59 +0400
+@@ -221,6 +221,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*)
+ host_xm_file=i386/xm-mingw32.h
+ host_xmake_file="${host_xmake_file} i386/x-mingw32"
+diff -Naur gcc-cygwin/libgcc/config.host gcc-msys2/libgcc/config.host
+--- gcc-cygwin/libgcc/config.host 2013-03-20 06:43:11 +0400
++++ gcc-msys2/libgcc/config.host 2013-03-20 08:56:27 +0400
+@@ -588,6 +588,39 @@
+ # 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 i386/t-crtfm t-dfprules i386/t-chkstk"
+ ;;
++i[34567]86-*-msys*)
++ extra_parts="crtbegin.o crtend.o crtfastmath.o"
++ # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
++ if test x$enable_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${host} = x${target} ; 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 i386/t-crtfm i386/t-chkstk t-dfprules"
++ ;;
++x86_64-*-msys*)
++ extra_parts="crtbegin.o crtend.o crtfastmath.o"
++ # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
++ if test x$enable_sjlj_exceptions = xyes; then
++ tmake_eh_file="i386/t-sjlj-eh"
++ else
++ tmake_eh_file="i386/t-seh-eh"
++ fi
++ # Shared libgcc DLL install dir depends on cross/native build.
++ if test x${host} = x${target} ; 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 i386/t-crtfm t-dfprules i386/t-chkstk"
++ ;;
+ i[34567]86-*-mingw*)
+ extra_parts="crtbegin.o crtend.o crtfastmath.o"
+ case ${target_thread_file} in
+@@ -1161,6 +1194,7 @@
+ i[34567]86-*-gnu* | \
+ i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]* | \
+ i[34567]86-*-cygwin* | x86_64-*-cygwin* | \
++ i[34567]86-*-msys* | x86_64-*-msys* | \
+ i[34567]86-*-mingw* | x86_64-*-mingw* | \
+ i[34567]86-*-freebsd* | x86_64-*-freebsd* | \
+ i[34567]86-*-openbsd* | x86_64-*-openbsd*)
diff --git a/gcc/4.8.0/msys2-gcc-4.8.0.patch b/gcc/4.8.0/msys2-gcc-4.8.0.patch
index f4f7052..637a9fd 100644
--- a/gcc/4.8.0/msys2-gcc-4.8.0.patch
+++ b/gcc/4.8.0/msys2-gcc-4.8.0.patch
@@ -578,336 +578,6 @@ diff -Naur gcc-cygwin/gcc/ada/gcc-interface/Makefile.in gcc-msys2/gcc/ada/gcc-in
LIBGNAT_TARGET_PAIRS = \
s-memory.adb<s-memory.adb \
g-socthi.ads<g-socthi.ads \
-diff -Naur gcc-cygwin/gcc/config/i386/msys-w64.h gcc-msys2/gcc/config/i386/msys-w64.h
---- gcc-cygwin/gcc/config/i386/msys-w64.h 1970-01-01 04:00:00 +0400
-+++ gcc-msys2/gcc/config/i386/msys-w64.h 2013-03-20 09:07:27 +0400
-@@ -0,0 +1,84 @@
-+/* 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 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
-+#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-cygwin/gcc/config/i386/msys.h gcc-msys2/gcc/config/i386/msys.h
---- gcc-cygwin/gcc/config/i386/msys.h 1970-01-01 04:00:00 +0400
-+++ gcc-msys2/gcc/config/i386/msys.h 2013-03-20 09:14:21 +0400
-@@ -0,0 +1,152 @@
-+/* 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-2013 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 ("__unix__"); \
-+ builtin_define ("__unix"); \
-+ } \
-+ while (0)
-+
-+#undef CPP_SPEC
-+#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} \
-+ %{!ansi:-Dunix} %{pthread: } \
-+ -D__MSYS__ \
-+ %{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}}}\
-+ crtbegin.o%s"
-+
-+#undef ENDFILE_SPEC
-+#define ENDFILE_SPEC \
-+ "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.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} \
-+ -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 not recognized. */
-+#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"
-+
-+/* We should find a way to not have to update this manually. */
-+#define LIBGCJ_SONAME "msys-gcj" /*LIBGCC_EH_EXTN*/ "-14.dll"
-+
-diff -Naur gcc-cygwin/gcc/config/i386/t-msys-w64 gcc-msys2/gcc/config/i386/t-msys-w64
---- gcc-cygwin/gcc/config/i386/t-msys-w64 1970-01-01 04:00:00 +0400
-+++ gcc-msys2/gcc/config/i386/t-msys-w64 2013-03-20 07:02:36 +0400
-@@ -0,0 +1,3 @@
-+MULTILIB_OPTIONS = m64/m32
-+MULTILIB_DIRNAMES = 64
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
-diff -Naur gcc-cygwin/gcc/config.build gcc-msys2/gcc/config.build
---- gcc-cygwin/gcc/config.build 2013-03-20 06:44:50 +0400
-+++ gcc-msys2/gcc/config.build 2013-03-20 08:30:07 +0400
-@@ -64,6 +64,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-cygwin/gcc/config.gcc gcc-msys2/gcc/config.gcc
---- gcc-cygwin/gcc/config.gcc 2013-03-20 06:44:50 +0400
-+++ gcc-msys2/gcc/config.gcc 2013-03-20 08:34:27 +0400
-@@ -1468,6 +1468,35 @@
- 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 dbxcoff.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="\$(srcdir)/config/i386/winnt.c"
-+ extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt"
-+ 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"
-+ if test x$enable_threads = xyes; then
-+ thread_file='posix'
-+ fi
-+ use_gcc_stdint=wrap
-+ ;;
-+x86_64-*-msys*)
-+ need_64bit_isa=yes
-+ tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.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 i386/t-msys-w64"
-+ target_gtfiles="\$(srcdir)/config/i386/winnt.c"
-+ extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt"
-+ 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"
-+ if test x$enable_threads = xyes; then
-+ thread_file='posix'
-+ fi
-+ use_gcc_stdint=wrap
-+ ;;
- i[34567]86-*-mingw* | x86_64-*-mingw*)
- tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h"
- xm_file=i386/xm-mingw32.h
-@@ -3720,6 +3750,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-*-freebsd* | x86_64-*-freebsd*)
-diff -Naur gcc-cygwin/gcc/config.host gcc-msys2/gcc/config.host
---- gcc-cygwin/gcc/config.host 2013-03-20 06:44:50 +0400
-+++ gcc-msys2/gcc/config.host 2013-03-20 08:37:59 +0400
-@@ -221,6 +221,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*)
- host_xm_file=i386/xm-mingw32.h
- host_xmake_file="${host_xmake_file} i386/x-mingw32"
diff -Naur gcc-cygwin/gcc/configure gcc-msys2/gcc/configure
--- gcc-cygwin/gcc/configure 2013-03-20 06:44:50 +0400
+++ gcc-msys2/gcc/configure 2013-03-20 08:44:00 +0400
@@ -1656,80 +1326,6 @@ diff -Naur gcc-cygwin/libffi/configure.ac gcc-msys2/libffi/configure.ac
TARGET=X86_WIN64; TARGETDIR=x86
# All mingw/cygwin/win32 builds require -no-undefined for sharedlib.
# We must also check with_cross_host to decide if this is a native
-diff -Naur gcc-cygwin/libgcc/config/i386/t-msys gcc-msys2/libgcc/config/i386/t-msys
---- gcc-cygwin/libgcc/config/i386/t-msys 1970-01-01 04:00:00 +0400
-+++ gcc-msys2/libgcc/config/i386/t-msys 2013-03-20 07:02:44 +0400
-@@ -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-cygwin/libgcc/config.host gcc-msys2/libgcc/config.host
---- gcc-cygwin/libgcc/config.host 2013-03-20 06:43:11 +0400
-+++ gcc-msys2/libgcc/config.host 2013-03-20 08:56:27 +0400
-@@ -588,6 +588,39 @@
- # 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 i386/t-crtfm t-dfprules i386/t-chkstk"
- ;;
-+i[34567]86-*-msys*)
-+ extra_parts="crtbegin.o crtend.o crtfastmath.o"
-+ # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
-+ if test x$enable_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${host} = x${target} ; 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 i386/t-crtfm i386/t-chkstk t-dfprules"
-+ ;;
-+x86_64-*-msys*)
-+ extra_parts="crtbegin.o crtend.o crtfastmath.o"
-+ # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
-+ if test x$enable_sjlj_exceptions = xyes; then
-+ tmake_eh_file="i386/t-sjlj-eh"
-+ else
-+ tmake_eh_file="i386/t-seh-eh"
-+ fi
-+ # Shared libgcc DLL install dir depends on cross/native build.
-+ if test x${host} = x${target} ; 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 i386/t-crtfm t-dfprules i386/t-chkstk"
-+ ;;
- i[34567]86-*-mingw*)
- extra_parts="crtbegin.o crtend.o crtfastmath.o"
- case ${target_thread_file} in
-@@ -1161,6 +1194,7 @@
- i[34567]86-*-gnu* | \
- i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]* | \
- i[34567]86-*-cygwin* | x86_64-*-cygwin* | \
-+ i[34567]86-*-msys* | x86_64-*-msys* | \
- i[34567]86-*-mingw* | x86_64-*-mingw* | \
- i[34567]86-*-freebsd* | x86_64-*-freebsd* | \
- i[34567]86-*-openbsd* | x86_64-*-openbsd*)
diff -Naur gcc-cygwin/libgcc/configure gcc-msys2/libgcc/configure
--- gcc-cygwin/libgcc/configure 2013-03-20 06:44:29 +0400
+++ gcc-msys2/libgcc/configure 2013-03-20 08:53:51 +0400
-----------------------------------------------------------------------
Summary of changes:
gcc/4.8.0/gcc-4.8.0-msys2-spec.patch | 404 ++++++++++++++++++++++++++++++++++
gcc/4.8.0/msys2-gcc-4.8.0.patch | 404 ----------------------------------
2 files changed, 404 insertions(+), 404 deletions(-)
create mode 100644 gcc/4.8.0/gcc-4.8.0-msys2-spec.patch
hooks/post-receive
--
Repository: msys2-tools
|
|
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] |
|
From: Alexx83 <no...@so...> - 2013-03-25 05:47:57
|
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 be41dd878d6314b9b311cd0824c0e7ac102bd171 (commit)
from 12f826b7db0c83bc16cebacc5c4940f799352124 (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/be41dd878d6314b9b311cd0824c0e7ac102bd171/
commit be41dd878d6314b9b311cd0824c0e7ac102bd171
Author: Alexpux <ale...@gm...>
Date: Mon Mar 25 09:47:39 2013 +0400
Split GCC-4.8.0 libstdc patch. Add missed patch.
diff --git a/gcc/4.8.0/4.5-skiptest.patch b/gcc/4.8.0/4.5-skiptest.patch
new file mode 100644
index 0000000..7d2e062
--- /dev/null
+++ b/gcc/4.8.0/4.5-skiptest.patch
@@ -0,0 +1,9 @@
+--- origsrc/gcc-4.5.0/gcc/testsuite/gcc.target/i386/pr25993.c 2008-02-26 01:38:34.000000000 +0000
++++ src/gcc-4.5.0/gcc/testsuite/gcc.target/i386/pr25993.c 2010-04-25 16:17:21.703125000 +0100
+@@ -1,5 +1,5 @@
+ /* { dg-do assemble } */
+-/* { dg-skip-if "" { "*-*-darwin*" "*-*-mingw*" } { "*" } { "" } } */
++/* { dg-skip-if "" { "*-*-darwin*" "*-*-mingw*" "*-*-cygwin*" } { "*" } { "" } } */
+ /* { dg-options "-std=c99 -x assembler-with-cpp" } */
+
+ #ifndef __ASSEMBLER__
diff --git a/gcc/4.8.0/4.7-libstdc-cygwin.patch b/gcc/4.8.0/4.7-libstdc-cygwin.patch
new file mode 100644
index 0000000..18d8de6
--- /dev/null
+++ b/gcc/4.8.0/4.7-libstdc-cygwin.patch
@@ -0,0 +1,34 @@
+--- origsrc/gcc-4.8-20130310/libstdc++-v3/configure 2013-03-15 02:47:51.930826600 -0500
++++ src/gcc-4.8-20130310/libstdc++-v3/configure 2013-03-17 00:43:35.146679400 -0500
+@@ -46017,7 +46017,7 @@ $as_echo "#define HAVE_TLS 1" >>confdefs
+ ;;
+ esac
+ ;;
+- *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu)
++ *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu | *-cygwin*)
+
+ # All these tests are for C++; save the language and the compiler flags.
+ # The CXXFLAGS thing is suspicious, but based on similar bits previously
+--- origsrc/gcc-4.8-20130310/libstdc++-v3/crossconfig.m4 2013-03-15 02:47:51.723814700 -0500
++++ src/gcc-4.8-20130310/libstdc++-v3/crossconfig.m4 2013-03-17 00:40:59.084753200 -0500
+@@ -141,7 +141,7 @@ case "${host}" in
+ ;;
+ esac
+ ;;
+- *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu)
++ *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu | *-cygwin*)
+ GLIBCXX_CHECK_COMPILER_FEATURES
+ GLIBCXX_CHECK_LINKER_FEATURES
+ GLIBCXX_CHECK_MATH_SUPPORT
+--- origsrc/gcc-4.7.2/libstdc++-v3/testsuite/lib/libstdc++.exp 2012-08-06 22:34:27.000000000 +0800
++++ src/gcc-4.7.2/libstdc++-v3/testsuite/lib/libstdc++.exp 2013-02-26 19:31:07.934763700 +0800
+@@ -146,6 +146,9 @@ proc libstdc++_init { testfile } {
+ set gccdir [file dirname $gccdir]
+ append ld_library_path_tmp ":${gccdir}"
+ }
++ if { [string match "*-*-cygwin*" $target_triplet] } {
++ append ld_library_path_tmp ":${blddir}/../libgcc"
++ }
+ v3track gccdir 3
+
+ # Locate libgomp. This is only required for parallel mode.
diff --git a/gcc/4.8.0/4.7-libstdc.patch b/gcc/4.8.0/4.7-libstdc-dllimport.patch
similarity index 86%
rename from gcc/4.8.0/4.7-libstdc.patch
rename to gcc/4.8.0/4.7-libstdc-dllimport.patch
index ef02552..e51c87b 100644
--- a/gcc/4.8.0/4.7-libstdc.patch
+++ b/gcc/4.8.0/4.7-libstdc-dllimport.patch
@@ -26,17 +26,6 @@
+#endif
+
#endif
---- origsrc/gcc-4.8-20130310/libstdc++-v3/configure 2013-03-15 02:47:51.930826600 -0500
-+++ src/gcc-4.8-20130310/libstdc++-v3/configure 2013-03-17 00:43:35.146679400 -0500
-@@ -46017,7 +46017,7 @@ $as_echo "#define HAVE_TLS 1" >>confdefs
- ;;
- esac
- ;;
-- *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu)
-+ *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu | *-cygwin*)
-
- # All these tests are for C++; save the language and the compiler flags.
- # The CXXFLAGS thing is suspicious, but based on similar bits previously
--- origsrc/gcc-4.7.2/libstdc++-v3/configure.host 2012-02-11 02:10:12.000000000 +0800
+++ src/gcc-4.7.2/libstdc++-v3/configure.host 2013-02-26 19:04:19.589029800 +0800
@@ -215,6 +215,7 @@ case "${host_os}" in
@@ -47,17 +36,6 @@
OPT_LDFLAGS="${OPT_LDFLAGS} \$(lt_host_flags)"
;;
darwin | darwin[1-7] | darwin[1-7].*)
---- origsrc/gcc-4.8-20130310/libstdc++-v3/crossconfig.m4 2013-03-15 02:47:51.723814700 -0500
-+++ src/gcc-4.8-20130310/libstdc++-v3/crossconfig.m4 2013-03-17 00:40:59.084753200 -0500
-@@ -141,7 +141,7 @@ case "${host}" in
- ;;
- esac
- ;;
-- *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu)
-+ *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu | *-cygwin*)
- GLIBCXX_CHECK_COMPILER_FEATURES
- GLIBCXX_CHECK_LINKER_FEATURES
- GLIBCXX_CHECK_MATH_SUPPORT
--- origsrc/gcc-4.7.2/libstdc++-v3/include/backward/strstream 2011-02-01 09:31:42.000000000 +0800
+++ src/gcc-4.7.2/libstdc++-v3/include/backward/strstream 2013-02-26 19:05:34.021481500 +0800
@@ -62,7 +62,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
@@ -609,18 +587,6 @@
{
public:
explicit underflow_error(const string& __arg);
---- origsrc/gcc-4.7.2/libstdc++-v3/libsupc++/Makefile.in 2012-08-06 09:34:27.000000000 -0500
-+++ src/gcc-4.7.2/libstdc++-v3/libsupc++/Makefile.in 2013-03-01 01:43:14.850133600 -0600
-@@ -463,7 +463,8 @@ LTCXXCOMPILE = \
- --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-
--LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
-+LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \
-+ -no-undefined -bindir $(bindir)
-
- # 3) We'd have a problem when building the shared libstdc++ object if
- # the rules automake generates would be used. We cannot allow g++ to
--- origsrc/gcc-4.7.2/libstdc++-v3/libsupc++/exception 2011-12-07 04:03:25.000000000 +0800
+++ src/gcc-4.7.2/libstdc++-v3/libsupc++/exception 2013-02-26 19:27:32.575916600 +0800
@@ -59,7 +59,7 @@ namespace std
@@ -681,73 +647,3 @@
{
public:
bad_typeid () _GLIBCXX_USE_NOEXCEPT { }
---- origsrc/gcc-4.7.2/libstdc++-v3/scripts/testsuite_flags.in 2007-09-12 06:32:51.000000000 +0800
-+++ src/gcc-4.7.2/libstdc++-v3/scripts/testsuite_flags.in 2013-02-26 19:29:43.370025400 +0800
-@@ -27,6 +27,7 @@ EOF
- BUILD_DIR=@glibcxx_builddir@
- SRC_DIR=@glibcxx_srcdir@
- PREFIX_DIR=@glibcxx_prefixdir@
-+target=@target@
- query=$1
-
- case ${query} in
-@@ -71,6 +72,12 @@ case ${query} in
- ;;
- --cxxldflags)
- SECTIONLDFLAGS="@SECTION_LDFLAGS@ @LIBICONV@"
-+ case ${target} in
-+ *cygwin*)
-+ SECTIONLDFLAGS="${SECTIONLDFLAGS} -Wl,--enable-auto-import"
-+ ;;
-+ esac
-+
- echo ${SECTIONLDFLAGS}
- ;;
- *)
---- origsrc/gcc-4.7.2/libstdc++-v3/src/Makefile.am 2012-08-06 22:34:27.000000000 +0800
-+++ src/gcc-4.7.2/libstdc++-v3/src/Makefile.am 2013-02-26 19:30:20.823281300 +0800
-@@ -74,7 +74,8 @@ libstdc___la_DEPENDENCIES = \
- $(top_builddir)/src/c++11/libc++11convenience.la
-
- libstdc___la_LDFLAGS = \
-- -version-info $(libtool_VERSION) ${version_arg} -lm
-+ -version-info $(libtool_VERSION) ${version_arg} -lm \
-+ -no-undefined -bindir $(bindir)
-
- libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS)
-
---- origsrc/gcc-4.7.2/libstdc++-v3/src/Makefile.in 2012-08-06 09:34:27.000000000 -0500
-+++ src/gcc-4.7.2/libstdc++-v3/src/Makefile.in 2013-03-01 01:42:17.174834800 -0600
-@@ -367,7 +367,8 @@ libstdc___la_DEPENDENCIES = \
- $(top_builddir)/src/c++11/libc++11convenience.la
-
- libstdc___la_LDFLAGS = \
-- -version-info $(libtool_VERSION) ${version_arg} -lm
-+ -version-info $(libtool_VERSION) ${version_arg} -lm \
-+ -no-undefined -bindir $(bindir)
-
- libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS)
-
---- origsrc/gcc-4.7.2/libstdc++-v3/testsuite/lib/libstdc++.exp 2012-08-06 22:34:27.000000000 +0800
-+++ src/gcc-4.7.2/libstdc++-v3/testsuite/lib/libstdc++.exp 2013-02-26 19:31:07.934763700 +0800
-@@ -126,6 +126,9 @@ proc libstdc++_init { testfile } {
- if { [string match "powerpc-*-darwin*" $target_triplet] } {
- append DEFAULT_CXXFLAGS " -multiply_defined suppress"
- }
-+ if { [string match "*-*-cygwin*" $target_triplet] } {
-+ append DEFAULT_CXXFLAGS " -Wl,--enable-auto-import"
-+ }
- }
- v3track DEFAULT_CXXFLAGS 2
-
-@@ -146,6 +149,9 @@ proc libstdc++_init { testfile } {
- set gccdir [file dirname $gccdir]
- append ld_library_path_tmp ":${gccdir}"
- }
-+ if { [string match "*-*-cygwin*" $target_triplet] } {
-+ append ld_library_path_tmp ":${blddir}/../libgcc"
-+ }
- v3track gccdir 3
-
- # Locate libgomp. This is only required for parallel mode.
-
-----------------------------------------------------------------------
Summary of changes:
.../4.5-skiptest.patch} | 0
gcc/4.8.0/4.7-libstdc-cygwin.patch | 34 +++++++
...7-libstdc.patch => 4.7-libstdc-dllimport.patch} | 104 --------------------
3 files changed, 34 insertions(+), 104 deletions(-)
copy gcc/{4.5.3/gcc45-skiptest.diff => 4.8.0/4.5-skiptest.patch} (100%)
create mode 100644 gcc/4.8.0/4.7-libstdc-cygwin.patch
rename gcc/4.8.0/{4.7-libstdc.patch => 4.7-libstdc-dllimport.patch} (86%)
hooks/post-receive
--
Repository: msys2-tools
|
|
From: Alexx83 <no...@so...> - 2013-03-25 05:33:30
|
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 12f826b7db0c83bc16cebacc5c4940f799352124 (commit)
from a4c734c673646b3bcaf65d8f2b3ecbfbcb2bc2cc (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/12f826b7db0c83bc16cebacc5c4940f799352124/
commit 12f826b7db0c83bc16cebacc5c4940f799352124
Author: Alexpux <ale...@gm...>
Date: Mon Mar 25 09:32:43 2013 +0400
Update cmodel-medium patch for GCC-4.8.0
diff --git a/gcc/4.8.0/4.8-cmodel-medium.patch b/gcc/4.8.0/4.8-cmodel-medium.patch
index fd34e6d..9789429 100644
--- a/gcc/4.8.0/4.8-cmodel-medium.patch
+++ b/gcc/4.8.0/4.8-cmodel-medium.patch
@@ -1,14 +1,29 @@
---- gcc/config/i386/i386-protos.h (revision 196430)
-+++ gcc/config/i386/i386-protos.h (working copy)
-@@ -260,6 +260,7 @@
- extern void i386_pe_assemble_visibility (tree, int);
- extern tree i386_pe_mangle_decl_assembler_name (tree, tree);
- extern tree i386_pe_mangle_assembler_name (const char *);
-+extern void i386_pe_record_stub (const char *);
+Index: gcc/config/i386/predicates.md
+===================================================================
+--- gcc/config/i386/predicates.md (revision 196791)
++++ gcc/config/i386/predicates.md (working copy)
+@@ -137,6 +137,8 @@
+ switch (XINT (XEXP (op, 0), 1))
+ {
+ case UNSPEC_GOTPCREL:
++ if (DEFAULT_ABI == MS_ABI)
++ break;
+ case UNSPEC_DTPOFF:
+ case UNSPEC_GOTNTPOFF:
+ case UNSPEC_NTPOFF:
+@@ -436,6 +438,9 @@
+ if (SYMBOL_REF_TLS_MODEL (op))
+ return false;
- extern void i386_pe_seh_init (FILE *);
- extern void i386_pe_seh_end_prologue (FILE *);
---- gcc/config/i386/winnt.c (revision 196430)
++ /* Dll-imported symbols are always external. */
++ if (TARGET_DLLIMPORT_DECL_ATTRIBUTES && SYMBOL_REF_DLLIMPORT_P (op))
++ return false;
+ if (SYMBOL_REF_LOCAL_P (op))
+ return true;
+
+Index: gcc/config/i386/winnt.c
+===================================================================
+--- gcc/config/i386/winnt.c (revision 196791)
+++ gcc/config/i386/winnt.c (working copy)
@@ -646,8 +646,18 @@
int is_data; /* used to type tag exported symbols. */
@@ -51,17 +66,7 @@
#ifdef CXX_WRAP_SPEC_LIST
/* Hash table equality helper function. */
-@@ -736,6 +761,9 @@
-
- #endif /* CXX_WRAP_SPEC_LIST */
-
-+void
-+ix86_pecoff_decl_stub (void);
-+
- /* This is called at the end of assembly. For each external function
- which has not been defined, we output a declaration now. We also
- output the .drectve section. */
-@@ -781,6 +809,30 @@
+@@ -781,6 +806,30 @@
(q->is_data ? ",data" : ""));
}
}
@@ -92,7 +97,9 @@
}
---- gcc/config/i386/xm-mingw32.h (revision 196430)
+Index: gcc/config/i386/xm-mingw32.h
+===================================================================
+--- gcc/config/i386/xm-mingw32.h (revision 196791)
+++ gcc/config/i386/xm-mingw32.h (working copy)
@@ -29,6 +29,12 @@
/* The st_ino field of struct stat is always 0. */
@@ -107,22 +114,21 @@
#define HOST_LONG_LONG_FORMAT "I64"
+#endif
+
-Index: gcc/config/i386/cygming.h
+Index: gcc/config/i386/i386-protos.h
===================================================================
---- gcc/config/i386/cygming.h (revision 196430)
-+++ gcc/config/i386/cygming.h (working copy)
-@@ -474,5 +474,8 @@
- #undef TARGET_ASM_ASSEMBLE_VISIBILITY
- #define TARGET_ASM_ASSEMBLE_VISIBILITY i386_pe_assemble_visibility
+--- gcc/config/i386/i386-protos.h (revision 196791)
++++ gcc/config/i386/i386-protos.h (working copy)
+@@ -260,6 +260,7 @@
+ extern void i386_pe_assemble_visibility (tree, int);
+ extern tree i386_pe_mangle_decl_assembler_name (tree, tree);
+ extern tree i386_pe_mangle_assembler_name (const char *);
++extern void i386_pe_record_stub (const char *);
-+#undef SUB_TARGET_RECORD_STUB
-+#define SUB_TARGET_RECORD_STUB i386_pe_record_stub
-+
- /* Static stack checking is supported by means of probes. */
- #define STACK_CHECK_STATIC_BUILTIN 1
+ extern void i386_pe_seh_init (FILE *);
+ extern void i386_pe_seh_end_prologue (FILE *);
Index: gcc/config/i386/i386.c
===================================================================
---- gcc/config/i386/i386.c (revision 196430)
+--- gcc/config/i386/i386.c (revision 196791)
+++ gcc/config/i386/i386.c (working copy)
@@ -64,6 +64,8 @@
#include "tree-flow.h"
@@ -142,17 +148,17 @@ Index: gcc/config/i386/i386.c
else if (TARGET_64BIT && TARGET_RDOS)
ix86_cmodel = CM_MEDIUM_PIC, flag_pic = 1;
else if (TARGET_64BIT)
-@@ -10575,7 +10577,9 @@
+@@ -10575,7 +10581,9 @@
ix86_emit_save_sse_regs_using_mov (frame.sse_reg_save_offset);
pic_reg_used = false;
-+ /* We don't use pic-register for pe-coff target. */
++ /* We don't use pic-register for x64 pe-coff target. */
if (pic_offset_table_rtx
+ && DEFAULT_ABI != MS_ABI
&& (df_regs_ever_live_p (REAL_PIC_OFFSET_TABLE_REGNUM)
|| crtl->profile))
{
-@@ -11380,7 +11384,8 @@
+@@ -11380,7 +11388,8 @@
use_reg (&call_fusage, rax);
}
@@ -162,35 +168,28 @@ Index: gcc/config/i386/i386.c
{
HOST_WIDE_INT argval;
-@@ -11999,6 +12004,27 @@
+@@ -11998,7 +12007,20 @@
+ return !ix86_legitimate_constant_p (mode, x);
}
++/* Nonzero if the symbol is marked as dllimport, or as stub-variable,
++ otherwise zero. */
+static bool
+is_imported_p (rtx x)
+{
-+ const char *name;
-+
+ if (!TARGET_DLLIMPORT_DECL_ATTRIBUTES
+ || GET_CODE (x) != SYMBOL_REF)
+ return false;
+
-+ if (SYMBOL_REF_DLLIMPORT_P (x))
-+ return true;
-+
-+ if ((name = XSTR (x, 0)) != NULL
-+ && (!strncmp (name, "*__imp_", 7)
-+ || !strncmp (name, "*.refptr.", 9)
-+ || !strncmp (name, "*refptr.", 8)))
-+ return true;
-+ return false;
++ return SYMBOL_REF_DLLIMPORT_P (x) || SYMBOL_REF_STUBVAR_P (x);
+}
+
+
/* Nonzero if the constant value X is a legitimate general operand
when generating PIC code. It is given that flag_pic is on and
that X satisfies CONSTANT_P or is a CONST_DOUBLE. */
-@@ -12086,11 +12112,32 @@
+@@ -12086,11 +12108,39 @@
/* FALLTHRU */
case SYMBOL_REF:
@@ -203,22 +202,29 @@ Index: gcc/config/i386/i386.c
return false;
- if (!SYMBOL_REF_FAR_ADDR_P (op0) && SYMBOL_REF_LOCAL_P (op0)
- && ix86_cmodel != CM_LARGE_PIC)
++
+ if (DEFAULT_ABI == MS_ABI)
+ {
+ if (is_imported_p (op0))
+ return true;
-+ if (SYMBOL_REF_FUNCTION_P (op0)
-+ && ix86_cmodel != CM_LARGE_PIC
-+ && !SYMBOL_REF_FAR_ADDR_P (op0)
-+ && SYMBOL_REF_LOCAL_P (op0))
-+ return true;
-+ if (!SYMBOL_REF_EXTERNAL_P (op0)
-+ && (ix86_cmodel == CM_LARGE_PIC
-+ || ix86_cmodel == CM_MEDIUM_PIC)
-+ && !SYMBOL_REF_FAR_ADDR_P (op0) && SYMBOL_REF_LOCAL_P (op0))
++
++ if (SYMBOL_REF_FAR_ADDR_P (op0)
++ || !SYMBOL_REF_LOCAL_P (op0))
++ break;
++
++ /* Function-symbols need to be resolved only for
++ large-model.
++ For the small-model we don't need to resolve anything
++ here. */
++ if ((ix86_cmodel != CM_LARGE_PIC
++ && SYMBOL_REF_FUNCTION_P (op0))
++ || ix86_cmodel == CM_SMALL_PIC)
+ return true;
-+ if ((ix86_cmodel == CM_SMALL_PIC)
-+ && !SYMBOL_REF_FAR_ADDR_P (op0) && SYMBOL_REF_LOCAL_P (op0))
++ /* Non-external symbols don't need to be resolved for
++ large, and medium-model. */
++ if ((ix86_cmodel == CM_LARGE_PIC
++ || ix86_cmodel == CM_MEDIUM_PIC)
++ && !SYMBOL_REF_EXTERNAL_P (op0))
+ return true;
+ }
+ else if (!SYMBOL_REF_FAR_ADDR_P (op0)
@@ -227,7 +233,7 @@ Index: gcc/config/i386/i386.c
return true;
break;
-@@ -12151,7 +12198,7 @@
+@@ -12151,7 +12201,7 @@
if ((GET_CODE (XVECEXP (disp, 0, 0)) == SYMBOL_REF
|| GET_CODE (XVECEXP (disp, 0, 0)) == LABEL_REF)
&& !TARGET_64BIT)
@@ -236,7 +242,7 @@ Index: gcc/config/i386/i386.c
return false;
case UNSPEC_GOTTPOFF:
case UNSPEC_GOTNTPOFF:
-@@ -12486,11 +12533,17 @@
+@@ -12486,11 +12536,17 @@
}
#endif
@@ -257,7 +263,7 @@ Index: gcc/config/i386/i386.c
{
rtx tmpreg;
/* This symbol may be referenced via a displacement from the PIC
-@@ -12521,9 +12574,10 @@
+@@ -12521,9 +12577,10 @@
tmpreg, 1, OPTAB_DIRECT);
new_rtx = reg;
}
@@ -270,7 +276,7 @@ Index: gcc/config/i386/i386.c
{
/* This symbol may be referenced via a displacement from the PIC
base address (@GOTOFF). */
-@@ -12554,31 +12604,22 @@
+@@ -12554,31 +12611,22 @@
see gotoff_operand. */
|| (TARGET_VXWORKS_RTP && GET_CODE (addr) == LABEL_REF))
{
@@ -308,7 +314,7 @@ Index: gcc/config/i386/i386.c
else if (TARGET_64BIT && ix86_cmodel != CM_LARGE_PIC)
{
new_rtx = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, addr), UNSPEC_GOTPCREL);
-@@ -12647,7 +12692,7 @@
+@@ -12647,7 +12695,7 @@
/* Check first to see if this is a constant offset from a @GOTOFF
symbol reference. */
@@ -317,7 +323,7 @@ Index: gcc/config/i386/i386.c
&& CONST_INT_P (op1))
{
if (!TARGET_64BIT)
-@@ -12791,7 +12836,7 @@
+@@ -12791,7 +12839,7 @@
if (!TARGET_64BIT)
{
@@ -326,7 +332,7 @@ Index: gcc/config/i386/i386.c
pic = pic_offset_table_rtx;
else
{
-@@ -13006,7 +13051,7 @@
+@@ -13006,7 +13054,7 @@
htab_t dllimport_map;
static tree
@@ -335,7 +341,7 @@ Index: gcc/config/i386/i386.c
{
struct tree_map *h, in;
void **loc;
-@@ -13039,8 +13084,11 @@
+@@ -13039,8 +13087,11 @@
name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
name = targetm.strip_name_encoding (name);
@@ -349,10 +355,12 @@ Index: gcc/config/i386/i386.c
namelen = strlen (name);
prefixlen = strlen (prefix);
imp_name = (char *) alloca (namelen + prefixlen + 1);
-@@ -13051,6 +13103,13 @@
+@@ -13050,7 +13101,14 @@
+ name = ggc_alloc_string (imp_name, namelen + prefixlen);
rtl = gen_rtx_SYMBOL_REF (Pmode, name);
SET_SYMBOL_REF_DECL (rtl, to);
- SYMBOL_REF_FLAGS (rtl) = SYMBOL_FLAG_LOCAL;
+- SYMBOL_REF_FLAGS (rtl) = SYMBOL_FLAG_LOCAL;
++ SYMBOL_REF_FLAGS (rtl) = SYMBOL_FLAG_LOCAL | SYMBOL_FLAG_STUBVAR;
+ if (!beimport)
+ {
+ SYMBOL_REF_FLAGS (rtl) |= SYMBOL_FLAG_EXTERNAL;
@@ -363,7 +371,7 @@ Index: gcc/config/i386/i386.c
rtl = gen_const_mem (Pmode, rtl);
set_mem_alias_set (rtl, ix86_GOT_alias_set ());
-@@ -13061,6 +13116,24 @@
+@@ -13061,6 +13119,24 @@
return to;
}
@@ -388,7 +396,7 @@ Index: gcc/config/i386/i386.c
/* Expand SYMBOL into its corresponding dllimport symbol. WANT_REG is
true if we require the result be a register. */
-@@ -13071,7 +13144,7 @@
+@@ -13071,7 +13147,7 @@
rtx x;
gcc_assert (SYMBOL_REF_DECL (symbol));
@@ -397,7 +405,7 @@ Index: gcc/config/i386/i386.c
x = DECL_RTL (imp_decl);
if (want_reg)
-@@ -13079,6 +13152,47 @@
+@@ -13079,6 +13155,47 @@
return x;
}
@@ -445,7 +453,7 @@ Index: gcc/config/i386/i386.c
/* Try machine-dependent ways of modifying an illegitimate address
to be legitimate. If we find one, return the new, valid address.
This macro is used in only one place: `memory_address' in explow.c.
-@@ -13119,16 +13233,9 @@
+@@ -13119,16 +13236,9 @@
if (TARGET_DLLIMPORT_DECL_ATTRIBUTES)
{
@@ -465,7 +473,7 @@ Index: gcc/config/i386/i386.c
}
if (flag_pic && SYMBOLIC_CONST (x))
-@@ -15944,6 +16051,8 @@
+@@ -15944,6 +16054,8 @@
if (GET_CODE (op1) == SYMBOL_REF)
{
@@ -474,7 +482,7 @@ Index: gcc/config/i386/i386.c
model = SYMBOL_REF_TLS_MODEL (op1);
if (model)
{
-@@ -15953,9 +16062,8 @@
+@@ -15953,9 +16065,8 @@
return;
op1 = convert_to_mode (mode, op1, 1);
}
@@ -486,7 +494,7 @@ Index: gcc/config/i386/i386.c
}
else if (GET_CODE (op1) == CONST
&& GET_CODE (XEXP (op1, 0)) == PLUS
-@@ -15963,14 +16071,13 @@
+@@ -15963,14 +16074,13 @@
{
rtx addend = XEXP (XEXP (op1, 0), 1);
rtx symbol = XEXP (XEXP (op1, 0), 0);
@@ -504,7 +512,7 @@ Index: gcc/config/i386/i386.c
if (tmp)
{
-@@ -23576,7 +23683,7 @@
+@@ -23576,7 +23686,7 @@
rtx tmp, unspec;
gcc_assert (GET_CODE (symbol) == SYMBOL_REF);
@@ -513,7 +521,7 @@ Index: gcc/config/i386/i386.c
gcc_assert (Pmode == DImode);
tmp = gen_reg_rtx (Pmode);
-@@ -23618,7 +23725,8 @@
+@@ -23618,7 +23728,8 @@
else
{
/* Static functions and indirect calls don't need the pic register. */
@@ -523,7 +531,7 @@ Index: gcc/config/i386/i386.c
&& GET_CODE (XEXP (fnaddr, 0)) == SYMBOL_REF
&& ! SYMBOL_REF_LOCAL_P (XEXP (fnaddr, 0)))
use_reg (&use, pic_offset_table_rtx);
-@@ -23632,6 +23740,7 @@
+@@ -23632,6 +23743,7 @@
}
if (ix86_cmodel == CM_LARGE_PIC
@@ -531,7 +539,7 @@ Index: gcc/config/i386/i386.c
&& MEM_P (fnaddr)
&& GET_CODE (XEXP (fnaddr, 0)) == SYMBOL_REF
&& !local_symbolic_operand (XEXP (fnaddr, 0), VOIDmode))
-@@ -34959,7 +35068,7 @@
+@@ -34959,7 +35071,7 @@
if (TARGET_64BIT)
{
if (!flag_pic || targetm.binds_local_p (function)
@@ -542,7 +550,7 @@ Index: gcc/config/i386/i386.c
{
Index: gcc/config/i386/i386.h
===================================================================
---- gcc/config/i386/i386.h (revision 196430)
+--- gcc/config/i386/i386.h (revision 196791)
+++ gcc/config/i386/i386.h (working copy)
@@ -1179,7 +1179,8 @@
#define REAL_PIC_OFFSET_TABLE_REGNUM BX_REG
@@ -554,34 +562,27 @@ Index: gcc/config/i386/i386.h
|| !flag_pic ? INVALID_REGNUM \
: reload_completed ? REGNO (pic_offset_table_rtx) \
: REAL_PIC_OFFSET_TABLE_REGNUM)
-Index: gcc/config/i386/predicates.md
-===================================================================
---- gcc/config/i386/predicates.md (revision 196430)
-+++ gcc/config/i386/predicates.md (working copy)
-@@ -137,6 +137,8 @@
- switch (XINT (XEXP (op, 0), 1))
- {
- case UNSPEC_GOTPCREL:
-+ if (DEFAULT_ABI == MS_ABI)
-+ break;
- case UNSPEC_DTPOFF:
- case UNSPEC_GOTNTPOFF:
- case UNSPEC_NTPOFF:
-@@ -436,6 +438,9 @@
- if (SYMBOL_REF_TLS_MODEL (op))
- return false;
+@@ -2379,6 +2380,10 @@
+ #define SYMBOL_REF_DLLEXPORT_P(X) \
+ ((SYMBOL_REF_FLAGS (X) & SYMBOL_FLAG_DLLEXPORT) != 0)
-+ /* Dll-imported symbols are always external. */
-+ if (TARGET_DLLIMPORT_DECL_ATTRIBUTES && SYMBOL_REF_DLLIMPORT_P (op))
-+ return false;
- if (SYMBOL_REF_LOCAL_P (op))
- return true;
++#define SYMBOL_FLAG_STUBVAR (SYMBOL_FLAG_MACH_DEP << 4)
++#define SYMBOL_REF_STUBVAR_P(X) \
++ ((SYMBOL_REF_FLAGS (X) & SYMBOL_FLAG_STUBVAR) != 0)
++
+ extern void debug_ready_dispatch (void);
+ extern void debug_dispatch_window (int);
-@@ -459,6 +464,7 @@
- ;; same segment as the GOT. Unfortunately, the flexibility of linker
- ;; scripts means that we can't be sure of that in general, so assume
- ;; that @GOTOFF is never valid on VxWorks.
-+;; For x64 we don't have got-table, so disallow it.
- (define_predicate "gotoff_operand"
- (and (not (match_test "TARGET_VXWORKS_RTP"))
- (match_operand 0 "local_symbolic_operand")))
+Index: gcc/config/i386/cygming.h
+===================================================================
+--- gcc/config/i386/cygming.h (revision 196791)
++++ gcc/config/i386/cygming.h (working copy)
+@@ -474,5 +474,8 @@
+ #undef TARGET_ASM_ASSEMBLE_VISIBILITY
+ #define TARGET_ASM_ASSEMBLE_VISIBILITY i386_pe_assemble_visibility
+
++#undef SUB_TARGET_RECORD_STUB
++#define SUB_TARGET_RECORD_STUB i386_pe_record_stub
++
+ /* Static stack checking is supported by means of probes. */
+ #define STACK_CHECK_STATIC_BUILTIN 1
-----------------------------------------------------------------------
Summary of changes:
gcc/4.8.0/4.8-cmodel-medium.patch | 225 +++++++++++++++++++------------------
1 files changed, 113 insertions(+), 112 deletions(-)
hooks/post-receive
--
Repository: msys2-tools
|
|
From: Alexx83 <no...@so...> - 2013-03-25 05:15:59
|
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 a4c734c673646b3bcaf65d8f2b3ecbfbcb2bc2cc (commit)
via b05ec3a06e90a5593a6389ac2222dcd51e002a02 (commit)
from 775333f3543ca4b511ca2827779a178392999d56 (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/a4c734c673646b3bcaf65d8f2b3ecbfbcb2bc2cc/
commit a4c734c673646b3bcaf65d8f2b3ecbfbcb2bc2cc
Author: Alexpux <ale...@gm...>
Date: Mon Mar 25 09:15:45 2013 +0400
Cleanup MSYS GCC-4.8.0 patch. Fix __MSYS__ definition in spec file.
diff --git a/gcc/4.8.0/msys2-gcc-4.8.0.patch b/gcc/4.8.0/msys2-gcc-4.8.0.patch
index 94d94e2..f33291f 100644
--- a/gcc/4.8.0/msys2-gcc-4.8.0.patch
+++ b/gcc/4.8.0/msys2-gcc-4.8.0.patch
@@ -669,7 +669,7 @@ diff -Naur gcc-cygwin/gcc/config/i386/msys-w64.h gcc-msys2/gcc/config/i386/msys-
diff -Naur gcc-cygwin/gcc/config/i386/msys.h gcc-msys2/gcc/config/i386/msys.h
--- gcc-cygwin/gcc/config/i386/msys.h 1970-01-01 04:00:00 +0400
+++ gcc-msys2/gcc/config/i386/msys.h 2013-03-20 09:14:21 +0400
-@@ -0,0 +1,151 @@
+@@ -0,0 +1,152 @@
+/* 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-2013 Free Software Foundation, Inc.
@@ -695,7 +695,7 @@ diff -Naur gcc-cygwin/gcc/config/i386/msys.h gcc-msys2/gcc/config/i386/msys.h
+ { \
+ builtin_define ("__CYGWIN__"); \
+ builtin_define ("__MSYS__"); \
-+ if (!TARGET_CYGWIN64) \
++ if (!TARGET_64BIT) \
+ builtin_define ("__CYGWIN32__"); \
+ builtin_define ("__unix__"); \
+ builtin_define ("__unix"); \
@@ -705,7 +705,8 @@ diff -Naur gcc-cygwin/gcc/config/i386/msys.h gcc-msys2/gcc/config/i386/msys.h
+#undef CPP_SPEC
+#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} \
+ %{!ansi:-Dunix} %{pthread: } \
-+ %{mwin32:-DWIN32 -D_WIN32 -D__WIN32 -D__WIN32__ -D__MSYS__ %{!ansi:-DWINNT}} \
++ -D__MSYS__ \
++ %{mwin32:-DWIN32 -D_WIN32 -D__WIN32 -D__WIN32__ %{!ansi:-DWINNT}} \
+ %{!nostdinc:%{!mno-win32:-idirafter ../include/w32api%s -idirafter ../../include/w32api%s}}\
+"
+
@@ -845,7 +846,7 @@ diff -Naur gcc-cygwin/gcc/config.build gcc-msys2/gcc/config.build
diff -Naur gcc-cygwin/gcc/config.gcc gcc-msys2/gcc/config.gcc
--- gcc-cygwin/gcc/config.gcc 2013-03-20 06:44:50 +0400
+++ gcc-msys2/gcc/config.gcc 2013-03-20 08:34:27 +0400
-@@ -1468,6 +1468,37 @@
+@@ -1468,6 +1468,35 @@
use_gcc_stdint=wrap
tm_defines="${tm_defines} TARGET_CYGWIN64=1"
;;
@@ -862,7 +863,6 @@ diff -Naur gcc-cygwin/gcc/config.gcc gcc-msys2/gcc/config.gcc
+ thread_file='posix'
+ fi
+ use_gcc_stdint=wrap
-+ tm_defines="${tm_defines} TARGET_CYGWIN64=0"
+ ;;
+x86_64-*-msys*)
+ need_64bit_isa=yes
@@ -878,7 +878,6 @@ diff -Naur gcc-cygwin/gcc/config.gcc gcc-msys2/gcc/config.gcc
+ thread_file='posix'
+ fi
+ 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 dbxcoff.h i386/cygming.h"
https://sf.net/p/mingw/msys2-tools/ci/b05ec3a06e90a5593a6389ac2222dcd51e002a02/
commit b05ec3a06e90a5593a6389ac2222dcd51e002a02
Author: Alexpux <ale...@gm...>
Date: Mon Mar 25 09:14:32 2013 +0400
Cleanup GCC-4.8.0 Cygwin patches for i686
diff --git a/gcc/4.8.0/4.8-cmodel-medium.patch b/gcc/4.8.0/4.8-cmodel-medium.patch
index 7fcac6b..fd34e6d 100644
--- a/gcc/4.8.0/4.8-cmodel-medium.patch
+++ b/gcc/4.8.0/4.8-cmodel-medium.patch
@@ -585,4 +585,3 @@ Index: gcc/config/i386/predicates.md
(define_predicate "gotoff_operand"
(and (not (match_test "TARGET_VXWORKS_RTP"))
(match_operand 0 "local_symbolic_operand")))
-
diff --git a/gcc/4.8.0/4.8-libgcc-cygwin64.patch b/gcc/4.8.0/4.8-libgcc-cygwin64.patch
index 37bdd5b..74685ab 100644
--- a/gcc/4.8.0/4.8-libgcc-cygwin64.patch
+++ b/gcc/4.8.0/4.8-libgcc-cygwin64.patch
@@ -21,9 +21,9 @@
+ __attribute__((unused)) struct object *o)
+{}
-+TARGET_ATTRIBUTE_WEAK void
++TARGET_ATTRIBUTE_WEAK void*
+__deregister_frame_info (__attribute__((unused)) const void *p)
-+{}
++{ return NULL; }
+#endif /* DWARF2_UNWIND_INFO */
+
+#if TARGET_USE_JCR_SECTION
diff --git a/gcc/4.8.0/4.8-specs-cygwin.patch b/gcc/4.8.0/4.8-specs-cygwin.patch
index 69f1a53..6a5063a 100644
--- a/gcc/4.8.0/4.8-specs-cygwin.patch
+++ b/gcc/4.8.0/4.8-specs-cygwin.patch
@@ -11,7 +11,7 @@
;;
--- gcc/config.gcc 2012-09-12 04:03:54.000000000 -0500
+++ gcc/config.gcc 2013-03-11 03:41:03.674656700 -0500
-@@ -1438,15 +1438,31 @@ i[34567]86-*-cygwin*)
+@@ -1438,15 +1438,30 @@ i[34567]86-*-cygwin*)
xm_file=i386/xm-cygwin.h
tmake_file="${tmake_file} i386/t-cygming t-slibgcc"
target_gtfiles="\$(srcdir)/config/i386/winnt.c"
@@ -39,7 +39,6 @@
+ thread_file='posix'
+ fi
+ 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 dbxcoff.h i386/cygming.h"
@@ -152,7 +151,7 @@
+ do \
+ { \
+ builtin_define ("__CYGWIN__"); \
-+ if (!TARGET_CYGWIN64) \
++ if (!TARGET_64BIT) \
+ builtin_define ("__CYGWIN32__"); \
+ builtin_define ("__unix__"); \
+ builtin_define ("__unix"); \
-----------------------------------------------------------------------
Summary of changes:
gcc/4.8.0/4.8-cmodel-medium.patch | 1 -
gcc/4.8.0/4.8-libgcc-cygwin64.patch | 4 ++--
gcc/4.8.0/4.8-specs-cygwin.patch | 5 ++---
gcc/4.8.0/msys2-gcc-4.8.0.patch | 11 +++++------
4 files changed, 9 insertions(+), 12 deletions(-)
hooks/post-receive
--
Repository: msys2-tools
|
|
From: Alexx83 <no...@so...> - 2013-03-24 20:18:45
|
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 775333f3543ca4b511ca2827779a178392999d56 (commit)
from ad415ba7bad0041d37dbf3fb19fcc10f9f54bd1a (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/775333f3543ca4b511ca2827779a178392999d56/
commit 775333f3543ca4b511ca2827779a178392999d56
Author: Alexpux <ale...@gm...>
Date: Mon Mar 25 00:18:21 2013 +0400
Fix build for MSYS 32-bit target. Add __MSYS__ to cppbuiltins
diff --git a/gcc/4.8.0/msys2-gcc-4.8.0.patch b/gcc/4.8.0/msys2-gcc-4.8.0.patch
index 8a0de52..94d94e2 100644
--- a/gcc/4.8.0/msys2-gcc-4.8.0.patch
+++ b/gcc/4.8.0/msys2-gcc-4.8.0.patch
@@ -705,7 +705,7 @@ diff -Naur gcc-cygwin/gcc/config/i386/msys.h gcc-msys2/gcc/config/i386/msys.h
+#undef CPP_SPEC
+#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} \
+ %{!ansi:-Dunix} %{pthread: } \
-+ %{mwin32:-DWIN32 -D_WIN32 -D__WIN32 -D__WIN32__ %{!ansi:-DWINNT}} \
++ %{mwin32:-DWIN32 -D_WIN32 -D__WIN32 -D__WIN32__ -D__MSYS__ %{!ansi:-DWINNT}} \
+ %{!nostdinc:%{!mno-win32:-idirafter ../include/w32api%s -idirafter ../../include/w32api%s}}\
+"
+
@@ -845,7 +845,7 @@ diff -Naur gcc-cygwin/gcc/config.build gcc-msys2/gcc/config.build
diff -Naur gcc-cygwin/gcc/config.gcc gcc-msys2/gcc/config.gcc
--- gcc-cygwin/gcc/config.gcc 2013-03-20 06:44:50 +0400
+++ gcc-msys2/gcc/config.gcc 2013-03-20 08:34:27 +0400
-@@ -1468,6 +1468,36 @@
+@@ -1468,6 +1468,37 @@
use_gcc_stdint=wrap
tm_defines="${tm_defines} TARGET_CYGWIN64=1"
;;
@@ -862,6 +862,7 @@ diff -Naur gcc-cygwin/gcc/config.gcc gcc-msys2/gcc/config.gcc
+ thread_file='posix'
+ fi
+ use_gcc_stdint=wrap
++ tm_defines="${tm_defines} TARGET_CYGWIN64=0"
+ ;;
+x86_64-*-msys*)
+ need_64bit_isa=yes
-----------------------------------------------------------------------
Summary of changes:
gcc/4.8.0/msys2-gcc-4.8.0.patch | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
Repository: msys2-tools
|
|
From: Alexx83 <no...@so...> - 2013-03-24 18:18:27
|
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 ad415ba7bad0041d37dbf3fb19fcc10f9f54bd1a (commit)
from 87726ff93d8ed60724f401931a0d578b4deed3e9 (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/ad415ba7bad0041d37dbf3fb19fcc10f9f54bd1a/
commit ad415ba7bad0041d37dbf3fb19fcc10f9f54bd1a
Author: Alexpux <ale...@gm...>
Date: Sun Mar 24 22:18:04 2013 +0400
Fix MSYS2 GCC-4.8.0 patch (Part3)
diff --git a/gcc/4.8.0/msys2-gcc-4.8.0.patch b/gcc/4.8.0/msys2-gcc-4.8.0.patch
index 2feae20..8a0de52 100644
--- a/gcc/4.8.0/msys2-gcc-4.8.0.patch
+++ b/gcc/4.8.0/msys2-gcc-4.8.0.patch
@@ -196,9 +196,9 @@ diff -Naur gcc-cygwin/config/dfp.m4 gcc-msys2/config/dfp.m4
powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
i?86*-*-gnu* | \
i?86*-*-mingw* | x86_64*-*-mingw* | \
-- i?86*-*-cygwin* | x86_64*-*cygwin*)
-+ i?86*-*-cygwin* | x86_64*-*cygwin* | \
-+ i?86*-*-msys* | x86_64*-*msys*)
+- i?86*-*-cygwin* | x86_64*-*-cygwin*)
++ i?86*-*-cygwin* | x86_64*-*-cygwin* | \
++ i?86*-*-msys* | x86_64*-*-msys*)
enable_decimal_float=yes
;;
*)
@@ -693,7 +693,7 @@ diff -Naur gcc-cygwin/gcc/config/i386/msys.h gcc-msys2/gcc/config/i386/msys.h
+#define EXTRA_OS_CPP_BUILTINS() \
+ do \
+ { \
-+ builtin_define ("__CYGWIN__"); \
++ builtin_define ("__CYGWIN__"); \
+ builtin_define ("__MSYS__"); \
+ if (!TARGET_CYGWIN64) \
+ builtin_define ("__CYGWIN32__"); \
@@ -915,7 +915,7 @@ diff -Naur gcc-cygwin/gcc/configure gcc-msys2/gcc/configure
;;
i[34567]86-*-cygwin* | x86_64-*-cygwin*)
;;
-+ i[34567]86-*msys* | x86_64-*msys*)
++ i[34567]86-*-msys* | x86_64-*-msys*)
+ ;;
i[34567]86-*-mingw* | x86_64-*-mingw*)
;;
@@ -1337,7 +1337,7 @@ diff -Naur gcc-cygwin/libada/configure gcc-msys2/libada/configure
;;
i[34567]86-*-cygwin* | x86_64-*-cygwin*)
;;
-+ i[34567]86-*msys* | x86_64-*msys*)
++ i[34567]86-*-msys* | x86_64-*-msys*)
+ ;;
i[34567]86-*-mingw* | x86_64-*-mingw*)
;;
@@ -1877,7 +1877,7 @@ diff -Naur gcc-cygwin/libgcc/configure gcc-msys2/libgcc/configure
;;
i[34567]86-*-cygwin* | x86_64-*-cygwin*)
;;
-+ i[34567]86-*msys* | x86_64-*msys*)
++ i[34567]86-*-msys* | x86_64-*-msys*)
+ ;;
i[34567]86-*-mingw* | x86_64-*-mingw*)
;;
-----------------------------------------------------------------------
Summary of changes:
gcc/4.8.0/msys2-gcc-4.8.0.patch | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
hooks/post-receive
--
Repository: msys2-tools
|
|
From: Alexx83 <no...@so...> - 2013-03-24 11:39:24
|
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-runtime".
The branch, cygwin has been updated
via beb095f5e58e2e15aba64f31f232391d94e01ca5 (commit)
via e7f6af16a92ca1461bbc66fbbe904b21d68f8f4c (commit)
from e7992abe1fe6bcb7b9a6b3103b46adc1a4c06084 (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-runtime/ci/beb095f5e58e2e15aba64f31f232391d94e01ca5/
commit beb095f5e58e2e15aba64f31f232391d94e01ca5
Author: Mike Frysinger <va...@ge...>
Date: Fri Mar 22 23:16:40 2013 +0000
src-release: fix version look up for bfd based projects
diff --git a/ChangeLog b/ChangeLog
index a276e71..07594a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-22 Mike Frysinger <va...@ge...>
+
+ * src-release (VER): Change bfd/configure.in sed to use the new
+ `bfd/configure --version` output.
+
2013-02-15 Yufeng Zhang <yuf...@ar...>
* configure.ac: Sync with GCC repo.
diff --git a/src-release b/src-release
index cba4384..c388cbe 100644
--- a/src-release
+++ b/src-release
@@ -67,7 +67,7 @@ SUPPORT_FILES = list-of-support-files-for-tool-in-question
# NOTE: No double quotes in the below. It is used within shell script
# as VER="$(VER)"
VER = ` if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null 2>&1; then \
- sed < bfd/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
+ bfd/configure --version | sed -n -e '1s,.* ,,p'; \
elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
elif test -f $(TOOL)/version.in; then \
https://sf.net/p/mingw/msys2-runtime/ci/e7f6af16a92ca1461bbc66fbbe904b21d68f8f4c/
commit e7f6af16a92ca1461bbc66fbbe904b21d68f8f4c
Author: Nick Clifton <ni...@re...>
Date: Thu Mar 21 16:08:06 2013 +0000
* elf32-h8300 (h8_relax_section): Add new relaxation of mov
@(disp:32,ERx) to mov @(disp:16,ERx).
(R_H8_DISP32A16): New reloc.
Comments added and corrected.
* reloc.c (BFD_RELOC_H8_DISP32A16): New reloc.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
* ld.texinfo (H8/300): Add description of relaxation of
mov @(disp:32,ERx) to mov @(disp:16,ERx).
* ld-h8300/h8300.exp: Add new relax-7 test on ELF.
* ld-h8300/relax-2.s: Add other direction and .w/.l variants of
mov insns.
* ld-h8300/relax-2.d: Update expected disassembly.
* ld-h8300/relax-7a.s: New: tests for mov @(disp:32,ERx) -> mov
@(disp:16,ERx).
* ld-h8300/relax-7b.s: New: Likewise.
* ld-h8300/relax-7.d: New: expected disassembly.
* config/tc-h8300.c (do_a_fix_imm): Add relaxation of mov
@(disp:32,ERx) to mov @(disp:16,ERx) insns by new reloc
R_H8_DISP32A16.
* config/tc-h8300.h: Remove duplicated defines.
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index f08ca6b..c726592 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-21 Michael Schewe <mic...@gm...>
+
+ * h8.h: Add new reloc R_H8_DISP32A16 for relaxation of
+ mov @(disp:32,ERx) to mov @(disp:16,ERx).
+
2013-03-08 Andreas Arnez <ar...@li...>
* common.h (NT_S390_TDB): Define.
diff --git a/include/elf/h8.h b/include/elf/h8.h
index 36aef6a..2a3d905 100644
--- a/include/elf/h8.h
+++ b/include/elf/h8.h
@@ -1,5 +1,5 @@
/* H8300/h8500 ELF support for BFD.
- Copyright 2001, 2003, 2010 Free Software Foundation, Inc.
+ Copyright 2001-2013 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
@@ -23,7 +23,7 @@
#include "elf/reloc-macros.h"
/* Relocations. */
-/* Relocations 59..63 are GNU extensions. */
+/* Relocations 59..64 are GNU extensions. */
START_RELOC_NUMBERS (elf_h8_reloc_type)
RELOC_NUMBER (R_H8_NONE, 0)
RELOC_NUMBER (R_H8_DIR32, 1)
@@ -65,6 +65,7 @@ START_RELOC_NUMBERS (elf_h8_reloc_type)
RELOC_NUMBER (R_H8_DIR24A8, 61)
RELOC_NUMBER (R_H8_DIR24R8, 62)
RELOC_NUMBER (R_H8_DIR32A16, 63)
+ RELOC_NUMBER (R_H8_DISP32A16, 64)
RELOC_NUMBER (R_H8_ABS32, 65)
RELOC_NUMBER (R_H8_ABS32A16, 127)
RELOC_NUMBER (R_H8_SYM, 128)
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index cc7ef5f..bdf990e 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-21 Michael Schewe <mic...@gm...>
+
+ * h8300.h: Add MEMRELAX flag for mov.b/w/l @(d:32,ERs),Rd
+ and mov.b/w/l Rs,@(d:32,ERd).
+
2013-03-20 Alexis Deruelle <ale...@gm...>
PR gas/15082
diff --git a/include/opcode/h8300.h b/include/opcode/h8300.h
index 81b1c08..3296deb 100644
--- a/include/opcode/h8300.h
+++ b/include/opcode/h8300.h
@@ -1,7 +1,5 @@
/* Opcode table for the H8/300
- Copyright 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000, 2001, 2002,
- 2003, 2004, 2005, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ Copyright 1991-2013 Free Software Foundation, Inc.
Written by Steve Chamberlain <sa...@cy...>.
This file is part of GDB, the GNU Debugger and GAS, the GNU Assembler.
@@ -553,7 +551,7 @@ struct h8_opcode
{CODE, AV_H8, 6, NAME, {{SRC, RDPREDEC, E}}, {{ 6, OP3, B31 | RDPREDEC, SRC, E}}}, \
{CODE, AV_H8SX, 0, NAME, {{SRC, DISP2DST, E}}, {{PREFIX, B30 | B20 | DISP2DST, 6, OP1, B31 | DSTDISPREG, SRC, E}}}, \
{CODE, AV_H8, 6, NAME, {{SRC, DISP16DST, E}}, {{ 6, OP4, B31 | DSTDISPREG, SRC, DSTDISP16LIST, E}}}, \
- {CODE, AV_H8, 6, NAME, {{SRC, DISP32DST, E}}, {{7, 8, B30 | DSTDISPREG, 0, 6, OP2, 10, SRC, DSTDISP32LIST, E}}}, \
+ {CODE, AV_H8, 6, NAME, {{SRC, DISP32DST, E}}, {{7, 8, B30 | DSTDISPREG, 0, 6, OP2, 10, SRC, MEMRELAX | DSTDISP32LIST, E}}}, \
{CODE, AV_H8SX, 0, NAME, {{SRC, INDEXB16D, E}}, {{PREFIX, 1, 6, OP4, B31 | DSTDISPREG, SRC, DSTDISP16LIST, E}}}, \
{CODE, AV_H8SX, 0, NAME, {{SRC, INDEXW16D, E}}, {{PREFIX, 2, 6, OP4, B31 | DSTDISPREG, SRC, DSTDISP16LIST, E}}}, \
{CODE, AV_H8SX, 0, NAME, {{SRC, INDEXL16D, E}}, {{PREFIX, 3, 6, OP4, B31 | DSTDISPREG, SRC, DSTDISP16LIST, E}}}, \
@@ -571,7 +569,7 @@ struct h8_opcode
{CODE, AV_H8SX, 0, NAME, {{RSPREDEC, DST, E}}, {{PREFIX, 3, 6, OP3, B30 | RSPREDEC, DST, E}}}, \
{CODE, AV_H8SX, 0, NAME, {{DISP2SRC, DST, E}}, {{PREFIX, B30 | B20 | DISP2SRC, 6, OP1, B30 | DISPREG, DST, E}}}, \
{CODE, AV_H8, 6, NAME, {{DISP16SRC, DST, E}}, {{ 6, OP4, B30 | DISPREG, DST, DISP16LIST, E}}}, \
- {CODE, AV_H8, 6, NAME, {{DISP32SRC, DST, E}}, {{7, 8, B30 | DISPREG, 0, 6, OP2, 2, DST, DISP32LIST, E}}}, \
+ {CODE, AV_H8, 6, NAME, {{DISP32SRC, DST, E}}, {{7, 8, B30 | DISPREG, 0, 6, OP2, 2, DST, MEMRELAX | DISP32LIST, E}}}, \
{CODE, AV_H8SX, 0, NAME, {{INDEXB16, DST, E}}, {{PREFIX, 1, 6, OP4, B30 | DISPREG, DST, DISP16LIST, E}}}, \
{CODE, AV_H8SX, 0, NAME, {{INDEXW16, DST, E}}, {{PREFIX, 2, 6, OP4, B30 | DISPREG, DST, DISP16LIST, E}}}, \
{CODE, AV_H8SX, 0, NAME, {{INDEXL16, DST, E}}, {{PREFIX, 3, 6, OP4, B30 | DISPREG, DST, DISP16LIST, E}}}, \
@@ -1518,8 +1516,8 @@ struct h8_opcode h8_opcodes[] =
{O (O_MOV, SL), AV_H8SX, 0, "mov.l", {{RS32, DISP2DST, E}}, {{PREFIX_010, B30 | B20 | DISP2DST, 0x6, 0x9, B31 | DSTDISPREG, RS32, E}}},
{O (O_MOV, SL), AV_H8H, 6, "mov.l", {{RS32, DISP16DST, E}}, {{PREFIX_0100, 0x6, 0xf, B31 | DSTDISPREG, RS32, DSTDISP16LIST, E}}},
{O (O_MOV, SL), AV_H8SX, 6, "mov.l", {{RS32, DISP32DST, E}}, {{0x7, 0x8, B31 | DSTDISPREG, 0x0, 0x6, 0xb, 0xa, RS32, DSTDISP32LIST, E}}},
- {O (O_MOV, SL), AV_H8H, 6, "mov.l", {{RS32, DISP32DST, E}}, {{PREFIX_0100, 0x7, 0x8, B31 | DSTDISPREG, 0x0, 0x6, 0xb, 0xa, RS32, DSTDISP32LIST, E}}},
- {O (O_MOV, SL), AV_H8H, 6, "mov.l", {{RS32, DISP32DST, E}}, {{PREFIX_0100, 0x7, 0x8, DSTDISPREG, 0x0, 0x6, 0xb, 0xa, RS32, DSTDISP32LIST, E}}},
+ {O (O_MOV, SL), AV_H8H, 6, "mov.l", {{RS32, DISP32DST, E}}, {{PREFIX_0100, 0x7, 0x8, B31 | DSTDISPREG, 0x0, 0x6, 0xb, 0xa, RS32, MEMRELAX | DSTDISP32LIST, E}}},
+ {O (O_MOV, SL), AV_H8H, 6, "mov.l", {{RS32, DISP32DST, E}}, {{PREFIX_0100, 0x7, 0x8, DSTDISPREG, 0x0, 0x6, 0xb, 0xa, RS32, MEMRELAX | DSTDISP32LIST, E}}},
{O (O_MOV, SL), AV_H8SX, 0, "mov.l", {{RS32, INDEXB16D, E}}, {{PREFIX_0101, 0x6, 0xf, B31 | DSTDISPREG, RS32, DSTDISP16LIST, E}}},
{O (O_MOV, SL), AV_H8SX, 0, "mov.l", {{RS32, INDEXW16D, E}}, {{PREFIX_0102, 0x6, 0xf, B31 | DSTDISPREG, RS32, DSTDISP16LIST, E}}},
{O (O_MOV, SL), AV_H8SX, 0, "mov.l", {{RS32, INDEXL16D, E}}, {{PREFIX_0103, 0x6, 0xf, B31 | DSTDISPREG, RS32, DSTDISP16LIST, E}}},
@@ -1537,7 +1535,7 @@ struct h8_opcode h8_opcodes[] =
{O (O_MOV, SL), AV_H8SX, 0, "mov.l", {{DISP2SRC, RD32, E}}, {{PREFIX_010, B30 | B20 | DISP2SRC, 0x6, 0x9, B30 | DISPREG, RD32, E}}},
{O (O_MOV, SL), AV_H8H, 6, "mov.l", {{DISP16SRC, RD32, E}}, {{PREFIX_0100, 0x6, 0xf, B30 | DISPREG, RD32, SRC | DISP16LIST, E}}},
{O (O_MOV, SL), AV_H8SX, 6, "mov.l", {{DISP32SRC, RD32, E}}, {{0x7, 0x8, B31 | DISPREG, 0x0, 0x6, 0xb, 0x2, RD32, SRC | DISP32LIST, E}}},
- {O (O_MOV, SL), AV_H8H, 6, "mov.l", {{DISP32SRC, RD32, E}}, {{PREFIX_0100, 0x7, 0x8, B30 | DISPREG, 0x0, 0x6, 0xb, 0x2, RD32, SRC | DISP32LIST, E}}},
+ {O (O_MOV, SL), AV_H8H, 6, "mov.l", {{DISP32SRC, RD32, E}}, {{PREFIX_0100, 0x7, 0x8, B30 | DISPREG, 0x0, 0x6, 0xb, 0x2, RD32, MEMRELAX | SRC | DISP32LIST, E}}},
{O (O_MOV, SL), AV_H8SX, 0, "mov.l", {{INDEXB16, RD32, E}}, {{PREFIX_0101, 0x6, 0xf, B30 | DISPREG, RD32, SRC | DISP16LIST, E}}},
{O (O_MOV, SL), AV_H8SX, 0, "mov.l", {{INDEXW16, RD32, E}}, {{PREFIX_0102, 0x6, 0xf, B30 | DISPREG, RD32, SRC | DISP16LIST, E}}},
{O (O_MOV, SL), AV_H8SX, 0, "mov.l", {{INDEXL16, RD32, E}}, {{PREFIX_0103, 0x6, 0xf, B30 | DISPREG, RD32, SRC | DISP16LIST, E}}},
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
include/elf/ChangeLog | 5 +++++
include/elf/h8.h | 5 +++--
include/opcode/ChangeLog | 5 +++++
include/opcode/h8300.h | 14 ++++++--------
src-release | 2 +-
6 files changed, 25 insertions(+), 11 deletions(-)
hooks/post-receive
--
Repository: msys2-runtime
|
|
From: Alexx83 <no...@so...> - 2013-03-22 07:55:00
|
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 87726ff93d8ed60724f401931a0d578b4deed3e9 (commit)
from be47bd21ba07a4fb60c277127a96f21714e8534a (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/87726ff93d8ed60724f401931a0d578b4deed3e9/
commit 87726ff93d8ed60724f401931a0d578b4deed3e9
Author: Alexpux <ale...@gm...>
Date: Fri Mar 22 11:54:44 2013 +0400
Fix gzip patch
diff --git a/gzip/msys2-gzip-1.4.patch b/gzip/msys2-gzip-1.4.patch
index fa8a05c..df999f3 100644
--- a/gzip/msys2-gzip-1.4.patch
+++ b/gzip/msys2-gzip-1.4.patch
@@ -11,11 +11,10 @@ diff -Naur gzip-1.4/build-aux/config.guess gzip-1.4-p/build-aux/config.guess
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
-@@ -841,6 +844,10 @@
+@@ -841,6 +844,9 @@
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
-+ exit ;;
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
+ echo x86_64-unknown-msys
+ exit ;;
-----------------------------------------------------------------------
Summary of changes:
gzip/msys2-gzip-1.4.patch | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
hooks/post-receive
--
Repository: msys2-tools
|
|
From: Alexx83 <no...@so...> - 2013-03-22 06:45:25
|
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 be47bd21ba07a4fb60c277127a96f21714e8534a (commit)
from 628f8716bfbd4ca032d211d1155f2a1a8d540449 (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/be47bd21ba07a4fb60c277127a96f21714e8534a/
commit be47bd21ba07a4fb60c277127a96f21714e8534a
Author: Alexpux <ale...@gm...>
Date: Fri Mar 22 10:44:57 2013 +0400
Add patches for:
- diffutils
- gzip
- libiconv
- patch
- tar
- wget
diff --git a/diffutils/msys2-diffutils-3.2.patch b/diffutils/msys2-diffutils-3.2.patch
new file mode 100644
index 0000000..b354fb5
--- /dev/null
+++ b/diffutils/msys2-diffutils-3.2.patch
@@ -0,0 +1,304 @@
+diff -Naur diffutils-3.2/build-aux/compile diffutils-3.2-p/build-aux/compile
+--- diffutils-3.2/build-aux/compile 2011-09-02 16:32:25 +0400
++++ diffutils-3.2-p/build-aux/compile 2013-03-22 09:27:01 +0400
+@@ -54,7 +54,7 @@
+ MINGW*)
+ file_conv=mingw
+ ;;
+- CYGWIN*)
++ CYGWIN* | MSYS*)
+ file_conv=cygwin
+ ;;
+ *)
+@@ -68,7 +68,7 @@
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+- cygwin/*)
++ cygwin/* | msys/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+diff -Naur diffutils-3.2/build-aux/config.guess diffutils-3.2-p/build-aux/config.guess
+--- diffutils-3.2/build-aux/config.guess 2011-08-28 15:55:52 +0400
++++ diffutils-3.2-p/build-aux/config.guess 2013-03-22 09:28:12 +0400
+@@ -803,6 +803,9 @@
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit ;;
++ i*:MSYS*:*)
++ echo ${UNAME_MACHINE}-pc-msys
++ exit ;;
+ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+@@ -843,6 +846,9 @@
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
++ echo x86_64-unknown-msys
++ exit ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit ;;
+diff -Naur diffutils-3.2/build-aux/config.rpath diffutils-3.2-p/build-aux/config.rpath
+--- diffutils-3.2/build-aux/config.rpath 2011-03-26 16:45:45 +0400
++++ diffutils-3.2-p/build-aux/config.rpath 2013-03-22 09:28:50 +0400
+@@ -57,7 +57,7 @@
+ aix*)
+ wl='-Wl,'
+ ;;
+- mingw* | cygwin* | pw32* | os2* | cegcc*)
++ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ wl='-Wl,'
+@@ -149,7 +149,7 @@
+ hardcode_minus_L=no
+
+ case "$host_os" in
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+@@ -198,7 +198,7 @@
+ ld_shlibs=no
+ fi
+ ;;
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+@@ -348,7 +348,7 @@
+ ;;
+ bsdi[45]*)
+ ;;
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+@@ -537,7 +537,7 @@
+ bsdi[45]*)
+ library_names_spec='$libname$shrext'
+ ;;
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ shrext=.dll
+ library_names_spec='$libname.dll.a $libname.lib'
+ ;;
+diff -Naur diffutils-3.2/build-aux/config.sub diffutils-3.2-p/build-aux/config.sub
+--- diffutils-3.2/build-aux/config.sub 2011-08-28 15:55:52 +0400
++++ diffutils-3.2-p/build-aux/config.sub 2013-03-22 09:29:03 +0400
+@@ -1340,7 +1340,7 @@
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+diff -Naur diffutils-3.2/configure diffutils-3.2-p/configure
+--- diffutils-3.2/configure 2011-09-02 19:19:02 +0400
++++ diffutils-3.2-p/configure 2013-03-22 09:26:25 +0400
+@@ -9052,7 +9052,7 @@
+ # special semantics and is distinct from /, please report it to
+ # <bug...@gn...>.
+ case $host in
+- *-cygwin | i370-ibm-openedition)
++ *-cygwin | *-msys | i370-ibm-openedition)
+ gl_cv_double_slash_root=yes ;;
+ *)
+ # Be optimistic and assume that / and // are the same when we
+@@ -15613,7 +15613,7 @@
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_getcwd_null="guessing yes";;
+ # Guess yes on Cygwin.
+- cygwin*) gl_cv_func_getcwd_null="guessing yes";;
++ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_getcwd_null="guessing no";;
+ esac
+@@ -16196,7 +16196,7 @@
+
+ case "$host_os" in
+ # Guess no on Cygwin.
+- cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
++ cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;;
+ # Guess yes otherwise.
+ *) gl_cv_func_btowc_nul="guessing yes" ;;
+ esac
+@@ -16538,7 +16538,7 @@
+ # special semantics and is distinct from /, please report it to
+ # <bug...@gn...>.
+ case $host in
+- *-cygwin | i370-ibm-openedition)
++ *-cygwin | *-msys | i370-ibm-openedition)
+ gl_cv_double_slash_root=yes ;;
+ *)
+ # Be optimistic and assume that / and // are the same when we
+@@ -16580,7 +16580,7 @@
+ case "$host_os" in
+ mingw*) # on this platform, dup2 always returns 0 for success
+ gl_cv_func_dup2_works=no;;
+- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
++ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0
+ gl_cv_func_dup2_works=no;;
+ linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
+ # closed fd may yield -EBADF instead of -1 / errno=EBADF.
+@@ -28197,7 +28197,7 @@
+
+ case "$host_os" in
+ mingw*) REPLACE_SETLOCALE=1 ;;
+- cygwin*)
++ cygwin* | msys*)
+ case `uname -r` in
+ 1.5.*) REPLACE_SETLOCALE=1 ;;
+ esac
+@@ -30323,7 +30323,7 @@
+ *) gl_cv_func_wctob_works="guessing yes" ;;
+ esac
+ case "$host_os" in
+- cygwin*)
++ cygwin* | msys*)
+ if test "$cross_compiling" = yes; then :
+ :
+ else
+diff -Naur diffutils-3.2/lib/Makefile.in diffutils-3.2-p/lib/Makefile.in
+--- diffutils-3.2/lib/Makefile.in 2011-09-02 16:32:25 +0400
++++ diffutils-3.2-p/lib/Makefile.in 2013-03-22 09:33:14 +0400
+@@ -2042,7 +2042,7 @@
+ case '$(host_os)' in \
+ darwin[56]*) \
+ need_charset_alias=true ;; \
+- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
+ need_charset_alias=false ;; \
+ *) \
+ need_charset_alias=true ;; \
+diff -Naur diffutils-3.2/lib/gnulib.mk diffutils-3.2-p/lib/gnulib.mk
+--- diffutils-3.2/lib/gnulib.mk 2011-08-28 15:57:27 +0400
++++ diffutils-3.2-p/lib/gnulib.mk 2013-03-22 09:32:49 +0400
+@@ -711,7 +711,7 @@
+ case '$(host_os)' in \
+ darwin[56]*) \
+ need_charset_alias=true ;; \
+- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
+ need_charset_alias=false ;; \
+ *) \
+ need_charset_alias=true ;; \
+diff -Naur diffutils-3.2/m4/btowc.m4 diffutils-3.2-p/m4/btowc.m4
+--- diffutils-3.2/m4/btowc.m4 2011-08-28 15:55:52 +0400
++++ diffutils-3.2-p/m4/btowc.m4 2013-03-22 09:33:42 +0400
+@@ -49,7 +49,7 @@
+ changequote(,)dnl
+ case "$host_os" in
+ # Guess no on Cygwin.
+- cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
++ cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;;
+ # Guess yes otherwise.
+ *) gl_cv_func_btowc_nul="guessing yes" ;;
+ esac
+diff -Naur diffutils-3.2/m4/double-slash-root.m4 diffutils-3.2-p/m4/double-slash-root.m4
+--- diffutils-3.2/m4/double-slash-root.m4 2011-01-04 01:04:38 +0400
++++ diffutils-3.2-p/m4/double-slash-root.m4 2013-03-22 09:33:58 +0400
+@@ -16,7 +16,7 @@
+ # special semantics and is distinct from /, please report it to
+ # <bug...@gn...>.
+ case $host in
+- *-cygwin | i370-ibm-openedition)
++ *-cygwin | *-msys | i370-ibm-openedition)
+ gl_cv_double_slash_root=yes ;;
+ *)
+ # Be optimistic and assume that / and // are the same when we
+diff -Naur diffutils-3.2/m4/dup2.m4 diffutils-3.2-p/m4/dup2.m4
+--- diffutils-3.2/m4/dup2.m4 2011-08-28 15:55:52 +0400
++++ diffutils-3.2-p/m4/dup2.m4 2013-03-22 09:34:09 +0400
+@@ -46,7 +46,7 @@
+ [case "$host_os" in
+ mingw*) # on this platform, dup2 always returns 0 for success
+ gl_cv_func_dup2_works=no;;
+- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
++ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0
+ gl_cv_func_dup2_works=no;;
+ linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
+ # closed fd may yield -EBADF instead of -1 / errno=EBADF.
+diff -Naur diffutils-3.2/m4/getcwd.m4 diffutils-3.2-p/m4/getcwd.m4
+--- diffutils-3.2/m4/getcwd.m4 2011-08-28 15:55:52 +0400
++++ diffutils-3.2-p/m4/getcwd.m4 2013-03-22 09:34:27 +0400
+@@ -45,7 +45,7 @@
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_getcwd_null="guessing yes";;
+ # Guess yes on Cygwin.
+- cygwin*) gl_cv_func_getcwd_null="guessing yes";;
++ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_getcwd_null="guessing no";;
+ esac
+diff -Naur diffutils-3.2/m4/printf.m4 diffutils-3.2-p/m4/printf.m4
+--- diffutils-3.2/m4/printf.m4 2011-08-28 15:55:52 +0400
++++ diffutils-3.2-p/m4/printf.m4 2013-03-22 09:35:06 +0400
+@@ -716,7 +716,7 @@
+ openbsd*) gl_cv_func_printf_directive_ls="guessing no";;
+ irix*) gl_cv_func_printf_directive_ls="guessing no";;
+ solaris*) gl_cv_func_printf_directive_ls="guessing no";;
+- cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
++ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";;
+ beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
+ *) gl_cv_func_printf_directive_ls="guessing yes";;
+ esac
+@@ -793,7 +793,7 @@
+ [
+ changequote(,)dnl
+ case "$host_os" in
+- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
++ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";;
+ netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
+ mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
+ *) gl_cv_func_printf_flag_grouping="guessing yes";;
+@@ -1383,7 +1383,7 @@
+ darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+ darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ # Guess yes on Cygwin.
+- cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
++ cygwin* | msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ # Guess yes on Solaris >= 2.6.
+ solaris2.[0-5] | solaris2.[0-5].*)
+ gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+diff -Naur diffutils-3.2/m4/setlocale.m4 diffutils-3.2-p/m4/setlocale.m4
+--- diffutils-3.2/m4/setlocale.m4 2011-08-28 15:55:52 +0400
++++ diffutils-3.2-p/m4/setlocale.m4 2013-03-22 09:35:28 +0400
+@@ -14,7 +14,7 @@
+ mingw*) REPLACE_SETLOCALE=1 ;;
+ dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL)
+ dnl is then still "C".
+- cygwin*)
++ cygwin* | msys*)
+ case `uname -r` in
+ 1.5.*) REPLACE_SETLOCALE=1 ;;
+ esac
+diff -Naur diffutils-3.2/m4/wctob.m4 diffutils-3.2-p/m4/wctob.m4
+--- diffutils-3.2/m4/wctob.m4 2011-08-28 15:55:52 +0400
++++ diffutils-3.2-p/m4/wctob.m4 2013-03-22 09:35:57 +0400
+@@ -29,14 +29,14 @@
+ changequote(,)dnl
+ case "$host_os" in
+ # Guess no on Solaris <= 9 and Cygwin.
+- solaris2.[1-9] | solaris2.[1-9].* | cygwin*)
++ solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*)
+ gl_cv_func_wctob_works="guessing no" ;;
+ # Guess yes otherwise.
+ *) gl_cv_func_wctob_works="guessing yes" ;;
+ esac
+ changequote([,])dnl
+ case "$host_os" in
+- cygwin*)
++ cygwin* | msys*)
+ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE([[
+ #include <locale.h>
diff --git a/gzip/msys2-gzip-1.4.patch b/gzip/msys2-gzip-1.4.patch
new file mode 100644
index 0000000..fa8a05c
--- /dev/null
+++ b/gzip/msys2-gzip-1.4.patch
@@ -0,0 +1,183 @@
+diff -Naur gzip-1.4/build-aux/config.guess gzip-1.4-p/build-aux/config.guess
+--- gzip-1.4/build-aux/config.guess 2010-01-03 22:29:24 +0400
++++ gzip-1.4-p/build-aux/config.guess 2013-03-22 07:57:46 +0400
+@@ -801,6 +801,9 @@
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit ;;
++ i*:MSYS*:*)
++ echo ${UNAME_MACHINE}-pc-msys
++ exit ;;
+ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+@@ -841,6 +844,10 @@
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
++ exit ;;
++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
++ echo x86_64-unknown-msys
++ exit ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit ;;
+diff -Naur gzip-1.4/build-aux/config.sub gzip-1.4-p/build-aux/config.sub
+--- gzip-1.4/build-aux/config.sub 2010-01-08 14:33:01 +0400
++++ gzip-1.4-p/build-aux/config.sub 2013-03-22 07:58:11 +0400
+@@ -1294,7 +1294,7 @@
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+diff -Naur gzip-1.4/configure gzip-1.4-p/configure
+--- gzip-1.4/configure 2010-01-20 20:26:07 +0400
++++ gzip-1.4-p/configure 2013-03-22 07:56:37 +0400
+@@ -7117,7 +7117,7 @@
+ # special semantics and is distinct from /, please report it to
+ # <bug...@gn...>.
+ case $host in
+- *-cygwin | i370-ibm-openedition)
++ *-cygwin | *-msys | i370-ibm-openedition)
+ gl_cv_double_slash_root=yes ;;
+ *)
+ # Be optimistic and assume that / and // are the same when we
+@@ -8947,7 +8947,7 @@
+ openbsd*) gl_cv_func_printf_directive_ls="guessing no";;
+ irix*) gl_cv_func_printf_directive_ls="guessing no";;
+ solaris*) gl_cv_func_printf_directive_ls="guessing no";;
+- cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
++ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";;
+ beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
+ *) gl_cv_func_printf_directive_ls="guessing yes";;
+ esac
+@@ -9078,7 +9078,7 @@
+ if test "$cross_compiling" = yes; then :
+
+ case "$host_os" in
+- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
++ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";;
+ netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
+ mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
+ *) gl_cv_func_printf_flag_grouping="guessing yes";;
+@@ -9896,7 +9896,7 @@
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_getcwd_null="guessing yes";;
+ # Guess yes on Cygwin.
+- cygwin*) gl_cv_func_getcwd_null="guessing yes";;
++ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";;
+ # Guess yes on mingw.
+ mingw*) gl_cv_func_getcwd_null="guessing yes";;
+ # If we don't know, assume the worst.
+@@ -13183,7 +13183,7 @@
+ # special semantics and is distinct from /, please report it to
+ # <bug...@gn...>.
+ case $host in
+- *-cygwin | i370-ibm-openedition)
++ *-cygwin | *-msys | i370-ibm-openedition)
+ gl_cv_double_slash_root=yes ;;
+ *)
+ # Be optimistic and assume that / and // are the same when we
+@@ -13233,7 +13233,7 @@
+ case "$host_os" in
+ mingw*) # on this platform, dup2 always returns 0 for success
+ gl_cv_func_dup2_works=no;;
+- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
++ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0
+ gl_cv_func_dup2_works=no;;
+ linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
+ # closed fd may yield -EBADF instead of -1 / errno=EBADF.
+diff -Naur gzip-1.4/lib/Makefile.in gzip-1.4-p/lib/Makefile.in
+--- gzip-1.4/lib/Makefile.in 2010-01-20 20:26:10 +0400
++++ gzip-1.4-p/lib/Makefile.in 2013-03-22 07:59:46 +0400
+@@ -1705,7 +1705,7 @@
+ case '$(host_os)' in \
+ darwin[56]*) \
+ need_charset_alias=true ;; \
+- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
+ need_charset_alias=false ;; \
+ *) \
+ need_charset_alias=true ;; \
+diff -Naur gzip-1.4/lib/gnulib.mk gzip-1.4-p/lib/gnulib.mk
+--- gzip-1.4/lib/gnulib.mk 2010-01-20 17:20:35 +0400
++++ gzip-1.4-p/lib/gnulib.mk 2013-03-22 07:58:58 +0400
+@@ -742,7 +742,7 @@
+ case '$(host_os)' in \
+ darwin[56]*) \
+ need_charset_alias=true ;; \
+- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
+ need_charset_alias=false ;; \
+ *) \
+ need_charset_alias=true ;; \
+diff -Naur gzip-1.4/m4/double-slash-root.m4 gzip-1.4-p/m4/double-slash-root.m4
+--- gzip-1.4/m4/double-slash-root.m4 2010-01-08 14:33:01 +0400
++++ gzip-1.4-p/m4/double-slash-root.m4 2013-03-22 08:01:22 +0400
+@@ -16,7 +16,7 @@
+ # special semantics and is distinct from /, please report it to
+ # <bug...@gn...>.
+ case $host in
+- *-cygwin | i370-ibm-openedition)
++ *-cygwin | *-msys | i370-ibm-openedition)
+ gl_cv_double_slash_root=yes ;;
+ *)
+ # Be optimistic and assume that / and // are the same when we
+diff -Naur gzip-1.4/m4/dup2.m4 gzip-1.4-p/m4/dup2.m4
+--- gzip-1.4/m4/dup2.m4 2010-01-08 14:33:01 +0400
++++ gzip-1.4-p/m4/dup2.m4 2013-03-22 08:01:51 +0400
+@@ -32,7 +32,7 @@
+ [case "$host_os" in
+ mingw*) # on this platform, dup2 always returns 0 for success
+ gl_cv_func_dup2_works=no;;
+- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
++ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0
+ gl_cv_func_dup2_works=no;;
+ linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
+ # closed fd may yield -EBADF instead of -1 / errno=EBADF.
+diff -Naur gzip-1.4/m4/getcwd.m4 gzip-1.4-p/m4/getcwd.m4
+--- gzip-1.4/m4/getcwd.m4 2010-01-08 14:33:01 +0400
++++ gzip-1.4-p/m4/getcwd.m4 2013-03-22 08:02:35 +0400
+@@ -38,7 +38,7 @@
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_getcwd_null="guessing yes";;
+ # Guess yes on Cygwin.
+- cygwin*) gl_cv_func_getcwd_null="guessing yes";;
++ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";;
+ # Guess yes on mingw.
+ mingw*) gl_cv_func_getcwd_null="guessing yes";;
+ # If we don't know, assume the worst.
+diff -Naur gzip-1.4/m4/printf.m4 gzip-1.4-p/m4/printf.m4
+--- gzip-1.4/m4/printf.m4 2010-01-08 14:33:01 +0400
++++ gzip-1.4-p/m4/printf.m4 2013-03-22 08:03:32 +0400
+@@ -694,7 +694,7 @@
+ openbsd*) gl_cv_func_printf_directive_ls="guessing no";;
+ irix*) gl_cv_func_printf_directive_ls="guessing no";;
+ solaris*) gl_cv_func_printf_directive_ls="guessing no";;
+- cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
++ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";;
+ beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
+ *) gl_cv_func_printf_directive_ls="guessing yes";;
+ esac
+@@ -765,7 +765,7 @@
+ [
+ changequote(,)dnl
+ case "$host_os" in
+- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
++ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";;
+ netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
+ mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
+ *) gl_cv_func_printf_flag_grouping="guessing yes";;
+@@ -1318,7 +1318,7 @@
+ darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+ darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ # Guess yes on Cygwin.
+- cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
++ cygwin* | msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ # Guess yes on Solaris >= 2.6.
+ solaris2.[0-5]*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+ solaris*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
diff --git a/libiconv/1.14-cross-install.patch b/libiconv/1.14-cross-install.patch
new file mode 100644
index 0000000..c364898
--- /dev/null
+++ b/libiconv/1.14-cross-install.patch
@@ -0,0 +1,10 @@
+--- origsrc/libiconv-1.14/src/Makefile.in 2011-06-04 12:05:58.000000000 -0500
++++ src/libiconv-1.14/src/Makefile.in 2013-02-17 02:11:05.179810500 -0600
+@@ -113,6 +113,7 @@ install : all force
+ if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+ case "@host_os@" in \
+ hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
++ cygwin*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) @LTLIBINTL@ -liconv $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
+ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
+ esac
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
diff --git a/libiconv/libiconv-1.14-reloc.patch b/libiconv/libiconv-1.14-reloc.patch
new file mode 100644
index 0000000..e1a1622
--- /dev/null
+++ b/libiconv/libiconv-1.14-reloc.patch
@@ -0,0 +1,269 @@
+--- old/libiconv-1.14/lib/relocatable.c 2011-08-07 13:48:03.000000000 -0400
++++ new/libiconv-1.14/lib/relocatable.c 2011-10-15 03:14:13.195133600 -0400
+@@ -2,20 +2,18 @@
+ Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc.
+ Written by Bruno Haible <br...@cl...>, 2003.
+
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU Lesser General Public License as published by
++ the Free Software Foundation; either version 2.1 of the License, or
++ (at your option) any later version.
+
+ This program 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
+- Library General Public License for more details.
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU Lesser General Public License for more details.
+
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+- USA. */
++ You should have received a copy of the GNU Lesser General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+
+ /* Tell glibc's <stdio.h> to provide a prototype for getline().
+@@ -87,6 +85,19 @@
+ # define FILE_SYSTEM_PREFIX_LEN(P) 0
+ #endif
+
++/* Whether to enable the more costly support for relocatable libraries.
++ It allows libraries to be have been installed with a different original
++ prefix than the program. But it is quite costly, especially on Cygwin
++ platforms, see below. Therefore we enable it by default only on native
++ Win32 platforms. */
++#ifndef ENABLE_COSTLY_RELOCATABLE
++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
++# define ENABLE_COSTLY_RELOCATABLE 1
++# else
++# define ENABLE_COSTLY_RELOCATABLE 0
++# endif
++#endif
++
+ /* Original installation prefix. */
+ static char *orig_prefix;
+ static size_t orig_prefix_len;
+@@ -156,7 +167,7 @@
+ #endif
+ }
+
+-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE)
+
+ /* Convenience function:
+ Computes the current installation prefix, based on the original
+@@ -286,7 +297,7 @@
+
+ #endif /* !IN_LIBRARY || PIC */
+
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+
+ /* Full pathname of shared library, or NULL. */
+ static char *shared_library_fullname;
+@@ -332,7 +343,9 @@
+ #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__
+ /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()
+ function.
+- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */
++ Cygwin >= 1.5 has /proc/self/maps and the getline() function too.
++ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on
++ Cygwin 1.7. */
+ FILE *fp;
+
+ /* Open the current process' maps file. It describes one VMA per line. */
+@@ -405,7 +418,7 @@
+ const char *
+ relocate (const char *pathname)
+ {
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+ static int initialized;
+
+ /* Initialization code for a shared library. */
+--- old/libiconv-1.14/libcharset/lib/relocatable.c 2011-08-07 13:48:03.000000000 -0400
++++ new/libiconv-1.14/libcharset/lib/relocatable.c 2011-10-15 03:14:27.878133600 -0400
+@@ -2,20 +2,18 @@
+ Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc.
+ Written by Bruno Haible <br...@cl...>, 2003.
+
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU Lesser General Public License as published by
++ the Free Software Foundation; either version 2.1 of the License, or
++ (at your option) any later version.
+
+ This program 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
+- Library General Public License for more details.
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU Lesser General Public License for more details.
+
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+- USA. */
++ You should have received a copy of the GNU Lesser General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+
+ /* Tell glibc's <stdio.h> to provide a prototype for getline().
+@@ -87,6 +85,19 @@
+ # define FILE_SYSTEM_PREFIX_LEN(P) 0
+ #endif
+
++/* Whether to enable the more costly support for relocatable libraries.
++ It allows libraries to be have been installed with a different original
++ prefix than the program. But it is quite costly, especially on Cygwin
++ platforms, see below. Therefore we enable it by default only on native
++ Win32 platforms. */
++#ifndef ENABLE_COSTLY_RELOCATABLE
++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
++# define ENABLE_COSTLY_RELOCATABLE 1
++# else
++# define ENABLE_COSTLY_RELOCATABLE 0
++# endif
++#endif
++
+ /* Original installation prefix. */
+ static char *orig_prefix;
+ static size_t orig_prefix_len;
+@@ -156,7 +167,7 @@
+ #endif
+ }
+
+-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE)
+
+ /* Convenience function:
+ Computes the current installation prefix, based on the original
+@@ -286,7 +297,7 @@
+
+ #endif /* !IN_LIBRARY || PIC */
+
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+
+ /* Full pathname of shared library, or NULL. */
+ static char *shared_library_fullname;
+@@ -332,7 +343,9 @@
+ #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__
+ /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()
+ function.
+- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */
++ Cygwin >= 1.5 has /proc/self/maps and the getline() function too.
++ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on
++ Cygwin 1.7. */
+ FILE *fp;
+
+ /* Open the current process' maps file. It describes one VMA per line. */
+@@ -405,7 +418,7 @@
+ const char *
+ relocate (const char *pathname)
+ {
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+ static int initialized;
+
+ /* Initialization code for a shared library. */
+--- old/libiconv-1.14/srclib/relocatable.c 2011-08-07 09:42:06.000000000 -0400
++++ new/libiconv-1.14/srclib/relocatable.c 2011-10-15 03:14:37.739133600 -0400
+@@ -3,16 +3,16 @@
+ Written by Bruno Haible <br...@cl...>, 2003.
+
+ This program 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 of the License, or
++ it under the terms of the GNU Lesser General Public License as published by
++ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This program 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.
++ GNU Lesser General Public License for more details.
+
+- You should have received a copy of the GNU General Public License
++ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+
+@@ -85,6 +85,19 @@
+ # define FILE_SYSTEM_PREFIX_LEN(P) 0
+ #endif
+
++/* Whether to enable the more costly support for relocatable libraries.
++ It allows libraries to be have been installed with a different original
++ prefix than the program. But it is quite costly, especially on Cygwin
++ platforms, see below. Therefore we enable it by default only on native
++ Win32 platforms. */
++#ifndef ENABLE_COSTLY_RELOCATABLE
++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
++# define ENABLE_COSTLY_RELOCATABLE 1
++# else
++# define ENABLE_COSTLY_RELOCATABLE 0
++# endif
++#endif
++
+ /* Original installation prefix. */
+ static char *orig_prefix;
+ static size_t orig_prefix_len;
+@@ -154,7 +167,7 @@
+ #endif
+ }
+
+-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE)
+
+ /* Convenience function:
+ Computes the current installation prefix, based on the original
+@@ -284,7 +297,7 @@
+
+ #endif /* !IN_LIBRARY || PIC */
+
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+
+ /* Full pathname of shared library, or NULL. */
+ static char *shared_library_fullname;
+@@ -330,7 +343,9 @@
+ #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__
+ /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()
+ function.
+- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */
++ Cygwin >= 1.5 has /proc/self/maps and the getline() function too.
++ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on
++ Cygwin 1.7. */
+ FILE *fp;
+
+ /* Open the current process' maps file. It describes one VMA per line. */
+@@ -403,7 +418,7 @@
+ const char *
+ relocate (const char *pathname)
+ {
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+ static int initialized;
+
+ /* Initialization code for a shared library. */
+--- origsrc/libiconv-1.14/srcm4/gnulib-comp.m4 2011-08-07 09:42:12.000000000 -0400
++++ src/libiconv-1.14/srcm4/gnulib-comp.m4 2011-08-30 02:40:45.597317000 -0400
+@@ -164,6 +164,7 @@ gl_UNISTD_MODULE_INDICATOR([readlink])
+ gl_RELOCATABLE([$gl_source_base])
+ if test $RELOCATABLE = yes; then
+ AC_LIBOBJ([progreloc])
++ AC_LIBOBJ([relocatable])
+ fi
+ gl_FUNC_READLINK_SEPARATE
+ gl_CANONICALIZE_LGPL_SEPARATE
diff --git a/libiconv/libiconv-1.14-wchar.patch b/libiconv/libiconv-1.14-wchar.patch
new file mode 100644
index 0000000..77df371
--- /dev/null
+++ b/libiconv/libiconv-1.14-wchar.patch
@@ -0,0 +1,103 @@
+diff -urN origsrc//libiconv-1.14/libcharset/lib/localcharset.c src//libiconv-1.14/libcharset/lib/localcharset.c
+--- origsrc//libiconv-1.14/libcharset/lib/localcharset.c 2011-02-28 17:43:35.000000000 -0500
++++ src//libiconv-1.14/libcharset/lib/localcharset.c 2011-08-28 00:16:57.238000000 -0400
+@@ -54,10 +54,6 @@
+ # include <locale.h>
+ # endif
+ # endif
+-# ifdef __CYGWIN__
+-# define WIN32_LEAN_AND_MEAN
+-# include <windows.h>
+-# endif
+ #elif defined WIN32_NATIVE
+ # define WIN32_LEAN_AND_MEAN
+ # include <windows.h>
+@@ -124,7 +120,7 @@
+ cp = charset_aliases;
+ if (cp == NULL)
+ {
+-#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
++#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE)
+ const char *dir;
+ const char *base = "charset.alias";
+ char *file_name;
+@@ -309,7 +305,7 @@
+ "DECKOREAN" "\0" "EUC-KR" "\0";
+ # endif
+
+-# if defined WIN32_NATIVE || defined __CYGWIN__
++# if defined WIN32_NATIVE
+ /* To avoid the troubles of installing a separate file in the same
+ directory as the DLL and of retrieving the DLL's directory at
+ runtime, simply inline the aliases here. */
+@@ -365,64 +361,12 @@
+
+ # if HAVE_LANGINFO_CODESET
+
+- /* Most systems support nl_langinfo (CODESET) nowadays. */
+- codeset = nl_langinfo (CODESET);
+-
+-# ifdef __CYGWIN__
+- /* Cygwin < 1.7 does not have locales. nl_langinfo (CODESET) always
+- returns "US-ASCII". Return the suffix of the locale name from the
+- environment variables (if present) or the codepage as a number. */
+- if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0)
+- {
+- const char *locale;
+- static char buf[2 + 10 + 1];
+-
+- locale = getenv ("LC_ALL");
+- if (locale == NULL || locale[0] == '\0')
+- {
+- locale = getenv ("LC_CTYPE");
+- if (locale == NULL || locale[0] == '\0')
+- locale = getenv ("LANG");
+- }
+- if (locale != NULL && locale[0] != '\0')
+- {
+- /* If the locale name contains an encoding after the dot, return
+- it. */
+- const char *dot = strchr (locale, '.');
+-
+- if (dot != NULL)
+- {
+- const char *modifier;
+-
+- dot++;
+- /* Look for the possible @... trailer and remove it, if any. */
+- modifier = strchr (dot, '@');
+- if (modifier == NULL)
+- return dot;
+- if (modifier - dot < sizeof (buf))
+- {
+- memcpy (buf, dot, modifier - dot);
+- buf [modifier - dot] = '\0';
+- return buf;
+- }
+- }
+- }
+-
+- /* Woe32 has a function returning the locale's codepage as a number:
+- GetACP(). This encoding is used by Cygwin, unless the user has set
+- the environment variable CYGWIN=codepage:oem (which very few people
+- do).
+- Output directed to console windows needs to be converted (to
+- GetOEMCP() if the console is using a raster font, or to
+- GetConsoleOutputCP() if it is using a TrueType font). Cygwin does
+- this conversion transparently (see winsup/cygwin/fhandler_console.cc),
+- converting to GetConsoleOutputCP(). This leads to correct results,
+- except when SetConsoleOutputCP has been called and a raster font is
+- in use. */
+- sprintf (buf, "CP%u", GetACP ());
+- codeset = buf;
+- }
+-# endif
++ /* Most systems support nl_langinfo (CODESET) nowadays.
++ POSIX allows that the returned pointer may point to a static area that
++ may be overwritten by subsequent calls to setlocale or nl_langinfo. */
++ static char codeset_buf[64];
++ codeset_buf[0] = '\0';
++ codeset = strncat (codeset_buf, nl_langinfo (CODESET), sizeof (codeset_buf));
+
+ # else
+
diff --git a/libiconv/msys2-libiconv-1.14.patch b/libiconv/msys2-libiconv-1.14.patch
new file mode 100644
index 0000000..3e10b94
--- /dev/null
+++ b/libiconv/msys2-libiconv-1.14.patch
@@ -0,0 +1,1698 @@
+diff -Naur libiconv-1.14/build-aux/config.guess libiconv-1.14-m/build-aux/config.guess
+--- libiconv-1.14/build-aux/config.guess 2009-06-21 15:17:33 +0400
++++ libiconv-1.14-m/build-aux/config.guess 2013-02-12 08:51:42 +0400
+@@ -794,6 +794,9 @@
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit ;;
++ i*:MSYS*:*)
++ echo ${UNAME_MACHINE}-pc-msys
++ exit ;;
+ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+@@ -831,6 +834,9 @@
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
++ echo x86_64-unknown-msys
++ exit ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit ;;
+diff -Naur libiconv-1.14/build-aux/config.libpath libiconv-1.14-m/build-aux/config.libpath
+--- libiconv-1.14/build-aux/config.libpath 2011-07-03 17:50:50 +0400
++++ libiconv-1.14-m/build-aux/config.libpath 2013-02-12 08:52:30 +0400
+@@ -56,7 +56,7 @@
+ bsdi[45]*)
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
+diff -Naur libiconv-1.14/build-aux/config.rpath libiconv-1.14-m/build-aux/config.rpath
+--- libiconv-1.14/build-aux/config.rpath 2011-07-03 17:50:50 +0400
++++ libiconv-1.14-m/build-aux/config.rpath 2013-02-12 08:53:44 +0400
+@@ -57,7 +57,7 @@
+ aix*)
+ wl='-Wl,'
+ ;;
+- mingw* | cygwin* | pw32* | os2* | cegcc*)
++ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ wl='-Wl,'
+@@ -149,7 +149,7 @@
+ hardcode_minus_L=no
+
+ case "$host_os" in
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+@@ -198,7 +198,7 @@
+ ld_shlibs=no
+ fi
+ ;;
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+@@ -348,7 +348,7 @@
+ ;;
+ bsdi[45]*)
+ ;;
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+@@ -537,7 +537,7 @@
+ bsdi[45]*)
+ library_names_spec='$libname$shrext'
+ ;;
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ shrext=.dll
+ library_names_spec='$libname.dll.a $libname.lib'
+ ;;
+diff -Naur libiconv-1.14/build-aux/config.sub libiconv-1.14-m/build-aux/config.sub
+--- libiconv-1.14/build-aux/config.sub 2009-06-21 15:17:33 +0400
++++ libiconv-1.14-m/build-aux/config.sub 2013-02-12 08:54:17 +0400
+@@ -1273,7 +1273,7 @@
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+diff -Naur libiconv-1.14/build-aux/ltmain.sh libiconv-1.14-m/build-aux/ltmain.sh
+--- libiconv-1.14/build-aux/ltmain.sh 2010-09-24 03:27:59 +0400
++++ libiconv-1.14-m/build-aux/ltmain.sh 2013-02-12 09:00:12 +0400
+@@ -1179,7 +1179,7 @@
+ test "$opt_debug" = : || func_append preserve_args " --debug"
+
+ case $host in
+- *cygwin* | *mingw* | *pw32* | *cegcc*)
++ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
+ ;;
+@@ -2122,7 +2122,7 @@
+
+ # On Cygwin there's no "real" PIC flag so we must build both object types
+ case $host_os in
+- cygwin* | mingw* | pw32* | os2* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | os2* | cegcc*)
+ pic_mode=default
+ ;;
+ esac
+@@ -2991,7 +2991,7 @@
+ 'exit $?'
+ tstripme="$stripme"
+ case $host_os in
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ case $realname in
+ *.dll.a)
+ tstripme=""
+@@ -3097,7 +3097,7 @@
+
+ # Do a test to see if this is really a libtool program.
+ case $host in
+- *cygwin* | *mingw*)
++ *cygwin* | *msys* | *mingw*)
+ if func_ltwrapper_executable_p "$file"; then
+ func_ltwrapper_scriptname "$file"
+ wrapper=$func_ltwrapper_scriptname_result
+@@ -3172,7 +3172,7 @@
+ # remove .exe since cygwin /usr/bin/install will append another
+ # one anyway
+ case $install_prog,$host in
+- */usr/bin/install*,*cygwin*)
++ */usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*)
+ case $file:$destfile in
+ *.exe:*.exe)
+ # this is ok
+@@ -3320,7 +3320,7 @@
+ $RM $export_symbols
+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ case $host in
+- *cygwin* | *mingw* | *cegcc* )
++ *cygwin* | *msys* | *mingw* | *cegcc* )
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+ ;;
+@@ -3332,7 +3332,7 @@
+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ eval '$MV "$nlist"T "$nlist"'
+ case $host in
+- *cygwin* | *mingw* | *cegcc* )
++ *cygwin* | *msys* | *mingw* | *cegcc* )
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+ ;;
+@@ -3346,7 +3346,7 @@
+ func_basename "$dlprefile"
+ name="$func_basename_result"
+ case $host in
+- *cygwin* | *mingw* | *cegcc* )
++ *cygwin* | *msys* | *mingw* | *cegcc* )
+ # if an import library, we need to obtain dlname
+ if func_win32_import_lib_p "$dlprefile"; then
+ func_tr_sh "$dlprefile"
+@@ -3499,7 +3499,7 @@
+ # Transform the symbol file into the correct name.
+ symfileobj="$output_objdir/${my_outputname}S.$objext"
+ case $host in
+- *cygwin* | *mingw* | *cegcc* )
++ *cygwin* | *msys* | *mingw* | *cegcc* )
+ if test -f "$output_objdir/$my_outputname.def"; then
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+@@ -4369,7 +4369,7 @@
+ {
+ EOF
+ case "$host" in
+- *mingw* | *cygwin* )
++ *mingw* | *cygwin* | *msys* )
+ # make stdout use "unix" line endings
+ echo " setmode(1,_O_BINARY);"
+ ;;
+@@ -5082,7 +5082,7 @@
+ {
+ $opt_debug
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
++ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ # It is impossible to link a dll without this setting, and
+ # we shouldn't force the makefile maintainer to figure out
+ # which system we are compiling for in order to pass an extra
+@@ -5569,7 +5569,7 @@
+ ;;
+ esac
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
++ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$dir:"*) ;;
+@@ -5589,7 +5589,7 @@
+ -l*)
+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
++ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ # These systems don't actually have a C or math library (as such)
+ continue
+ ;;
+@@ -5666,7 +5666,7 @@
+
+ -no-install)
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
++ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+ # The PATH hackery in wrapper scripts is required on Windows
+ # and Darwin in order for the loader to find any dlls it needs.
+ func_warning "\`-no-install' is ignored for $host"
+@@ -6531,7 +6531,7 @@
+ fi
+ case "$host" in
+ # special handling for platforms with PE-DLLs.
+- *cygwin* | *mingw* | *cegcc* )
++ *cygwin* | *msys* | *mingw* | *cegcc* )
+ # Linker will automatically link against shared library if both
+ # static and shared are present. Therefore, ensure we extract
+ # symbols from the import library if a shared library is present
+@@ -6675,7 +6675,7 @@
+ if test -n "$library_names" &&
+ { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ case $host in
+- *cygwin* | *mingw* | *cegcc*)
++ *cygwin* | *msys* | *mingw* | *cegcc*)
+ # No point in relinking DLLs because paths are not encoded
+ func_append notinst_deplibs " $lib"
+ need_relink=no
+@@ -6745,7 +6745,7 @@
+ elif test -n "$soname_spec"; then
+ # bleh windows
+ case $host in
+- *cygwin* | mingw* | *cegcc*)
++ *cygwin* | *msys* | mingw* | *cegcc*)
+ func_arith $current - $age
+ major=$func_arith_result
+ versuffix="-$major"
+@@ -7605,7 +7605,7 @@
+ if test "$build_libtool_libs" = yes; then
+ if test -n "$rpath"; then
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
++ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ # these systems don't actually have a c library (as such)!
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+@@ -8118,7 +8118,7 @@
+
+ orig_export_symbols=
+ case $host_os in
+- cygwin* | mingw* | cegcc*)
++ cygwin* | msys* | mingw* | cegcc*)
+ if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+ # exporting using user supplied symfile
+ if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+@@ -8674,7 +8674,7 @@
+
+ prog)
+ case $host in
+- *cygwin*) func_stripname '' '.exe' "$output"
++ *cygwin* | *msys*) func_stripname '' '.exe' "$output"
+ output=$func_stripname_result.exe;;
+ esac
+ test -n "$vinfo" && \
+@@ -8787,7 +8787,7 @@
+ esac
+ fi
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
++ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$libdir:"*) ;;
+@@ -8865,7 +8865,7 @@
+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+ wrappers_required=no
+ ;;
+- *cygwin* | *mingw* )
++ *cygwin* | *msys* | *mingw* )
+ if test "$build_libtool_libs" != yes; then
+ wrappers_required=no
+ fi
+@@ -9012,14 +9012,14 @@
+ esac
+ # test for cygwin because mv fails w/o .exe extensions
+ case $host in
+- *cygwin*)
++ *cygwin* | *msys*)
+ exeext=.exe
+ func_stripname '' '.exe' "$outputname"
+ outputname=$func_stripname_result ;;
+ *) exeext= ;;
+ esac
+ case $host in
+- *cygwin* | *mingw* )
++ *cygwin* | *msys* | *mingw* )
+ func_dirname_and_basename "$output" "" "."
+ output_name=$func_basename_result
+ output_path=$func_dirname_result
+@@ -9346,7 +9346,7 @@
+ # tests/bindir.at for full details.
+ tdlname=$dlname
+ case $host,$output,$installed,$module,$dlname in
+- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
++ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+ # If a -bindir argument was supplied, place the dll there.
+ if test "x$bindir" != x ;
+ then
+diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure
+--- libiconv-1.14/configure 2011-08-07 21:49:02 +0400
++++ libiconv-1.14-m/configure 2013-02-12 08:49:33 +0400
+@@ -6502,7 +6502,7 @@
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
+
+- cygwin* | mingw* | cegcc*)
++ cygwin* | msys* | mingw* | cegcc*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -6686,7 +6686,7 @@
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+ ;;
+- *-*-cygwin* )
++ *-*-cygwin* | *-*-msys*)
+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+ ;;
+ * ) # otherwise, assume *nix
+@@ -6694,12 +6694,12 @@
+ ;;
+ esac
+ ;;
+- *-*-cygwin* )
++ *-*-cygwin* | *-*-msys*)
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+ ;;
+- *-*-cygwin* )
++ *-*-cygwin* | *-*-msys*)
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+ * ) # otherwise, assume *nix
+@@ -6765,7 +6765,7 @@
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ case $host_os in
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ if test "$GCC" != yes; then
+ reload_cmds=false
+ fi
+@@ -6920,7 +6920,7 @@
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
+-cygwin*)
++cygwin* | msys*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+@@ -7238,7 +7238,7 @@
+ lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+ case $host_os in
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # two different shell functions defined in ltmain.sh
+ # decide which to use based on capabilities of $DLLTOOL
+ case `$DLLTOOL --help 2>&1` in
+@@ -7730,7 +7730,7 @@
+ aix*)
+ symcode='[BCDT]'
+ ;;
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+ symcode='[ABCDGISTW]'
+ ;;
+ hpux*)
+@@ -8997,7 +8997,7 @@
+ enable_win32_dll=yes
+
+ case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
++*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}as; ac_word=$2
+@@ -9807,7 +9807,7 @@
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | cygwin* | pw32* | os2* | cegcc*)
++ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -9889,7 +9889,7 @@
+ fi
+ ;;
+
+- mingw* | cygwin* | pw32* | os2* | cegcc*)
++ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+@@ -10366,7 +10366,7 @@
+ extract_expsyms_cmds=
+
+ case $host_os in
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | mingw* | msys* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+@@ -10481,7 +10481,7 @@
+ fi
+ ;;
+
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+@@ -10939,7 +10939,7 @@
+ export_dynamic_flag_spec=-rdynamic
+ ;;
+
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | msys* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+@@ -11900,7 +11900,7 @@
+ # libtool to hard-code these into programs
+ ;;
+
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+@@ -11932,6 +11932,12 @@
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+ ;;
++ msys*)
++ # Msys DLLs use 'msys-' prefix rather than 'lib'
++ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
++ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+@@ -11966,7 +11972,7 @@
+ # Convert to MSYS style.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+ ;;
+- cygwin*)
++ cygwin* | msys*)
+ # Convert to unix form, then to dos form, then back to unix form
+ # but this time dos style (no spaces!) so that the unix form looks
+ # like /cygdrive/c/PROGRA~1:/cygdr...
+@@ -12630,7 +12636,7 @@
+ lt_cv_dlopen_libs=
+ ;;
+
+- cygwin*)
++ cygwin* | msys*)
+ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
+@@ -13420,7 +13426,7 @@
+
+
+ case "$host_os" in
+- mingw* | cygwin*) is_woe32=yes ;;
++ mingw* | cygwin* | msys*) is_woe32=yes ;;
+ *) is_woe32=no ;;
+ esac
+ WOE32=$is_woe32
+@@ -16651,7 +16657,7 @@
+ # special semantics and is distinct from /, please report it to
+ # <bug...@gn...>.
+ case $host in
+- *-cygwin | i370-ibm-openedition)
++ *-cygwin | *-msys | i370-ibm-openedition)
+ gl_cv_double_slash_root=yes ;;
+ *)
+ # Be optimistic and assume that / and // are the same when we
+@@ -19824,7 +19830,7 @@
+ # special semantics and is distinct from /, please report it to
+ # <bug...@gn...>.
+ case $host in
+- *-cygwin | i370-ibm-openedition)
++ *-cygwin | *-msys | i370-ibm-openedition)
+ gl_cv_double_slash_root=yes ;;
+ *)
+ # Be optimistic and assume that / and // are the same when we
+@@ -21629,7 +21635,7 @@
+
+ if test "$enable_shared" = yes; then
+ case "$host_os" in
+- mingw* | cygwin*) is_woe32dll=yes ;;
++ mingw* | cygwin* | msys*) is_woe32dll=yes ;;
+ *) is_woe32dll=no ;;
+ esac
+ else
+diff -Naur libiconv-1.14/configure.ac libiconv-1.14-m/configure.ac
+--- libiconv-1.14/configure.ac 2011-08-07 21:48:03 +0400
++++ libiconv-1.14-m/configure.ac 2013-02-12 10:41:24 +0400
+@@ -20,6 +20,7 @@
+ AC_INIT
+ AC_CONFIG_SRCDIR([lib/iconv.c])
+ AC_CONFIG_AUX_DIR([build-aux])
++AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([libiconv], [1.14])
+ AC_CONFIG_HEADERS([config.h lib/config.h])
+ AC_PROG_MAKE_SET
+@@ -86,7 +87,7 @@
+ dnl On mingw and Cygwin, we can activate special Makefile rules which add
+ dnl version information to the executables.
+ case "$host_os" in
+- mi...
[truncated message content] |
|
From: Alexx83 <no...@so...> - 2013-03-21 18:48:25
|
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 628f8716bfbd4ca032d211d1155f2a1a8d540449 (commit)
from 6a63b4f7f525c2857254f1fa9fde667e678ce87b (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/628f8716bfbd4ca032d211d1155f2a1a8d540449/
commit 628f8716bfbd4ca032d211d1155f2a1a8d540449
Author: Alexpux <ale...@gm...>
Date: Thu Mar 21 22:48:08 2013 +0400
Fix MSYS2 GCC-4.8.0 patch (Part2)
diff --git a/gcc/4.8.0/msys2-gcc-4.8.0.patch b/gcc/4.8.0/msys2-gcc-4.8.0.patch
index 4fd56fa..2feae20 100644
--- a/gcc/4.8.0/msys2-gcc-4.8.0.patch
+++ b/gcc/4.8.0/msys2-gcc-4.8.0.patch
@@ -543,11 +543,13 @@ diff -Naur gcc-cygwin/fixincludes/configure gcc-msys2/fixincludes/configure
diff -Naur gcc-cygwin/fixincludes/mkfixinc.sh gcc-msys2/fixincludes/mkfixinc.sh
--- gcc-cygwin/fixincludes/mkfixinc.sh 2013-03-17 10:46:01 +0400
+++ gcc-msys2/fixincludes/mkfixinc.sh 2013-03-20 07:01:37 +0400
-@@ -12,6 +12,7 @@
+@@ -12,6 +12,9 @@
# Check for special fix rules for particular targets
case $machine in
i?86-*-cygwin* | \
-+ i?86-*-msys* | \
++ x86_64-*-cygwin* | \
++ i?86-*-msys* | \
++ x86_64-*-msys* | \
i?86-*-mingw32* | \
x86_64-*-mingw32* | \
i?86-*-interix* | \
@@ -1598,7 +1600,7 @@ diff -Naur gcc-cygwin/libdecnumber/configure gcc-msys2/libdecnumber/configure
i?86*-*-mingw* | x86_64*-*-mingw* | \
- i?86*-*-cygwin* | x86_64*-*-cygwin*)
+ i?86*-*-cygwin* | x86_64*-*-cygwin* | \
-+ i?86*-*msys* | x86_64*-*msys*)
++ i?86*-*-msys* | x86_64*-*-msys*)
enable_decimal_float=yes
;;
*)
@@ -2431,7 +2433,7 @@ diff -Naur gcc-cygwin/libgo/config/ltmain.sh gcc-msys2/libgo/config/ltmain.sh
# bleh windows
case $host in
- *cygwin* | mingw* | *cegcc*)
-+ *cygwin* | msys* | mingw* | *cegcc*)
++ *cygwin* | *msys* | mingw* | *cegcc*)
func_arith $current - $age
major=$func_arith_result
versuffix="-$major"
-----------------------------------------------------------------------
Summary of changes:
gcc/4.8.0/msys2-gcc-4.8.0.patch | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
hooks/post-receive
--
Repository: msys2-tools
|
|
From: Alexx83 <no...@so...> - 2013-03-21 12:04:26
|
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 6a63b4f7f525c2857254f1fa9fde667e678ce87b (commit)
from 920a3d8caf95f2b78c9002ca8c95f6f041c3ed56 (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/6a63b4f7f525c2857254f1fa9fde667e678ce87b/
commit 6a63b4f7f525c2857254f1fa9fde667e678ce87b
Author: Alexpux <ale...@gm...>
Date: Thu Mar 21 16:04:11 2013 +0400
Fix msys2 patch for GCC-4.8.0
diff --git a/gcc/4.8.0/msys2-gcc-4.8.0.patch b/gcc/4.8.0/msys2-gcc-4.8.0.patch
index 7883092..4fd56fa 100644
--- a/gcc/4.8.0/msys2-gcc-4.8.0.patch
+++ b/gcc/4.8.0/msys2-gcc-4.8.0.patch
@@ -667,7 +667,7 @@ diff -Naur gcc-cygwin/gcc/config/i386/msys-w64.h gcc-msys2/gcc/config/i386/msys-
diff -Naur gcc-cygwin/gcc/config/i386/msys.h gcc-msys2/gcc/config/i386/msys.h
--- gcc-cygwin/gcc/config/i386/msys.h 1970-01-01 04:00:00 +0400
+++ gcc-msys2/gcc/config/i386/msys.h 2013-03-20 09:14:21 +0400
-@@ -0,0 +1,150 @@
+@@ -0,0 +1,151 @@
+/* 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-2013 Free Software Foundation, Inc.
@@ -747,6 +747,7 @@ diff -Naur gcc-cygwin/gcc/config/i386/msys.h gcc-msys2/gcc/config/i386/msys.h
+#undef LIB_SPEC
+#define LIB_SPEC "\
+ %{pg:-lgmon} \
++ %{pthread: } \
+ -lmsys-2.0 \
+ %{mwindows:-lgdi32 -lcomdlg32} \
+ -ladvapi32 -lshell32 -luser32 -lkernel32"
@@ -1258,7 +1259,7 @@ diff -Naur gcc-cygwin/gcc/testsuite/lib/options.exp gcc-msys2/gcc/testsuite/lib/
# 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*"] } {
++if { [ishost "*-*-cygwin*"] || [ishost "*-*-msys*"] } {
setenv LC_ALL C.ASCII
setenv LANG C.ASCII
}
@@ -3076,7 +3077,7 @@ diff -Naur gcc-cygwin/libitm/configure gcc-msys2/libitm/configure
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -14538,6 +14544,12 @@
+@@ -14538,6 +14544,11 @@
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
;;
@@ -3084,7 +3085,6 @@ diff -Naur gcc-cygwin/libitm/configure gcc-msys2/libitm/configure
+ # Msys DLLs use 'msys-' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+ ;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
@@ -5600,7 +5600,7 @@ diff -Naur gcc-cygwin/libstdc++-v3/configure gcc-msys2/libstdc++-v3/configure
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -14277,6 +14283,12 @@
+@@ -14277,6 +14283,11 @@
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
;;
@@ -5608,7 +5608,6 @@ diff -Naur gcc-cygwin/libstdc++-v3/configure gcc-msys2/libstdc++-v3/configure
+ # Msys DLLs use 'msys-' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+ ;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
@@ -11532,14 +11531,6 @@ diff -Naur gcc-cygwin/libstdc++-v3/crossconfig.m4 gcc-msys2/libstdc++-v3/crossco
GLIBCXX_CHECK_COMPILER_FEATURES
GLIBCXX_CHECK_LINKER_FEATURES
GLIBCXX_CHECK_MATH_SUPPORT
-@@ -149,7 +149,6 @@
- AC_DEFINE(_GLIBCXX_USE_RANDOM_TR1)
- GCC_CHECK_TLS
- AM_ICONV
-- ;;
- *-mingw32*)
- GLIBCXX_CHECK_LINKER_FEATURES
- GLIBCXX_CHECK_MATH_SUPPORT
diff -Naur gcc-cygwin/libstdc++-v3/scripts/testsuite_flags.in gcc-msys2/libstdc++-v3/scripts/testsuite_flags.in
--- gcc-cygwin/libstdc++-v3/scripts/testsuite_flags.in 2013-03-20 06:43:49 +0400
+++ gcc-msys2/libstdc++-v3/scripts/testsuite_flags.in 2013-03-20 08:19:26 +0400
-----------------------------------------------------------------------
Summary of changes:
gcc/4.8.0/msys2-gcc-4.8.0.patch | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
hooks/post-receive
--
Repository: msys2-tools
|
|
From: Alexx83 <no...@so...> - 2013-03-21 03:00:37
|
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-runtime".
The branch, cygwin has been updated
via e7992abe1fe6bcb7b9a6b3103b46adc1a4c06084 (commit)
via 88d21df654b3e9cac9363b72c838eb5209b3088e (commit)
via 3b1b023c9d65e0bca9816281e77fd7fcae85d1cd (commit)
from 3c51cd478fb367af51da72cd0ab98776ef02c825 (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-runtime/ci/e7992abe1fe6bcb7b9a6b3103b46adc1a4c06084/
commit e7992abe1fe6bcb7b9a6b3103b46adc1a4c06084
Author: Nick Clifton <ni...@re...>
Date: Wed Mar 20 16:56:34 2013 +0000
PR gas/15082
* tic6x-opcode-table.h: Rename mpydp's specific operand type macro
from ORREGD1324 to ORXREGD1324 and make it cross-path-able through
tic6x_operand_xregpair operand coding type.
Make mpydp instruction cross-path-able, ie: remove the FIXed 'x'
opcode field, usu ORXREGD1324 for the src2 operand and remove the
TIC6X_FLAG_NO_CROSS.
* gas/tic6x/insns-bad-1.s: Remove test-case for mpydp with
cross-path.
* gas/tic6x/insns-bad-1.l: Update expected output.
* gas/tic6x/insns-c674x.s: Add a test-case for mpydp with
cross-path.
* gas/tic6x/insns-c674x.d: Update expected output.
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 69d0859..cc7ef5f 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,5 +1,15 @@
2013-03-20 Alexis Deruelle <ale...@gm...>
+ PR gas/15082
+ * tic6x-opcode-table.h: Rename mpydp's specific operand type macro
+ from ORREGD1324 to ORXREGD1324 and make it cross-path-able through
+ tic6x_operand_xregpair operand coding type.
+ Make mpydp instruction cross-path-able, ie: remove the FIXed 'x'
+ opcode field, usu ORXREGD1324 for the src2 operand and remove the
+ TIC6X_FLAG_NO_CROSS.
+
+2013-03-20 Alexis Deruelle <ale...@gm...>
+
PR gas/15095
* tic6x.h (enum tic6x_coding_method): Add
tic6x_coding_dreg_(msb|lsb) field coding type in order to encode
diff --git a/include/opcode/tic6x-opcode-table.h b/include/opcode/tic6x-opcode-table.h
index abebd3c..e9cfab9 100644
--- a/include/opcode/tic6x-opcode-table.h
+++ b/include/opcode/tic6x-opcode-table.h
@@ -75,7 +75,7 @@
#define ORREGD12 { tic6x_operand_regpair, 8, tic6x_rw_read, 1, 1, 2, 2 }
#define ORXREGD12 { tic6x_operand_xregpair, 8, tic6x_rw_read, 1, 1, 2, 2 }
#define ORREGD1234 { tic6x_operand_regpair, 8, tic6x_rw_read, 1, 2, 3, 4 }
-#define ORREGD1324 { tic6x_operand_regpair, 8, tic6x_rw_read, 1, 3, 2, 4 }
+#define ORXREGD1324 { tic6x_operand_xregpair, 8, tic6x_rw_read, 1, 3, 2, 4 }
#define OWREGD910 { tic6x_operand_regpair, 8, tic6x_rw_write, 9, 9, 10, 10 }
#define ORCREG1 { tic6x_operand_ctrl, 4, tic6x_rw_read, 1, 1, 0, 0 }
#define OWCREG1 { tic6x_operand_ctrl, 4, tic6x_rw_write, 1, 1, 0, 0 }
@@ -1154,11 +1154,11 @@ INSNE(mpy, m_s5_xsl16_si, m, mpy, 1616_m, C62X, 0,
ENC5(ENC(s, fu, 0), ENC(x, xpath, 0), ENC(src1, scst, 0),
ENC(src2, reg, 1), ENC(dst, reg, 2)))
-INSN(mpydp, m, mpy, mpydp, C67X, TIC6X_FLAG_NO_CROSS,
- FIX2(FIX(op, 0x0e), FIX(x, 0)),
- OP3(ORREGD1234, ORREGD1324, OWREGD910),
- ENC4(ENC(s, fu, 0), ENC(src1, reg, 0), ENC(src2, reg, 1),
- ENC(dst, reg, 2)))
+INSN(mpydp, m, mpy, mpydp, C67X, 0,
+ FIX1(FIX(op, 0x0e)),
+ OP3(ORREGD1234, ORXREGD1324, OWREGD910),
+ ENC5(ENC(s, fu, 0), ENC(x, xpath, 0), ENC(src1, reg, 0),
+ ENC(src2, reg, 1), ENC(dst, reg, 2)))
INSN(mpyh, m, mpy, 1616_m, C62X, 0,
FIX1(FIX(op, 0x01)),
@@ -2520,7 +2520,7 @@ INSNE(zero, d_sub, d, 1_or_2_src, 1cycle, C62X,
#undef OWDREGD5
#undef ORREGD12
#undef ORXREGD12
-#undef ORREGD1234
+#undef ORXREGD1234
#undef ORREGD1324
#undef OWREGD910
#undef ORCREG1
https://sf.net/p/mingw/msys2-runtime/ci/88d21df654b3e9cac9363b72c838eb5209b3088e/
commit 88d21df654b3e9cac9363b72c838eb5209b3088e
Author: Nick Clifton <ni...@re...>
Date: Wed Mar 20 16:36:34 2013 +0000
* include/opcode/tic6x.h: add tic6x_coding_dreg_(msb|lsb) field coding type in
order to encode separately the msb and lsb of a register pair ; this will be
needed to encode the opcodes the same
way as Ti assembler does.
* gas/config/tc-tic6x.c: handle tic6x_coding_dreg_(msb|lsb) field coding types
and use it to encode register pair numbers when required.
* opcodes/tic6x-dis.c: decodes opcodes that have individual msb and lsb halves
in src1 & src2 fields ; discard the src1 (lsb) value and only use src2 (msb),
discarding bit 0, to follow what Ti SDK does in that case as any value in the
src1 field yields the same output with SDK disassembler.
* include/opcode/tic6x-opcode-table.h: modify absdp, dpint, dpsp, dptrunc,
rcpdp and rsqrdp opcodes to use the new field coding types.
* gas/testsuite/gas/tic6x/insns-c674x.d, gas/testsuite/gas/tic6x/insns-c674x.s
: add test case for the newly generated opcode but keep the old ones as they
seem legit as per Ti disassembler output.
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index a46900a..69d0859 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,13 @@
+2013-03-20 Alexis Deruelle <ale...@gm...>
+
+ PR gas/15095
+ * tic6x.h (enum tic6x_coding_method): Add
+ tic6x_coding_dreg_(msb|lsb) field coding type in order to encode
+ separately the msb and lsb of a register pair. This is needed to
+ encode the opcodes in the same way as TI assembler does.
+ * tic6x-opcode-table.h: Modify absdp, dpint, dpsp, dptrunc, rcpdp
+ and rsqrdp opcodes to use the new field coding types.
+
2013-03-11 Kyrylo Tkachov <kyr...@ar...>
* arm.h (CRC_EXT_ARMV8): New constant.
diff --git a/include/opcode/tic6x-opcode-table.h b/include/opcode/tic6x-opcode-table.h
index 45e26fb..abebd3c 100644
--- a/include/opcode/tic6x-opcode-table.h
+++ b/include/opcode/tic6x-opcode-table.h
@@ -1,6 +1,5 @@
/* TI C6X opcode table.
- Copyright 2010, 2011
- Free Software Foundation, Inc.
+ Copyright 2010-2013 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -129,9 +128,10 @@ INSN(abs2, l, unary, 1cycle, C64X, 0,
ENC(dst, reg, 1)))
INSN(absdp, s, 1_or_2_src, 2cycle_dp, C67X, TIC6X_FLAG_NO_CROSS,
- FIX3(FIX(op, 0x2c), FIX(x, 0), FIX(src1, 0)),
+ FIX2(FIX(op, 0x2c), FIX(x, 0)),
OP2(ORREGD1, OWREGD12),
- ENC3(ENC(s, fu, 0), ENC(src2, reg, 0), ENC(dst, reg, 1)))
+ ENC4(ENC(s, fu, 0), ENC(src2, regpair_msb, 0), ENC(src1, regpair_lsb, 0),
+ ENC(dst, reg, 1)))
INSN(abssp, s, unary, 1cycle, C67X, 0,
FIX1(FIX(op, 0)),
@@ -916,19 +916,22 @@ INSN(dpackx2, l, 1_or_2_src_noncond, 1cycle, C64XP, 0,
ENC(src2, reg, 1), ENC(dst, reg, 2)))
INSN(dpint, l, 1_or_2_src, 4cycle, C67X, TIC6X_FLAG_NO_CROSS,
- FIX3(FIX(op, 0x8), FIX(x, 0), FIX(src1, 0)),
+ FIX2(FIX(op, 0x8), FIX(x, 0)),
OP2(ORREGD1, OWREG4),
- ENC3(ENC(s, fu, 0), ENC(src2, reg, 0), ENC(dst, reg, 1)))
+ ENC4(ENC(s, fu, 0), ENC(src2, regpair_msb, 0), ENC(src1, regpair_lsb, 0),
+ ENC(dst, reg, 1)))
INSN(dpsp, l, 1_or_2_src, 4cycle, C67X, TIC6X_FLAG_NO_CROSS,
- FIX3(FIX(op, 0x9), FIX(x, 0), FIX(src1, 0)),
+ FIX2(FIX(op, 0x9), FIX(x, 0)),
OP2(ORREGD1, OWREG4),
- ENC3(ENC(s, fu, 0), ENC(src2, reg, 0), ENC(dst, reg, 1)))
+ ENC4(ENC(s, fu, 0), ENC(src2, regpair_msb, 0), ENC(src1, regpair_lsb, 0),
+ ENC(dst, reg, 1)))
INSN(dptrunc, l, 1_or_2_src, 4cycle, C67X, TIC6X_FLAG_NO_CROSS,
- FIX3(FIX(op, 0x1), FIX(x, 0), FIX(src1, 0)),
+ FIX2(FIX(op, 0x1), FIX(x, 0)),
OP2(ORREGD1, OWREG4),
- ENC3(ENC(s, fu, 0), ENC(src2, reg, 0), ENC(dst, reg, 1)))
+ ENC4(ENC(s, fu, 0), ENC(src2, regpair_msb, 0), ENC(src1, regpair_lsb, 0),
+ ENC(dst, reg, 1)))
INSN(ext, s, field, 1cycle, C62X, TIC6X_FLAG_NO_CROSS,
FIX1(FIX(op, 0x1)),
@@ -1617,9 +1620,10 @@ INSN(packl4, l, 1_or_2_src, 1cycle, C64X, 0,
ENC(src2, reg, 1), ENC(dst, reg, 2)))
INSN(rcpdp, s, 1_or_2_src, 2cycle_dp, C67X, TIC6X_FLAG_NO_CROSS,
- FIX3(FIX(op, 0x2d), FIX(x, 0), FIX(src1, 0)),
+ FIX2(FIX(op, 0x2d), FIX(x, 0)),
OP2(ORREGD1, OWREGD12),
- ENC3(ENC(s, fu, 0), ENC(src2, reg, 0), ENC(dst, reg, 1)))
+ ENC4(ENC(s, fu, 0), ENC(src2, regpair_msb, 0), ENC(src1, regpair_lsb, 0),
+ ENC(dst, reg, 1)))
INSN(rcpsp, s, 1_or_2_src, 1cycle, C67X, 0,
FIX2(FIX(op, 0x3d), FIX(src1, 0)),
@@ -1677,9 +1681,10 @@ INSN(rpack2, s, ext_1_or_2_src_noncond, 1cycle, C64XP, 0,
ENC(src2, reg, 1), ENC(dst, reg, 2)))
INSN(rsqrdp, s, 1_or_2_src, 2cycle_dp, C67X, TIC6X_FLAG_NO_CROSS,
- FIX3(FIX(op, 0x2e), FIX(x, 0), FIX(src1, 0)),
+ FIX2(FIX(op, 0x2e), FIX(x, 0)),
OP2(ORREGD1, OWREGD12),
- ENC3(ENC(s, fu, 0), ENC(src2, reg, 0), ENC(dst, reg, 1)))
+ ENC4(ENC(s, fu, 0), ENC(src2, regpair_msb, 0), ENC(src1, regpair_lsb, 0),
+ ENC(dst, reg, 1)))
INSN(rsqrsp, s, 1_or_2_src, 1cycle, C67X, 0,
FIX2(FIX(op, 0x3e), FIX(src1, 0)),
diff --git a/include/opcode/tic6x.h b/include/opcode/tic6x.h
index 2a7a246..168f660 100644
--- a/include/opcode/tic6x.h
+++ b/include/opcode/tic6x.h
@@ -1,6 +1,5 @@
/* TI C6X opcode information.
- Copyright 2010, 2011
- Free Software Foundation, Inc.
+ Copyright 2010-2013 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -380,6 +379,12 @@ typedef enum
the field. When applied to a memory reference, encode the base
register. */
tic6x_coding_reg,
+ /* Encode the register-pair's lsb (even register) for instructions
+ that use src1 as port for loading lsb of double-precision
+ operand value (absdp, dpint, dpsp, dptrunc, rcpdp, rsqrdp). */
+ tic6x_coding_regpair_lsb,
+ /* Encode the register-pair's msb (odd register), see above. */
+ tic6x_coding_regpair_msb,
/* Store 0 for register B14, 1 for register B15. When applied to
a memory reference, encode the base register. */
tic6x_coding_areg,
https://sf.net/p/mingw/msys2-runtime/ci/3b1b023c9d65e0bca9816281e77fd7fcae85d1cd/
commit 3b1b023c9d65e0bca9816281e77fd7fcae85d1cd
Author: Christopher Faylor <me....@cg...>
Date: Tue Mar 19 16:41:42 2013 +0000
test checkin
diff --git a/winsup/cygwin/release/1.7.18 b/winsup/cygwin/release/1.7.18
index 977ae18..148d441 100644
--- a/winsup/cygwin/release/1.7.18
+++ b/winsup/cygwin/release/1.7.18
@@ -17,7 +17,7 @@ What's new:
- Changes in cygwin1.dll and gdb-7.5.50-2 now allow gdb to recognize
Cygwin-specific signals like "SIGTERM" as well as Windows signals like
- "SIGSEGV".
+ "SIGSEGV". This feature is still experimental.
Bug fixes:
----------
-----------------------------------------------------------------------
Summary of changes:
include/opcode/ChangeLog | 20 +++++++++++++++
include/opcode/tic6x-opcode-table.h | 47 +++++++++++++++++++---------------
include/opcode/tic6x.h | 9 +++++-
winsup/cygwin/release/1.7.18 | 2 +-
4 files changed, 54 insertions(+), 24 deletions(-)
hooks/post-receive
--
Repository: msys2-runtime
|
|
From: Alexx83 <no...@so...> - 2013-03-20 08:50:37
|
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 920a3d8caf95f2b78c9002ca8c95f6f041c3ed56 (commit)
via 739ce40939cd1db413e211c2013ac88c726c8317 (commit)
from f61e4783d030d636f5d42f538d23b69724cbccd7 (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/920a3d8caf95f2b78c9002ca8c95f6f041c3ed56/
commit 920a3d8caf95f2b78c9002ca8c95f6f041c3ed56
Author: Alexpux <ale...@gm...>
Date: Wed Mar 20 12:50:08 2013 +0400
Update patches for gcc-4.8.0
diff --git a/gcc/4.8.0/4.5-java-FIONREAD.patch b/gcc/4.8.0/4.5-java-FIONREAD.patch
new file mode 100644
index 0000000..9c936fe
--- /dev/null
+++ b/gcc/4.8.0/4.5-java-FIONREAD.patch
@@ -0,0 +1,13 @@
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35536
+
+--- origsrc/gcc-4.5.1/libjava/gnu/java/nio/channels/natFileChannelPosix.cc 2007-04-02 20:05:50.000000000 -0500
++++ src/gcc-4.5.1/libjava/gnu/java/nio/channels/natFileChannelPosix.cc 2010-10-27 13:39:34.044718100 -0500
+@@ -386,7 +386,7 @@ FileChannelImpl::available (void)
+
+ #if defined (FIONREAD)
+ r = ::ioctl (fd, FIONREAD, &num);
+- if (r == -1 && errno == ENOTTY)
++ if (r == -1 && (errno == ENOTTY || errno == EINVAL))
+ {
+ // If the ioctl doesn't work, we don't care.
+ r = 0;
diff --git a/gcc/4.8.0/4.7-ada.patch b/gcc/4.8.0/4.7-ada.patch
new file mode 100644
index 0000000..350160f
--- /dev/null
+++ b/gcc/4.8.0/4.7-ada.patch
@@ -0,0 +1,3291 @@
+--- origsrc/gcc-4.7.2/gcc/ada/a-intnam-cygwin.ads 1970-01-01 07:30:00.000000000 +0730
++++ src/gcc-4.7.2/gcc/ada/a-intnam-cygwin.ads 2013-02-25 22:54:36.447141300 +0800
+@@ -0,0 +1,168 @@
++------------------------------------------------------------------------------
++-- --
++-- GNAT RUN-TIME LIBRARY (GNARL) COMPONENTS --
++-- --
++-- A D A . I N T E R R U P T S . N A M E S --
++-- --
++-- S p e c --
++-- --
++-- Copyright (C) 1991-2005, Free Software Foundation, Inc. --
++-- --
++-- GNARL is free software; you can redistribute it and/or modify it under --
++-- terms of the GNU General Public License as published by the Free Soft- --
++-- ware Foundation; either version 2, or (at your option) any later ver- --
++-- sion. GNARL is distributed in the hope that it will be useful, but WITH- --
++-- OUT 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 distributed with GNARL; see file COPYING. If not, write --
++-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
++-- Boston, MA 02110-1301, USA. --
++-- --
++-- As a special exception, if other files instantiate generics from this --
++-- unit, or you link this unit with other files to produce an executable, --
++-- this unit does not by itself cause the resulting executable to be --
++-- covered by the GNU General Public License. This exception does not --
++-- however invalidate any other reasons why the executable file might be --
++-- covered by the GNU Public License. --
++-- --
++-- GNARL was developed by the GNARL team at Florida State University. --
++-- Extensive contributions were provided by Ada Core Technologies, Inc. --
++-- --
++------------------------------------------------------------------------------
++
++-- This is a Cygwin version of this package but really it's a copy of the
++-- Linux version, so the below comments are probably irrelevant:
++
++-- The following signals are reserved by the run time (FSU threads):
++
++-- SIGFPE, SIGILL, SIGSEGV, SIGBUS, SIGTRAP, SIGABRT, SIGINT,
++-- SIGALRM, SIGVTALRM, SIGUNUSED, SIGSTOP, SIGKILL
++
++-- The following signals are reserved by the run time (LinuxThreads):
++
++-- SIGFPE, SIGILL, SIGSEGV, SIGBUS, SIGTRAP, SIGABRT, SIGINT,
++-- SIGUSR1, SIGUSR2, SIGVTALRM, SIGUNUSED, SIGSTOP, SIGKILL
++
++-- The pragma Unreserve_All_Interrupts affects the following signal(s):
++
++-- SIGINT: made available for Ada handler
++
++-- This target-dependent package spec contains names of interrupts
++-- supported by the local system.
++
++with System.OS_Interface;
++-- used for names of interrupts
++
++package Ada.Interrupts.Names is
++
++ -- Beware that the mapping of names to signals may be many-to-one. There
++ -- may be aliases. Also, for all signal names that are not supported on the
++ -- current system the value of the corresponding constant will be zero.
++
++ SIGHUP : constant Interrupt_ID :=
++ System.OS_Interface.SIGHUP; -- hangup
++
++ SIGINT : constant Interrupt_ID :=
++ System.OS_Interface.SIGINT; -- interrupt (rubout)
++
++ SIGQUIT : constant Interrupt_ID :=
++ System.OS_Interface.SIGQUIT; -- quit (ASCD FS)
++
++ SIGILL : constant Interrupt_ID :=
++ System.OS_Interface.SIGILL; -- illegal instruction (not reset)
++
++ SIGTRAP : constant Interrupt_ID :=
++ System.OS_Interface.SIGTRAP; -- trace trap (not reset)
++
++ SIGIOT : constant Interrupt_ID :=
++ System.OS_Interface.SIGIOT; -- IOT instruction
++
++ SIGABRT : constant Interrupt_ID := -- used by abort,
++ System.OS_Interface.SIGABRT; -- replace SIGIOT in the future
++
++ SIGFPE : constant Interrupt_ID :=
++ System.OS_Interface.SIGFPE; -- floating point exception
++
++ SIGKILL : constant Interrupt_ID :=
++ System.OS_Interface.SIGKILL; -- kill (cannot be caught or ignored)
++
++ SIGBUS : constant Interrupt_ID :=
++ System.OS_Interface.SIGBUS; -- bus error
++
++ SIGSEGV : constant Interrupt_ID :=
++ System.OS_Interface.SIGSEGV; -- segmentation violation
++
++ SIGPIPE : constant Interrupt_ID := -- write on a pipe with
++ System.OS_Interface.SIGPIPE; -- no one to read it
++
++ SIGALRM : constant Interrupt_ID :=
++ System.OS_Interface.SIGALRM; -- alarm clock
++
++ SIGTERM : constant Interrupt_ID :=
++ System.OS_Interface.SIGTERM; -- software termination signal from kill
++
++ SIGUSR1 : constant Interrupt_ID :=
++ System.OS_Interface.SIGUSR1; -- user defined signal 1
++
++ SIGUSR2 : constant Interrupt_ID :=
++ System.OS_Interface.SIGUSR2; -- user defined signal 2
++
++ SIGCLD : constant Interrupt_ID :=
++ System.OS_Interface.SIGCLD; -- child status change
++
++ SIGCHLD : constant Interrupt_ID :=
++ System.OS_Interface.SIGCHLD; -- 4.3BSD's/POSIX name for SIGCLD
++
++ SIGWINCH : constant Interrupt_ID :=
++ System.OS_Interface.SIGWINCH; -- window size change
++
++ SIGURG : constant Interrupt_ID :=
++ System.OS_Interface.SIGURG; -- urgent condition on IO channel
++
++ SIGPOLL : constant Interrupt_ID :=
++ System.OS_Interface.SIGPOLL; -- pollable event occurred
++
++ SIGIO : constant Interrupt_ID := -- input/output possible,
++ System.OS_Interface.SIGIO; -- SIGPOLL alias (Solaris)
++
++ SIGSTOP : constant Interrupt_ID :=
++ System.OS_Interface.SIGSTOP; -- stop (cannot be caught or ignored)
++
++ SIGTSTP : constant Interrupt_ID :=
++ System.OS_Interface.SIGTSTP; -- user stop requested from tty
++
++ SIGCONT : constant Interrupt_ID :=
++ System.OS_Interface.SIGCONT; -- stopped process has been continued
++
++ SIGTTIN : constant Interrupt_ID :=
++ System.OS_Interface.SIGTTIN; -- background tty read attempted
++
++ SIGTTOU : constant Interrupt_ID :=
++ System.OS_Interface.SIGTTOU; -- background tty write attempted
++
++ SIGVTALRM : constant Interrupt_ID :=
++ System.OS_Interface.SIGVTALRM; -- virtual timer expired
++
++ SIGPROF : constant Interrupt_ID :=
++ System.OS_Interface.SIGPROF; -- profiling timer expired
++
++ SIGXCPU : constant Interrupt_ID :=
++ System.OS_Interface.SIGXCPU; -- CPU time limit exceeded
++
++ SIGXFSZ : constant Interrupt_ID :=
++ System.OS_Interface.SIGXFSZ; -- filesize limit exceeded
++
++ SIGUNUSED : constant Interrupt_ID :=
++ System.OS_Interface.SIGUNUSED; -- unused signal
++
++ SIGSTKFLT : constant Interrupt_ID :=
++ System.OS_Interface.SIGSTKFLT; -- stack fault on coprocessor
++
++ SIGLOST : constant Interrupt_ID :=
++ System.OS_Interface.SIGLOST; -- Linux alias for SIGIO
++
++ SIGPWR : constant Interrupt_ID :=
++ System.OS_Interface.SIGPWR; -- Power failure
++
++end Ada.Interrupts.Names;
+--- origsrc/gcc-4.7.2/gcc/ada/g-soccon-cygwin.ads 1970-01-01 07:30:00.000000000 +0730
++++ src/gcc-4.7.2/gcc/ada/g-soccon-cygwin.ads 2013-02-25 22:55:38.908072800 +0800
+@@ -0,0 +1,196 @@
++------------------------------------------------------------------------------
++-- --
++-- GNAT COMPILER COMPONENTS --
++-- --
++-- G N A T . S O C K E T S . C O N S T A N T S --
++-- --
++-- S p e c --
++-- --
++-- Copyright (C) 2000-2007, Free Software Foundation, Inc. --
++-- --
++-- GNAT is free software; you can redistribute it and/or modify it under --
++-- terms of the GNU General Public License as published by the Free Soft- --
++-- ware Foundation; either version 2, or (at your option) any later ver- --
++-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
++-- OUT 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 distributed with GNAT; see file COPYING. If not, write --
++-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
++-- Boston, MA 02110-1301, USA. --
++-- --
++-- As a special exception, if other files instantiate generics from this --
++-- unit, or you link this unit with other files to produce an executable, --
++-- this unit does not by itself cause the resulting executable to be --
++-- covered by the GNU General Public License. This exception does not --
++-- however invalidate any other reasons why the executable file might be --
++-- covered by the GNU Public License. --
++-- --
++-- GNAT was originally developed by the GNAT team at New York University. --
++-- Extensive contributions were provided by Ada Core Technologies Inc. --
++-- --
++------------------------------------------------------------------------------
++
++-- This package provides target dependent definitions of constant for use
++-- by the GNAT.Sockets package (g-socket.ads). This package should not be
++-- directly with'ed by an applications program.
++
++-- This is the version for Cygwin
++-- This file is generated automatically, do not modify it by hand! Instead,
++-- make changes to gen-soccon.c and re-run it on each target.
++
++package GNAT.Sockets.Constants is
++
++ --------------
++ -- Families --
++ --------------
++
++ AF_INET : constant := 2; -- IPv4 address family
++ AF_INET6 : constant := 23; -- IPv6 address family
++
++ -----------
++ -- Modes --
++ -----------
++
++ SOCK_STREAM : constant := 1; -- Stream socket
++ SOCK_DGRAM : constant := 2; -- Datagram socket
++
++ -------------------
++ -- Socket errors --
++ -------------------
++
++ EACCES : constant := 13; -- Permission denied
++ EADDRINUSE : constant := 112; -- Address already in use
++ EADDRNOTAVAIL : constant := 125; -- Cannot assign address
++ EAFNOSUPPORT : constant := 106; -- Addr family not supported
++ EALREADY : constant := 120; -- Operation in progress
++ EBADF : constant := 9; -- Bad file descriptor
++ ECONNABORTED : constant := 113; -- Connection aborted
++ ECONNREFUSED : constant := 111; -- Connection refused
++ ECONNRESET : constant := 104; -- Connection reset by peer
++ EDESTADDRREQ : constant := 121; -- Destination addr required
++ EFAULT : constant := 14; -- Bad address
++ EHOSTDOWN : constant := 117; -- Host is down
++ EHOSTUNREACH : constant := 118; -- No route to host
++ EINPROGRESS : constant := 119; -- Operation now in progress
++ EINTR : constant := 4; -- Interrupted system call
++ EINVAL : constant := 22; -- Invalid argument
++ EIO : constant := 5; -- Input output error
++ EISCONN : constant := 127; -- Socket already connected
++ ELOOP : constant := 92; -- Too many symbolic lynks
++ EMFILE : constant := 24; -- Too many open files
++ EMSGSIZE : constant := 122; -- Message too long
++ ENAMETOOLONG : constant := 91; -- Name too long
++ ENETDOWN : constant := 115; -- Network is down
++ ENETRESET : constant := 126; -- Disconn. on network reset
++ ENETUNREACH : constant := 114; -- Network is unreachable
++ ENOBUFS : constant := 105; -- No buffer space available
++ ENOPROTOOPT : constant := 109; -- Protocol not available
++ ENOTCONN : constant := 128; -- Socket not connected
++ ENOTSOCK : constant := 108; -- Operation on non socket
++ EOPNOTSUPP : constant := 95; -- Operation not supported
++ EPFNOSUPPORT : constant := 96; -- Unknown protocol family
++ EPROTONOSUPPORT : constant := 123; -- Unknown protocol
++ EPROTOTYPE : constant := 107; -- Unknown protocol type
++ ESHUTDOWN : constant := 110; -- Cannot send once shutdown
++ ESOCKTNOSUPPORT : constant := 124; -- Socket type not supported
++ ETIMEDOUT : constant := 116; -- Connection timed out
++ ETOOMANYREFS : constant := 129; -- Too many references
++ EWOULDBLOCK : constant := 11; -- Operation would block
++
++ -----------------
++ -- Host errors --
++ -----------------
++
++ HOST_NOT_FOUND : constant := 1; -- Unknown host
++ TRY_AGAIN : constant := 2; -- Host name lookup failure
++ NO_DATA : constant := 4; -- No data record for name
++ NO_RECOVERY : constant := 3; -- Non recoverable errors
++
++ -------------------
++ -- Control flags --
++ -------------------
++
++ FIONBIO : constant := -2147195266; -- Set/clear non-blocking io
++ FIONREAD : constant := 1074030207; -- How many bytes to read
++
++ --------------------
++ -- Shutdown modes --
++ --------------------
++
++ SHUT_RD : constant := 0; -- No more recv
++ SHUT_WR : constant := 1; -- No more send
++ SHUT_RDWR : constant := 2; -- No more recv/send
++
++ ---------------------
++ -- Protocol levels --
++ ---------------------
++
++ SOL_SOCKET : constant := 65535; -- Options for socket level
++ IPPROTO_IP : constant := 0; -- Dummy protocol for IP
++ IPPROTO_UDP : constant := 17; -- UDP
++ IPPROTO_TCP : constant := 6; -- TCP
++
++ -------------------
++ -- Request flags --
++ -------------------
++
++ MSG_OOB : constant := 1; -- Process out-of-band data
++ MSG_PEEK : constant := 2; -- Peek at incoming data
++ MSG_EOR : constant := -1; -- Send end of record
++ MSG_WAITALL : constant := 8; -- Wait for full reception
++ MSG_NOSIGNAL : constant := 32; -- No SIGPIPE on send
++ MSG_Forced_Flags : constant := 0;
++ -- Flags set on all send(2) calls
++
++ --------------------
++ -- Socket options --
++ --------------------
++
++ TCP_NODELAY : constant := 1; -- Do not coalesce packets
++ SO_REUSEADDR : constant := 4; -- Bind reuse local address
++ SO_REUSEPORT : constant := -1; -- Bind reuse port number
++ SO_KEEPALIVE : constant := 8; -- Enable keep-alive msgs
++ SO_LINGER : constant := 128; -- Defer close to flush data
++ SO_BROADCAST : constant := 32; -- Can send broadcast msgs
++ SO_SNDBUF : constant := 4097; -- Set/get send buffer size
++ SO_RCVBUF : constant := 4098; -- Set/get recv buffer size
++ SO_SNDTIMEO : constant := 4101; -- Emission timeout
++ SO_RCVTIMEO : constant := 4102; -- Reception timeout
++ SO_ERROR : constant := 4103; -- Get/clear error status
++ IP_MULTICAST_IF : constant := 9; -- Set/get mcast interface
++ IP_MULTICAST_TTL : constant := 10; -- Set/get multicast TTL
++ IP_MULTICAST_LOOP : constant := 11; -- Set/get mcast loopback
++ IP_ADD_MEMBERSHIP : constant := 12; -- Join a multicast group
++ IP_DROP_MEMBERSHIP : constant := 13; -- Leave a multicast group
++ IP_PKTINFO : constant := 19; -- Get datagram info
++
++ -------------------
++ -- System limits --
++ -------------------
++
++ IOV_MAX : constant := 1024; -- Maximum writev iovcnt
++
++ ----------------------
++ -- Type definitions --
++ ----------------------
++
++ -- Sizes (in bytes) of the components of struct timeval
++
++ SIZEOF_tv_sec : constant := 4; -- tv_sec
++ SIZEOF_tv_usec : constant := 4; -- tv_usec
++
++ ----------------------------------------
++ -- Properties of supported interfaces --
++ ----------------------------------------
++
++ Need_Netdb_Buffer : constant := 0; -- Need buffer for Netdb ops
++
++ ----------------------
++ -- Additional flags --
++ ----------------------
++
++ Thread_Blocking_IO : constant Boolean := True;
++ -- Set False for contexts where socket i/o are process blocking
++
++end GNAT.Sockets.Constants;
+--- origsrc/gcc-4.7.2/gcc/ada/indepsw-cygwin.adb 1970-01-01 07:30:00.000000000 +0730
++++ src/gcc-4.7.2/gcc/ada/indepsw-cygwin.adb 2013-02-25 22:56:27.015181700 +0800
+@@ -0,0 +1,69 @@
++------------------------------------------------------------------------------
++-- --
++-- GNAT COMPILER COMPONENTS --
++-- --
++-- I N D E P S W --
++-- --
++-- B o d y --
++-- (Windows version) --
++-- --
++-- Copyright (C) 2004 Free Software Foundation, Inc. --
++-- --
++-- GNAT is free software; you can redistribute it and/or modify it under --
++-- terms of the GNU General Public License as published by the Free Soft- --
++-- ware Foundation; either version 2, or (at your option) any later ver- --
++-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
++-- OUT 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 distributed with GNAT; see file COPYING. If not, write --
++-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
++-- Boston, MA 02110-1301, USA. --
++-- --
++-- As a special exception, if other files instantiate generics from this --
++-- unit, or you link this unit with other files to produce an executable, --
++-- this unit does not by itself cause the resulting executable to be --
++-- covered by the GNU General Public License. This exception does not --
++-- however invalidate any other reasons why the executable file might be --
++-- covered by the GNU Public License. --
++-- --
++-- GNAT was originally developed by the GNAT team at New York University. --
++-- Extensive contributions were provided by Ada Core Technologies Inc. --
++-- --
++------------------------------------------------------------------------------
++
++-- This is the Windows version
++
++package body Indepsw is
++
++ Map_Switch : aliased constant String := "-Wl,-Map,";
++
++ -------------
++ -- Convert --
++ -------------
++
++ procedure Convert
++ (Switch : Switch_Kind;
++ Argument : String;
++ To : out String_List_Access)
++ is
++ begin
++ case Switch is
++ when Map_File =>
++ To := new Argument_List'(1 => new String'(Map_Switch & Argument));
++ end case;
++ end Convert;
++
++ ------------------
++ -- Is_Supported --
++ ------------------
++
++ function Is_Supported (Switch : Switch_Kind) return Boolean is
++ begin
++ case Switch is
++ when Map_File =>
++ return True;
++ end case;
++ end Is_Supported;
++
++end Indepsw;
+--- origsrc/gcc-4.7.2/gcc/ada/initialize.c 2011-07-13 01:23:04.000000000 +0800
++++ src/gcc-4.7.2/gcc/ada/initialize.c 2013-02-25 22:57:26.560743000 +0800
+@@ -347,6 +347,39 @@ __gnat_initialize (void *eh ATTRIBUTE_UN
+ {
+ __main ();
+ }
++#elif defined (__CYGWIN__)
++
++/***************************************/
++/* __gnat_initialize (Cygwin Version) */
++/***************************************/
++
++extern void __main (void);
++
++void
++__gnat_initialize (void *eh ATTRIBUTE_UNUSED)
++{
++#ifdef IN_RTS
++ /* We must call __main to run the static ctors, or DW2 EH, amongst
++ other things, will fail. */
++ __main ();
++#endif
++ /* Initialize floating-point coprocessor. This call is needed because
++ the MS libraries default to 64-bit precision instead of 80-bit
++ precision, and we require the full precision for proper operation,
++ given that we have set Max_Digits etc with this in mind */
++ __gnat_init_float ();
++
++ /* Note that we do not activate this for the compiler itself to avoid a
++ bootstrap path problem. Older version of gnatbind will generate a call
++ to __gnat_initialize() without argument. Therefore we cannot use eh in
++ this case. It will be possible to remove the following #ifdef at some
++ point. */
++#ifdef IN_RTS
++ /* Install the Structured Exception handler. */
++ if (eh)
++ __gnat_install_SEH_handler (eh);
++#endif
++}
+
+ #else
+
+--- origsrc/gcc-4.7.2/gcc/ada/mlib-tgt-cygwin.adb 1970-01-01 07:30:00.000000000 +0730
++++ src/gcc-4.7.2/gcc/ada/mlib-tgt-cygwin.adb 2013-02-25 22:58:26.986916100 +0800
+@@ -0,0 +1,160 @@
++------------------------------------------------------------------------------
++-- --
++-- GNAT COMPILER COMPONENTS --
++-- --
++-- M L I B . T G T . S P E C I F I C --
++-- (Cygwin Version) --
++-- --
++-- B o d y --
++-- --
++-- Copyright (C) 2002-2009, Free Software Foundation, Inc. --
++-- --
++-- GNAT is free software; you can redistribute it and/or modify it under --
++-- terms of the GNU General Public License as published by the Free Soft- --
++-- ware Foundation; either version 3, or (at your option) any later ver- --
++-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
++-- OUT 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 distributed with GNAT; see file COPYING3. If not, go to --
++-- http://www.gnu.org/licenses for a complete copy of the license. --
++-- --
++-- GNAT was originally developed by the GNAT team at New York University. --
++-- Extensive contributions were provided by Ada Core Technologies Inc. --
++-- --
++------------------------------------------------------------------------------
++
++-- This is the Windows version of the body. Works only with GCC versions
++-- supporting the "-shared" option.
++
++with Opt;
++with Output; use Output;
++
++with MLib.Fil;
++with MLib.Utl;
++
++package body MLib.Tgt.Specific is
++
++ package Files renames MLib.Fil;
++ package Tools renames MLib.Utl;
++
++ -- Non default subprograms
++
++ procedure Build_Dynamic_Library
++ (Ofiles : Argument_List;
++ Options : Argument_List;
++ Interfaces : Argument_List;
++ Lib_Filename : String;
++ Lib_Dir : String;
++ Symbol_Data : Symbol_Record;
++ Driver_Name : Name_Id := No_Name;
++ Lib_Version : String := "";
++ Auto_Init : Boolean := False);
++
++ function DLL_Ext return String;
++
++ function DLL_Prefix return String;
++
++ function Is_Archive_Ext (Ext : String) return Boolean;
++
++ function Library_Major_Minor_Id_Supported return Boolean;
++
++ function PIC_Option return String;
++
++ No_Argument_List : constant String_List := (1 .. 0 => null);
++ -- Used as value of parameter Options or Options2 in calls to Gcc
++
++ ---------------------------
++ -- Build_Dynamic_Library --
++ ---------------------------
++
++ procedure Build_Dynamic_Library
++ (Ofiles : Argument_List;
++ Options : Argument_List;
++ Interfaces : Argument_List;
++ Lib_Filename : String;
++ Lib_Dir : String;
++ Symbol_Data : Symbol_Record;
++ Driver_Name : Name_Id := No_Name;
++ Lib_Version : String := "";
++ Auto_Init : Boolean := False)
++ is
++ pragma Unreferenced (Symbol_Data);
++ pragma Unreferenced (Interfaces);
++ pragma Unreferenced (Lib_Version);
++ pragma Unreferenced (Auto_Init);
++
++ Lib_File : constant String :=
++ Lib_Dir & Directory_Separator &
++ DLL_Prefix & Files.Append_To (Lib_Filename, DLL_Ext);
++
++ -- Start of processing for Build_Dynamic_Library
++
++ begin
++ if Opt.Verbose_Mode then
++ Write_Str ("building relocatable shared library ");
++ Write_Line (Lib_File);
++ end if;
++
++ Tools.Gcc
++ (Output_File => Lib_File,
++ Objects => Ofiles,
++ Options => No_Argument_List,
++ Options_2 => Options,
++ Driver_Name => Driver_Name);
++ end Build_Dynamic_Library;
++
++ -------------
++ -- DLL_Ext --
++ -------------
++
++ function DLL_Ext return String is
++ begin
++ return "dll";
++ end DLL_Ext;
++
++ ----------------
++ -- DLL_Prefix --
++ ----------------
++
++ function DLL_Prefix return String is
++ begin
++ return "cyg";
++ end DLL_Prefix;
++
++ --------------------
++ -- Is_Archive_Ext --
++ --------------------
++
++ function Is_Archive_Ext (Ext : String) return Boolean is
++ begin
++ return Ext = ".a" or else Ext = ".dll";
++ end Is_Archive_Ext;
++
++ --------------------------------------
++ -- Library_Major_Minor_Id_Supported --
++ --------------------------------------
++
++ function Library_Major_Minor_Id_Supported return Boolean is
++ begin
++ return False;
++ end Library_Major_Minor_Id_Supported;
++
++ ----------------
++ -- PIC_Option --
++ ----------------
++
++ function PIC_Option return String is
++ begin
++ return "";
++ end PIC_Option;
++
++begin
++ Build_Dynamic_Library_Ptr := Build_Dynamic_Library'Access;
++ DLL_Ext_Ptr := DLL_Ext'Access;
++ DLL_Prefix_Ptr := DLL_Prefix'Access;
++ Is_Archive_Ext_Ptr := Is_Archive_Ext'Access;
++ PIC_Option_Ptr := PIC_Option'Access;
++ Library_Major_Minor_Id_Supported_Ptr :=
++ Library_Major_Minor_Id_Supported'Access;
++end MLib.Tgt.Specific;
+--- origsrc/gcc-4.7.2/gcc/ada/s-gloloc-cygwin.adb 1970-01-01 07:30:00.000000000 +0730
++++ src/gcc-4.7.2/gcc/ada/s-gloloc-cygwin.adb 2013-02-25 22:59:32.067680300 +0800
+@@ -0,0 +1,113 @@
++------------------------------------------------------------------------------
++-- --
++-- GNAT COMPILER COMPONENTS --
++-- --
++-- S Y S T E M . G L O B A L _ L O C K S --
++-- --
++-- B o d y --
++-- --
++-- Copyright (C) 1999-2007, AdaCore --
++-- --
++-- GNAT is free software; you can redistribute it and/or modify it under --
++-- terms of the GNU General Public License as published by the Free Soft- --
++-- ware Foundation; either version 2, or (at your option) any later ver- --
++-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
++-- OUT 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 distributed with GNAT; see file COPYING. If not, write --
++-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
++-- Boston, MA 02110-1301, USA. --
++-- --
++-- As a special exception, if other files instantiate generics from this --
++-- unit, or you link this unit with other files to produce an executable, --
++-- this unit does not by itself cause the resulting executable to be --
++-- covered by the GNU General Public License. This exception does not --
++-- however invalidate any other reasons why the executable file might be --
++-- covered by the GNU Public License. --
++-- --
++-- GNAT was originally developed by the GNAT team at New York University. --
++-- Extensive contributions were provided by Ada Core Technologies Inc. --
++-- --
++------------------------------------------------------------------------------
++
++-- This implementation is specific to NT
++
++with System.Task_Lock;
++
++with Interfaces.C.Strings;
++with System.OS_Interface;
++
++package body System.Global_Locks is
++
++ package TSL renames System.Task_Lock;
++ package OSI renames System.OS_Interface;
++ package ICS renames Interfaces.C.Strings;
++
++ subtype Lock_File_Entry is OSI.HANDLE;
++
++ Last_Lock : Lock_Type := Null_Lock;
++ Lock_Table : array (Lock_Type range 1 .. 15) of Lock_File_Entry;
++
++ -----------------
++ -- Create_Lock --
++ -----------------
++
++ procedure Create_Lock
++ (Lock : out Lock_Type;
++ Name : String)
++ is
++ L : Lock_Type;
++
++ begin
++ TSL.Lock;
++ Last_Lock := Last_Lock + 1;
++ L := Last_Lock;
++ TSL.Unlock;
++
++ if L > Lock_Table'Last then
++ raise Lock_Error;
++ end if;
++
++ Lock_Table (L) :=
++ OSI.CreateMutex (null, OSI.BOOL (False), ICS.New_String (Name));
++ Lock := L;
++ end Create_Lock;
++
++ ------------------
++ -- Acquire_Lock --
++ ------------------
++
++ procedure Acquire_Lock
++ (Lock : in out Lock_Type)
++ is
++ use type OSI.DWORD;
++
++ Res : OSI.DWORD;
++ begin
++ Res := OSI.WaitForSingleObject (Lock_Table (Lock), OSI.Wait_Infinite);
++
++ if Res = OSI.WAIT_FAILED then
++ raise Lock_Error;
++ end if;
++ end Acquire_Lock;
++
++ ------------------
++ -- Release_Lock --
++ ------------------
++
++ procedure Release_Lock
++ (Lock : in out Lock_Type)
++ is
++ use type OSI.BOOL;
++
++ Res : OSI.BOOL;
++ begin
++ Res := OSI.ReleaseMutex (Lock_Table (Lock));
++
++ if Res = OSI.False then
++ raise Lock_Error;
++ end if;
++ end Release_Lock;
++
++end System.Global_Locks;
+--- origsrc/gcc-4.7.2/gcc/ada/s-osinte-cygwin.ads 1970-01-01 07:30:00.000000000 +0730
++++ src/gcc-4.7.2/gcc/ada/s-osinte-cygwin.ads 2013-02-25 23:01:34.615742000 +0800
+@@ -0,0 +1,952 @@
++------------------------------------------------------------------------------
++-- --
++-- GNAT RUN-TIME LIBRARY (GNARL) COMPONENTS --
++-- --
++-- S Y S T E M . O S _ I N T E R F A C E --
++-- --
++-- S p e c --
++-- --
++-- Copyright (C) 1991-1994, Florida State University --
++-- Copyright (C) 1995-2007, Free Software Foundation, Inc. --
++-- --
++-- GNARL is free software; you can redistribute it and/or modify it under --
++-- terms of the GNU General Public License as published by the Free Soft- --
++-- ware Foundation; either version 2, or (at your option) any later ver- --
++-- sion. GNARL is distributed in the hope that it will be useful, but WITH- --
++-- OUT 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 distributed with GNARL; see file COPYING. If not, write --
++-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
++-- Boston, MA 02110-1301, USA. --
++-- --
++-- As a special exception, if other files instantiate generics from this --
++-- unit, or you link this unit with other files to produce an executable, --
++-- this unit does not by itself cause the resulting executable to be --
++-- covered by the GNU General Public License. This exception does not --
++-- however invalidate any other reasons why the executable file might be --
++-- covered by the GNU Public License. --
++-- --
++-- GNARL was developed by the GNARL team at Florida State University. --
++-- Extensive contributions were provided by Ada Core Technologies, Inc. --
++-- --
++------------------------------------------------------------------------------
++
++-- This is a GNU/Linux (GNU/LinuxThreads) version of this package
++
++-- This package encapsulates all direct interfaces to OS services
++-- that are needed by children of System.
++
++-- PLEASE DO NOT add any with-clauses to this package or remove the pragma
++-- Preelaborate. This package is designed to be a bottom-level (leaf) package.
++
++with Interfaces.C;
++with Interfaces.C.Strings;
++with Ada.Unchecked_Conversion;
++
++package System.OS_Interface is
++ pragma Preelaborate;
++
++ subtype int is Interfaces.C.int;
++ subtype char is Interfaces.C.char;
++ subtype short is Interfaces.C.short;
++ subtype long is Interfaces.C.long;
++ subtype unsigned is Interfaces.C.unsigned;
++ subtype unsigned_short is Interfaces.C.unsigned_short;
++ subtype unsigned_long is Interfaces.C.unsigned_long;
++ subtype unsigned_char is Interfaces.C.unsigned_char;
++ subtype plain_char is Interfaces.C.plain_char;
++ subtype size_t is Interfaces.C.size_t;
++
++ -----------
++ -- Errno --
++ -----------
++
++ function errno return int;
++ pragma Import (C, errno, "__get_errno");
++
++ EAGAIN : constant := 11;
++ EINTR : constant := 4;
++ EINVAL : constant := 22;
++ ENOMEM : constant := 12;
++ EPERM : constant := 1;
++ ETIMEDOUT : constant := 110;
++
++ -------------
++ -- Signals --
++ -------------
++
++ Max_Interrupt : constant := 63;
++ type Signal is new int range 0 .. Max_Interrupt;
++ for Signal'Size use int'Size;
++
++ SIGHUP : constant := 1; -- hangup
++ SIGINT : constant := 2; -- interrupt (rubout)
++ SIGQUIT : constant := 3; -- quit (ASCD FS)
++ SIGILL : constant := 4; -- illegal instruction (not reset)
++ SIGTRAP : constant := 5; -- trace trap (not reset)
++ SIGIOT : constant := 6; -- IOT instruction
++ SIGABRT : constant := 6; -- used by abort, replace SIGIOT in the future
++ SIGFPE : constant := 8; -- floating point exception
++ SIGKILL : constant := 9; -- kill (cannot be caught or ignored)
++ SIGBUS : constant := 7; -- bus error
++ SIGSEGV : constant := 11; -- segmentation violation
++ SIGPIPE : constant := 13; -- write on a pipe with no one to read it
++ SIGALRM : constant := 14; -- alarm clock
++ SIGTERM : constant := 15; -- software termination signal from kill
++ SIGUSR1 : constant := 10; -- user defined signal 1
++ SIGUSR2 : constant := 12; -- user defined signal 2
++ SIGCLD : constant := 17; -- alias for SIGCHLD
++ SIGCHLD : constant := 17; -- child status change
++ SIGPWR : constant := 30; -- power-fail restart
++ SIGWINCH : constant := 28; -- window size change
++ SIGURG : constant := 23; -- urgent condition on IO channel
++ SIGPOLL : constant := 29; -- pollable event occurred
++ SIGIO : constant := 29; -- I/O now possible (4.2 BSD)
++ SIGLOST : constant := 29; -- File lock lost
++ SIGSTOP : constant := 19; -- stop (cannot be caught or ignored)
++ SIGTSTP : constant := 20; -- user stop requested from tty
++ SIGCONT : constant := 18; -- stopped process has been continued
++ SIGTTIN : constant := 21; -- background tty read attempted
++ SIGTTOU : constant := 22; -- background tty write attempted
++ SIGVTALRM : constant := 26; -- virtual timer expired
++ SIGPROF : constant := 27; -- profiling timer expired
++ SIGXCPU : constant := 24; -- CPU time limit exceeded
++ SIGXFSZ : constant := 25; -- filesize limit exceeded
++ SIGUNUSED : constant := 31; -- unused signal (GNU/Linux)
++ SIGSTKFLT : constant := 16; -- coprocessor stack fault (Linux)
++ SIGLTHRRES : constant := 32; -- GNU/LinuxThreads restart signal
++ SIGLTHRCAN : constant := 33; -- GNU/LinuxThreads cancel signal
++ SIGLTHRDBG : constant := 34; -- GNU/LinuxThreads debugger signal
++
++ SIGADAABORT : constant := SIGABRT;
++ -- Change this if you want to use another signal for task abort.
++ -- SIGTERM might be a good one.
++
++ type Signal_Set is array (Natural range <>) of Signal;
++
++ Unmasked : constant Signal_Set := (
++ SIGTRAP,
++ -- To enable debugging on multithreaded applications, mark SIGTRAP to
++ -- be kept unmasked.
++
++ SIGBUS,
++
++ SIGTTIN, SIGTTOU, SIGTSTP,
++ -- Keep these three signals unmasked so that background processes
++ -- and IO behaves as normal "C" applications
++
++ SIGPROF,
++ -- To avoid confusing the profiler
++
++ SIGKILL, SIGSTOP,
++ -- These two signals actually cannot be masked;
++ -- POSIX simply won't allow it.
++
++ SIGLTHRRES, SIGLTHRCAN, SIGLTHRDBG);
++ -- These three signals are used by GNU/LinuxThreads starting from
++ -- glibc 2.1 (future 2.2).
++
++ Reserved : constant Signal_Set :=
++ -- I am not sure why the following two signals are reserved.
++ -- I guess they are not supported by this version of GNU/Linux.
++ (SIGVTALRM, SIGUNUSED);
++
++ type sigset_t is private;
++
++ function sigaddset (set : access sigset_t; sig : Signal) return int;
++ pragma Import (C, sigaddset, "sigaddset");
++
++ function sigdelset (set : access sigset_t; sig : Signal) return int;
++ pragma Import (C, sigdelset, "sigdelset");
++
++ function sigfillset (set : access sigset_t) return int;
++ pragma Import (C, sigfillset, "sigfillset");
++
++ function sigismember (set : access sigset_t; sig : Signal) return int;
++ pragma Import (C, sigismember, "sigismember");
++
++ function sigemptyset (set : access sigset_t) return int;
++ pragma Import (C, sigemptyset, "sigemptyset");
++
++ type union_type_3 is new String (1 .. 116);
++ type siginfo_t is record
++ si_signo : int;
++ si_code : int;
++ si_errno : int;
++ X_data : union_type_3;
++ end record;
++ pragma Convention (C, siginfo_t);
++
++ type struct_sigaction is record
++ sa_handler : System.Address;
++ sa_mask : sigset_t;
++ sa_flags : unsigned_long;
++ sa_restorer : System.Address;
++ end record;
++ pragma Convention (C, struct_sigaction);
++ type struct_sigaction_ptr is access all struct_sigaction;
++
++ type Machine_State is record
++ eip : unsigned_long;
++ ebx : unsigned_long;
++ esp : unsigned_long;
++ ebp : unsigned_long;
++ esi : unsigned_long;
++ edi : unsigned_long;
++ end record;
++ type Machine_State_Ptr is access all Machine_State;
++
++ SA_SIGINFO : constant := 16#04#;
++
++ SIG_BLOCK : constant := 0;
++ SIG_UNBLOCK : constant := 1;
++ SIG_SETMASK : constant := 2;
++
++ SIG_DFL : constant := 0;
++ SIG_IGN : constant := 1;
++
++ function sigaction
++ (sig : Signal;
++ act : struct_sigaction_ptr;
++ oact : struct_sigaction_ptr) return int;
++ pragma Import (C, sigaction, "sigaction");
++
++ ----------
++ -- Time --
++ ----------
++
++ type timespec is private;
++
++ function To_Duration (TS : timespec) return Duration;
++ pragma Inline (To_Duration);
++
++ function To_Timespec (D : Duration) return timespec;
++ pragma Inline (To_Timespec);
++
++ type struct_timeval is private;
++
++ function To_Duration (TV : struct_timeval) return Duration;
++ pragma Inline (To_Duration);
++
++ function To_Timeval (D : Duration) return struct_timeval;
++ pragma Inline (To_Timeval);
++
++ function gettimeofday
++ (tv : access struct_timeval;
++ tz : System.Address := System.Null_Address) return int;
++ pragma Import (C, gettimeofday, "gettimeofday");
++
++ function sysconf (name : int) return long;
++ pragma Import (C, sysconf);
++
++ SC_CLK_TCK : constant := 2;
++ SC_NPROCESSORS_ONLN : constant := 84;
++
++ -------------------------
++ -- Priority Scheduling --
++ -------------------------
++
++ SCHED_OTHER : constant := 0;
++ SCHED_FIFO : constant := 1;
++ SCHED_RR : constant := 2;
++
++ function To_Target_Priority
++ (Prio : System.Any_Priority) return Interfaces.C.int;
++ -- Maps System.Any_Priority to a POSIX priority
++
++ -------------
++ -- Process --
++ -------------
++
++ type pid_t is private;
++
++ function kill (pid : pid_t; sig : Signal) return int;
++ pragma Import (C, kill, "kill");
++
++ function getpid return pid_t;
++ pragma Import (C, getpid, "getpid");
++
++ -------------
++ -- Threads --
++ -------------
++
++ type Thread_Body is access
++ function (arg : System.Address) return System.Address;
++ pragma Convention (C, Thread_Body);
++
++ function Thread_Body_Access is new
++ Ada.Unchecked_Conversion (System.Address, Thread_Body);
++
++ type pthread_t is new unsigned_long;
++ subtype Thread_Id is pthread_t;
++
++ function To_pthread_t is new Ada.Unchecked_Conversion
++ (unsigned_long, pthread_t);
++
++ type pthread_mutex_t is limited private;
++ type pthread_cond_t is limited private;
++ type pthread_attr_t is limited private;
++ type pthread_mutexattr_t is limited private;
++ type pthread_condattr_t is limited private;
++ type pthread_key_t is private;
++
++ PTHREAD_CREATE_DETACHED : constant := 1;
++
++ -----------
++ -- Stack --
++ -----------
++
++ function Get_Stack_Base (thread : pthread_t) return Address;
++ pragma Inline (Get_Stack_Base);
++ -- This is a dummy procedure to share some GNULLI files
++
++ ---------------------------------------
++ -- Nonstandard Thread Initialization --
++ ---------------------------------------
++
++ procedure pthread_init;
++ pragma Inline (pthread_init);
++ -- This is a dummy procedure to share some GNULLI files
++
++ -------------------------
++ -- POSIX.1c Section 3 --
++ -------------------------
++
++ function sigwait (set : access sigset_t; sig : access Signal) return int;
++ pragma Import (C, sigwait, "sigwait");
++
++ function pthread_kill (thread : pthread_t; sig : Signal) return int;
++ pragma Import (C, pthread_kill, "pthread_kill");
++
++ function pthread_sigmask
++ (how : int;
++ set : access sigset_t;
++ oset : access sigset_t) return int;
++ pragma Import (C, pthread_sigmask, "pthread_sigmask");
++
++ --------------------------
++ -- POSIX.1c Section 11 --
++ --------------------------
++
++ function pthread_mutexattr_init
++ (attr : access pthread_mutexattr_t) return int;
++ pragma Import (C, pthread_mutexattr_init, "pthread_mutexattr_init");
++
++ function pthread_mutexattr_destroy
++ (attr : access pthread_mutexattr_t) return int;
++ pragma Import (C, pthread_mutexattr_destroy, "pthread_mutexattr_destroy");
++
++ function pthread_mutex_init
++ (mutex : access pthread_mutex_t;
++ attr : access pthread_mutexattr_t) return int;
++ pragma Import (C, pthread_mutex_init, "pthread_mutex_init");
++
++ function pthread_mutex_destroy (mutex : access pthread_mutex_t) return int;
++ pragma Import (C, pthread_mutex_destroy, "pthread_mutex_destroy");
++
++ function pthread_mutex_lock (mutex : access pthread_mutex_t) return int;
++ pragma Import (C, pthread_mutex_lock, "pthread_mutex_lock");
++
++ function pthread_mutex_unlock (mutex : access pthread_mutex_t) return int;
++ pragma Import (C, pthread_mutex_unlock, "pthread_mutex_unlock");
++
++ function pthread_condattr_init
++ (attr : access pthread_condattr_t) return int;
++ pragma Import (C, pthread_condattr_init, "pthread_condattr_init");
++
++ function pthread_condattr_destroy
++ (attr : access pthread_condattr_t) return int;
++ pragma Import (C, pthread_condattr_destroy, "pthread_condattr_destroy");
++
++ function pthread_cond_init
++ (cond : access pthread_cond_t;
++ attr : access pthread_condattr_t) return int;
++ pragma Import (C, pthread_cond_init, "pthread_cond_init");
++
++ function pthread_cond_destroy (cond : access pthread_cond_t) return int;
++ pragma Import (C, pthread_cond_destroy, "pthread_cond_destroy");
++
++ function pthread_cond_signal (cond : access pthread_cond_t) return int;
++ pragma Import (C, pthread_cond_signal, "pthread_cond_signal");
++
++ function pthread_cond_wait
++ (cond : access pthread_cond_t;
++ mutex : access pthread_mutex_t) return int;
++ pragma Import (C, pthread_cond_wait, "pthread_cond_wait");
++
++ function pthread_cond_timedwait
++ (cond : access pthread_cond_t;
++ mutex : access pthread_mutex_t;
++ abstime : access timespec) return int;
++ pragma Import (C, pthread_cond_timedwait, "pthread_cond_timedwait");
++
++ --------------------------
++ -- POSIX.1c Section 13 --
++ --------------------------
++
++ type struct_sched_param is record
++ sched_priority : int; -- scheduling priority
++ end record;
++ pragma Convention (C, struct_sched_param);
++
++ function pthread_setschedparam
++ (thread : pthread_t;
++ policy : int;
++ param : access struct_sched_param) return int;
++ pragma Import (C, pthread_setschedparam, "pthread_setschedparam");
++
++ function pthread_attr_setschedpolicy
++ (attr : access pthread_attr_t;
++ policy : int) return int;
++ pragma Import
++ (C, pthread_attr_setschedpolicy, "pthread_attr_setschedpolicy");
++
++ function sched_yield return int;
++ pragma Import (C, sched_yield, "sched_yield");
++
++ ---------------------------
++ -- P1003.1c - Section 16 --
++ ---------------------------
++
++ function pthread_attr_init
++ (attributes : access pthread_attr_t) return int;
++ pragma Import (C, pthread_attr_init, "pthread_attr_init");
++
++ function pthread_attr_destroy
++ (attributes : access pthread_attr_t) return int;
++ pragma Import (C, pthread_attr_destroy, "pthread_attr_destroy");
++
++ function pthread_attr_setdetachstate
++ (attr : access pthread_attr_t;
++ detachstate : int) return int;
++ pragma Import
++ (C, pthread_attr_setdetachstate, "pthread_attr_setdetachstate");
++
++ function pthread_attr_setstacksize
++ (attr : access pthread_attr_t;
++ stacksize : size_t) return int;
++ pragma Import (C, pthread_attr_setstacksize, "pthread_attr_setstacksize");
++
++ function pthread_create
++ (thread : access pthread_t;
++ attributes : access pthread_attr_t;
++ start_routine : Thread_Body;
++ arg : System.Address) return int;
++ pragma Import (C, pthread_create, "pthread_create");
++
++ procedure pthread_exit (status : System.Address);
++ pragma Import (C, pthread_exit, "pthread_exit");
++
++ function pthread_self return pthread_t;
++ pragma Import (C, pthread_self, "pthread_self");
++
++ --------------------------
++ -- POSIX.1c Section 17 --
++ --------------------------
++
++ function pthread_setspecific
++ (key : pthread_key_t;
++ value : System.Address) return int;
++ pragma Import (C, pthread_setspecific, "pthread_setspecific");
++
++ function pthread_getspecific (key : pthread_key_t) return System.Address;
++ pragma Import (C, pthread_getspecific, "pthread_getspecific");
++
++ type destructor_pointer is access procedure (arg : System.Address);
++ pragma Convention (C, destructor_pointer);
++
++ function pthread_key_create
++ (key : access pthread_key_t;
++ destructor : destructor_pointer) return int;
++ pragma Import (C, pthread_key_create, "pthread_key_create");
++
++ CPU_SETSIZE : constant := 1_024;
++
++ type bit_field is array (1 .. CPU_SETSIZE) of Boolean;
++ for bit_field'Size use CPU_SETSIZE;
++ pragma Pack (bit_field);
++ pragma Convention (C, bit_field);
++
++ type cpu_set_t is record
++ bits : bit_field;
++ end record;
++ pragma Convention (C, cpu_set_t);
++
++ function pthread_setaffinity_np
++ (thread : pthread_t;
++ cpusetsize : size_t;
++ cpuset : access cpu_set_t) return int;
++ pragma Import (C, pthread_setaffinity_np, "__gnat_pthread_setaffinity_np");
++
++ -------------------
++ -- Win32 compat --
++ -------------------
++
++ -------------------
++ -- General Types --
++ -------------------
++
++ type DWORD is new Interfaces.C.unsigned_long;
++ type WORD is new Interfaces.C.unsigned_short;
++
++ -- The LARGE_INTEGER type is actually a fixed point type
++ -- that only can represent integers. The reason for this is
++ -- easier conversion to Duration or other fixed point types.
++ -- (See Operations.Clock)
++
++ type LARGE_INTEGER is delta 1.0 range -2.0**63 .. 2.0**63 - 1.0;
++
++ subtype PSZ is Interfaces.C.Strings.chars_ptr;
++ subtype PCHAR is Interfaces.C.Strings.chars_ptr;
++
++ subtype PVOID is System.Address;
++
++ Null_Void : constant PVOID := System.Null_Address;
++
++ type PLONG is access all Interfaces.C.long;
++ type PDWORD is access all DWORD;
++
++ type BOOL is new Boolean;
++ for BOOL'Size use Interfaces.C.unsigned_long'Size;
++
++ -------------------------
++ -- Handles for objects --
++ -------------------------
++
++ type HANDLE is new Interfaces.C.long;
++ type PHANDLE is access all HANDLE;
++
++ subtype Win32_Thread_Id is HANDLE;
++
++ ------------------------
++ -- System Information --
++ ------------------------
++
++ type SYSTEM_INFO is record
++ dwOemId : DWORD;
++ dwPageSize : DWORD;
++ lpMinimumApplicationAddress : PVOID;
++ lpMaximumApplicationAddress : PVOID;
++ dwActiveProcessorMask : DWORD;
++ dwNumberOfProcessors : DWORD;
++ dwProcessorType : DWORD;
++ dwAllocationGranularity : DWORD;
++ dwReserved : DWORD;
++ end record;
++
++ procedure GetSystemInfo (SI : access SYSTEM_INFO);
++ pragma Import (Stdcall, GetSystemInfo, "GetSystemInfo");
++
++ ---------------------
++ -- Time Management --
++ ---------------------
++
++ procedure Sleep (dwMilliseconds : DWORD);
++ pragma Import (Stdcall, Sleep, External_Name => "Sleep");
++
++ type SYSTEMTIME is record
++ wYear : WORD;
++ wMonth : WORD;
++ wDayOfWeek : WORD;
++ wDay : WORD;
++ wHour : WORD;
++ wMinute : WORD;
++ wSecond : WORD;
++ wMilliseconds : WORD;
++ end record;
++
++ procedure GetSystemTime (pSystemTime : access SYSTEMTIME);
++ pragma Import (Stdcall, GetSystemTime, "GetSystemTime");
++
++ procedure GetSystemTimeAsFileTime (lpFileTime : access Long_Long_Integer);
++ pragma Import (Stdcall, GetSystemTimeAsFileTime, "GetSystemTimeAsFileTime");
++
++ function SetSystemTime (pSystemTime : access SYSTEMTIME) return BOOL;
++ pragma Import (Stdcall, SetSystemTime, "SetSystemTime");
++
++ function FileTimeToSystemTime
++ (lpFileTime : access Long_Long_Integer;
++ lpSystemTime : access SYSTEMTIME) return BOOL;
++ pragma Import (Stdcall, FileTimeToSystemTime, "FileTimeToSystemTime");
++
++ function SystemTimeToFileTime
++ (lpSystemTime : access SYSTEMTIME;
++ lpFileTime : access Long_Long_Integer) return BOOL;
++ pragma Import (Stdcall, SystemTimeToFileTime, "SystemTimeToFileTime");
++
++ function FileTimeToLocalFileTime
++ (lpFileTime : access Long_Long_Integer;
++ lpLocalFileTime : access Long_Long_Integer) return BOOL;
++ pragma Import (Stdcall, FileTimeToLocalFileTime, "FileTimeToLocalFileTime");
++
++ function LocalFileTimeToFileTime
++ (lpFileTime : access Long_Long_Integer;
++ lpLocalFileTime : access Long_Long_Integer) return BOOL;
++ pragma Import (Stdcall, LocalFileTimeToFileTime, "LocalFileTimeToFileTime");
++
++ function QueryPerformanceCounter
++ (lpPerformanceCount : access LARGE_INTEGER) return BOOL;
++ pragma Import
++ (Stdcall, QueryPerformanceCounter, "QueryPerformanceCounter");
++
++ function QueryPerformanceFrequency
++ (lpFrequency : access LARGE_INTEGER) return BOOL;
++ pragma Import
++ (Stdcall, QueryPerformanceFrequency, "QueryPerformanceFrequency");
++
++ -------------
++ -- Threads --
++ -------------
++
++-- type Win32_Thread_Body is access
++-- function (arg : System.Address) return System.Address;
++-- pragma Convention (C, Thread_Body);
++
++-- function Win32_Thread_Body_Access is new
++-- Ada.Unchecked_Conversion (System.Address, Thread_Body);
++
++ procedure SwitchToThread;
++ pragma Import (Stdcall, SwitchToThread, "SwitchToThread");
++
++ function GetThreadTimes
++ (hThread : HANDLE;
++ lpCreationTime : access Long_Long_Integer;
++ lpExitTime : access Long_Long_Integer;
++ lpKernelTime : access Long_Long_Integer;
++ lpUserTime : access Long_Long_Integer) return BOOL;
++ pragma Import (Stdcall, GetThreadTimes, "GetThreadTimes");
++
++ -----------------------
++ -- Critical sections --
++ -----------------------
++
++ type CRITICAL_SECTION is private;
++
++ procedure InitializeCriticalSection
++ (pCriticalSection : access CRITICAL_SECTION);
++ pragma Import
++ (Stdcall, InitializeCriticalSection, "InitializeCriticalSection");
++
++ procedure EnterCriticalSection
++ (pCriticalSection : access CRITICAL_SECTION);
++ pragma Import (Stdcall, EnterCriticalSection, "EnterCriticalSection");
++
++ procedure LeaveCriticalSection
++ (pCriticalSection : access CRITICAL_SECTION);
++ pragma Import (Stdcall, LeaveCriticalSection, "LeaveCriticalSection");
++
++ procedure Delet...
[truncated message content] |