[rtems-crossrpms commit] Cygwin gcc-4.8.2-2.
Ralf Corsepius
ralf at rtems.org
Thu May 8 11:04:59 UTC 2014
Module: rtems-crossrpms
Branch: master
Commit: dd6085e2eccc9ff482ebff55c7cb16d8dc4eb959
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=dd6085e2eccc9ff482ebff55c7cb16d8dc4eb959
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Sat Feb 8 07:44:42 2014 +0100
Cygwin gcc-4.8.2-2.
---
cygwin/gcc-prep.add | 9 -
cygwin/i686/Makefile.am | 4 +-
cygwin/i686/Makefile.in | 4 +-
cygwin/i686/gcc-sources.add | 48 +-
cygwin/i686/i686-pc-cygwin-gcc.spec | 46 +-
cygwin/x86_64/Makefile.am | 7 +
cygwin/x86_64/Makefile.in | 54 +-
cygwin/x86_64/gcc-sources.add | 9 +
cygwin/x86_64/x86_64-pc-cygwin-gcc.spec | 724 +++
patches/gcc-4.8.2-x86-cygwin-4.8.2-2-20140206.diff | 4645 ++++++++++++++++
.../gcc-4.8.2-x86_64-cygwin-4.8.2-2-20140206.diff | 5690 ++++++++++++++++++++
11 files changed, 11148 insertions(+), 92 deletions(-)
diff --git a/cygwin/gcc-prep.add b/cygwin/gcc-prep.add
index f428311..e69de29 100644
--- a/cygwin/gcc-prep.add
+++ b/cygwin/gcc-prep.add
@@ -1,9 +0,0 @@
-# cygwin patches can't be directly applied through rpm
-cd gcc-%{gcc_pkgvers}
-%if "%{gcc_version}" < "4.0"
-patch -p1 -t < %{PATCH70} || true
-%else
-patch -p2 -t < %{PATCH70} || true
-%endif
-%{?PATCH71:patch -p1 < %{PATCH71}}
-cd ..
diff --git a/cygwin/i686/Makefile.am b/cygwin/i686/Makefile.am
index c843caa..b58b962 100644
--- a/cygwin/i686/Makefile.am
+++ b/cygwin/i686/Makefile.am
@@ -60,9 +60,9 @@ BINUTILS_RPMREL = 0.20131211.0
include ../binutils.am
BINUTILS_OPTS += --disable-infos
-GCC_VERS = 3.4.4
+GCC_VERS = 4.8.2
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20131217.0
+GCC_RPMREL = 0.20140206.0
include ../gcc.am
GCC_OPTS += --languages=c,cxx
GCC_OPTS += --disable-infos
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index e5183bb..b7ee17d 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -341,9 +341,9 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/common/clean.add \
$(top_srcdir)/binutils/target-binutils.add \
$(top_srcdir)/binutils/base-binutils.add
-GCC_VERS = 3.4.4
+GCC_VERS = 4.8.2
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20131217.0
+GCC_RPMREL = 0.20140206.0
GCC_OPTS = --languages=c,cxx --disable-infos
GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/gccnewlib.add $(top_srcdir)/gcc/prep.add \
diff --git a/cygwin/i686/gcc-sources.add b/cygwin/i686/gcc-sources.add
index 43772e0..cd51fdc 100644
--- a/cygwin/i686/gcc-sources.add
+++ b/cygwin/i686/gcc-sources.add
@@ -1,43 +1,9 @@
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
- at PATCH0@
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-4.8.2/gcc-4.8.2.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/rtems4.11/gcc-4.8.2.tar.%{?el5:bz2}%{!?el5:xz}
+# Patches extracted from cygwin tarball
+Patch0: gcc-4.8.2-x86-cygwin-4.8.2-2-20140206.diff
-%if %build_cxx
-Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
- at PATCH1@
+BuildRequires: i686-pc-cygwin-w32api-headers
+BuildRequires: i686-pc-cygwin-w32api-runtime
-%endif
-%if %build_fortran
-Source2: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
- at PATCH2@
-
-%endif
-%if %build_gcj
-Source3: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
- at PATCH3@
-
-%endif
-%if %build_gnat
-Source4: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
- at PATCH4@
-
-%endif
-%if %build_objc
-Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
- at PATCH5@
-%endif
-
-%if "%{gcc_version}" == "3.4.4"
-# Cygwin patch extracted from
-# ftp://sourceware.org/pub/cygwin/release/gcc/gcc-3.4.4-3-src.tar.bz2
-Patch70: gcc-3.4.4-3.patch
-
-# Misc. local fixes
-Patch71: cygwin-gcc-3.4.4-3.20120823.diff
-%endif
-%if "%{gcc_version}" == "4.3.4"
-# Cygwin patch extracted from
-# ftp://sourceware.org/pub/cygwin/release/gcc4/gcc4-4.3.4-3-src.tar.bz2
-Patch70: gcc4-4.3.4-3.src.patch
-
-Patch71: cygwin-gcc4-4.3.4-3.diff
-%endif
+%global gcc_options --disable-libitm --disable-symvers --disable-sjlj-exceptions --enable-shared --enable-shared-libgcc --enable-static
diff --git a/cygwin/i686/i686-pc-cygwin-gcc.spec b/cygwin/i686/i686-pc-cygwin-gcc.spec
index b671a37..173ee24 100644
--- a/cygwin/i686/i686-pc-cygwin-gcc.spec
+++ b/cygwin/i686/i686-pc-cygwin-gcc.spec
@@ -32,9 +32,9 @@
%{?!el5:%global _with_noarch_subpackages 1}
-%define gcc_pkgvers 3.4.4
-%define gcc_version 3.4.4
-%define gcc_rpmvers %{expand:%(echo "3.4.4" | tr - _ )}
+%define gcc_pkgvers 4.8.2
+%define gcc_version 4.8.2
+%define gcc_rpmvers %{expand:%(echo "4.8.2" | tr - _ )}
Name: i686-pc-cygwin-gcc
@@ -42,7 +42,7 @@ Summary: i686-pc-cygwin gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 0.20131217.0%{?dist}
+Release: 0.20140206.0%{?dist}
License: GPL
URL: http://gcc.gnu.org
%{?el5:BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
@@ -260,26 +260,15 @@ BuildRequires: %{_host_rpmprefix}zlib-devel
%global _gcclibdir %{_prefix}/lib
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-4.8.2/gcc-4.8.2.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/rtems4.11/gcc-4.8.2.tar.%{?el5:bz2}%{!?el5:xz}
+# Patches extracted from cygwin tarball
+Patch0: gcc-4.8.2-x86-cygwin-4.8.2-2-20140206.diff
-Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+BuildRequires: i686-pc-cygwin-w32api-headers
+BuildRequires: i686-pc-cygwin-w32api-runtime
-
-%if "%{gcc_version}" == "3.4.4"
-# Cygwin patch extracted from
-# ftp://sourceware.org/pub/cygwin/release/gcc/gcc-3.4.4-3-src.tar.bz2
-Patch70: gcc-3.4.4-3.patch
-
-# Misc. local fixes
-Patch71: cygwin-gcc-3.4.4-3.20120823.diff
-%endif
-%if "%{gcc_version}" == "4.3.4"
-# Cygwin patch extracted from
-# ftp://sourceware.org/pub/cygwin/release/gcc4/gcc4-4.3.4-3-src.tar.bz2
-Patch70: gcc4-4.3.4-3.src.patch
-
-Patch71: cygwin-gcc4-4.3.4-3.diff
-%endif
+%global gcc_options --disable-libitm --disable-symvers --disable-sjlj-exceptions --enable-shared --enable-shared-libgcc --enable-static
%if 0%{?_build_mpfr}
Source60: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.%{?el5:bz2}%{!?el5:xz}
@@ -350,15 +339,6 @@ sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/u
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-# cygwin patches can't be directly applied through rpm
-cd gcc-%{gcc_pkgvers}
-%if "%{gcc_version}" < "4.0"
-patch -p1 -t < %{PATCH70} || true
-%else
-patch -p2 -t < %{PATCH70} || true
-%endif
-%{?PATCH71:patch -p1 < %{PATCH71}}
-cd ..
# Fix timestamps
cd gcc-%{gcc_pkgvers}
@@ -401,6 +381,7 @@ cd ..
--with-sysroot=%{_exec_prefix}/i686-pc-cygwin/sys-root \
%{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
%{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
+ %{?gcc_options:%gcc_options} \
--enable-languages="$languages"
%if "%_host" != "%_build"
@@ -473,6 +454,8 @@ cd ..
fi
%endif
+ mv "${RPM_BUILD_ROOT}"%{_gcclibdir}/gcc/i686-pc-cygwin/cyggcc_s-1.dll \
+ "${RPM_BUILD_ROOT}"%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}
# Collect multilib subdirectories
multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
@@ -525,6 +508,7 @@ cd ..
%{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
%{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
*/libstdc++.*) echo "$i" >> build/files.g++ ;;
+ */cygstdc++*.dll) echo "$i" >> build/files.g++ ;;
*/libsupc++.*) echo "$i" >> build/files.g++ ;;
*) echo "$i" >> build/files.gcc ;;
esac
diff --git a/cygwin/x86_64/Makefile.am b/cygwin/x86_64/Makefile.am
index 2d8d5df..f8fe962 100644
--- a/cygwin/x86_64/Makefile.am
+++ b/cygwin/x86_64/Makefile.am
@@ -55,3 +55,10 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 0.20131211.0
include ../binutils.am
BINUTILS_OPTS += --disable-infos
+
+GCC_VERS = 4.8.2
+GCC_PKGVERS = $(GCC_VERS)
+GCC_RPMREL = 0.20140206.0
+include ../gcc.am
+GCC_OPTS += --languages=c,cxx
+GCC_OPTS += --disable-infos
diff --git a/cygwin/x86_64/Makefile.in b/cygwin/x86_64/Makefile.in
index 4435732..9a06617 100644
--- a/cygwin/x86_64/Makefile.in
+++ b/cygwin/x86_64/Makefile.in
@@ -84,9 +84,10 @@ DIST_COMMON = $(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am \
$(srcdir)/../terminfo.am $(srcdir)/../zlib.am \
$(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am \
$(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am \
- $(srcdir)/../binutils.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am
+ $(srcdir)/../binutils.am $(srcdir)/../gcc.am \
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am
@CUSTOM_RPMPREFIX_TRUE at am__append_1 = @rpmprefix@$(TARGET)-binutils.spec
+ at CUSTOM_RPMPREFIX_TRUE@am__append_2 = @rpmprefix@$(TARGET)-gcc.spec
subdir = cygwin/x86_64
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -215,7 +216,8 @@ noinst_DATA = @rpmprefix@$(TARGET)-libs.spec \
@rpmprefix@$(TARGET)-mpc.spec @rpmprefix@$(TARGET)-mpfr.spec \
@rpmprefix@$(TARGET)-w32api-headers.spec \
@rpmprefix@$(TARGET)-w32api-runtime.spec \
- @rpmprefix@$(TARGET)-binutils.spec
+ @rpmprefix@$(TARGET)-binutils.spec \
+ @rpmprefix@$(TARGET)-gcc.spec
CLEANFILES = $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec \
$(TARGET)-cloog-ppl.spec.in \
@rpmprefix@$(TARGET)-cloog-ppl.spec $(TARGET)-ncurses.spec.in \
@@ -231,7 +233,8 @@ CLEANFILES = $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec \
@rpmprefix@$(TARGET)-w32api-headers.spec \
$(TARGET)-w32api-runtime.spec.in \
@rpmprefix@$(TARGET)-w32api-runtime.spec \
- $(TARGET)-binutils.spec.in $(am__append_1)
+ $(TARGET)-binutils.spec.in $(am__append_1) \
+ $(TARGET)-gcc.spec.in $(am__append_2)
EXTRA_DIST = libs.add target-libs.add target-cloog-ppl.add \
cloog-ppl.add target-ncurses.add ncurses.add target-expat.add \
expat.add target-readline.add readline.add target-terminfo.add \
@@ -239,7 +242,9 @@ EXTRA_DIST = libs.add target-libs.add target-cloog-ppl.add \
target-mpc.add mpc.add target-mpfr.add mpfr.add \
target-w32api-headers.add w32api-headers.add \
target-w32api-runtime.add w32api-runtime.add \
- binutils-sources.add $(BINUTILS_SUBPACKAGES)
+ binutils-sources.add $(BINUTILS_SUBPACKAGES) \
+ $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
+ $(GCC_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -328,10 +333,25 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/common/clean.add \
$(top_srcdir)/binutils/target-binutils.add \
$(top_srcdir)/binutils/base-binutils.add
+GCC_VERS = 4.8.2
+GCC_PKGVERS = $(GCC_VERS)
+GCC_RPMREL = 0.20140206.0
+GCC_OPTS = --languages=c,cxx --disable-infos
+GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(top_srcdir)/gcc/gccnewlib.add $(top_srcdir)/gcc/prep.add \
+ $(top_srcdir)/gcc/build.add $(top_srcdir)/gcc/install.add \
+ $(top_srcdir)/gcc/rpm-install.add \
+ $(top_srcdir)/common/clean.add \
+ $(top_srcdir)/gcc/target-gcc.add \
+ $(top_srcdir)/gcc/base-gcc.add \
+ $(top_srcdir)/gcc/target-c++.add \
+ $(top_srcdir)/gcc/target-gfortran.add \
+ $(top_srcdir)/gcc/base-gfortran.add \
+ $(top_srcdir)/gcc/target-objc.add
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am $(srcdir)/../binutils.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am $(srcdir)/../binutils.am $(srcdir)/../gcc.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -352,7 +372,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am $(srcdir)/../binutils.am:
+$(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am $(srcdir)/../binutils.am $(srcdir)/../gcc.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -647,6 +667,26 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binuti
@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) $(BINUTILS_OPTS) > $@
+$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
+ cat $(GCC_SUBPACKAGES) \
+ | sed \
+ -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
+ -e "/[@]SOURCES[@]/d" \
+ -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
+ -e "/[@]PREP[@]/d" \
+ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
+ -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
+ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
+ -e "/[@]tool_target[@]-newlib/d" \
+ -e "/^BuildRequ.*[@]tool_target[@]-w32api-headers-sys-root/d" \
+ -e "s,[@]tool_target[@]-w32api-headers-sys-root, at tool_target@-w32api-headers," \
+ -e "/^BuildRequ.*[@]tool_target[@]-w32api-runtime-sys-root/d" \
+ -e "s,[@]tool_target[@]-w32api-runtime-sys-root, at tool_target@-w32api-runtime," \
+ | $(MKSPEC0) > $(TARGET)-gcc.spec.in
+
+ at rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
+ $(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/cygwin/x86_64/gcc-sources.add b/cygwin/x86_64/gcc-sources.add
new file mode 100644
index 0000000..fe2eb16
--- /dev/null
+++ b/cygwin/x86_64/gcc-sources.add
@@ -0,0 +1,9 @@
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-4.8.2/gcc-4.8.2.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/rtems4.11/gcc-4.8.2.tar.%{?el5:bz2}%{!?el5:xz}
+# Patches extracted from cygwin tarball
+Patch0: gcc-4.8.2-x86_64-cygwin-4.8.2-2-20140206.diff
+
+BuildRequires: x86_64-pc-cygwin-w32api-headers
+BuildRequires: x86_64-pc-cygwin-w32api-runtime
+
+%global gcc_options --disable-libitm --disable-symvers --enable-shared --enable-shared-libgcc --enable-static
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-gcc.spec b/cygwin/x86_64/x86_64-pc-cygwin-gcc.spec
new file mode 100644
index 0000000..ab76c11
--- /dev/null
+++ b/cygwin/x86_64/x86_64-pc-cygwin-gcc.spec
@@ -0,0 +1,724 @@
+#
+# Please send bugfixes or comments to
+# http://www.rtems.org/bugzilla
+#
+
+
+%ifos cygwin cygwin32 mingw mingw32
+%define _exeext .exe
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
+%else
+%define _exeext %{nil}
+%endif
+
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix %{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%{?!el5:%global _with_noarch_subpackages 1}
+
+%define gcc_pkgvers 4.8.2
+%define gcc_version 4.8.2
+%define gcc_rpmvers %{expand:%(echo "4.8.2" | tr - _ )}
+
+
+Name: x86_64-pc-cygwin-gcc
+Summary: x86_64-pc-cygwin gcc
+
+Group: Development/Tools
+Version: %{gcc_rpmvers}
+Release: 0.20140206.0%{?dist}
+License: GPL
+URL: http://gcc.gnu.org
+%{?el5:BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
+
+%define _use_internal_dependency_generator 0
+
+BuildRequires: %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires: %{_host_rpmprefix}gcc-c++
+%endif
+
+# FIXME: Disable lto for now, to avoid dependencies on libelf
+%bcond_with lto
+
+# FIXME: Disable python gdb scripts
+# ATM, no idea how to package them
+%bcond_with pygdb
+
+# FIXME: Disable GCC-plugin
+# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
+%bcond_with plugin
+
+# Use gcc's stdint.h instead of newlib's
+# Should be applicable to gcc >= 4.5.0
+%if "%{gcc_version}" >= "4.5.3"
+%bcond_without gcc_stdint
+%else
+%bcond_with gcc_stdint
+%endif
+
+# Enable newlib's iconv
+%bcond_without iconv
+
+# versions of libraries, we conditionally bundle if necessary
+%global mpc_version 1.0.1
+%global mpfr_version 3.1.2
+%global gmp_version 5.1.2
+%global libelf_version 0.8.13
+
+# versions of libraries these distros are known to ship
+%if 0%{?fc21}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
+%if 0%{?fc19}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.1
+%global gmp_provided 5.1.1
+%endif
+
+%if 0%{?fc18}
+%global mpc_provided 0.9
+%global mpfr_provided 3.1.1
+%global gmp_provided 5.0.5
+%endif
+
+%if 0%{?el6}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el5}
+%global mpc_provided %{nil}
+%global mpfr_provided %{nil}
+%global gmp_provided 4.1.4
+%endif
+
+%if 0%{?suse13_1}
+%global mpc_provided 1.0
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
+%if 0%{?suse12_3}
+%global mpc_provided 1.0
+%global mpfr_provided 3.1.1
+%global gmp_provided 5.0.5
+%endif
+
+%if 0%{?cygwin}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.3
+%endif
+
+%if 0%{?mingw32}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.2.0"
+%endif
+
+%if "%{gcc_version}" >= "4.3.0"
+%define gmp_required 4.1
+%define mpfr_required 2.3.1
+%endif
+
+%if "%{gcc_version}" >= "4.3.3"
+%define cloog_required 0.15
+%endif
+
+%if "%{gcc_version}" >= "4.4.0"
+%define mpfr_required 2.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.8.0"
+%define mpfr_required 2.4.0
+%endif
+
+%if "%{gcc_version}" >= "4.5.0"
+%define mpc_required 0.8
+%if %{with lto}
+%define libelf_required 0.8.12
+%endif
+%endif
+
+%if "%{gcc_version}" >= "4.7.0"
+%define gmp_required 4.2
+%endif
+
+%if %{defined mpc_required}
+%if "%{mpc_provided}" >= "%{mpc_required}"
+%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
+%if "%{_build}" != "%{_host}"
+BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
+%endif
+%else
+%define _build_mpc 1
+%define gmp_required 4.2
+%endif
+%endif
+
+%if %{defined gmp_required}
+%if "%{gmp_provided}" >= "%{gmp_required}"
+BuildRequires: gmp-devel >= %{gmp_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires: %{_host_rpmprefix}gmp-devel >= %{gmp_required}
+%endif
+%else
+%define _build_gmp 1
+%endif
+%endif
+
+%if %{defined libelf_required}
+%if "%{libelf_provided}" >= "%{libelf_required}"
+BuildRequires: libelf-devel >= %{libelf_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
+%endif
+%else
+%define _build_libelf 1
+%endif
+%endif
+
+
+%if %{defined cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%endif
+
+
+%if %{defined mpfr_required}
+%if "%{mpfr_provided}" >= "%{mpfr_required}"
+BuildRequires: mpfr-devel >= %{mpfr_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
+%endif
+%else
+%define _build_mpfr 1
+%endif
+%endif
+
+%if "%{_build}" != "%{_host}"
+BuildRequires: x86_64-pc-cygwin-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires: x86_64-pc-cygwin-gcc-c++ = %{gcc_rpmvers}
+%endif
+%endif
+
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
+BuildRequires: flex bison
+
+BuildRequires: %{?suse:makeinfo}%{!?suse:texinfo} >= 4.2
+BuildRequires: x86_64-pc-cygwin-binutils
+BuildRequires: x86_64-pc-cygwin-sys-root
+
+Requires: x86_64-pc-cygwin-binutils
+Requires: x86_64-pc-cygwin-sys-root
+Requires: x86_64-pc-cygwin-w32api-headers
+Requires: x86_64-pc-cygwin-w32api-runtime
+Requires: x86_64-pc-cygwin-gcc-libgcc = %{gcc_rpmvers}-%{release}
+
+%if "%{gcc_version}" >= "4.5.0"
+BuildRequires: zlib-devel
+%if "%{_build}" != "%{_host}"
+BuildRequires: %{_host_rpmprefix}zlib-devel
+%endif
+%else
+%endif
+
+%global _gcclibdir %{_prefix}/lib
+
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-4.8.2/gcc-4.8.2.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/rtems4.11/gcc-4.8.2.tar.%{?el5:bz2}%{!?el5:xz}
+# Patches extracted from cygwin tarball
+Patch0: gcc-4.8.2-x86_64-cygwin-4.8.2-2-20140206.diff
+
+BuildRequires: x86_64-pc-cygwin-w32api-headers
+BuildRequires: x86_64-pc-cygwin-w32api-runtime
+
+%global gcc_options --disable-libitm --disable-symvers --enable-shared --enable-shared-libgcc --enable-static
+
+%if 0%{?_build_mpfr}
+Source60: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.%{?el5:bz2}%{!?el5:xz}
+%endif
+
+%if 0%{?_build_mpc}
+Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+%endif
+
+%if 0%{?_build_gmp}
+Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.%{?el5:bz2}%{!?el5:xz}
+%endif
+
+%if 0%{?_build_libelf}
+Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
+%endif
+
+%description
+Cross gcc for x86_64-pc-cygwin.
+
+%prep
+%setup -c -T -n %{name}-%{version}
+
+%setup -q -T -D -n %{name}-%{version} -a0
+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
+
+%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH1:%patch1 -p1}
+cd ..
+
+
+
+
+
+%if %{with gcc_stdint}
+sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
+%endif
+
+
+%if 0%{?_build_mpfr}
+%setup -q -T -D -n %{name}-%{version} -a60
+%{?PATCH60:%patch60 -p1}
+ # Build mpfr one-tree style
+ ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
+%endif
+
+%if 0%{?_build_mpc}
+%setup -q -T -D -n %{name}-%{version} -a61
+%{?PATCH61:%patch61 -p1}
+ # Build mpc one-tree style
+ ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
+%endif
+
+%if 0%{?_build_gmp}
+%setup -q -T -D -n %{name}-%{version} -a62
+%{?PATCH62:%patch62 -p1}
+ # Build gmp one-tree style
+ ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
+%endif
+
+%if 0%{?_build_libelf}
+%setup -q -T -D -n %{name}-%{version} -a63
+%{?PATCH63:%patch63 -p1}
+ # Build libelf one-tree style
+ ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
+%endif
+
+
+ # Fix timestamps
+ cd gcc-%{gcc_pkgvers}
+ contrib/gcc_update --touch
+ cd ..
+%build
+ mkdir -p build
+
+ cd build
+
+ languages="c"
+ languages="$languages,c++"
+%if "%{_build}" != "%{_host}"
+ CFLAGS_FOR_BUILD="-g -O2 -Wall" \
+ CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
+%else
+# gcc is not ready to be compiled with -std=gnu99
+ CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
+%endif
+ ../gcc-%{gcc_pkgvers}/configure \
+ --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --exec_prefix=%{_exec_prefix} \
+ --includedir=%{_includedir} \
+ --libdir=%{_gcclibdir} \
+ --libexecdir=%{_libexecdir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir} \
+ --datadir=%{_datadir} \
+ --build=%_build --host=%_host \
+ --target=x86_64-pc-cygwin \
+ --disable-libstdcxx-pch \
+ --with-gnu-as --with-gnu-ld --verbose \
+ --with-newlib \
+ --with-system-zlib \
+ --disable-nls --without-included-gettext \
+ --disable-win32-registry \
+ --enable-version-specific-runtime-libs \
+ --enable-threads \
+ --with-sysroot=%{_exec_prefix}/x86_64-pc-cygwin/sys-root \
+ %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
+ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
+ %{?gcc_options:%gcc_options} \
+ --enable-languages="$languages"
+
+%if "%_host" != "%_build"
+ # Bug in gcc-3.2.1:
+ # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
+ mkdir -p gcc/include
+ cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
+%endif
+
+ make %{?_smp_mflags} all
+ cd ..
+
+%install
+ rm -rf $RPM_BUILD_ROOT
+
+ cd build
+
+ make DESTDIR=$RPM_BUILD_ROOT install
+ cd ..
+
+
+%if "%{gcc_version}" <= "4.1.2"
+# Misplaced header file
+ if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
+ mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
+ $RPM_BUILD_ROOT%{_gcclibdir}/gcc/x86_64-pc-cygwin/%{gcc_version}/include/
+ fi
+%endif
+
+ # host library
+%if "%{gcc_version}" >= "4.2.0"
+ # libiberty doesn't honor --libdir, but always installs to a
+ # magically guessed _libdir
+ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
+%else
+ # libiberty installs to --libdir=...
+ rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
+%endif
+
+ # We use the version from binutils
+ rm -f $RPM_BUILD_ROOT%{_bindir}/x86_64-pc-cygwin-c++filt%{_exeext}
+
+
+# Conflict with a native GCC's infos
+ rm -rf $RPM_BUILD_ROOT%{_infodir}
+
+# Conflict with a native GCC's man pages
+ rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
+
+ # We don't want libffi's man-pages
+ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
+
+ # Bug in gcc-3.4.0pre
+ rm -f $RPM_BUILD_ROOT%{_bindir}/x86_64-pc-cygwin-x86_64-pc-cygwin-gcjh%{_exeext}
+
+ # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
+ # the fixinclude-install-tools
+ rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/x86_64-pc-cygwin/%{gcc_version}/install-tools
+ rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/x86_64-pc-cygwin/%{gcc_version}/install-tools
+
+ # Bug in gcc > 4.1.0: Installs an unused, empty directory
+ if test -d ${RPM_BUILD_ROOT}%{_prefix}/x86_64-pc-cygwin/include/bits; then
+ rmdir ${RPM_BUILD_ROOT}%{_prefix}/x86_64-pc-cygwin/include/bits
+ fi
+
+%if ! %{with pygdb}
+ # gcc >= 4.5.0: installs weird libstdc++ python bindings.
+ if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
+ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
+ fi
+
+%endif
+ mv "${RPM_BUILD_ROOT}"%{_gcclibdir}/gcc/x86_64-pc-cygwin/cyggcc_s-seh-1.dll \
+ "${RPM_BUILD_ROOT}"%{_gcclibdir}/gcc/x86_64-pc-cygwin/lib/libgcc_s.dll.a \
+ "${RPM_BUILD_ROOT}"%{_gcclibdir}/gcc/x86_64-pc-cygwin/%{gcc_version}
+ # Collect multilib subdirectories
+ multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+
+
+ rm -f dirs ;
+ echo "%defattr(-,root,root,-)" >> dirs
+ TGTDIR="%{_gcclibdir}/gcc/x86_64-pc-cygwin/%{gcc_version}"
+ for i in $multilibs; do
+ case $i in
+ \.) ;; # ignore, handled elsewhere
+ *) echo "%dir ${TGTDIR}/$i" >> dirs
+ ;;
+ esac
+ done
+
+ # Collect files to go into different packages
+ cp dirs build/files.gcc
+ cp dirs build/files.gfortran
+ cp dirs build/files.objc
+ cp dirs build/files.gcj
+ cp dirs build/files.g++
+ cp dirs build/files.go
+
+ TGTDIR="%{_gcclibdir}/gcc/x86_64-pc-cygwin/%{gcc_version}"
+ f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
+ for i in $f; do
+ case $i in
+ *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
+ *f771) ;;
+ *f951) ;;
+ *cc1) ;;
+ *cc1obj) ;;
+ *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
+ *collect2) ;;
+ *libobjc*) echo "$i" >> build/files.objc ;;
+ *go1) ;; # ignore: explicitly put into rpm elsewhere
+ *include/objc*) ;;
+ *include/g++*);;
+ *include/c++*);;
+ *include-fixed/*);;
+ *finclude/*);;
+ */go/*) ;; # ignore : explicitly put into rpm elsewhere
+ *adainclude*);;
+ *adalib*);;
+ *gnat1);;
+ *jc1) ;;
+ *jvgenmain) ;;
+ */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
+ */libgo.*) echo "$i" >> build/files.go ;;
+ %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
+ %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
+ */libstdc++.*) echo "$i" >> build/files.g++ ;;
+ */cygstdc++*.dll) echo "$i" >> build/files.g++ ;;
+ */libsupc++.*) echo "$i" >> build/files.g++ ;;
+ *) echo "$i" >> build/files.gcc ;;
+ esac
+ done
+
+ TGTDIR="%{_exec_prefix}/x86_64-pc-cygwin/lib"
+ f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
+ for i in $f; do
+ case $i in
+ *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
+ *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
+# all other files belong to newlib
+ *) echo "$i" >> build/files.newlib ;;
+ esac
+ done
+# Extract %%__os_install_post into os_install_post~
+cat << \EOF > os_install_post~
+%__os_install_post
+EOF
+
+# Generate customized brp-*scripts
+cat os_install_post~ | while read a x y; do
+case $a in
+# Prevent brp-strip* from trying to handle foreign binaries
+*/brp-strip*)
+ b=$(basename $a)
+ sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
+ chmod a+x $b
+ ;;
+esac
+done
+
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+< os_install_post~ > os_install_post
+%define __os_install_post . ./os_install_post
+
+
+cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
+#!/bin/sh
+grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/x86_64-pc-cygwin/(lib|include|sys-root)' \
+ %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/x86_64-pc-cygwin/'} | %__find_provides
+EOF
+chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
+
+cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
+#!/bin/sh
+grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/x86_64-pc-cygwin/(lib|include|sys-root)' \
+ %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/x86_64-pc-cygwin/'} | %__find_requires
+EOF
+chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
+%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
+
+%ifnarch noarch
+# Extract %%__debug_install_post into debug_install_post~
+cat << \EOF > debug_install_post~
+%__debug_install_post
+EOF
+
+# Generate customized debug_install_post script
+cat debug_install_post~ | while read a x y; do
+case $a in
+# Prevent find-debuginfo.sh* from trying to handle foreign binaries
+*/find-debuginfo.sh)
+ b=$(basename $a)
+ sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
+ chmod a+x $b
+ ;;
+esac
+done
+
+sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
+< debug_install_post~ > debug_install_post
+%define __debug_install_post . ./debug_install_post
+
+%endif
+
+%clean
+ rm -rf $RPM_BUILD_ROOT
+
+# ==============================================================
+# x86_64-pc-cygwin-gcc
+# ==============================================================
+# %package -n x86_64-pc-cygwin-gcc
+# Summary: GNU cc compiler for x86_64-pc-cygwin
+# Group: Development/Tools
+# Version: %{gcc_rpmvers}
+# Requires: x86_64-pc-cygwin-binutils
+# License: GPL
+
+# %if %build_infos
+# Requires: gcc-common
+# %endif
+
+%description -n x86_64-pc-cygwin-gcc
+GNU cc compiler for x86_64-pc-cygwin.
+
+# ==============================================================
+# x86_64-pc-cygwin-gcc-libgcc
+# ==============================================================
+%package -n x86_64-pc-cygwin-gcc-libgcc
+Summary: libgcc for x86_64-pc-cygwin-gcc
+Group: Development/Tools
+Version: %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License: GPL
+
+%description -n x86_64-pc-cygwin-gcc-libgcc
+libgcc x86_64-pc-cygwin-gcc.
+
+
+%files -n x86_64-pc-cygwin-gcc
+%defattr(-,root,root)
+
+%{_mandir}/man1/x86_64-pc-cygwin-gcc.1*
+%{_mandir}/man1/x86_64-pc-cygwin-cpp.1*
+%{_mandir}/man1/x86_64-pc-cygwin-gcov.1*
+
+%{_bindir}/x86_64-pc-cygwin-cpp%{_exeext}
+%{_bindir}/x86_64-pc-cygwin-gcc%{_exeext}
+%{_bindir}/x86_64-pc-cygwin-gcc-%{gcc_version}%{_exeext}
+%{_bindir}/x86_64-pc-cygwin-gcov%{_exeext}
+%if "%{gcc_version}" < "4.6.0"
+%{_bindir}/x86_64-pc-cygwin-gccbug
+%endif
+%if "%{gcc_version}" >= "4.7.0"
+# FIXME: To ship or not to ship?
+%{_bindir}/x86_64-pc-cygwin-gcc-ar%{_exeext}
+%{_bindir}/x86_64-pc-cygwin-gcc-nm%{_exeext}
+%{_bindir}/x86_64-pc-cygwin-gcc-ranlib%{_exeext}
+%endif
+
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/x86_64-pc-cygwin
+%dir %{_libexecdir}/gcc/x86_64-pc-cygwin/%{gcc_version}
+%{_libexecdir}/gcc/x86_64-pc-cygwin/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/x86_64-pc-cygwin/%{gcc_version}/collect2%{_exeext}
+%if "%{gcc_version}" >= "4.5.0"
+%{?with_lto:%{_libexecdir}/gcc/x86_64-pc-cygwin/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/x86_64-pc-cygwin/%{gcc_version}/lto-wrapper%{_exeext}
+%endif
+
+%files -n x86_64-pc-cygwin-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/x86_64-pc-cygwin
+%dir %{_gcclibdir}/gcc/x86_64-pc-cygwin/%{gcc_version}
+%dir %{_gcclibdir}/gcc/x86_64-pc-cygwin/%{gcc_version}/include
+
+%if "%{gcc_version}" > "4.0.3"
+%dir %{_gcclibdir}/gcc/x86_64-pc-cygwin/%{gcc_version}/include/ssp
+%endif
+
+%if "%{gcc_version}" >= "4.3.0"
+%{_gcclibdir}/gcc/x86_64-pc-cygwin/%{gcc_version}/include-fixed
+%endif
+
+# ==============================================================
+# x86_64-pc-cygwin-gcc-c++
+# ==============================================================
+%package -n x86_64-pc-cygwin-gcc-c++
+Summary: GCC c++ compiler for x86_64-pc-cygwin
+Group: Development/Tools
+Version: %{gcc_rpmvers}
+License: GPL
+Requires: x86_64-pc-cygwin-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
+
+%if "%{_build}" != "%{_host}"
+BuildRequires: x86_64-pc-cygwin-gcc-c++ = %{gcc_rpmvers}
+%endif
+
+Requires: x86_64-pc-cygwin-gcc = %{gcc_rpmvers}-%{release}
+
+%description -n x86_64-pc-cygwin-gcc-c++
+GCC c++ compiler for x86_64-pc-cygwin.
+
+
+%package -n x86_64-pc-cygwin-gcc-libstdc++
+Summary: libstdc++ for x86_64-pc-cygwin
+Group: Development/Tools
+Version: %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License: GPL
+
+%description -n x86_64-pc-cygwin-gcc-libstdc++
+%{summary}
+
+
+%files -n x86_64-pc-cygwin-gcc-c++
+%defattr(-,root,root)
+
+%{_mandir}/man1/x86_64-pc-cygwin-g++.1*
+
+%{_bindir}/x86_64-pc-cygwin-c++%{_exeext}
+%{_bindir}/x86_64-pc-cygwin-g++%{_exeext}
+
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/x86_64-pc-cygwin
+%dir %{_libexecdir}/gcc/x86_64-pc-cygwin/%{gcc_version}
+%{_libexecdir}/gcc/x86_64-pc-cygwin/%{gcc_version}/cc1plus%{_exeext}
+
+
+%files -n x86_64-pc-cygwin-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/x86_64-pc-cygwin
+%dir %{_gcclibdir}/gcc/x86_64-pc-cygwin/%{gcc_version}
+%dir %{_gcclibdir}/gcc/x86_64-pc-cygwin/%{gcc_version}/include
+%{_gcclibdir}/gcc/x86_64-pc-cygwin/%{gcc_version}/include/c++
+
+
+
diff --git a/patches/gcc-4.8.2-x86-cygwin-4.8.2-2-20140206.diff b/patches/gcc-4.8.2-x86-cygwin-4.8.2-2-20140206.diff
new file mode 100644
index 0000000..43a25dd
--- /dev/null
+++ b/patches/gcc-4.8.2-x86-cygwin-4.8.2-2-20140206.diff
@@ -0,0 +1,4645 @@
+diff --git a/Makefile.in b/Makefile.in
+index bfbaf03..39f1e05 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1588,7 +1588,6 @@ install-info-target: maybe-install-info-target-libgo
+ install-info-target: maybe-install-info-target-libtermcap
+ install-info-target: maybe-install-info-target-winsup
+ install-info-target: maybe-install-info-target-libgloss
+-install-info-target: maybe-install-info-target-libffi
+ install-info-target: maybe-install-info-target-libjava
+ install-info-target: maybe-install-info-target-zlib
+ install-info-target: maybe-install-info-target-boehm-gc
+@@ -1670,7 +1669,6 @@ install-pdf-target: maybe-install-pdf-target-libgo
+ install-pdf-target: maybe-install-pdf-target-libtermcap
+ install-pdf-target: maybe-install-pdf-target-winsup
+ install-pdf-target: maybe-install-pdf-target-libgloss
+-install-pdf-target: maybe-install-pdf-target-libffi
+ install-pdf-target: maybe-install-pdf-target-libjava
+ install-pdf-target: maybe-install-pdf-target-zlib
+ install-pdf-target: maybe-install-pdf-target-boehm-gc
+@@ -1752,7 +1750,6 @@ install-html-target: maybe-install-html-target-libgo
+ install-html-target: maybe-install-html-target-libtermcap
+ install-html-target: maybe-install-html-target-winsup
+ install-html-target: maybe-install-html-target-libgloss
+-install-html-target: maybe-install-html-target-libffi
+ install-html-target: maybe-install-html-target-libjava
+ install-html-target: maybe-install-html-target-zlib
+ install-html-target: maybe-install-html-target-boehm-gc
+@@ -1834,7 +1831,6 @@ installcheck-target: maybe-installcheck-target-libgo
+ installcheck-target: maybe-installcheck-target-libtermcap
+ installcheck-target: maybe-installcheck-target-winsup
+ installcheck-target: maybe-installcheck-target-libgloss
+-installcheck-target: maybe-installcheck-target-libffi
+ installcheck-target: maybe-installcheck-target-libjava
+ installcheck-target: maybe-installcheck-target-zlib
+ installcheck-target: maybe-installcheck-target-boehm-gc
+@@ -2454,7 +2450,6 @@ install-target: \
+ maybe-install-target-libtermcap \
+ maybe-install-target-winsup \
+ maybe-install-target-libgloss \
+- maybe-install-target-libffi \
+ maybe-install-target-libjava \
+ maybe-install-target-zlib \
+ maybe-install-target-boehm-gc \
+@@ -2556,7 +2551,6 @@ install-strip-target: \
+ maybe-install-strip-target-libtermcap \
+ maybe-install-strip-target-winsup \
+ maybe-install-strip-target-libgloss \
+- maybe-install-strip-target-libffi \
+ maybe-install-strip-target-libjava \
+ maybe-install-strip-target-zlib \
+ maybe-install-strip-target-boehm-gc \
+diff --git a/boehm-gc/win32_threads.c b/boehm-gc/win32_threads.c
+index ffb34e0..186bc39 100644
+--- a/boehm-gc/win32_threads.c
++++ b/boehm-gc/win32_threads.c
+@@ -707,6 +707,54 @@ void * GC_start_routine(void * arg)
+ return(result);
+ }
+
++void GC_register_my_thread()
++{
++ GC_thread me;
++ pthread_t my_pthread;
++
++ my_pthread = pthread_self();
++# if DEBUG_CYGWIN_THREADS
++ GC_printf1("Attaching thread 0x%lx\n", my_pthread);
++ GC_printf1("pid = %ld\n", (long) getpid());
++# endif
++
++ /* Check to ensure this thread isn't attached already. */
++ LOCK();
++ me = GC_lookup_thread (my_pthread);
++ UNLOCK();
++ if (me != 0)
++ {
++# if DEBUG_CYGWIN_THREADS
++ GC_printf1("Attempt to re-attach known thread 0x%lx\n", my_pthread);
++# endif
++ return;
++ }
++
++ LOCK();
++ me = GC_new_thread();
++ me -> flags |= DETACHED;
++ me -> pthread_id = pthread_self();
++ UNLOCK();
++}
++
++void GC_unregister_my_thread()
++{
++ pthread_t my_pthread;
++ GC_thread me;
++
++ my_pthread = pthread_self();
++
++# if DEBUG_CYGWIN_THREADS
++ GC_printf1("Detaching thread 0x%lx\n", my_pthread);
++# endif
++
++ LOCK();
++ me = GC_lookup_thread(my_pthread);
++ UNLOCK();
++ GC_thread_exit_proc ((void *)me);
++}
++
++
+ void GC_thread_exit_proc(void *arg)
+ {
+ GC_thread me = (GC_thread)arg;
+diff --git a/config/dfp.m4 b/config/dfp.m4
+index e971db4..5f52bfa 100644
+--- a/config/dfp.m4
++++ b/config/dfp.m4
+@@ -23,7 +23,7 @@ Valid choices are 'yes', 'bid', 'dpd', and 'no'.]) ;;
+ powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
+ i?86*-*-gnu* | \
+ i?86*-*-mingw* | x86_64*-*-mingw* | \
+- i?86*-*-cygwin*)
++ i?86*-*-cygwin* | x86_64*-*cygwin*)
+ enable_decimal_float=yes
+ ;;
+ *)
+diff --git a/config/picflag.m4 b/config/picflag.m4
+index bd81812..2ee5cd0 100644
+--- a/config/picflag.m4
++++ b/config/picflag.m4
+@@ -17,7 +17,9 @@ case "${$2}" in
+ hppa*64*-*-hpux*)
+ # PIC is the default for 64-bit PA HP-UX.
+ ;;
+- i[[34567]]86-*-cygwin* | i[[34567]]86-*-mingw* | x86_64-*-mingw*)
++ i[[34567]]86-*-cygwin* | x86_64-*-cygwin*)
++ ;;
++ i[[34567]]86-*-mingw* | x86_64-*-mingw*)
+ ;;
+ i[[34567]]86-*-interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+diff --git a/fix-libtool-scripts-for-latest-gcc-runtimes.sh b/fix-libtool-scripts-for-latest-gcc-runtimes.sh
+new file mode 100755
+index 0000000..5ffad8f
+--- /dev/null
++++ b/fix-libtool-scripts-for-latest-gcc-runtimes.sh
+@@ -0,0 +1,16 @@
++libdir=${@:-/usr/lib}
++
++[ ! -d ${libdir} ] && exit 1
++
++extrafiles=$(ls -1 2>/dev/null /usr/bin/libtool \
++ /usr/share/apr/build-1/libtool \
++ /usr/lib/R/bin/libtool /usr/lib/rep/i686-pc-cygwin/libtool)
++
++echo "${extrafiles}" \
++ | xargs -r grep -l '^sys_lib_search_path_spec=.*/usr/lib/gcc/i686-pc-cygwin/[34].[3-9].[0-9]' \
++ | xargs -r sed -i -e "/^sys_lib_search_path_spec=/ s|\(pc-cygwin\)/[34].[3-9].[0-9]|\1/$(/usr/bin/gcc-4 -dumpversion)|g"
++
++find ${libdir} -type f -name '*.la' \
++ | xargs -r grep -l '^dependency_libs=.*/usr/lib/gcc/i686-pc-cygwin/[34].[3-9].[0-9]/lib[a-z_+]*.la' \
++ | xargs -r sed -i -e "/^dependency_libs=/ s|[^ ]*pc-cygwin/[34].[3-9].[0-9]/lib\([a-z_+]*\)\.la|-l\1|g"
++
+diff --git a/gcc/ada/a-intnam-cygwin.ads b/gcc/ada/a-intnam-cygwin.ads
+new file mode 100644
+index 0000000..d441e7b
+--- /dev/null
++++ b/gcc/ada/a-intnam-cygwin.ads
+@@ -0,0 +1,170 @@
++------------------------------------------------------------------------------
++-- --
++-- 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-2011, 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 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. --
++-- --
++-- As a special exception under Section 7 of GPL version 3, you are granted --
++-- additional permissions described in the GCC Runtime Library Exception, --
++-- version 3.1, as published by the Free Software Foundation. --
++-- --
++-- You should have received a copy of the GNU General Public License and --
++-- a copy of the GCC Runtime Library Exception along with this program; --
++-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
++-- <http://www.gnu.org/licenses/>. --
++-- --
++-- 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
++
++ -- All identifiers in this unit are implementation defined
++
++ pragma Implementation_Defined;
++
++ -- 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;
+diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
+index 0ddde72..06f36ac 100644
+--- a/gcc/ada/gcc-interface/Makefile.in
++++ b/gcc/ada/gcc-interface/Makefile.in
+@@ -191,6 +191,13 @@ TARGET_ADA_SRCS =
+ # Type of tools build we are doing; default is not compiling tools.
+ TOOLSCASE =
+
++# Which install goal to use.
++INSTALL_GNATLIB_MAIN = install-gnatlib
++INSTALL_GNATLIB_WIN32 = unused-install-gnatlib
++
++# Set shared lib prefix (lib on all systems but cygwin, which uses cyg)
++LIBGNAT_SHARED_LIB_PREFIX=lib
++
+ # Multilib handling
+ MULTISUBDIR =
+ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
+@@ -1600,6 +1607,12 @@ endif
+
+ # Cygwin/Mingw32
+ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(osys))),)
++ # Set target pair suffix for mingw or cygwin
++ W32_TARG=mingw
++ ifneq ($(strip $(filter cygwin%,$(osys))),)
++ W32_TARG=cygwin
++ LIBGNAT_SHARED_LIB_PREFIX=cyg
++ endif
+ # Cygwin provides a full Posix environment, and so we use the default
+ # versions of s-memory and g-socthi rather than the Windows-specific
+ # MinGW versions. Ideally we would use all the default versions for
+@@ -1668,24 +1681,24 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(osys))),)
+ ifeq ($(strip $(MULTISUBDIR)),/32)
+ LIBGNAT_TARGET_PAIRS += \
+ $(X86_TARGET_PAIRS) \
+- system.ads<system-mingw.ads
++ system.ads<system-$(W32_TARG).ads
+ SO_OPTS= -m32 -Wl,-soname,
+ else
+ LIBGNAT_TARGET_PAIRS += \
+ $(X86_64_TARGET_PAIRS) \
+- system.ads<system-mingw-x86_64.ads
++ system.ads<system-$(W32_TARG)-x86_64.ads
+ SO_OPTS = -m64 -Wl,-soname,
+ endif
+ else
+ ifeq ($(strip $(MULTISUBDIR)),/64)
+ LIBGNAT_TARGET_PAIRS += \
+ $(X86_64_TARGET_PAIRS) \
+- system.ads<system-mingw-x86_64.ads
++ system.ads<system-$(W32_TARG)-x86_64.ads
+ SO_OPTS = -m64 -Wl,-soname,
+ else
+ LIBGNAT_TARGET_PAIRS += \
+ $(X86_TARGET_PAIRS) \
+- system.ads<system-mingw.ads
++ system.ads<system-$(W32_TARG).ads
+ SO_OPTS = -m32 -Wl,-soname,
+ endif
+ endif
+@@ -1694,7 +1707,14 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(osys))),)
+ s-win32.o s-winext.o g-regist.o g-sse.o g-ssvety.o
+ EXTRA_GNATRTL_TASKING_OBJS = a-exetim.o
+
+- MISCLIB = -lws2_32
++ # Which install goal to use.
++ INSTALL_GNATLIB_MAIN = unused-install-gnatlib
++ INSTALL_GNATLIB_WIN32 = install-gnatlib
++
++ # Mingw uses winsock-based sockets; cygwin uses POSIX sockets.
++ ifneq ($(strip $(filter-out cygwin%,$(osys))),)
++ MISCLIB = -lwsock32
++ endif
+
+ # ??? This will be replaced by gnatlib-shared-dual-win32 when GNAT
+ # auto-import support for array/record will be done.
+@@ -1704,10 +1724,11 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(osys))),)
+ endif
+
+ TOOLS_TARGET_PAIRS= \
+- mlib-tgt-specific.adb<mlib-tgt-specific-mingw.adb \
+- indepsw.adb<indepsw-mingw.adb
++ mlib-tgt-specific.adb<mlib-tgt-specific-$(W32_TARG).adb \
++ indepsw.adb<indepsw-$(W32_TARG).adb
+
+ GMEM_LIB = gmemlib
++ EH_MECHANISM=-gcc
+ EXTRA_GNATTOOLS = ../../gnatdll$(exeext)
+ EXTRA_GNATMAKE_OBJS = mdll.o mdll-utl.o mdll-fil.o
+ soext = .dll
+@@ -2535,7 +2556,7 @@ gnatlink-re: ../stamp-tools link.o targext.o gnatmake-re
+ true; \
+ fi
+
+-install-gnatlib: ../stamp-gnatlib-$(RTSDIR)
++$(INSTALL_GNATLIB_MAIN): ../stamp-gnatlib-$(RTSDIR)
+ # Create the directory before deleting it, in case the directory is
+ # a list of directories (as it may be on VMS). This ensures we are
+ # deleting the right one.
+@@ -2582,6 +2603,46 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR)
+ cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
+ cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
+
++$(INSTALL_GNATLIB_WIN32): ../stamp-gnatlib-$(RTSDIR)
++# Create the directory before deleting it, in case the directory is
++# a list of directories (as it may be on VMS). This ensures we are
++# deleting the right one.
++ -$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR)
++ -$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR)
++ $(RMDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR)
++ $(RMDIR) $(DESTDIR)$(ADA_INCLUDE_DIR)
++ -$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR)
++ -$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR)
++ for file in $(RTSDIR)/*.ali; do \
++ $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
++ done
++ -$(INSTALL_DATA) $(RTSDIR)/g-trasym$(objext) $(DESTDIR)$(ADA_RTL_OBJ_DIR)
++ -cd $(RTSDIR); for file in *$(arext);do \
++ $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
++ $(RANLIB_FOR_TARGET) $(DESTDIR)$(ADA_RTL_OBJ_DIR)/$$file; \
++ done
++ -$(foreach file, $(EXTRA_ADALIB_FILES), \
++ $(INSTALL_DATA_DATE) $(RTSDIR)/$(file) $(DESTDIR)$(ADA_RTL_OBJ_DIR) && \
++ ) true
++# Install the shared libraries, if any, using $(INSTALL) instead
++# of $(INSTALL_DATA). The latter may force a mode inappropriate
++# for shared libraries on some targets, e.g. on HP-UX where the x
++# permission is required. We are win32 here.
++ for file in gnat gnarl; do \
++ if [ -f $(RTSDIR)/$(LIBGNAT_SHARED_LIB_PREFIX)$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \
++ $(INSTALL) $(RTSDIR)/$(LIBGNAT_SHARED_LIB_PREFIX)$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ $(DESTDIR)$(bindir); \
++ $(LN_S) $(bindir)/$(LIBGNAT_SHARED_LIB_PREFIX)$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ $(DESTDIR)$(ADA_RTL_OBJ_DIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION).dll.a; \
++ fi; \
++ done
++# This copy must be done preserving the date on the original file.
++ for file in $(RTSDIR)/*.ad?; do \
++ $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_INCLUDE_DIR); \
++ done
++ cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
++ cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
++
+ ../stamp-gnatlib2-$(RTSDIR):
+ $(RM) $(RTSDIR)/s-*.ali
+ $(RM) $(RTSDIR)/s-*$(objext)
+@@ -2774,20 +2835,20 @@ gnatlib-shared-win32:
+ MULTISUBDIR="$(MULTISUBDIR)" \
+ THREAD_KIND="$(THREAD_KIND)" \
+ gnatlib
+- $(RM) $(RTSDIR)/libgna*$(soext)
++ $(RM) $(RTSDIR)/$(LIBGNAT_SHARED_LIB_PREFIX)gna*$(soext)
+ cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
+ | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared -shared-libgcc \
+ $(PICFLAG_FOR_TARGET) \
+- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ -o $(LIBGNAT_SHARED_LIB_PREFIX)gnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
+- $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB)
++ $(SO_OPTS)$(LIBGNAT_SHARED_LIB_PREFIX)gnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB)
+ cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
+ | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared -shared-libgcc \
+ $(PICFLAG_FOR_TARGET) \
+- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ -o $(LIBGNAT_SHARED_LIB_PREFIX)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ $(GNATRTL_TASKING_OBJS) \
+- $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+- $(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)
++ $(SO_OPTS)$(LIBGNAT_SHARED_LIB_PREFIX)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ $(THREADSLIB) -Wl,$(LIBGNAT_SHARED_LIB_PREFIX)gnat$(hyphen)$(LIBRARY_VERSION)$(soext)
+
+ gnatlib-shared-darwin:
+ $(MAKE) $(FLAGS_TO_PASS) \
+diff --git a/gcc/ada/gsocket.h b/gcc/ada/gsocket.h
+index e21d714..c18a891 100644
+--- a/gcc/ada/gsocket.h
++++ b/gcc/ada/gsocket.h
+@@ -199,7 +199,7 @@
+ #endif
+
+ #if defined (_AIX) || defined (__FreeBSD__) || defined (__hpux__) || \
+- defined (_WIN32) || defined (__APPLE__)
++ defined (_WIN32) || defined (__APPLE__) || defined (__CYGWIN__)
+ # define HAVE_THREAD_SAFE_GETxxxBYyyy 1
+
+ #elif defined (linux) || defined (__GLIBC__) || \
+diff --git a/gcc/ada/indepsw-cygwin.adb b/gcc/ada/indepsw-cygwin.adb
+new file mode 100644
+index 0000000..7632cf7
+--- /dev/null
++++ b/gcc/ada/indepsw-cygwin.adb
+@@ -0,0 +1,67 @@
++------------------------------------------------------------------------------
++-- --
++-- GNAT COMPILER COMPONENTS --
++-- --
++-- I N D E P S W --
++-- --
++-- B o d y --
++-- (Windows version) --
++-- --
++-- Copyright (C) 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. --
++-- --
++-- As a special exception under Section 7 of GPL version 3, you are granted --
++-- additional permissions described in the GCC Runtime Library Exception, --
++-- version 3.1, as published by the Free Software Foundation. --
++-- --
++-- You should have received a copy of the GNU General Public License and --
++-- a copy of the GCC Runtime Library Exception along with this program; --
++-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
++-- <http://www.gnu.org/licenses/>. --
++-- --
++-- 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;
+diff --git a/gcc/ada/initialize.c b/gcc/ada/initialize.c
+index 00c4d04..5971f79 100644
+--- a/gcc/ada/initialize.c
++++ b/gcc/ada/initialize.c
+@@ -297,6 +297,40 @@ __gnat_initialize (void *eh ATTRIBUTE_UNUSED)
+ __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
+
+ /* For all other versions of GNAT, the initialize routine and handler
+diff --git a/gcc/ada/mlib-tgt-specific-cygwin.adb b/gcc/ada/mlib-tgt-specific-cygwin.adb
+new file mode 100644
+index 0000000..8e0c0a1
+--- /dev/null
++++ b/gcc/ada/mlib-tgt-specific-cygwin.adb
+@@ -0,0 +1,162 @@
++------------------------------------------------------------------------------
++-- --
++-- 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-2010, 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;
++
++ Shared_Libgcc : aliased String := "-shared-libgcc";
++
++ Shared_Libgcc_Switch : constant Argument_List :=
++ (1 => Shared_Libgcc'Access);
++
++ ---------------------------
++ -- 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 => Shared_Libgcc_Switch,
++ 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;
+diff --git a/gcc/ada/s-gloloc-cygwin.adb b/gcc/ada/s-gloloc-cygwin.adb
+new file mode 100644
+index 0000000..b6050cb
+--- /dev/null
++++ b/gcc/ada/s-gloloc-cygwin.adb
+@@ -0,0 +1,107 @@
++------------------------------------------------------------------------------
++-- --
++-- 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-2010, 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 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. --
++-- --
++-- As a special exception under Section 7 of GPL version 3, you are granted --
++-- additional permissions described in the GCC Runtime Library Exception, --
++-- version 3.1, as published by the Free Software Foundation. --
++-- --
++-- You should have received a copy of the GNU General Public License and --
++-- a copy of the GCC Runtime Library Exception along with this program; --
++-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
++-- <http://www.gnu.org/licenses/>. --
++-- --
++-- 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.OS_Interface;
++with System.Task_Lock;
++with System.Win32;
++
++with Interfaces.C.Strings;
++
++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 Win32.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, Win32.FALSE, ICS.New_String (Name));
++ Lock := L;
++ end Create_Lock;
++
++ ------------------
++ -- Acquire_Lock --
++ ------------------
++
++ procedure Acquire_Lock (Lock : in out Lock_Type) is
++ use type Win32.DWORD;
++
++ Res : Win32.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 Win32.BOOL;
++
++ Res : Win32.BOOL;
++
++ begin
++ Res := OSI.ReleaseMutex (Lock_Table (Lock));
++
++ if Res = Win32.FALSE then
++ raise Lock_Error;
++ end if;
++ end Release_Lock;
++
++end System.Global_Locks;
+diff --git a/gcc/ada/s-oscons-tmplt.c b/gcc/ada/s-oscons-tmplt.c
+index 0964886..e08a079 100644
+--- a/gcc/ada/s-oscons-tmplt.c
++++ b/gcc/ada/s-oscons-tmplt.c
+@@ -973,7 +973,12 @@ CND(VEOL2, "Alternative EOL")
+
+ #endif /* HAVE_TERMIOS */
+
+-#ifdef __MINGW32__
++#ifdef __CYGWIN__
++#define RTS_CONTROL_ENABLE 0x1
++#define DTR_CONTROL_ENABLE 0x1
++#endif
++
++#if defined (__CYGWIN__) || defined (__MINGW32__)
+ CNU(DTR_CONTROL_ENABLE, "Enable DTR flow ctrl")
+ CNU(RTS_CONTROL_ENABLE, "Enable RTS flow ctrl")
+ #endif
+diff --git a/gcc/ada/s-osinte-cygwin.ads b/gcc/ada/s-osinte-cygwin.ads
+new file mode 100644
+index 0000000..2f656d2
+--- /dev/null
++++ b/gcc/ada/s-osinte-cygwin.ads
+@@ -0,0 +1,951 @@
++------------------------------------------------------------------------------
++-- --
++-- 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-2010, 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. --
++-- --
++-- As a special exception under Section 7 of GPL version 3, you are granted --
++-- additional permissions described in the GCC Runtime Library Exception, --
++-- version 3.1, as published by the Free Software Foundation. --
++-- --
++-- You should have received a copy of the GNU General Public License and --
++-- a copy of the GCC Runtime Library Exception along with this program; --
++-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
++-- <http://www.gnu.org/licenses/>. --
++-- --
++-- 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 DeleteCriticalSection
++ (pCriticalSection : access CRITICAL_SECTION);
++ pragma Import (Stdcall, DeleteCriticalSection, "DeleteCriticalSection");
++
++ -------------------------------------------------------------
++ -- Thread Creation, Activation, Suspension And Termination --
++ -------------------------------------------------------------
++
++ subtype ProcessorId is DWORD;
++
++ type PTHREAD_START_ROUTINE is access function
++ (pThreadParameter : PVOID) return DWORD;
++ pragma Convention (Stdcall, PTHREAD_START_ROUTINE);
++
++ function To_PTHREAD_START_ROUTINE is new
++ Ada.Unchecked_Conversion (System.Address, PTHREAD_START_ROUTINE);
++
++ type SECURITY_ATTRIBUTES is record
++ nLength : DWORD;
++ pSecurityDescriptor : PVOID;
++ bInheritHandle : BOOL;
++ end record;
++
++ type PSECURITY_ATTRIBUTES is access all SECURITY_ATTRIBUTES;
++
++ function CreateThread
++ (pThreadAttributes : PSECURITY_ATTRIBUTES;
++ dwStackSize : DWORD;
++ pStartAddress : PTHREAD_START_ROUTINE;
++ pParameter : PVOID;
++ dwCreationFlags : DWORD;
++ pThreadId : PDWORD) return HANDLE;
++ pragma Import (Stdcall, CreateThread, "CreateThread");
++
++ function BeginThreadEx
++ (pThreadAttributes : PSECURITY_ATTRIBUTES;
++ dwStackSize : DWORD;
++ pStartAddress : PTHREAD_START_ROUTINE;
++ pParameter : PVOID;
++ dwCreationFlags : DWORD;
++ pThreadId : PDWORD) return HANDLE;
++ pragma Import (C, BeginThreadEx, "_beginthreadex");
++
++ Debug_Process : constant := 16#00000001#;
++ Debug_Only_This_Process : constant := 16#00000002#;
++ Create_Suspended : constant := 16#00000004#;
++ Detached_Process : constant := 16#00000008#;
++ Create_New_Console : constant := 16#00000010#;
++
++ Create_New_Process_Group : constant := 16#00000200#;
++
++ Create_No_window : constant := 16#08000000#;
++
++ Profile_User : constant := 16#10000000#;
++ Profile_Kernel : constant := 16#20000000#;
++ Profile_Server : constant := 16#40000000#;
++
++ Stack_Size_Param_Is_A_Reservation : constant := 16#00010000#;
++
++ function GetExitCodeThread
++ (hThread : HANDLE;
++ pExitCode : PDWORD) return BOOL;
++ pragma Import (Stdcall, GetExitCodeThread, "GetExitCodeThread");
++
++ function ResumeThread (hThread : HANDLE) return DWORD;
++ pragma Import (Stdcall, ResumeThread, "ResumeThread");
++
++ function SuspendThread (hThread : HANDLE) return DWORD;
++ pragma Import (Stdcall, SuspendThread, "SuspendThread");
++
++ procedure ExitThread (dwExitCode : DWORD);
++ pragma Import (Stdcall, ExitThread, "ExitThread");
++
++ procedure EndThreadEx (dwExitCode : DWORD);
++ pragma Import (C, EndThreadEx, "_endthreadex");
++
++ function TerminateThread
++ (hThread : HANDLE;
++ dwExitCode : DWORD) return BOOL;
++ pragma Import (Stdcall, TerminateThread, "TerminateThread");
++
++ function GetCurrentThread return HANDLE;
++ pragma Import (Stdcall, GetCurrentThread, "GetCurrentThread");
++
++ function GetCurrentProcess return HANDLE;
++ pragma Import (Stdcall, GetCurrentProcess, "GetCurrentProcess");
++
++ function GetCurrentThreadId return DWORD;
++ pragma Import (Stdcall, GetCurrentThreadId, "GetCurrentThreadId");
++
++ function TlsAlloc return DWORD;
++ pragma Import (Stdcall, TlsAlloc, "TlsAlloc");
++
++ function TlsGetValue (dwTlsIndex : DWORD) return PVOID;
++ pragma Import (Stdcall, TlsGetValue, "TlsGetValue");
++
++ function TlsSetValue (dwTlsIndex : DWORD; pTlsValue : PVOID) return BOOL;
++ pragma Import (Stdcall, TlsSetValue, "TlsSetValue");
++
++ function TlsFree (dwTlsIndex : DWORD) return BOOL;
++ pragma Import (Stdcall, TlsFree, "TlsFree");
++
++ TLS_Nothing : constant := DWORD'Last;
++
++ procedure ExitProcess (uExitCode : Interfaces.C.unsigned);
++ pragma Import (Stdcall, ExitProcess, "ExitProcess");
++
++ function WaitForSingleObject
++ (hHandle : HANDLE;
++ dwMilliseconds : DWORD) return DWORD;
++ pragma Import (Stdcall, WaitForSingleObject, "WaitForSingleObject");
++
++ function WaitForSingleObjectEx
++ (hHandle : HANDLE;
++ dwMilliseconds : DWORD;
++ fAlertable : BOOL) return DWORD;
++ pragma Import (Stdcall, WaitForSingleObjectEx, "WaitForSingleObjectEx");
++
++ function SetThreadIdealProcessor
++ (hThread : HANDLE;
++ dwIdealProcessor : ProcessorId) return DWORD;
++ pragma Import (Stdcall, SetThreadIdealProcessor, "SetThreadIdealProcessor");
++
++ Wait_Infinite : constant := DWORD'Last;
++ WAIT_TIMEOUT : constant := 16#0000_0102#;
++ WAIT_FAILED : constant := 16#FFFF_FFFF#;
++
++ ------------------------------------
++ -- Semaphores, Events and Mutexes --
++ ------------------------------------
++
++ function CloseHandle (hObject : HANDLE) return BOOL;
++ pragma Import (Stdcall, CloseHandle, "CloseHandle");
++
++ function CreateSemaphore
++ (pSemaphoreAttributes : PSECURITY_ATTRIBUTES;
++ lInitialCount : Interfaces.C.long;
++ lMaximumCount : Interfaces.C.long;
++ pName : PSZ) return HANDLE;
++ pragma Import (Stdcall, CreateSemaphore, "CreateSemaphoreA");
++
++ function OpenSemaphore
++ (dwDesiredAccess : DWORD;
++ bInheritHandle : BOOL;
++ pName : PSZ) return HANDLE;
++ pragma Import (Stdcall, OpenSemaphore, "OpenSemaphoreA");
++
++ function ReleaseSemaphore
++ (hSemaphore : HANDLE;
++ lReleaseCount : Interfaces.C.long;
++ pPreviousCount : PLONG) return BOOL;
++ pragma Import (Stdcall, ReleaseSemaphore, "ReleaseSemaphore");
++
++ function CreateEvent
++ (pEventAttributes : PSECURITY_ATTRIBUTES;
++ bManualReset : BOOL;
++ bInitialState : BOOL;
++ pName : PSZ) return HANDLE;
++ pragma Import (Stdcall, CreateEvent, "CreateEventA");
++
++ function OpenEvent
++ (dwDesiredAccess : DWORD;
++ bInheritHandle : BOOL;
++ pName : PSZ) return HANDLE;
++ pragma Import (Stdcall, OpenEvent, "OpenEventA");
++
++ function SetEvent (hEvent : HANDLE) return BOOL;
++ pragma Import (Stdcall, SetEvent, "SetEvent");
++
++ function ResetEvent (hEvent : HANDLE) return BOOL;
++ pragma Import (Stdcall, ResetEvent, "ResetEvent");
++
++ function PulseEvent (hEvent : HANDLE) return BOOL;
++ pragma Import (Stdcall, PulseEvent, "PulseEvent");
++
++ function CreateMutex
++ (pMutexAttributes : PSECURITY_ATTRIBUTES;
++ bInitialOwner : BOOL;
++ pName : PSZ) return HANDLE;
++ pragma Import (Stdcall, CreateMutex, "CreateMutexA");
++
++ function OpenMutex
++ (dwDesiredAccess : DWORD;
++ bInheritHandle : BOOL;
++ pName : PSZ) return HANDLE;
++ pragma Import (Stdcall, OpenMutex, "OpenMutexA");
++
++ function ReleaseMutex (hMutex : HANDLE) return BOOL;
++ pragma Import (Stdcall, ReleaseMutex, "ReleaseMutex");
++
++ ---------------------------------------------------
++ -- Accessing properties of Threads and Processes --
++ ---------------------------------------------------
++
++ -----------------
++ -- Priorities --
++ -----------------
++
++ function SetThreadPriority
++ (hThread : HANDLE;
++ nPriority : Interfaces.C.int) return BOOL;
++ pragma Import (Stdcall, SetThreadPriority, "SetThreadPriority");
++
++ function GetThreadPriority (hThread : HANDLE) return Interfaces.C.int;
++ pragma Import (Stdcall, GetThreadPriority, "GetThreadPriority");
++
++ function SetPriorityClass
++ (hProcess : HANDLE;
++ dwPriorityClass : DWORD) return BOOL;
++ pragma Import (Stdcall, SetPriorityClass, "SetPriorityClass");
++
++ procedure SetThreadPriorityBoost
++ (hThread : HANDLE;
++ DisablePriorityBoost : BOOL);
++ pragma Import (Stdcall, SetThreadPriorityBoost, "SetThreadPriorityBoost");
++
++ Normal_Priority_Class : constant := 16#00000020#;
++ Idle_Priority_Class : constant := 16#00000040#;
++ High_Priority_Class : constant := 16#00000080#;
++ Realtime_Priority_Class : constant := 16#00000100#;
++
++ Thread_Priority_Idle : constant := -15;
++ Thread_Priority_Lowest : constant := -2;
++ Thread_Priority_Below_Normal : constant := -1;
++ Thread_Priority_Normal : constant := 0;
++ Thread_Priority_Above_Normal : constant := 1;
++ Thread_Priority_Highest : constant := 2;
++ Thread_Priority_Time_Critical : constant := 15;
++ Thread_Priority_Error_Return : constant := Interfaces.C.long'Last;
++
++ function GetLastError return DWORD;
++ pragma Import (Stdcall, GetLastError, "GetLastError");
++
++private
++
++ type sigset_t is array (0 .. 127) of unsigned_char;
++ pragma Convention (C, sigset_t);
++ for sigset_t'Alignment use unsigned_long'Alignment;
++
++ type pid_t is new int;
++
++ type time_t is new long;
++
++ type timespec is record
++ tv_sec : time_t;
++ tv_nsec : long;
++ end record;
++ pragma Convention (C, timespec);
++
++ type struct_timeval is record
++ tv_sec : time_t;
++ tv_usec : time_t;
++ end record;
++ pragma Convention (C, struct_timeval);
++
++ type pthread_attr_t is record
++ detachstate : int;
++ schedpolicy : int;
++ schedparam : struct_sched_param;
++ inheritsched : int;
++ scope : int;
++ guardsize : size_t;
++ stackaddr_set : int;
++ stackaddr : System.Address;
++ stacksize : size_t;
++ end record;
++ pragma Convention (C, pthread_attr_t);
++
++ type pthread_condattr_t is record
++ dummy : int;
++ end record;
++ pragma Convention (C, pthread_condattr_t);
++
++ type pthread_mutexattr_t is record
++ mutexkind : int;
++ end record;
++ pragma Convention (C, pthread_mutexattr_t);
++
++ type struct_pthread_fast_lock is record
++ status : long;
++ spinlock : int;
++ end record;
++ pragma Convention (C, struct_pthread_fast_lock);
++
++ type pthread_mutex_t is record
++ m_reserved : int;
++ m_count : int;
++ m_owner : System.Address;
++ m_kind : int;
++ m_lock : struct_pthread_fast_lock;
++ end record;
++ pragma Convention (C, pthread_mutex_t);
++
++ type pthread_cond_t is array (0 .. 47) of unsigned_char;
++ pragma Convention (C, pthread_cond_t);
++
++ type pthread_key_t is new unsigned;
++
++ -------------------
++ -- Win32 private --
++ -------------------
++
++ type CRITICAL_SECTION is record
++ DebugInfo : System.Address;
++ -- The following three fields control entering and
++ -- exiting the critical section for the resource
++ LockCount : Long_Integer;
++ RecursionCount : Long_Integer;
++ OwningThread : HANDLE;
++ LockSemaphore : HANDLE;
++ Reserved : DWORD;
++ end record;
++
++end System.OS_Interface;
+diff --git a/gcc/ada/s-taprop-cygwin.adb b/gcc/ada/s-taprop-cygwin.adb
+new file mode 100644
+index 0000000..782af9d
+--- /dev/null
++++ b/gcc/ada/s-taprop-cygwin.adb
+@@ -0,0 +1,1337 @@
++------------------------------------------------------------------------------
++-- --
++-- GNU ADA RUN-TIME LIBRARY (GNARL) COMPONENTS --
++-- --
++-- S Y S T E M . T A S K _ P R I M I T I V E S . O P E R A T I O N S --
++-- --
++-- B o d y --
++-- --
++-- Copyright (C) 1992-2011, 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 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. --
++-- --
++-- As a special exception under Section 7 of GPL version 3, you are granted --
++-- additional permissions described in the GCC Runtime Library Exception, --
++-- version 3.1, as published by the Free Software Foundation. --
++-- --
++-- You should have received a copy of the GNU General Public License and --
++-- a copy of the GCC Runtime Library Exception along with this program; --
++-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
++-- <http://www.gnu.org/licenses/>. --
++-- --
++-- 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 contains all the GNULL primitives that interface directly
++-- with the underlying OS.
++
++pragma Polling (Off);
++-- Turn off polling, we do not want ATC polling to take place during
++-- tasking operations. It causes infinite loops and other problems.
++
++with Interfaces.C;
++-- used for int
++-- size_t
++
++with System.Task_Info;
++-- used for Unspecified_Task_Info
++
++with System.Tasking.Debug;
++-- used for Known_Tasks
++
++with System.Interrupt_Management;
++-- used for Keep_Unmasked
++-- Abort_Task_Interrupt
++-- Interrupt_ID
++
++with System.OS_Primitives;
++-- used for Delay_Modes
++
++with System.Soft_Links;
++-- used for Abort_Defer/Undefer
++
++-- We use System.Soft_Links instead of System.Tasking.Initialization
++-- because the later is a higher level package that we shouldn't depend on.
++-- For example when using the restricted run time, it is replaced by
++-- System.Tasking.Restricted.Stages.
++
++with System.Storage_Elements;
++with System.Stack_Checking.Operations;
++-- Used for Invalidate_Stack_Cache and Notify_Stack_Attributes;
++
++with Ada.Exceptions;
++-- used for Raise_Exception
++-- Raise_From_Signal_Handler
++-- Exception_Id
++
++with Ada.Unchecked_Conversion;
++with Ada.Unchecked_Deallocation;
++
++package body System.Task_Primitives.Operations is
++
++ package SSL renames System.Soft_Links;
++ package SC renames System.Stack_Checking.Operations;
++
++ use System.Tasking.Debug;
++ use System.Tasking;
++ use Interfaces.C;
++ use System.OS_Interface;
++ use System.Parameters;
++ use System.OS_Primitives;
++ use System.Storage_Elements;
++ use System.Task_Info;
++
++ ----------------
++ -- Local Data --
++ ----------------
++
++ -- The followings are logically constants, but need to be initialized
++ -- at run time.
++
++ Single_RTS_Lock : aliased RTS_Lock;
++ -- This is a lock to allow only one thread of control in the RTS at
++ -- a time; it is used to execute in mutual exclusion from all other tasks.
++ -- Used mainly in Single_Lock mode, but also to protect All_Tasks_List
++
++ ATCB_Key : aliased pthread_key_t;
++ -- Key used to find the Ada Task_Id associated with a thread
++
++ Environment_Task_Id : Task_Id;
++ -- A variable to hold Task_Id for the environment task
++
++ Unblocked_Signal_Mask : aliased sigset_t;
++ -- The set of signals that should be unblocked in all tasks
++
++ -- The followings are internal configuration constants needed
++
++ Next_Serial_Number : Task_Serial_Number := 100;
++ -- We start at 100 (reserve some special values for using in error checks)
++
++ Time_Slice_Val : Integer;
++ pragma Import (C, Time_Slice_Val, "__gl_time_slice_val");
++
++ Dispatching_Policy : Character;
++ pragma Import (C, Dispatching_Policy, "__gl_task_dispatching_policy");
++
++ -- The following are effectively constants, but they need to be initialized
++ -- by calling a pthread_ function.
++
++ Mutex_Attr : aliased pthread_mutexattr_t;
++ Cond_Attr : aliased pthread_condattr_t;
++
++ Foreign_Task_Elaborated : aliased Boolean := True;
++ -- Used to identified fake tasks (i.e., non-Ada Threads)
++
++ --------------------
++ -- Local Packages --
++ --------------------
++
++ package Specific is
++
++ procedure Initialize (Environment_Task : Task_Id);
++ pragma Inline (Initialize);
++ -- Initialize various data needed by this package
++
++ function Is_Valid_Task return Boolean;
++ pragma Inline (Is_Valid_Task);
++ -- Does executing thread have a TCB?
++
++ procedure Set (Self_Id : Task_Id);
++ pragma Inline (Set);
++ -- Set the self id for the current task
++
++ function Self return Task_Id;
++ pragma Inline (Self);
++ -- Return a pointer to the Ada Task Control Block of the calling task
++
++ end Specific;
++
++ package body Specific is separate;
++ -- The body of this package is target specific
++
++ ---------------------------------
++ -- Support for foreign threads --
++ ---------------------------------
++
++ function Register_Foreign_Thread (Thread : Thread_Id) return Task_Id;
++ -- Allocate and Initialize a new ATCB for the current Thread
++
++ function Register_Foreign_Thread
++ (Thread : Thread_Id) return Task_Id is separate;
++
++ -----------------------
++ -- Local Subprograms --
++ -----------------------
++
++ subtype unsigned_long is Interfaces.C.unsigned_long;
++
++ procedure Abort_Handler (signo : Signal);
++
++ function To_pthread_t is new Ada.Unchecked_Conversion
++ (unsigned_long, System.OS_Interface.pthread_t);
++
++ procedure Get_Stack_Attributes
++ (T : Task_Id;
++ ISP : out System.Address;
++ Size : out Storage_Offset);
++ -- Fill ISP and Size with the Initial Stack Pointer value and the
++ -- thread stack size for task T.
++
++ -------------------
++ -- Abort_Handler --
++ -------------------
++
++ procedure Abort_Handler (signo : Signal) is
++ pragma Unreferenced (signo);
++
++ Self_Id : constant Task_Id := Self;
++ Result : Interfaces.C.int;
++ Old_Set : aliased sigset_t;
++
++ begin
++ if ZCX_By_Default and then GCC_ZCX_Support then
++ return;
++ end if;
++
++ if Self_Id.Deferral_Level = 0
++ and then Self_Id.Pending_ATC_Level < Self_Id.ATC_Nesting_Level
++ and then not Self_Id.Aborting
++ then
++ Self_Id.Aborting := True;
++
++ -- Make sure signals used for RTS internal purpose are unmasked
++
++ Result :=
++ pthread_sigmask
++ (SIG_UNBLOCK,
++ Unblocked_Signal_Mask'Access,
++ Old_Set'Access);
++ pragma Assert (Result = 0);
++
++ raise Standard'Abort_Signal;
++ end if;
++ end Abort_Handler;
++
++ --------------
++ -- Lock_RTS --
++ --------------
++
++ procedure Lock_RTS is
++ begin
++ Write_Lock (Single_RTS_Lock'Access, Global_Lock => True);
++ end Lock_RTS;
++
++ ----------------
++ -- Unlock_RTS --
++ ----------------
++
++ procedure Unlock_RTS is
++ begin
++ Unlock (Single_RTS_Lock'Access, Global_Lock => True);
++ end Unlock_RTS;
++
++ -----------------
++ -- Stack_Guard --
++ -----------------
++
++ -- The underlying thread system extends the memory (up to 2MB) when needed
++
++ procedure Stack_Guard (T : ST.Task_Id; On : Boolean) is
++ pragma Unreferenced (T);
++ pragma Unreferenced (On);
++ begin
++ null;
++ end Stack_Guard;
++
++ --------------------
++ -- Get_Thread_Id --
++ --------------------
++
++ function Get_Thread_Id (T : ST.Task_Id) return OSI.Thread_Id is
++ begin
++ return T.Common.LL.Thread;
++ end Get_Thread_Id;
++
++ ----------
++ -- Self --
++ ----------
++
++ function Self return Task_Id renames Specific.Self;
++
++ ---------------------
++ -- Initialize_Lock --
++ ---------------------
++
++ -- Note: mutexes and cond_variables needed per-task basis are
++ -- initialized in Initialize_TCB and the Storage_Error is
++ -- handled. Other mutexes (such as RTS_Lock, Memory_Lock...)
++ -- used in RTS is initialized before any status change of RTS.
++ -- Therefore rasing Storage_Error in the following routines
++ -- should be able to be handled safely.
++
++ procedure Initialize_Lock
++ (Prio : System.Any_Priority;
++ L : not null access Lock)
++ is
++ pragma Unreferenced (Prio);
++
++ Result : Interfaces.C.int;
++
++ begin
++ Result := pthread_mutex_init (L, Mutex_Attr'Access);
++
++ pragma Assert (Result = 0 or else Result = ENOMEM);
++
++ if Result = ENOMEM then
++ Ada.Exceptions.Raise_Exception (Storage_Error'Identity,
++ "Failed to allocate a lock");
++ end if;
++ end Initialize_Lock;
++
++ procedure Initialize_Lock
++ (L : not null access RTS_Lock;
++ Level : Lock_Level)
++ is
++ pragma Unreferenced (Level);
++
++ Result : Interfaces.C.int;
++
++ begin
++ Result := pthread_mutex_init (L, Mutex_Attr'Access);
++
++ pragma Assert (Result = 0 or else Result = ENOMEM);
++
++ if Result = ENOMEM then
++ raise Storage_Error;
++ end if;
++ end Initialize_Lock;
++
++ -------------------
++ -- Finalize_Lock --
++ -------------------
++
++ procedure Finalize_Lock (L : not null access Lock) is
++ Result : Interfaces.C.int;
++ begin
++ Result := pthread_mutex_destroy (L);
++ pragma Assert (Result = 0);
++ end Finalize_Lock;
++
++ procedure Finalize_Lock (L : not null access RTS_Lock) is
++ Result : Interfaces.C.int;
++ begin
++ Result := pthread_mutex_destroy (L);
++ pragma Assert (Result = 0);
++ end Finalize_Lock;
++
++ ----------------
++ -- Write_Lock --
++ ----------------
++
++ procedure Write_Lock
++ (L : not null access Lock;
++ Ceiling_Violation : out Boolean)
++ is
++ Result : Interfaces.C.int;
++ begin
++ Result := pthread_mutex_lock (L);
++ Ceiling_Violation := Result = EINVAL;
++
++ -- Assume the cause of EINVAL is a priority ceiling violation
++
++ pragma Assert (Result = 0 or else Result = EINVAL);
++ end Write_Lock;
++
++ procedure Write_Lock
++ (L : not null access RTS_Lock;
++ Global_Lock : Boolean := False)
++ is
++ Result : Interfaces.C.int;
++ begin
++ if not Single_Lock or else Global_Lock then
++ Result := pthread_mutex_lock (L);
++ pragma Assert (Result = 0);
++ end if;
++ end Write_Lock;
++
++ procedure Write_Lock (T : Task_Id) is
++ Result : Interfaces.C.int;
++ begin
++ if not Single_Lock then
++ Result := pthread_mutex_lock (T.Common.LL.L'Access);
++ pragma Assert (Result = 0);
++ end if;
++ end Write_Lock;
++
++ ---------------
++ -- Read_Lock --
++ ---------------
++
++ procedure Read_Lock
++ (L : not null access Lock;
++ Ceiling_Violation : out Boolean)
++ is
++ begin
++ Write_Lock (L, Ceiling_Violation);
++ end Read_Lock;
++
++ ------------
++ -- Unlock --
++ ------------
++
++ procedure Unlock (L : not null access Lock) is
++ Result : Interfaces.C.int;
++ begin
++ Result := pthread_mutex_unlock (L);
++ pragma Assert (Result = 0);
++ end Unlock;
++
++ procedure Unlock
++ (L : not null access RTS_Lock;
++ Global_Lock : Boolean := False)
++ is
++ Result : Interfaces.C.int;
++ begin
++ if not Single_Lock or else Global_Lock then
++ Result := pthread_mutex_unlock (L);
++ pragma Assert (Result = 0);
++ end if;
++ end Unlock;
++
++ procedure Unlock (T : Task_Id) is
++ Result : Interfaces.C.int;
++ begin
++ if not Single_Lock then
++ Result := pthread_mutex_unlock (T.Common.LL.L'Access);
++ pragma Assert (Result = 0);
++ end if;
++ end Unlock;
++
++ -----------------
++ -- Set_Ceiling --
++ -----------------
++
++ -- Dynamic priority ceilings are not supported by the underlying system
++
++ procedure Set_Ceiling
++ (L : not null access Lock;
++ Prio : System.Any_Priority)
++ is
++ pragma Unreferenced (L, Prio);
++ begin
++ null;
++ end Set_Ceiling;
++
++ -----------
++ -- Sleep --
++ -----------
++
++ procedure Sleep
++ (Self_ID : Task_Id;
++ Reason : System.Tasking.Task_States)
++ is
++ pragma Unreferenced (Reason);
++
++ Result : Interfaces.C.int;
++
++ begin
++ pragma Assert (Self_ID = Self);
++
++ if Single_Lock then
++ Result :=
++ pthread_cond_wait
++ (Self_ID.Common.LL.CV'Access, Single_RTS_Lock'Access);
++ else
++ Result :=
++ pthread_cond_wait
++ (Self_ID.Common.LL.CV'Access, Self_ID.Common.LL.L'Access);
++ end if;
++
++ -- EINTR is not considered a failure
++
++ pragma Assert (Result = 0 or else Result = EINTR);
++ end Sleep;
++
++ -----------------
++ -- Timed_Sleep --
++ -----------------
++
++ -- This is for use within the run-time system, so abort is
++ -- assumed to be already deferred, and the caller should be
++ -- holding its own ATCB lock.
++
++ procedure Timed_Sleep
++ (Self_ID : Task_Id;
++ Time : Duration;
++ Mode : ST.Delay_Modes;
++ Reason : System.Tasking.Task_States;
++ Timedout : out Boolean;
++ Yielded : out Boolean)
++ is
++ pragma Unreferenced (Reason);
++
++ Base_Time : constant Duration := Monotonic_Clock;
++ Check_Time : Duration := Base_Time;
++ Abs_Time : Duration;
++ Request : aliased timespec;
++ Result : Interfaces.C.int;
++
++ begin
++ Timedout := True;
++ Yielded := False;
++
++ if Mode = Relative then
++ Abs_Time := Duration'Min (Time, Max_Sensible_Delay) + Check_Time;
++ else
++ Abs_Time := Duration'Min (Check_Time + Max_Sensible_Delay, Time);
++ end if;
++
++ if Abs_Time > Check_Time then
++ Request := To_Timespec (Abs_Time);
++
++ loop
++ exit when Self_ID.Pending_ATC_Level < Self_ID.ATC_Nesting_Level;
++
++ if Single_Lock then
++ Result :=
++ pthread_cond_timedwait
++ (Self_ID.Common.LL.CV'Access,
++ Single_RTS_Lock'Access,
++ Request'Access);
++
++ else
++ Result :=
++ pthread_cond_timedwait
++ (Self_ID.Common.LL.CV'Access,
++ Self_ID.Common.LL.L'Access,
++ Request'Access);
++ end if;
++
++ Check_Time := Monotonic_Clock;
++ exit when Abs_Time <= Check_Time or else Check_Time < Base_Time;
++
++ if Result = 0 or else Result = EINTR then
++
++ -- Somebody may have called Wakeup for us
++
++ Timedout := False;
++ exit;
++ end if;
++
++ pragma Assert (Result = ETIMEDOUT);
++ end loop;
++ end if;
++ end Timed_Sleep;
++
++ -----------------
++ -- Timed_Delay --
++ -----------------
++
++ -- This is for use in implementing delay statements, so we assume the
++ -- caller is abort-deferred but is holding no locks.
++
++ procedure Timed_Delay
++ (Self_ID : Task_Id;
++ Time : Duration;
++ Mode : ST.Delay_Modes)
++ is
++ Base_Time : constant Duration := Monotonic_Clock;
++ Check_Time : Duration := Base_Time;
++ Abs_Time : Duration;
++ Request : aliased timespec;
++
++ Result : Interfaces.C.int;
++ pragma Warnings (Off, Result);
++
++ begin
++ if Single_Lock then
++ Lock_RTS;
++ end if;
++
++ Write_Lock (Self_ID);
++
++ if Mode = Relative then
++ Abs_Time := Time + Check_Time;
++ else
++ Abs_Time := Duration'Min (Check_Time + Max_Sensible_Delay, Time);
++ end if;
++
++ if Abs_Time > Check_Time then
++ Request := To_Timespec (Abs_Time);
++ Self_ID.Common.State := Delay_Sleep;
++
++ loop
++ exit when Self_ID.Pending_ATC_Level < Self_ID.ATC_Nesting_Level;
++
++ if Single_Lock then
++ Result := pthread_cond_timedwait
++ (Self_ID.Common.LL.CV'Access,
++ Single_RTS_Lock'Access,
++ Request'Access);
++ else
++ Result := pthread_cond_timedwait
++ (Self_ID.Common.LL.CV'Access,
++ Self_ID.Common.LL.L'Access,
++ Request'Access);
++ end if;
++
++ Check_Time := Monotonic_Clock;
++ exit when Abs_Time <= Check_Time or else Check_Time < Base_Time;
++
++ pragma Assert (Result = 0 or else
++ Result = ETIMEDOUT or else
++ Result = EINTR);
++ end loop;
++
++ Self_ID.Common.State := Runnable;
++ end if;
++
++ Unlock (Self_ID);
++
++ if Single_Lock then
++ Unlock_RTS;
++ end if;
++
++ Result := sched_yield;
++ end Timed_Delay;
++
++ ---------------------
++ -- Monotonic_Clock --
++ ---------------------
++
++ function Monotonic_Clock return Duration is
++ TV : aliased struct_timeval;
++ Result : Interfaces.C.int;
++ begin
++ Result := gettimeofday (TV'Access, System.Null_Address);
++ pragma Assert (Result = 0);
++ return To_Duration (TV);
++ end Monotonic_Clock;
++
++ -------------------
++ -- RT_Resolution --
++ -------------------
++
++ function RT_Resolution return Duration is
++ begin
++ return 10#1.0#E-6;
++ end RT_Resolution;
++
++ ------------
++ -- Wakeup --
++ ------------
++
++ procedure Wakeup (T : Task_Id; Reason : System.Tasking.Task_States) is
++ pragma Unreferenced (Reason);
++ Result : Interfaces.C.int;
++ begin
++ Result := pthread_cond_signal (T.Common.LL.CV'Access);
++ pragma Assert (Result = 0);
++ end Wakeup;
++
++ -----------
++ -- Yield --
++ -----------
++
++ procedure Yield (Do_Yield : Boolean := True) is
++ Result : Interfaces.C.int;
++ pragma Unreferenced (Result);
++ begin
++ if Do_Yield then
++ Result := sched_yield;
++ end if;
++ end Yield;
++
++ ------------------
++ -- Set_Priority --
++ ------------------
++
++ procedure Set_Priority
++ (T : Task_Id;
++ Prio : System.Any_Priority;
++ Loss_Of_Inheritance : Boolean := False)
++ is
++ pragma Unreferenced (Loss_Of_Inheritance);
++
++ Result : Interfaces.C.int;
++ Param : aliased struct_sched_param;
++
++ function Get_Policy (Prio : System.Any_Priority) return Character;
++ pragma Import (C, Get_Policy, "__gnat_get_specific_dispatching");
++ -- Get priority specific dispatching policy
++
++ Priority_Specific_Policy : constant Character := Get_Policy (Prio);
++ -- Upper case first character of the policy name corresponding to the
++ -- task as set by a Priority_Specific_Dispatching pragma.
++
++ begin
++ T.Common.Current_Priority := Prio;
++
++ -- Priorities on Cygwin follow Win32 standards, we use the
++ -- MinGW conversion table.
++
++ Param.sched_priority := Interfaces.C.int (Underlying_Priorities (Prio));
++
++ if Dispatching_Policy = 'R'
++ or else Priority_Specific_Policy = 'R'
++ or else Time_Slice_Val > 0
++ then
++ Result :=
++ pthread_setschedparam
++ (T.Common.LL.Thread, SCHED_RR, Param'Access);
++
++ elsif Dispatching_Policy = 'F'
++ or else Priority_Specific_Policy = 'F'
++ or else Time_Slice_Val = 0
++ then
++ Result :=
++ pthread_setschedparam
++ (T.Common.LL.Thread, SCHED_FIFO, Param'Access);
++
++ else
++ Param.sched_priority := 0;
++ Result :=
++ pthread_setschedparam
++ (T.Common.LL.Thread,
++ SCHED_OTHER, Param'Access);
++ end if;
++
++ pragma Assert (Result = 0 or else Result = EPERM);
++ end Set_Priority;
++
++ ------------------
++ -- Get_Priority --
++ ------------------
++
++ function Get_Priority (T : Task_Id) return System.Any_Priority is
++ begin
++ return T.Common.Current_Priority;
++ end Get_Priority;
++
++ --------------------------
++ -- Get_Stack_Attributes --
++ --------------------------
++
++ procedure Get_Stack_Attributes
++ (T : Task_Id;
++ ISP : out System.Address;
++ Size : out Storage_Offset)
++ is
++ function pthread_getattr_np
++ (thread : pthread_t;
++ attr : System.Address) return Interfaces.C.int;
++ pragma Import (C, pthread_getattr_np, "pthread_getattr_np");
++
++ function pthread_attr_getstack
++ (attr : System.Address;
++ base : System.Address;
++ size : System.Address) return Interfaces.C.int;
++ pragma Import (C, pthread_attr_getstack, "pthread_attr_getstack");
++
++ Result : Interfaces.C.int;
++
++ Attributes : aliased pthread_attr_t;
++ Stack_Base : aliased System.Address;
++ Stack_Size : aliased Storage_Offset;
++
++ begin
++ Result :=
++ pthread_getattr_np
++ (T.Common.LL.Thread, Attributes'Address);
++ pragma Assert (Result = 0);
++
++ Result :=
++ pthread_attr_getstack
++ (Attributes'Address, Stack_Base'Address, Stack_Size'Address);
++ pragma Assert (Result = 0);
++
++ Result := pthread_attr_destroy (Attributes'Access);
++ pragma Assert (Result = 0);
++
++ ISP := Stack_Base + Stack_Size;
++ Size := Stack_Size;
++ end Get_Stack_Attributes;
++
++ ----------------
++ -- Enter_Task --
++ ----------------
++
++ procedure Enter_Task (Self_ID : Task_Id) is
++ begin
++ if Self_ID.Common.Task_Info /= null
++ and then
++ Self_ID.Common.Task_Info.CPU_Affinity = No_CPU
++ then
++ raise Invalid_CPU_Number;
++ end if;
++
++ Self_ID.Common.LL.Thread := pthread_self;
++
++ Specific.Set (Self_ID);
++
++ Lock_RTS;
++
++ for J in Known_Tasks'Range loop
++ if Known_Tasks (J) = null then
++ Known_Tasks (J) := Self_ID;
++ Self_ID.Known_Tasks_Index := J;
++ exit;
++ end if;
++ end loop;
++
++ Unlock_RTS;
++
++ -- Determine where the task stack starts, how large it is, and let the
++ -- stack checking engine know about it.
++
++ declare
++ Initial_SP : System.Address;
++ Stack_Size : Storage_Offset;
++ begin
++ Get_Stack_Attributes (Self_ID, Initial_SP, Stack_Size);
++ System.Stack_Checking.Operations.Notify_Stack_Attributes
++ (Initial_SP, Stack_Size);
++ end;
++ end Enter_Task;
++
++ --------------
++ -- New_ATCB --
++ --------------
++
++ function New_ATCB (Entry_Num : Task_Entry_Index) return Task_Id is
++ begin
++ return new Ada_Task_Control_Block (Entry_Num);
++ end New_ATCB;
++
++ -------------------
++ -- Is_Valid_Task --
++ -------------------
++
++ function Is_Valid_Task return Boolean renames Specific.Is_Valid_Task;
++
++ -----------------------------
++ -- Register_Foreign_Thread --
++ -----------------------------
++
++ function Register_Foreign_Thread return Task_Id is
++ begin
++ if Is_Valid_Task then
++ return Self;
++ else
++ return Register_Foreign_Thread (pthread_self);
++ end if;
++ end Register_Foreign_Thread;
++
++ --------------------
++ -- Initialize_TCB --
++ --------------------
++
++ procedure Initialize_TCB (Self_ID : Task_Id; Succeeded : out Boolean) is
++ Result : Interfaces.C.int;
++
++ begin
++ -- Give the task a unique serial number
++
++ Self_ID.Serial_Number := Next_Serial_Number;
++ Next_Serial_Number := Next_Serial_Number + 1;
++ pragma Assert (Next_Serial_Number /= 0);
++
++ Self_ID.Common.LL.Thread := To_pthread_t (-1);
++
++ if not Single_Lock then
++ Result := pthread_mutex_init (Self_ID.Common.LL.L'Access,
++ Mutex_Attr'Access);
++ pragma Assert (Result = 0 or else Result = ENOMEM);
++
++ if Result /= 0 then
++ Succeeded := False;
++ return;
++ end if;
++ end if;
++
++ Result := pthread_cond_init (Self_ID.Common.LL.CV'Access,
++ Cond_Attr'Access);
++ pragma Assert (Result = 0 or else Result = ENOMEM);
++
++ if Result = 0 then
++ Succeeded := True;
++ else
++ if not Single_Lock then
++ Result := pthread_mutex_destroy (Self_ID.Common.LL.L'Access);
++ pragma Assert (Result = 0);
++ end if;
++
++ Succeeded := False;
++ end if;
++ end Initialize_TCB;
++
++ -----------------
++ -- Create_Task --
++ -----------------
++
++ procedure Create_Task
++ (T : Task_Id;
++ Wrapper : System.Address;
++ Stack_Size : System.Parameters.Size_Type;
++ Priority : System.Any_Priority;
++ Succeeded : out Boolean)
++ is
++ Attributes : aliased pthread_attr_t;
++ Result : Interfaces.C.int;
++
++ begin
++ Result := pthread_attr_init (Attributes'Access);
++ pragma Assert (Result = 0 or else Result = ENOMEM);
++
++ if Result /= 0 then
++ Succeeded := False;
++ return;
++ end if;
++
++ Result :=
++ pthread_attr_setstacksize
++ (Attributes'Access, Interfaces.C.size_t (Stack_Size));
++ pragma Assert (Result = 0);
++
++ Result :=
++ pthread_attr_setdetachstate
++ (Attributes'Access, PTHREAD_CREATE_DETACHED);
++ pragma Assert (Result = 0);
++
++ -- Since the initial signal mask of a thread is inherited from the
++ -- creator, and the Environment task has all its signals masked, we
++ -- do not need to manipulate caller's signal mask at this point.
++ -- All tasks in RTS will have All_Tasks_Mask initially.
++
++ Result := pthread_create
++ (T.Common.LL.Thread'Access,
++ Attributes'Access,
++ Thread_Body_Access (Wrapper),
++ To_Address (T));
++ pragma Assert (Result = 0 or else Result = EAGAIN);
++
++ Succeeded := Result = 0;
++
++ -- Handle Task_Info
++
++ if T.Common.Task_Info /= null then
++ if T.Common.Task_Info.CPU_Affinity /= Task_Info.Any_CPU then
++ Result :=
++ pthread_setaffinity_np
++ (T.Common.LL.Thread,
++ CPU_SETSIZE / 8,
++ T.Common.Task_Info.CPU_Affinity'Access);
++ pragma Assert (Result = 0);
++ end if;
++ end if;
++
++ Result := pthread_attr_destroy (Attributes'Access);
++ pragma Assert (Result = 0);
++
++ Set_Priority (T, Priority);
++ end Create_Task;
++
++ ------------------
++ -- Finalize_TCB --
++ ------------------
++
++ procedure Finalize_TCB (T : Task_Id) is
++ Result : Interfaces.C.int;
++ Tmp : Task_Id := T;
++ Is_Self : constant Boolean := T = Self;
++
++ procedure Free is new
++ Ada.Unchecked_Deallocation (Ada_Task_Control_Block, Task_Id);
++
++ begin
++ if not Single_Lock then
++ Result := pthread_mutex_destroy (T.Common.LL.L'Access);
++ pragma Assert (Result = 0);
++ end if;
++
++ Result := pthread_cond_destroy (T.Common.LL.CV'Access);
++ pragma Assert (Result = 0);
++
++ if T.Known_Tasks_Index /= -1 then
++ Known_Tasks (T.Known_Tasks_Index) := null;
++ end if;
++ SC.Invalidate_Stack_Cache (T.Common.Compiler_Data.Pri_Stack_Info'Access);
++ Free (Tmp);
++
++ if Is_Self then
++ Specific.Set (null);
++ end if;
++ end Finalize_TCB;
++
++ ---------------
++ -- Exit_Task --
++ ---------------
++
++ procedure Exit_Task is
++ begin
++ Specific.Set (null);
++ end Exit_Task;
++
++ ----------------
++ -- Abort_Task --
++ ----------------
++
++ procedure Abort_Task (T : Task_Id) is
++ Result : Interfaces.C.int;
++ begin
++ Result :=
++ pthread_kill
++ (T.Common.LL.Thread,
++ Signal (System.Interrupt_Management.Abort_Task_Interrupt));
++ pragma Assert (Result = 0);
++ end Abort_Task;
++
++ ----------------
++ -- Initialize --
++ ----------------
++
++ procedure Initialize (S : in out Suspension_Object) is
++ Result : Interfaces.C.int;
++
++ begin
++ -- Initialize internal state (always to False (RM D.10(6)))
++
++ S.State := False;
++ S.Waiting := False;
++
++ -- Initialize internal mutex
++
++ Result := pthread_mutex_init (S.L'Access, Mutex_Attr'Access);
++
++ pragma Assert (Result = 0 or else Result = ENOMEM);
++
++ if Result = ENOMEM then
++ raise Storage_Error;
++ end if;
++
++ -- Initialize internal condition variable
++
++ Result := pthread_cond_init (S.CV'Access, Cond_Attr'Access);
++
++ pragma Assert (Result = 0 or else Result = ENOMEM);
++
++ if Result /= 0 then
++ Result := pthread_mutex_destroy (S.L'Access);
++ pragma Assert (Result = 0);
++
++ if Result = ENOMEM then
++ raise Storage_Error;
++ end if;
++ end if;
++ end Initialize;
++
++ --------------
++ -- Finalize --
++ --------------
++
++ procedure Finalize (S : in out Suspension_Object) is
++ Result : Interfaces.C.int;
++
++ begin
++ -- Destroy internal mutex
++
++ Result := pthread_mutex_destroy (S.L'Access);
++ pragma Assert (Result = 0);
++
++ -- Destroy internal condition variable
++
++ Result := pthread_cond_destroy (S.CV'Access);
++ pragma Assert (Result = 0);
++ end Finalize;
++
++ -------------------
++ -- Current_State --
++ -------------------
++
++ function Current_State (S : Suspension_Object) return Boolean is
++ begin
++ -- We do not want to use lock on this read operation. State is marked
++ -- as Atomic so that we ensure that the value retrieved is correct.
++
++ return S.State;
++ end Current_State;
++
++ ---------------
++ -- Set_False --
++ ---------------
++
++ procedure Set_False (S : in out Suspension_Object) is
++ Result : Interfaces.C.int;
++
++ begin
++ SSL.Abort_Defer.all;
++
++ Result := pthread_mutex_lock (S.L'Access);
++ pragma Assert (Result = 0);
++
++ S.State := False;
++
++ Result := pthread_mutex_unlock (S.L'Access);
++ pragma Assert (Result = 0);
++
++ SSL.Abort_Undefer.all;
++ end Set_False;
++
++ --------------
++ -- Set_True --
++ --------------
++
++ procedure Set_True (S : in out Suspension_Object) is
++ Result : Interfaces.C.int;
++
++ begin
++ SSL.Abort_Defer.all;
++
++ Result := pthread_mutex_lock (S.L'Access);
++ pragma Assert (Result = 0);
++
++ -- If there is already a task waiting on this suspension object then
++ -- we resume it, leaving the state of the suspension object to False,
++ -- as it is specified in ARM D.10 par. 9. Otherwise, it just leaves
++ -- the state to True.
++
++ if S.Waiting then
++ S.Waiting := False;
++ S.State := False;
++
++ Result := pthread_cond_signal (S.CV'Access);
++ pragma Assert (Result = 0);
++
++ else
++ S.State := True;
++ end if;
++
++ Result := pthread_mutex_unlock (S.L'Access);
++ pragma Assert (Result = 0);
++
++ SSL.Abort_Undefer.all;
++ end Set_True;
++
++ ------------------------
++ -- Suspend_Until_True --
++ ------------------------
++
++ procedure Suspend_Until_True (S : in out Suspension_Object) is
++ Result : Interfaces.C.int;
++
++ begin
++ SSL.Abort_Defer.all;
++
++ Result := pthread_mutex_lock (S.L'Access);
++ pragma Assert (Result = 0);
++
++ if S.Waiting then
++
++ -- Program_Error must be raised upon calling Suspend_Until_True
++ -- if another task is already waiting on that suspension object
++ -- (RM D.10(10)).
++
++ Result := pthread_mutex_unlock (S.L'Access);
++ pragma Assert (Result = 0);
++
++ SSL.Abort_Undefer.all;
++
++ raise Program_Error;
++ else
++ -- Suspend the task if the state is False. Otherwise, the task
++ -- continues its execution, and the state of the suspension object
++ -- is set to False (ARM D.10 par. 9).
++
++ if S.State then
++ S.State := False;
++ else
++ S.Waiting := True;
++ Result := pthread_cond_wait (S.CV'Access, S.L'Access);
++ end if;
++
++ Result := pthread_mutex_unlock (S.L'Access);
++ pragma Assert (Result = 0);
++
++ SSL.Abort_Undefer.all;
++ end
++ if;
++ end Suspend_Until_True;
++
++ ----------------
++ -- Check_Exit --
++ ----------------
++
++ -- Dummy version
++
++ function Check_Exit (Self_ID : ST.Task_Id) return Boolean is
++ pragma Unreferenced (Self_ID);
++ begin
++ return True;
++ end Check_Exit;
++
++ --------------------
++ -- Check_No_Locks --
++ --------------------
++
++ function Check_No_Locks (Self_ID : ST.Task_Id) return Boolean is
++ pragma Unreferenced (Self_ID);
++ begin
++ return True;
++ end Check_No_Locks;
++
++ ----------------------
++ -- Environment_Task --
++ ----------------------
++
++ function Environment_Task return Task_Id is
++ begin
++ return Environment_Task_Id;
++ end Environment_Task;
++
++ ------------------
++ -- Suspend_Task --
++ ------------------
++
++ function Suspend_Task
++ (T : ST.Task_Id;
++ Thread_Self : Thread_Id) return Boolean
++ is
++ begin
++ if T.Common.LL.Thread /= Thread_Self then
++ return pthread_kill (T.Common.LL.Thread, SIGSTOP) = 0;
++ else
++ return True;
++ end if;
++ end Suspend_Task;
++
++ -----------------
++ -- Resume_Task --
++ -----------------
++
++ function Resume_Task
++ (T : ST.Task_Id;
++ Thread_Self : Thread_Id) return Boolean
++ is
++ begin
++ if T.Common.LL.Thread /= Thread_Self then
++ return pthread_kill (T.Common.LL.Thread, SIGCONT) = 0;
++ else
++ return True;
++ end if;
++ end Resume_Task;
++
++ --------------------
++ -- Stop_All_Tasks --
++ --------------------
++
++ procedure Stop_All_Tasks is
++ begin
++ null;
++ end Stop_All_Tasks;
++
++ ---------------
++ -- Stop_Task --
++ ---------------
++
++ function Stop_Task (T : ST.Task_Id) return Boolean is
++ pragma Unreferenced (T);
++ begin
++ return False;
++ end Stop_Task;
++
++ -------------------
++ -- Continue_Task --
++ -------------------
++
++ function Continue_Task (T : ST.Task_Id) return Boolean is
++ pragma Unreferenced (T);
++ begin
++ return False;
++ end Continue_Task;
++
++ ----------------
++ -- Initialize --
++ ----------------
++
++ procedure Initialize (Environment_Task : Task_Id) is
++ act : aliased struct_sigaction;
++ old_act : aliased struct_sigaction;
++ Tmp_Set : aliased sigset_t;
++ Result : Interfaces.C.int;
++
++ function State
++ (Int : System.Interrupt_Management.Interrupt_ID) return Character;
++ pragma Import (C, State, "__gnat_get_interrupt_state");
++ -- Get interrupt state. Defined in a-init.c
++ -- The input argument is the interrupt number,
++ -- and the result is one of the following:
++
++ Default : constant Character := 's';
++ -- 'n' this interrupt not set by any Interrupt_State pragma
++ -- 'u' Interrupt_State pragma set state to User
++ -- 'r' Interrupt_State pragma set state to Runtime
++ -- 's' Interrupt_State pragma set state to System (use "default"
++ -- system handler)
++
++ begin
++ Environment_Task_Id := Environment_Task;
++
++ Interrupt_Management.Initialize;
++
++ -- Prepare the set of signals that should be unblocked in all tasks
++
++ Result := sigemptyset (Unblocked_Signal_Mask'Access);
++ pragma Assert (Result = 0);
++
++ for J in Interrupt_Management.Interrupt_ID loop
++ if System.Interrupt_Management.Keep_Unmasked (J) then
++ Result := sigaddset (Unblocked_Signal_Mask'Access, Signal (J));
++ pragma Assert (Result = 0);
++ end if;
++ end loop;
++
++ Result := pthread_mutexattr_init (Mutex_Attr'Access);
++ pragma Assert (Result = 0);
++
++ Result := pthread_condattr_init (Cond_Attr'Access);
++ pragma Assert (Result = 0);
++
++ Initialize_Lock (Single_RTS_Lock'Access, RTS_Lock_Level);
++
++ -- Initialize the global RTS lock
++
++ Specific.Initialize (Environment_Task);
++
++ Enter_Task (Environment_Task);
++
++ -- Install the abort-signal handler
++
++ if State
++ (System.Interrupt_Management.Abort_Task_Interrupt) /= Default
++ then
++ act.sa_flags := 0;
++ act.sa_handler := Abort_Handler'Address;
++
++ Result := sigemptyset (Tmp_Set'Access);
++ pragma Assert (Result = 0);
++ act.sa_mask := Tmp_Set;
++
++ Result :=
++ sigaction
++ (Signal (Interrupt_Management.Abort_Task_Interrupt),
++ act'Unchecked_Access,
++ old_act'Unchecked_Access);
++ pragma Assert (Result = 0);
++ end if;
++ end Initialize;
++
++end System.Task_Primitives.Operations;
+diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c
+index 1eec8b9..8d58c17 100644
+--- a/gcc/ada/sysdep.c
++++ b/gcc/ada/sysdep.c
+@@ -314,7 +314,7 @@ getc_immediate_common (FILE *stream,
+ int waiting)
+ {
+ #if defined (linux) || defined (sun) \
+- || defined (__CYGWIN32__) || defined (__MACHTEN__) || defined (__hpux__) \
++ || defined (__CYGWIN__) || defined (__MACHTEN__) || defined (__hpux__) \
+ || defined (_AIX) || (defined (__svr4__) && defined (i386)) \
+ || defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) \
+ || defined (__GLIBC__) || defined (__APPLE__)
+@@ -595,6 +595,18 @@ rts_get_nShowCmd (void)
+ }
+
+ #endif /* WINNT */
++
++#ifdef __CYGWIN__
++
++#include <malloc.h>
++
++size_t _msize(void *memblock)
++{
++ return (size_t) malloc_usable_size (memblock);
++}
++
++#endif /* __CYGWIN__ */
++
+ #ifdef VMS
+
+ /* This gets around a problem with using the old threads library on VMS 7.0. */
+diff --git a/gcc/ada/system-cygwin.ads b/gcc/ada/system-cygwin.ads
+new file mode 100644
+index 0000000..6d813f5
+--- /dev/null
++++ b/gcc/ada/system-cygwin.ads
+@@ -0,0 +1,198 @@
++------------------------------------------------------------------------------
++-- --
++-- GNAT RUN-TIME COMPONENTS --
++-- --
++-- S Y S T E M --
++-- --
++-- S p e c --
++-- (Cygwin Version) --
++-- --
++-- Copyright (C) 1992-2007, Free Software Foundation, Inc. --
++-- --
++-- This specification is derived from the Ada Reference Manual for use with --
++-- GNAT. The copyright notice above, and the license provisions that follow --
++-- apply solely to the contents of the part following the private keyword. --
++-- --
++-- 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. --
++-- --
++------------------------------------------------------------------------------
++
++package System is
++ pragma Pure;
++ -- Note that we take advantage of the implementation permission to make
++ -- this unit Pure instead of Preelaborable; see RM 13.7.1(15). In Ada
++ -- 2005, this is Pure in any case (AI-362).
++
++ type Name is (SYSTEM_NAME_GNAT);
++ System_Name : constant Name := SYSTEM_NAME_GNAT;
++
++ -- System-Dependent Named Numbers
++
++ Min_Int : constant := Long_Long_Integer'First;
++ Max_Int : constant := Long_Long_Integer'Last;
++
++ Max_Binary_Modulus : constant := 2 ** Long_Long_Integer'Size;
++ Max_Nonbinary_Modulus : constant := 2 ** Integer'Size - 1;
++
++ Max_Base_Digits : constant := Long_Long_Float'Digits;
++ Max_Digits : constant := Long_Long_Float'Digits;
++
++ Max_Mantissa : constant := 63;
++ Fine_Delta : constant := 2.0 ** (-Max_Mantissa);
++
++ Tick : constant := 0.01;
++
++ -- Storage-related Declarations
++
++ type Address is private;
++ pragma Preelaborable_Initialization (Address);
++ Null_Address : constant Address;
++
++ Storage_Unit : constant := 8;
++ Word_Size : constant := 32;
++ Memory_Size : constant := 2 ** 32;
++
++ -- Address comparison
++
++ function "<" (Left, Right : Address) return Boolean;
++ function "<=" (Left, Right : Address) return Boolean;
++ function ">" (Left, Right : Address) return Boolean;
++ function ">=" (Left, Right : Address) return Boolean;
++ function "=" (Left, Right : Address) return Boolean;
++
++ pragma Import (Intrinsic, "<");
++ pragma Import (Intrinsic, "<=");
++ pragma Import (Intrinsic, ">");
++ pragma Import (Intrinsic, ">=");
++ pragma Import (Intrinsic, "=");
++
++ -- Other System-Dependent Declarations
++
++ type Bit_Order is (High_Order_First, Low_Order_First);
++ Default_Bit_Order : constant Bit_Order := Low_Order_First;
++ pragma Warnings (Off, Default_Bit_Order); -- kill constant condition warning
++
++ -- Priority-related Declarations (RM D.1)
++
++ Max_Priority : constant Positive := 30;
++ Max_Interrupt_Priority : constant Positive := 31;
++
++ subtype Any_Priority is Integer range 0 .. 31;
++ subtype Priority is Any_Priority range 0 .. 30;
++ subtype Interrupt_Priority is Any_Priority range 31 .. 31;
++
++ Default_Priority : constant Priority := 15;
++
++private
++
++ type Address is mod Memory_Size;
++ Null_Address : constant Address := 0;
++
++ --------------------------------------
++ -- System Implementation Parameters --
++ --------------------------------------
++
++ -- These parameters provide information about the target that is used
++ -- by the compiler. They are in the private part of System, where they
++ -- can be accessed using the special circuitry in the Targparm unit
++ -- whose source should be consulted for more detailed descriptions
++ -- of the individual switch values.
++
++ Backend_Divide_Checks : constant Boolean := False;
++ Backend_Overflow_Checks : constant Boolean := False;
++ Command_Line_Args : constant Boolean := True;
++ Configurable_Run_Time : constant Boolean := False;
++ Denorm : constant Boolean := True;
++ Duration_32_Bits : constant Boolean := False;
++ Exit_Status_Supported : constant Boolean := True;
++ Fractional_Fixed_Ops : constant Boolean := False;
++ Frontend_Layout : constant Boolean := False;
++ Machine_Overflows : constant Boolean := False;
++ Machine_Rounds : constant Boolean := True;
++ Preallocated_Stacks : constant Boolean := False;
++ Signed_Zeros : constant Boolean := True;
++ Stack_Check_Default : constant Boolean := False;
++ Stack_Check_Probes : constant Boolean := True;
++ Stack_Check_Limits : constant Boolean := False;
++ Support_64_Bit_Divides : constant Boolean := True;
++ Support_Aggregates : constant Boolean := True;
++ Support_Composite_Assign : constant Boolean := True;
++ Support_Composite_Compare : constant Boolean := True;
++ Support_Long_Shifts : constant Boolean := True;
++ Always_Compatible_Rep : constant Boolean := True;
++ Suppress_Standard_Library : constant Boolean := False;
++ Use_Ada_Main_Program_Name : constant Boolean := False;
++ ZCX_By_Default : constant Boolean := True;
++
++ ---------------------------
++ -- Underlying Priorities --
++ ---------------------------
++
++ -- Important note: this section of the file must come AFTER the
++ -- definition of the system implementation parameters to ensure
++ -- that the value of these parameters is available for analysis
++ -- of the declarations here (using Rtsfind at compile time).
++
++ -- The underlying priorities table provides a generalized mechanism
++ -- for mapping from Ada priorities to system priorities. In some
++ -- cases a 1-1 mapping is not the convenient or optimal choice.
++
++ type Priorities_Mapping is array (Any_Priority) of Integer;
++ pragma Suppress_Initialization (Priorities_Mapping);
++ -- Suppress initialization in case gnat.adc specifies Normalize_Scalars
++
++ Underlying_Priorities : constant Priorities_Mapping :=
++ (Priority'First ..
++ Default_Priority - 8 => -15,
++ Default_Priority - 7 => -7,
++ Default_Priority - 6 => -6,
++ Default_Priority - 5 => -5,
++ Default_Priority - 4 => -4,
++ Default_Priority - 3 => -3,
++ Default_Priority - 2 => -2,
++ Default_Priority - 1 => -1,
++ Default_Priority => 0,
++ Default_Priority + 1 => 1,
++ Default_Priority + 2 => 2,
++ Default_Priority + 3 => 3,
++ Default_Priority + 4 => 4,
++ Default_Priority + 5 => 5,
++ Default_Priority + 6 ..
++ Priority'Last => 6,
++ Interrupt_Priority => 15);
++ -- The default mapping preserves the standard 31 priorities of the Ada
++ -- model, but maps them using compression onto the 7 priority levels
++ -- available in NT and on the 16 priority levels available in 2000/XP.
++
++ -- To replace the default values of the Underlying_Priorities mapping,
++ -- copy this source file into your build directory, edit the file to
++ -- reflect your desired behavior, and recompile using Makefile.adalib
++ -- which can be found under the adalib directory of your gnat installation
++
++ pragma Linker_Options ("-Wl,--stack=0x2000000");
++ -- This is used to change the default stack (32 MB) size for non tasking
++ -- programs. We change this value for GNAT on Windows here because the
++ -- binutils on this platform have switched to a too low value for Ada
++ -- programs. Note that we also set the stack size for tasking programs in
++ -- System.Task_Primitives.Operations.
++
++end System;
+diff --git a/gcc/builtin-attrs.def b/gcc/builtin-attrs.def
+index dcaeee9..44042de 100644
+--- a/gcc/builtin-attrs.def
++++ b/gcc/builtin-attrs.def
+@@ -107,6 +107,7 @@ DEF_ATTR_IDENT (ATTR_TYPEGENERIC, "type generic")
+ DEF_ATTR_IDENT (ATTR_TM_REGPARM, "*tm regparm")
+ DEF_ATTR_IDENT (ATTR_TM_TMPURE, "transaction_pure")
+ DEF_ATTR_IDENT (ATTR_RETURNS_TWICE, "returns_twice")
++DEF_ATTR_IDENT (ATTR_SYSV_ABI, "sysv_abi")
+
+ DEF_ATTR_TREE_LIST (ATTR_NOVOPS_LIST, ATTR_NOVOPS, ATTR_NULL, ATTR_NULL)
+
+@@ -254,6 +255,8 @@ DEF_ATTR_TREE_LIST (ATTR_TM_CONST_NOTHROW_LIST,
+ ATTR_TM_REGPARM, ATTR_NULL, ATTR_CONST_NOTHROW_LIST)
+ DEF_ATTR_TREE_LIST (ATTR_TM_NOTHROW_RT_LIST,
+ ATTR_RETURNS_TWICE, ATTR_NULL, ATTR_TM_NOTHROW_LIST)
++DEF_ATTR_TREE_LIST (ATTR_TM_NOTHROW_RT_SYSV_LIST,
++ ATTR_SYSV_ABI, ATTR_NULL, ATTR_TM_NOTHROW_RT_LIST)
+
+ /* Same attributes used for BUILT_IN_MALLOC except with TM_PURE thrown in. */
+ DEF_ATTR_TREE_LIST (ATTR_TMPURE_MALLOC_NOTHROW_LIST,
+diff --git a/gcc/config.build b/gcc/config.build
+index 0bc5ce8..12d5248 100644
+--- a/gcc/config.build
++++ b/gcc/config.build
+@@ -60,7 +60,7 @@ case $build in
+ # IBM 360/370/390 Architecture
+ build_xm_defines='FATAL_EXIT_CODE=12'
+ ;;
+- i[34567]86-*-cygwin* )
++ i[34567]86-*-cygwin* | x86_64-*-cygwin* )
+ build_xm_file=i386/xm-cygwin.h
+ build_exeext=.exe
+ ;;
+diff --git a/gcc/config.gcc b/gcc/config.gcc
+index 92d57dd..ec617cf 100644
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -1444,7 +1444,22 @@ 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"
+- extra_options="${extra_options} i386/cygming.opt"
++ 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-*-cygwin*)
++ need_64bit_isa=yes
++ tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/cygwin.h i386/cygwin-w64.h i386/cygwin-stdint.h"
++ xm_file=i386/xm-cygwin.h
++ tmake_file="${tmake_file} i386/t-cygming t-slibgcc i386/t-cygwin-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"
+@@ -3707,7 +3722,9 @@ case ${target} in
+ ;;
+ i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]*)
+ ;;
+- i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
++ i[34567]86-*-cygwin* | x86_64-*-cygwin*)
++ ;;
++ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ ;;
+ i[34567]86-*-freebsd* | x86_64-*-freebsd*)
+ ;;
+diff --git a/gcc/config.host b/gcc/config.host
+index 1196ec5..d871333 100644
+--- a/gcc/config.host
++++ b/gcc/config.host
+@@ -214,19 +214,19 @@ case ${host} in
+ ;;
+ esac
+ ;;
+- i[34567]86-*-cygwin*)
++ i[34567]86-*-cygwin* | x86_64-*-cygwin*)
+ host_xm_file=i386/xm-cygwin.h
+ out_host_hook_obj=host-cygwin.o
+ host_xmake_file="${host_xmake_file} i386/x-cygwin"
+ host_exeext=.exe
+- host_lto_plugin_soname=cyglto_plugin-0.dll
++ host_lto_plugin_soname=cyglto_plugin.dll
+ ;;
+ i[34567]86-*-mingw32*)
+ host_xm_file=i386/xm-mingw32.h
+ host_xmake_file="${host_xmake_file} i386/x-mingw32"
+ host_exeext=.exe
+ out_host_hook_obj=host-mingw32.o
+- host_lto_plugin_soname=liblto_plugin-0.dll
++ host_lto_plugin_soname=liblto_plugin.dll
+ ;;
+ x86_64-*-mingw*)
+ use_long_long_for_widest_fast_int=yes
+@@ -234,7 +234,7 @@ case ${host} in
+ host_xmake_file="${host_xmake_file} i386/x-mingw32"
+ host_exeext=.exe
+ out_host_hook_obj=host-mingw32.o
+- host_lto_plugin_soname=liblto_plugin-0.dll
++ host_lto_plugin_soname=liblto_plugin.dll
+ ;;
+ i[34567]86-*-uwin*)
+ echo "*** UWIN may not be used as a host platform because"
+diff --git a/gcc/config/i386/cygming.opt b/gcc/config/i386/cygming.opt
+index 01fa0b6..32e44c9 100644
+--- a/gcc/config/i386/cygming.opt
++++ b/gcc/config/i386/cygming.opt
+@@ -50,6 +50,10 @@ muse-libstdc-wrappers
+ Target Condition({defined (USE_CYGWIN_LIBSTDCXX_WRAPPERS)})
+ Compile code that relies on Cygwin DLL wrappers to support C++ operator new/delete replacement
+
++fset-stack-executable
++Common Report Var(flag_setstackexecutable) Init(1) Optimization
++For nested functions on stack executable permission is set.
++
+ posix
+ Driver
+
+diff --git a/gcc/config/i386/cygwin-stdint.h b/gcc/config/i386/cygwin-stdint.h
+index f8c04a8..2dc207b 100644
+--- a/gcc/config/i386/cygwin-stdint.h
++++ b/gcc/config/i386/cygwin-stdint.h
+@@ -24,39 +24,71 @@ along with GCC; see the file COPYING3. If not see
+ #define INT8_TYPE "signed char"
+ #define INT16_TYPE "short int"
+ #define INT32_TYPE "int"
++#ifdef __x86_64__
++#define INT64_TYPE "long int"
++#else
+ #define INT64_TYPE "long long int"
++#endif
+
+ #define UINT8_TYPE "unsigned char"
+ #define UINT16_TYPE "short unsigned int"
+ #define UINT32_TYPE "unsigned int"
++#ifdef __x86_64__
++#define UINT64_TYPE "long unsigned int"
++#else
+ #define UINT64_TYPE "long long unsigned int"
++#endif
+
+ /* Minimum-width integer types */
+
+ #define INT_LEAST8_TYPE "signed char"
+ #define INT_LEAST16_TYPE "short int"
+ #define INT_LEAST32_TYPE "int"
++#ifdef __x86_64__
++#define INT_LEAST64_TYPE "long int"
++#else
+ #define INT_LEAST64_TYPE "long long int"
++#endif
+
+ #define UINT_LEAST8_TYPE "unsigned char"
+ #define UINT_LEAST16_TYPE "short unsigned int"
+ #define UINT_LEAST32_TYPE "unsigned int"
++#ifdef __x86_64__
++#define UINT_LEAST64_TYPE "long unsigned int"
++#else
+ #define UINT_LEAST64_TYPE "long long unsigned int"
++#endif
+
+ /* Fastest minimum-width integer types */
+
+ #define INT_FAST8_TYPE "signed char"
++#ifdef __x86_64__
++#define INT_FAST16_TYPE "long int"
++#define INT_FAST32_TYPE "long int"
++#define INT_FAST64_TYPE "long int"
++#else
+ #define INT_FAST16_TYPE "int"
+ #define INT_FAST32_TYPE "int"
+ #define INT_FAST64_TYPE "long long int"
++#endif
+
+ #define UINT_FAST8_TYPE "unsigned char"
++#ifdef __x86_64__
++#define UINT_FAST16_TYPE "long unsigned int"
++#define UINT_FAST32_TYPE "long unsigned int"
++#define UINT_FAST64_TYPE "long unsigned int"
++#else
+ #define UINT_FAST16_TYPE "unsigned int"
+ #define UINT_FAST32_TYPE "unsigned int"
+ #define UINT_FAST64_TYPE "long long unsigned int"
++#endif
+
+ /* Integer types capable of holding object pointers */
+
++#ifdef __x86_64__
++#define INTPTR_TYPE "long int"
++#define UINTPTR_TYPE "long unsigned int"
++#else
+ #define INTPTR_TYPE "int"
+ #define UINTPTR_TYPE "unsigned int"
+-
++#endif
+diff --git a/gcc/config/i386/cygwin-w64.h b/gcc/config/i386/cygwin-w64.h
+new file mode 100644
+index 0000000..152632e
+--- /dev/null
++++ b/gcc/config/i386/cygwin-w64.h
+@@ -0,0 +1,84 @@
++/* Operating system specific defines to be used when targeting GCC for
++ hosting on Windows 32/64 via Cygwin 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 __cygwin_dll_entry at 12"
++#define SUB_LINK_ENTRY64 "-e _cygwin_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=cyg \
++ %{rdynamic: --export-all-symbols} \
++ %{!shared: %{!mdll: %{" SPEC_32 ":--large-address-aware} --tsaware}}"
++
++/* Cygwin64 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 "cyggcc_s-seh-1.dll"
+diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h
+index 7f92ada..43072a1 100644
+--- a/gcc/config/i386/cygwin.h
++++ b/gcc/config/i386/cygwin.h
+@@ -18,11 +18,20 @@ 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() /* Nothing. */
++#define EXTRA_OS_CPP_BUILTINS() \
++ do \
++ { \
++ builtin_define ("__CYGWIN__"); \
++ 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} \
+- -D__CYGWIN32__ -D__CYGWIN__ %{!ansi:-Dunix} -D__unix__ -D__unix \
++ %{!ansi:-Dunix} %{pthread: } \
+ %{mwin32:-DWIN32 -D_WIN32 -D__WIN32 -D__WIN32__ %{!ansi:-DWINNT}} \
+ %{!nostdinc:%{!mno-win32:-idirafter ../include/w32api%s -idirafter ../../include/w32api%s}}\
+ "
+@@ -67,12 +76,14 @@ along with GCC; see the file COPYING3. If not see
+ #undef LIB_SPEC
+ #define LIB_SPEC "\
+ %{pg:-lgmon} \
++ %{pthread: } \
+ -lcygwin \
+ %{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 \
+@@ -110,7 +121,9 @@ along with GCC; see the file COPYING3. If not see
+ %{shared: --shared} %{mdll:--dll} \
+ %{static:-Bstatic} %{!static:-Bdynamic} \
+ %{shared|mdll: --enable-auto-image-base -e __cygwin_dll_entry at 12} \
+- --dll-search-prefix=cyg -tsaware"
++ --dll-search-prefix=cyg \
++ %{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. */
+@@ -133,5 +146,9 @@ along with GCC; see the file COPYING3. If not see
+ #define LIBGCC_SONAME "cyggcc_s" LIBGCC_EH_EXTN "-1.dll"
+
+ /* We should find a way to not have to update this manually. */
+-#define LIBGCJ_SONAME "cyggcj" /*LIBGCC_EH_EXTN*/ "-13.dll"
++#define LIBGCJ_SONAME "cyggcj" /*LIBGCC_EH_EXTN*/ "-14.dll"
+
++/* Make stack executable to avoid DEP problems with trampolines. */
++#define HAVE_ENABLE_EXECUTE_STACK
++#undef CHECK_EXECUTE_STACK_ENABLED
++#define CHECK_EXECUTE_STACK_ENABLED flag_setstackexecutable
+diff --git a/gcc/config/i386/cygwin.opt b/gcc/config/i386/cygwin.opt
+new file mode 100644
+index 0000000..4c69509
+--- /dev/null
++++ b/gcc/config/i386/cygwin.opt
+@@ -0,0 +1,27 @@
++; Cygwin-specific options.
++
++; Copyright (C) 2005, 2007, 2009, 2010, 2011 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/>.
++
++pthread
++Driver
++
++rdynamic
++Driver
++
++; Retain blank line above
+diff --git a/gcc/config/i386/mingw.opt b/gcc/config/i386/mingw.opt
+index 0341904..85ed5be 100644
+--- a/gcc/config/i386/mingw.opt
++++ b/gcc/config/i386/mingw.opt
+@@ -28,8 +28,4 @@ Wpedantic-ms-format
+ C ObjC C++ ObjC++ Var(warn_pedantic_ms_format) Init(1) Warning
+ Warn about none ISO msvcrt scanf/printf width extensions
+
+-fset-stack-executable
+-Common Report Var(flag_setstackexecutable) Init(1) Optimization
+-For nested functions on stack executable permission is set.
+-
+ ; Need to retain blank line above.
+diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
+index 1ac5544..92d3607 100644
+--- a/gcc/config/i386/mingw32.h
++++ b/gcc/config/i386/mingw32.h
+@@ -245,4 +245,4 @@ do { \
+ #define LIBGCC_SONAME "libgcc_s" LIBGCC_EH_EXTN "-1.dll"
+
+ /* We should find a way to not have to update this manually. */
+-#define LIBGCJ_SONAME "libgcj" /*LIBGCC_EH_EXTN*/ "-13.dll"
++#define LIBGCJ_SONAME "libgcj" /*LIBGCC_EH_EXTN*/ "-14.dll"
+diff --git a/gcc/config/i386/t-cygwin-w64 b/gcc/config/i386/t-cygwin-w64
+new file mode 100644
+index 0000000..01968fd
+--- /dev/null
++++ b/gcc/config/i386/t-cygwin-w64
+@@ -0,0 +1,3 @@
++MULTILIB_OPTIONS = m64/m32
++MULTILIB_DIRNAMES = 64
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+diff --git a/gcc/configure b/gcc/configure
+index b9e8a8f..66a8f1c 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -4893,7 +4893,9 @@ case "${target}" in
+ hppa*64*-*-hpux*)
+ # PIC is the default for 64-bit PA HP-UX.
+ ;;
+- i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
++ i[34567]86-*-cygwin* | x86_64-*-cygwin*)
++ ;;
++ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ ;;
+ i[34567]86-*-interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+@@ -7079,7 +7081,7 @@ else
+ powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
+ i?86*-*-gnu* | \
+ i?86*-*-mingw* | x86_64*-*-mingw* | \
+- i?86*-*-cygwin*)
++ i?86*-*-cygwin* | x86_64*-*-cygwin*)
+ enable_decimal_float=yes
+ ;;
+ *)
+@@ -24273,7 +24275,7 @@ fi
+ # wrappers to aid in interposing and redirecting operators new, delete,
+ # etc., as per n2800 #17.6.4.6 [replacement.functions]. Check if we
+ # are configuring for a version of Cygwin that exports the wrappers.
+- if test x$host = x$target; then
++ if test x$host = x$target && test x$host_cpu = xi686; then
+ ac_fn_c_check_func "$LINENO" "__wrap__Znaj" "ac_cv_func___wrap__Znaj"
+ if test "x$ac_cv_func___wrap__Znaj" = x""yes; then :
+ gcc_ac_cygwin_dll_wrappers=yes
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 8e9626c..30e5f7c 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -3623,7 +3623,7 @@ changequote([,])dnl
+ # wrappers to aid in interposing and redirecting operators new, delete,
+ # etc., as per n2800 #17.6.4.6 [replacement.functions]. Check if we
+ # are configuring for a version of Cygwin that exports the wrappers.
+- if test x$host = x$target; then
++ if test x$host = x$target && test x$host_cpu = xi686; then
+ AC_CHECK_FUNC([__wrap__Znaj],[gcc_ac_cygwin_dll_wrappers=yes],[gcc_ac_cygwin_dll_wrappers=no])
+ else
+ # Can't check presence of libc functions during cross-compile, so
+diff --git a/gcc/gtm-builtins.def b/gcc/gtm-builtins.def
+index 171019e..df003fd 100644
+--- a/gcc/gtm-builtins.def
++++ b/gcc/gtm-builtins.def
+@@ -1,5 +1,5 @@
+ DEF_TM_BUILTIN (BUILT_IN_TM_START, "_ITM_beginTransaction",
+- BT_FN_UINT32_UINT32_VAR, ATTR_TM_NOTHROW_RT_LIST)
++ BT_FN_UINT32_UINT32_VAR, ATTR_TM_NOTHROW_RT_SYSV_LIST)
+
+ DEF_TM_BUILTIN (BUILT_IN_TM_COMMIT, "_ITM_commitTransaction",
+ BT_FN_VOID, ATTR_TM_NOTHROW_LIST)
+diff --git a/gcc/testsuite/gcc.target/i386/pr25993.c b/gcc/testsuite/gcc.target/i386/pr25993.c
+index b079e25..c30eaf5 100644
+--- a/gcc/testsuite/gcc.target/i386/pr25993.c
++++ b/gcc/testsuite/gcc.target/i386/pr25993.c
+@@ -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/libada/configure b/libada/configure
+index da92d0e..19d3e5e 100755
+--- a/libada/configure
++++ b/libada/configure
+@@ -2834,7 +2834,9 @@ case "${host}" in
+ hppa*64*-*-hpux*)
+ # PIC is the default for 64-bit PA HP-UX.
+ ;;
+- i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
++ i[34567]86-*-cygwin* | x86_64-*-cygwin*)
++ ;;
++ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ ;;
+ i[34567]86-*-interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
+index a98ee64..9f2a7ed 100644
+--- a/libatomic/Makefile.am
++++ b/libatomic/Makefile.am
+@@ -66,7 +66,7 @@ libatomic_version_dep =
+ endif
+ libatomic_version_info = -version-info $(libtool_VERSION)
+
+-libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script)
++libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) $(lt_host_flags)
+ libatomic_la_SOURCES = gload.c gstore.c gcas.c gexch.c glfree.c lock.c init.c
+
+ SIZEOBJS = load store cas exch fadd fsub fand fior fxor fnand tas
+diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in
+index 46e60c9..61bcf0d 100644
+--- a/libatomic/Makefile.in
++++ b/libatomic/Makefile.in
+@@ -244,6 +244,7 @@ libexecdir = @libexecdir@
+ libtool_VERSION = @libtool_VERSION@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_host_flags = @lt_host_flags@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ multi_basedir = @multi_basedir@
+@@ -285,7 +286,7 @@ noinst_LTLIBRARIES = libatomic_convenience.la
+ @LIBAT_BUILD_VERSIONED_SHLIB_GNU_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE at libatomic_version_dep = $(top_srcdir)/libatomic.map
+ @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE at libatomic_version_dep = libatomic.map-sun
+ libatomic_version_info = -version-info $(libtool_VERSION)
+-libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script)
++libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) $(lt_host_flags)
+ libatomic_la_SOURCES = gload.c gstore.c gcas.c gexch.c glfree.c lock.c init.c
+ SIZEOBJS = load store cas exch fadd fsub fand fior fxor fnand tas
+ EXTRA_libatomic_la_SOURCES = $(addsuffix _n.c,$(SIZEOBJS))
+diff --git a/libatomic/aclocal.m4 b/libatomic/aclocal.m4
+index 48f5ef5..b709f12 100644
+--- a/libatomic/aclocal.m4
++++ b/libatomic/aclocal.m4
+@@ -993,6 +993,7 @@ AC_SUBST([am__untar])
+ m4_include([../config/acx.m4])
+ m4_include([../config/depstand.m4])
+ m4_include([../config/lead-dot.m4])
++m4_include([../config/lthostflags.m4])
+ m4_include([../config/multi.m4])
+ m4_include([../config/override.m4])
+ m4_include([../config/stdint.m4])
+diff --git a/libatomic/configure b/libatomic/configure
+index a9dfa03..23e006e 100755
+--- a/libatomic/configure
++++ b/libatomic/configure
+@@ -627,6 +627,7 @@ MAINTAINER_MODE_FALSE
+ MAINTAINER_MODE_TRUE
+ enable_static
+ enable_shared
++lt_host_flags
+ CPP
+ OTOOL64
+ OTOOL
+@@ -11013,7 +11014,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11016 "configure"
++#line 11017 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11119,7 +11120,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11122 "configure"
++#line 11123 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11359,6 +11360,28 @@ CC="$lt_save_CC"
+
+
+
++case $host in
++ *-cygwin* | *-mingw*)
++ # 'host' will be top-level target in the case of a target lib,
++ # we must compare to with_cross_host to decide if this is a native
++ # or cross-compiler and select where to install dlls appropriately.
++ if test -n "$with_cross_host" &&
++ test x"$with_cross_host" != x"no"; then
++ lt_host_flags='-no-undefined -bindir "$(toolexeclibdir)"';
++ else
++ lt_host_flags='-no-undefined -bindir "$(bindir)"';
++ fi
++ ;;
++ *)
++ lt_host_flags=
++ ;;
++esac
++
++
++
++
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+ # Check whether --enable-maintainer-mode was given.
+diff --git a/libatomic/configure.ac b/libatomic/configure.ac
+index 0dc4a98..0110b93 100644
+--- a/libatomic/configure.ac
++++ b/libatomic/configure.ac
+@@ -143,6 +143,7 @@ AC_PROG_INSTALL
+
+ # Configure libtool
+ AM_PROG_LIBTOOL
++ACX_LT_HOST_FLAGS
+ AC_SUBST(enable_shared)
+ AC_SUBST(enable_static)
+ AM_MAINTAINER_MODE
+diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
+index b9e5d6c..6550285 100644
+--- a/libatomic/configure.tgt
++++ b/libatomic/configure.tgt
+@@ -108,7 +108,7 @@ case "${target}" in
+ *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu \
+ | *-*-netbsd* | *-*-freebsd* | *-*-openbsd* \
+ | *-*-solaris2* | *-*-sysv4* | *-*-irix6* | *-*-osf* | *-*-hpux11* \
+- | *-*-darwin* | *-*-aix*)
++ | *-*-darwin* | *-*-aix* | *-*-cygwin*)
+ # POSIX system. The OS is supported.
+ config_path="${config_path} posix"
+ ;;
+diff --git a/libdecnumber/configure b/libdecnumber/configure
+index 0466371..91721de 100755
+--- a/libdecnumber/configure
++++ b/libdecnumber/configure
+@@ -4613,7 +4613,7 @@ else
+ powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
+ i?86*-*-gnu* | \
+ i?86*-*-mingw* | x86_64*-*-mingw* | \
+- i?86*-*-cygwin*)
++ i?86*-*-cygwin* | x86_64*-*-cygwin*)
+ enable_decimal_float=yes
+ ;;
+ *)
+diff --git a/libffi/src/x86/ffi.c b/libffi/src/x86/ffi.c
+index 611e221..6338de2 100644
+--- a/libffi/src/x86/ffi.c
++++ b/libffi/src/x86/ffi.c
+@@ -28,7 +28,7 @@
+ DEALINGS IN THE SOFTWARE.
+ ----------------------------------------------------------------------- */
+
+-#if !defined(__x86_64__) || defined(_WIN64)
++#if !defined(__x86_64__) || defined(_WIN64) || defined(__CYGWIN__)
+
+ #ifdef _WIN64
+ #include <windows.h>
+diff --git a/libffi/src/x86/win64.S b/libffi/src/x86/win64.S
+index fcdb270..45fe150 100644
+--- a/libffi/src/x86/win64.S
++++ b/libffi/src/x86/win64.S
+@@ -295,7 +295,7 @@ SYMBOL_NAME(ffi_closure_win64):
+ mov %rax, %rcx # context is first parameter
+ mov %rsp, %rdx # stack is second parameter
+ add $48, %rdx # point to start of arguments
+- mov $SYMBOL_NAME(ffi_closure_win64_inner), %rax
++ lea SYMBOL_NAME(ffi_closure_win64_inner)(%rip), %rax
+ callq *%rax # call the real closure function
+ add $40, %rsp
+ movq %rax, %xmm0 # If the closure returned a float,
+diff --git a/libgcc/config.host b/libgcc/config.host
+index 259c9a7..74472ed 100644
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -274,6 +274,9 @@ case ${host} in
+ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ enable_execute_stack=config/i386/enable-execute-stack-mingw32.c
+ ;;
++i[34567]86-*-cygwin* | x86_64-*-cygwin*)
++ enable_execute_stack=config/i386/enable-execute-stack-mingw32.c
++ ;;
+ *)
+ enable_execute_stack=enable-execute-stack-empty.c;
+ ;;
+diff --git a/libgcc/config/i386/cygming-crtbegin.c b/libgcc/config/i386/cygming-crtbegin.c
+index 6a513cb..e274b77 100644
+--- a/libgcc/config/i386/cygming-crtbegin.c
++++ b/libgcc/config/i386/cygming-crtbegin.c
+@@ -82,6 +82,8 @@ static void *__JCR_LIST__[]
+ extern void __gcc_register_frame (void);
+ extern void __gcc_deregister_frame (void);
+
++static HANDLE libgcc_dll;
++
+ void
+ __gcc_register_frame (void)
+ {
+@@ -94,8 +96,11 @@ __gcc_register_frame (void)
+ void (*register_frame_fn) (const void *, struct object *);
+ HANDLE h = GetModuleHandle (LIBGCC_SONAME);
+ if (h)
+- register_frame_fn = (void (*) (const void *, struct object *))
+- GetProcAddress (h, "__register_frame_info");
++ {
++ libgcc_dll = LoadLibrary (LIBGCC_SONAME); /* Hold reference */
++ register_frame_fn = (void (*) (const void *, struct object *))
++ GetProcAddress (h, "__register_frame_info");
++ }
+ else
+ register_frame_fn = __register_frame_info;
+ if (register_frame_fn)
+@@ -124,13 +129,16 @@ __gcc_deregister_frame (void)
+ {
+ #if DWARF2_UNWIND_INFO
+ void * (*deregister_frame_fn) (const void *);
+- HANDLE h = GetModuleHandle (LIBGCC_SONAME);
+- if (h)
++ if (libgcc_dll)
+ deregister_frame_fn = (void* (*) (const void *))
+- GetProcAddress (h, "__deregister_frame_info");
++ GetProcAddress (libgcc_dll, "__deregister_frame_info");
+ else
+ deregister_frame_fn = __deregister_frame_info;
+ if (deregister_frame_fn)
+ deregister_frame_fn (__EH_FRAME_BEGIN__);
++
++if (libgcc_dll)
++ FreeLibrary (libgcc_dll);
++
+ #endif
+ }
+diff --git a/libgcc/configure b/libgcc/configure
+index 1425df6..bb36889 100644
+--- a/libgcc/configure
++++ b/libgcc/configure
+@@ -2228,7 +2228,9 @@ case "${host}" in
+ hppa*64*-*-hpux*)
+ # PIC is the default for 64-bit PA HP-UX.
+ ;;
+- i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
++ i[34567]86-*-cygwin* | x86_64-*-cygwin*)
++ ;;
++ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ ;;
+ i[34567]86-*-interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+@@ -4078,7 +4080,7 @@ else
+ powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
+ i?86*-*-gnu* | \
+ i?86*-*-mingw* | x86_64*-*-mingw* | \
+- i?86*-*-cygwin*)
++ i?86*-*-cygwin* | x86_64*-*-cygwin*)
+ enable_decimal_float=yes
+ ;;
+ *)
+diff --git a/libiberty/configure b/libiberty/configure
+index 5367027..17bd3c5 100755
+--- a/libiberty/configure
++++ b/libiberty/configure
+@@ -4865,7 +4865,9 @@ case "${host}" in
+ hppa*64*-*-hpux*)
+ # PIC is the default for 64-bit PA HP-UX.
+ ;;
+- i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
++ i[34567]86-*-cygwin* | x86_64-*-cygwin*)
++ ;;
++ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ ;;
+ i[34567]86-*-interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+diff --git a/libitm/Makefile.am b/libitm/Makefile.am
+index e754ccc..7bf9b70 100644
+--- a/libitm/Makefile.am
++++ b/libitm/Makefile.am
+@@ -54,7 +54,7 @@ libitm_version_info = -version-info $(libtool_VERSION)
+ # want or need libstdc++.
+ libitm_la_DEPENDENCIES = $(libitm_version_dep)
+ libitm_la_LINK = $(LINK) $(libitm_la_LDFLAGS)
+-libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script)
++libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script) $(lt_host_flags)
+
+ libitm_la_SOURCES = \
+ aatree.cc alloc.cc alloc_c.cc alloc_cpp.cc barrier.cc beginend.cc \
+diff --git a/libitm/Makefile.in b/libitm/Makefile.in
+index f44fd70..4ffef43 100644
+--- a/libitm/Makefile.in
++++ b/libitm/Makefile.in
+@@ -279,6 +279,7 @@ libtool_VERSION = @libtool_VERSION@
+ link_itm = @link_itm@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_host_flags = @lt_host_flags@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ multi_basedir = @multi_basedir@
+@@ -329,7 +330,7 @@ libitm_version_info = -version-info $(libtool_VERSION)
+ # want or need libstdc++.
+ libitm_la_DEPENDENCIES = $(libitm_version_dep)
+ libitm_la_LINK = $(LINK) $(libitm_la_LDFLAGS)
+-libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script)
++libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script) $(lt_host_flags)
+ libitm_la_SOURCES = aatree.cc alloc.cc alloc_c.cc alloc_cpp.cc \
+ barrier.cc beginend.cc clone.cc eh_cpp.cc local.cc query.cc \
+ retry.cc rwlock.cc useraction.cc util.cc sjlj.S tls.cc \
+diff --git a/libitm/aclocal.m4 b/libitm/aclocal.m4
+index 625404e..4be0d43 100644
+--- a/libitm/aclocal.m4
++++ b/libitm/aclocal.m4
+@@ -996,6 +996,7 @@ m4_include([../config/depstand.m4])
+ m4_include([../config/enable.m4])
+ m4_include([../config/futex.m4])
+ m4_include([../config/lead-dot.m4])
++m4_include([../config/lthostflags.m4])
+ m4_include([../config/mmap.m4])
+ m4_include([../config/multi.m4])
+ m4_include([../config/override.m4])
+diff --git a/libitm/configure b/libitm/configure
+index 7635a47..9d19922 100644
+--- a/libitm/configure
++++ b/libitm/configure
+@@ -630,6 +630,7 @@ MAINTAINER_MODE_FALSE
+ MAINTAINER_MODE_TRUE
+ enable_static
+ enable_shared
++lt_host_flags
+ CXXCPP
+ CPP
+ OTOOL64
+@@ -15141,6 +15142,28 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
++case $host in
++ *-cygwin* | *-mingw*)
++ # 'host' will be top-level target in the case of a target lib,
++ # we must compare to with_cross_host to decide if this is a native
++ # or cross-compiler and select where to install dlls appropriately.
++ if test -n "$with_cross_host" &&
++ test x"$with_cross_host" != x"no"; then
++ lt_host_flags='-no-undefined -bindir "$(toolexeclibdir)"';
++ else
++ lt_host_flags='-no-undefined -bindir "$(bindir)"';
++ fi
++ ;;
++ *)
++ lt_host_flags=
++ ;;
++esac
++
++
++
++
++
++
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+diff --git a/libitm/configure.ac b/libitm/configure.ac
+index 584a23b..c5459fe 100644
+--- a/libitm/configure.ac
++++ b/libitm/configure.ac
+@@ -147,6 +147,7 @@ AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes")
+
+ # Configure libtool
+ AM_PROG_LIBTOOL
++ACX_LT_HOST_FLAGS
+ AC_SUBST(enable_shared)
+ AC_SUBST(enable_static)
+
+diff --git a/libitm/configure.tgt b/libitm/configure.tgt
+index a20b410..77d071c 100644
+--- a/libitm/configure.tgt
++++ b/libitm/configure.tgt
+@@ -137,7 +137,7 @@ case "${target}" in
+ *-*-gnu* | *-*-k*bsd*-gnu \
+ | *-*-netbsd* | *-*-freebsd* | *-*-openbsd* \
+ | *-*-solaris2* | *-*-sysv4* | *-*-hpux11* \
+- | *-*-darwin* | *-*-aix*)
++ | *-*-darwin* | *-*-aix* | *-*-cygwin*)
+ # POSIX system. The OS is supported.
+ ;;
+
+diff --git a/libitm/libitm.h b/libitm/libitm.h
+index 20ac59a..9a7be25 100644
+--- a/libitm/libitm.h
++++ b/libitm/libitm.h
+@@ -45,6 +45,7 @@ extern "C" {
+
+ #define ITM_NORETURN __attribute__((noreturn))
+ #define ITM_PURE __attribute__((transaction_pure))
++#define ITM_SYSV __attribute__((sysv_abi))
+
+ /* The following are externally visible definitions and functions, though
+ only very few of these should be called by user code. */
+@@ -136,7 +137,7 @@ typedef uint64_t _ITM_transactionId_t; /* Transaction identifier */
+
+ extern _ITM_transactionId_t _ITM_getTransactionId(void) ITM_REGPARM;
+
+-extern uint32_t _ITM_beginTransaction(uint32_t, ...) ITM_REGPARM;
++extern uint32_t _ITM_beginTransaction(uint32_t, ...) ITM_REGPARM ITM_SYSV;
+
+ extern void _ITM_abortTransaction(_ITM_abortReason) ITM_REGPARM ITM_NORETURN;
+
+diff --git a/libitm/libitm_i.h b/libitm/libitm_i.h
+index 421b349..1c6ddf6 100644
+--- a/libitm/libitm_i.h
++++ b/libitm/libitm_i.h
+@@ -39,8 +39,10 @@
+ #include "local_type_traits"
+ #include "local_atomic"
+
++#ifndef __CYGWIN__
+ /* Don't require libgcc_s.so for exceptions. */
+ extern void _Unwind_DeleteException (_Unwind_Exception*) __attribute__((weak));
++#endif
+
+
+ #include "common.h"
+@@ -281,10 +283,10 @@ struct gtm_thread
+ #define UPFX1(t) UPFX(t)
+ #define UPFX(t) #t
+ static uint32_t begin_transaction(uint32_t, const gtm_jmpbuf *)
+- __asm__(UPFX1(__USER_LABEL_PREFIX__) "GTM_begin_transaction") ITM_REGPARM;
++ __asm__(UPFX1(__USER_LABEL_PREFIX__) "GTM_begin_transaction") ITM_REGPARM ITM_SYSV;
+ #else
+ static uint32_t begin_transaction(uint32_t, const gtm_jmpbuf *)
+- __asm__("GTM_begin_transaction") ITM_REGPARM;
++ __asm__("GTM_begin_transaction") ITM_REGPARM ITM_SYSV;
+ #endif
+ // In eh_cpp.cc
+ void revert_cpp_exceptions (gtm_transaction_cp *cp = 0);
+@@ -318,7 +320,7 @@ namespace GTM HIDDEN {
+ extern uint64_t gtm_spin_count_var;
+
+ extern "C" uint32_t GTM_longjmp (uint32_t, const gtm_jmpbuf *, uint32_t)
+- ITM_NORETURN ITM_REGPARM;
++ ITM_NORETURN ITM_REGPARM ITM_SYSV;
+
+ extern "C" void GTM_LB (const void *, size_t) ITM_REGPARM;
+
+diff --git a/libjava/classpath/configure b/libjava/classpath/configure
+index 23341df..02d8323 100755
+--- a/libjava/classpath/configure
++++ b/libjava/classpath/configure
+@@ -3173,7 +3173,7 @@ case "$host_os" in
+ cp_module=""
+ ;;
+ *)
+- cp_module="-module"
++ cp_module="-module -avoid-version"
+ ;;
+ esac
+
+diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac
+index 910c8f0..14a6543 100644
+--- a/libjava/classpath/configure.ac
++++ b/libjava/classpath/configure.ac
+@@ -64,7 +64,7 @@ case "$host_os" in
+ cp_module=""
+ ;;
+ *)
+- cp_module="-module"
++ cp_module="-module -avoid-version"
+ ;;
+ esac
+
+diff --git a/libjava/classpath/examples/gnu/classpath/examples/awt/HintingDemo.java b/libjava/classpath/examples/gnu/classpath/examples/awt/HintingDemo.java
+index 5ba44f6..068b596 100644
+--- a/libjava/classpath/examples/gnu/classpath/examples/awt/HintingDemo.java
++++ b/libjava/classpath/examples/gnu/classpath/examples/awt/HintingDemo.java
+@@ -211,7 +211,7 @@ public class HintingDemo extends JFrame {
+
+ HintingDemo()
+ {
+- File file = new File("/usr/share/fonts/truetype/freefont/FreeSans.ttf");
++ File file = new File("/usr/share/fonts/TTF/Vera.ttf");
+ loadFont(file);
+ setLayout(new BorderLayout());
+ chooser = new Chooser();
+diff --git a/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java b/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java
+index fd4f498..2935a5a 100644
+--- a/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java
++++ b/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java
+@@ -58,7 +58,7 @@ public class ClasspathDesktopPeer
+ implements DesktopPeer
+ {
+ /** This is the fallback browser, if no desktop was detected. */
+- protected static final String _DEFAULT_BROWSER = "firefox";
++ protected static final String _DEFAULT_BROWSER = "xdg-open";
+
+ /** gnu.java.awt.peer.Desktop.html.command */
+ protected static final String _BROWSE = "html";
+diff --git a/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java b/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java
+index 96677a4..101a85f 100644
+--- a/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java
++++ b/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java
+@@ -158,6 +158,8 @@ public abstract class ClasspathFontPeer
+
+ protected static boolean isLogicalFontName(String name)
+ {
++ return false;
++/*
+ String uname = name.toUpperCase ();
+ return (uname.equals ("SANSSERIF") ||
+ uname.equals ("SERIF") ||
+@@ -165,6 +167,7 @@ public abstract class ClasspathFontPeer
+ uname.equals ("DIALOG") ||
+ uname.equals ("DIALOGINPUT") ||
+ uname.equals ("DEFAULT"));
++*/
+ }
+
+ protected static String logicalFontNameToFaceName (String name)
+diff --git a/libjava/classpath/resource/gnu/java/awt/font/fonts.properties b/libjava/classpath/resource/gnu/java/awt/font/fonts.properties
+index 4fc0b10..1370469 100644
+--- a/libjava/classpath/resource/gnu/java/awt/font/fonts.properties
++++ b/libjava/classpath/resource/gnu/java/awt/font/fonts.properties
+@@ -36,20 +36,20 @@
+ # exception statement from your version.
+
+ # List of available fonts.
+-FreeMono/p=/usr/share/fonts/truetype/freefont/FreeMono.ttf
+-FreeMono/b=/usr/share/fonts/truetype/freefont/FreeMonoBold.ttf
+-FreeMono/bi=/usr/share/fonts/truetype/freefont/FreeMonoBoldOblique.ttf
+-FreeMono/i=/usr/share/fonts/truetype/freefont/FreeMonoOblique.ttf
++FreeMono/p=/usr/share/fonts/TTF/VeraMono.ttf
++FreeMono/b=/usr/share/fonts/TTF/VeraMoBd.ttf
++FreeMono/bi=/usr/share/fonts/TTF/VeraMoBI.ttf
++FreeMono/i=/usr/share/fonts/TTF/VeraMoIt.ttf
+
+-FreeSans/p=/usr/share/fonts/truetype/freefont/FreeSans.ttf
+-FreeSans/b=/usr/share/fonts/truetype/freefont/FreeSansBold.ttf
+-FreeSans/bi=/usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf
+-FreeSans/i=/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf
++FreeSans/p=/usr/share/fonts/TTF/Vera.ttf
++FreeSans/b=/usr/share/fonts/TTF/VeraBd.ttf
++FreeSans/bi=/usr/share/fonts/TTF/VeraBI.ttf
++FreeSans/i=/usr/share/fonts/TTF/VeraIt.ttf
+
+-FreeSerif/p=/usr/share/fonts/truetype/freefont/FreeSerif.ttf
+-FreeSerif/b=/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
+-FreeSerif/bi=/usr/share/fonts/truetype/freefont/FreeSerifBoldOblique.ttf
+-FreeSerif/i=/usr/share/fonts/truetype/freefont/FreeSerifOblique.ttf
++FreeSerif/p=/usr/share/fonts/TTF/VeraSe.ttf
++FreeSerif/b=/usr/share/fonts/TTF/VeraSeBd.ttf
++FreeSerif/bi=/usr/share/fonts/TTF/VeraSeBd.ttf
++FreeSerif/i=/usr/share/fonts/TTF/VeraSe.ttf
+
+ # List of aliases.
+ Dialog/a=FreeSans
+diff --git a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc
+index e05904c..0a2569c 100644
+--- a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc
++++ b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc
+@@ -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/libjava/include/posix.h b/libjava/include/posix.h
+index 6bd560c..cbda784 100644
+--- a/libjava/include/posix.h
++++ b/libjava/include/posix.h
+@@ -42,11 +42,17 @@ details. */
+ #include <java/util/Properties.h>
+
+ // Prefix and suffix for shared libraries.
++#ifdef __CYGWIN__
++#define _Jv_platform_solib_prefix "cyg"
++#else
+ #define _Jv_platform_solib_prefix "lib"
++#endif
+ #if defined(__APPLE__) && defined(__MACH__)
+ #define _Jv_platform_solib_suffix ".dylib"
+ #elif defined(HPUX) && defined(HP_PA)
+ #define _Jv_platform_solib_suffix ".sl"
++#elif defined(__CYGWIN__)
++#define _Jv_platform_solib_suffix ".dll"
+ #else
+ #define _Jv_platform_solib_suffix ".so"
+ #endif
+diff --git a/libjava/java/net/natVMURLConnection.cc b/libjava/java/net/natVMURLConnection.cc
+index 0a30a21..810e045 100644
+--- a/libjava/java/net/natVMURLConnection.cc
++++ b/libjava/java/net/natVMURLConnection.cc
+@@ -32,7 +32,11 @@ void
+ java::net::VMURLConnection::init ()
+ {
+ #if defined (HAVE_MAGIC_T) && defined (HAVE_MAGIC_H) && defined (USE_LTDL)
++#ifdef __CYGWIN__
++ lt_dlhandle handle = lt_dlopenext ("cygmagic-1.dll");
++#else
+ lt_dlhandle handle = lt_dlopenext ("libmagic.so");
++#endif
+ if (!handle)
+ return;
+
+diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
+index 57452f7..f8af3c7 100755
+--- a/libstdc++-v3/configure
++++ b/libstdc++-v3/configure
+@@ -46113,7 +46113,7 @@ $as_echo "#define HAVE_TLS 1" >>confdefs.h
+ ;;
+ 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
+diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
+index 943ea67..0112f6f 100644
+--- a/libstdc++-v3/crossconfig.m4
++++ b/libstdc++-v3/crossconfig.m4
+@@ -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
+diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
+index 51ff6dd..844c74a 100644
+--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
++++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
+@@ -144,6 +144,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/lto-plugin/Makefile.am b/lto-plugin/Makefile.am
+index b24015e..ea176d9 100644
+--- a/lto-plugin/Makefile.am
++++ b/lto-plugin/Makefile.am
+@@ -22,7 +22,7 @@ liblto_plugin_la_SOURCES = lto-plugin.c
+ liblto_plugin_la_LIBADD = \
+ $(if $(wildcard ../libiberty/pic/libiberty.a),$(Wc)../libiberty/pic/libiberty.a,)
+ # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS
+-liblto_plugin_la_LDFLAGS = $(lt_host_flags) -module -bindir $(libexecsubdir) \
++liblto_plugin_la_LDFLAGS = $(lt_host_flags) -module -avoid-version -bindir $(libexecsubdir) \
+ $(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a)
+ liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \
+ ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,)
+diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in
+index 0c8d89f..c591d5d 100644
+--- a/lto-plugin/Makefile.in
++++ b/lto-plugin/Makefile.in
+@@ -242,7 +242,7 @@ liblto_plugin_la_LIBADD = \
+ $(if $(wildcard ../libiberty/pic/libiberty.a),$(Wc)../libiberty/pic/libiberty.a,)
+
+ # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS
+-liblto_plugin_la_LDFLAGS = $(lt_host_flags) -module -bindir $(libexecsubdir) \
++liblto_plugin_la_LDFLAGS = $(lt_host_flags) -module -avoid-version -bindir $(libexecsubdir) \
+ $(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a)
+
+ liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \
diff --git a/patches/gcc-4.8.2-x86_64-cygwin-4.8.2-2-20140206.diff b/patches/gcc-4.8.2-x86_64-cygwin-4.8.2-2-20140206.diff
new file mode 100644
index 0000000..693d8d6
--- /dev/null
+++ b/patches/gcc-4.8.2-x86_64-cygwin-4.8.2-2-20140206.diff
@@ -0,0 +1,5690 @@
+diff --git a/Makefile.in b/Makefile.in
+index bfbaf03..39f1e05 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1588,7 +1588,6 @@ install-info-target: maybe-install-info-target-libgo
+ install-info-target: maybe-install-info-target-libtermcap
+ install-info-target: maybe-install-info-target-winsup
+ install-info-target: maybe-install-info-target-libgloss
+-install-info-target: maybe-install-info-target-libffi
+ install-info-target: maybe-install-info-target-libjava
+ install-info-target: maybe-install-info-target-zlib
+ install-info-target: maybe-install-info-target-boehm-gc
+@@ -1670,7 +1669,6 @@ install-pdf-target: maybe-install-pdf-target-libgo
+ install-pdf-target: maybe-install-pdf-target-libtermcap
+ install-pdf-target: maybe-install-pdf-target-winsup
+ install-pdf-target: maybe-install-pdf-target-libgloss
+-install-pdf-target: maybe-install-pdf-target-libffi
+ install-pdf-target: maybe-install-pdf-target-libjava
+ install-pdf-target: maybe-install-pdf-target-zlib
+ install-pdf-target: maybe-install-pdf-target-boehm-gc
+@@ -1752,7 +1750,6 @@ install-html-target: maybe-install-html-target-libgo
+ install-html-target: maybe-install-html-target-libtermcap
+ install-html-target: maybe-install-html-target-winsup
+ install-html-target: maybe-install-html-target-libgloss
+-install-html-target: maybe-install-html-target-libffi
+ install-html-target: maybe-install-html-target-libjava
+ install-html-target: maybe-install-html-target-zlib
+ install-html-target: maybe-install-html-target-boehm-gc
+@@ -1834,7 +1831,6 @@ installcheck-target: maybe-installcheck-target-libgo
+ installcheck-target: maybe-installcheck-target-libtermcap
+ installcheck-target: maybe-installcheck-target-winsup
+ installcheck-target: maybe-installcheck-target-libgloss
+-installcheck-target: maybe-installcheck-target-libffi
+ installcheck-target: maybe-installcheck-target-libjava
+ installcheck-target: maybe-installcheck-target-zlib
+ installcheck-target: maybe-installcheck-target-boehm-gc
+@@ -2454,7 +2450,6 @@ install-target: \
+ maybe-install-target-libtermcap \
+ maybe-install-target-winsup \
+ maybe-install-target-libgloss \
+- maybe-install-target-libffi \
+ maybe-install-target-libjava \
+ maybe-install-target-zlib \
+ maybe-install-target-boehm-gc \
+@@ -2556,7 +2551,6 @@ install-strip-target: \
+ maybe-install-strip-target-libtermcap \
+ maybe-install-strip-target-winsup \
+ maybe-install-strip-target-libgloss \
+- maybe-install-strip-target-libffi \
+ maybe-install-strip-target-libjava \
+ maybe-install-strip-target-zlib \
+ maybe-install-strip-target-boehm-gc \
+diff --git a/boehm-gc/win32_threads.c b/boehm-gc/win32_threads.c
+index ffb34e0..186bc39 100644
+--- a/boehm-gc/win32_threads.c
++++ b/boehm-gc/win32_threads.c
+@@ -707,6 +707,54 @@ void * GC_start_routine(void * arg)
+ return(result);
+ }
+
++void GC_register_my_thread()
++{
++ GC_thread me;
++ pthread_t my_pthread;
++
++ my_pthread = pthread_self();
++# if DEBUG_CYGWIN_THREADS
++ GC_printf1("Attaching thread 0x%lx\n", my_pthread);
++ GC_printf1("pid = %ld\n", (long) getpid());
++# endif
++
++ /* Check to ensure this thread isn't attached already. */
++ LOCK();
++ me = GC_lookup_thread (my_pthread);
++ UNLOCK();
++ if (me != 0)
++ {
++# if DEBUG_CYGWIN_THREADS
++ GC_printf1("Attempt to re-attach known thread 0x%lx\n", my_pthread);
++# endif
++ return;
++ }
++
++ LOCK();
++ me = GC_new_thread();
++ me -> flags |= DETACHED;
++ me -> pthread_id = pthread_self();
++ UNLOCK();
++}
++
++void GC_unregister_my_thread()
++{
++ pthread_t my_pthread;
++ GC_thread me;
++
++ my_pthread = pthread_self();
++
++# if DEBUG_CYGWIN_THREADS
++ GC_printf1("Detaching thread 0x%lx\n", my_pthread);
++# endif
++
++ LOCK();
++ me = GC_lookup_thread(my_pthread);
++ UNLOCK();
++ GC_thread_exit_proc ((void *)me);
++}
++
++
+ void GC_thread_exit_proc(void *arg)
+ {
+ GC_thread me = (GC_thread)arg;
+diff --git a/config/dfp.m4 b/config/dfp.m4
+index e971db4..5f52bfa 100644
+--- a/config/dfp.m4
++++ b/config/dfp.m4
+@@ -23,7 +23,7 @@ Valid choices are 'yes', 'bid', 'dpd', and 'no'.]) ;;
+ powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
+ i?86*-*-gnu* | \
+ i?86*-*-mingw* | x86_64*-*-mingw* | \
+- i?86*-*-cygwin*)
++ i?86*-*-cygwin* | x86_64*-*cygwin*)
+ enable_decimal_float=yes
+ ;;
+ *)
+diff --git a/config/picflag.m4 b/config/picflag.m4
+index bd81812..2ee5cd0 100644
+--- a/config/picflag.m4
++++ b/config/picflag.m4
+@@ -17,7 +17,9 @@ case "${$2}" in
+ hppa*64*-*-hpux*)
+ # PIC is the default for 64-bit PA HP-UX.
+ ;;
+- i[[34567]]86-*-cygwin* | i[[34567]]86-*-mingw* | x86_64-*-mingw*)
++ i[[34567]]86-*-cygwin* | x86_64-*-cygwin*)
++ ;;
++ i[[34567]]86-*-mingw* | x86_64-*-mingw*)
+ ;;
+ i[[34567]]86-*-interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+diff --git a/fix-libtool-scripts-for-latest-gcc-runtimes.sh b/fix-libtool-scripts-for-latest-gcc-runtimes.sh
+new file mode 100755
+index 0000000..5ffad8f
+--- /dev/null
++++ b/fix-libtool-scripts-for-latest-gcc-runtimes.sh
+@@ -0,0 +1,16 @@
++libdir=${@:-/usr/lib}
++
++[ ! -d ${libdir} ] && exit 1
++
++extrafiles=$(ls -1 2>/dev/null /usr/bin/libtool \
++ /usr/share/apr/build-1/libtool \
++ /usr/lib/R/bin/libtool /usr/lib/rep/i686-pc-cygwin/libtool)
++
++echo "${extrafiles}" \
++ | xargs -r grep -l '^sys_lib_search_path_spec=.*/usr/lib/gcc/i686-pc-cygwin/[34].[3-9].[0-9]' \
++ | xargs -r sed -i -e "/^sys_lib_search_path_spec=/ s|\(pc-cygwin\)/[34].[3-9].[0-9]|\1/$(/usr/bin/gcc-4 -dumpversion)|g"
++
++find ${libdir} -type f -name '*.la' \
++ | xargs -r grep -l '^dependency_libs=.*/usr/lib/gcc/i686-pc-cygwin/[34].[3-9].[0-9]/lib[a-z_+]*.la' \
++ | xargs -r sed -i -e "/^dependency_libs=/ s|[^ ]*pc-cygwin/[34].[3-9].[0-9]/lib\([a-z_+]*\)\.la|-l\1|g"
++
+diff --git a/gcc/ada/a-intnam-cygwin.ads b/gcc/ada/a-intnam-cygwin.ads
+new file mode 100644
+index 0000000..d441e7b
+--- /dev/null
++++ b/gcc/ada/a-intnam-cygwin.ads
+@@ -0,0 +1,170 @@
++------------------------------------------------------------------------------
++-- --
++-- 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-2011, 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 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. --
++-- --
++-- As a special exception under Section 7 of GPL version 3, you are granted --
++-- additional permissions described in the GCC Runtime Library Exception, --
++-- version 3.1, as published by the Free Software Foundation. --
++-- --
++-- You should have received a copy of the GNU General Public License and --
++-- a copy of the GCC Runtime Library Exception along with this program; --
++-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
++-- <http://www.gnu.org/licenses/>. --
++-- --
++-- 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
++
++ -- All identifiers in this unit are implementation defined
++
++ pragma Implementation_Defined;
++
++ -- 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;
+diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
+index 0ddde72..06f36ac 100644
+--- a/gcc/ada/gcc-interface/Makefile.in
++++ b/gcc/ada/gcc-interface/Makefile.in
+@@ -191,6 +191,13 @@ TARGET_ADA_SRCS =
+ # Type of tools build we are doing; default is not compiling tools.
+ TOOLSCASE =
+
++# Which install goal to use.
++INSTALL_GNATLIB_MAIN = install-gnatlib
++INSTALL_GNATLIB_WIN32 = unused-install-gnatlib
++
++# Set shared lib prefix (lib on all systems but cygwin, which uses cyg)
++LIBGNAT_SHARED_LIB_PREFIX=lib
++
+ # Multilib handling
+ MULTISUBDIR =
+ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
+@@ -1600,6 +1607,12 @@ endif
+
+ # Cygwin/Mingw32
+ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(osys))),)
++ # Set target pair suffix for mingw or cygwin
++ W32_TARG=mingw
++ ifneq ($(strip $(filter cygwin%,$(osys))),)
++ W32_TARG=cygwin
++ LIBGNAT_SHARED_LIB_PREFIX=cyg
++ endif
+ # Cygwin provides a full Posix environment, and so we use the default
+ # versions of s-memory and g-socthi rather than the Windows-specific
+ # MinGW versions. Ideally we would use all the default versions for
+@@ -1668,24 +1681,24 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(osys))),)
+ ifeq ($(strip $(MULTISUBDIR)),/32)
+ LIBGNAT_TARGET_PAIRS += \
+ $(X86_TARGET_PAIRS) \
+- system.ads<system-mingw.ads
++ system.ads<system-$(W32_TARG).ads
+ SO_OPTS= -m32 -Wl,-soname,
+ else
+ LIBGNAT_TARGET_PAIRS += \
+ $(X86_64_TARGET_PAIRS) \
+- system.ads<system-mingw-x86_64.ads
++ system.ads<system-$(W32_TARG)-x86_64.ads
+ SO_OPTS = -m64 -Wl,-soname,
+ endif
+ else
+ ifeq ($(strip $(MULTISUBDIR)),/64)
+ LIBGNAT_TARGET_PAIRS += \
+ $(X86_64_TARGET_PAIRS) \
+- system.ads<system-mingw-x86_64.ads
++ system.ads<system-$(W32_TARG)-x86_64.ads
+ SO_OPTS = -m64 -Wl,-soname,
+ else
+ LIBGNAT_TARGET_PAIRS += \
+ $(X86_TARGET_PAIRS) \
+- system.ads<system-mingw.ads
++ system.ads<system-$(W32_TARG).ads
+ SO_OPTS = -m32 -Wl,-soname,
+ endif
+ endif
+@@ -1694,7 +1707,14 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(osys))),)
+ s-win32.o s-winext.o g-regist.o g-sse.o g-ssvety.o
+ EXTRA_GNATRTL_TASKING_OBJS = a-exetim.o
+
+- MISCLIB = -lws2_32
++ # Which install goal to use.
++ INSTALL_GNATLIB_MAIN = unused-install-gnatlib
++ INSTALL_GNATLIB_WIN32 = install-gnatlib
++
++ # Mingw uses winsock-based sockets; cygwin uses POSIX sockets.
++ ifneq ($(strip $(filter-out cygwin%,$(osys))),)
++ MISCLIB = -lwsock32
++ endif
+
+ # ??? This will be replaced by gnatlib-shared-dual-win32 when GNAT
+ # auto-import support for array/record will be done.
+@@ -1704,10 +1724,11 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(osys))),)
+ endif
+
+ TOOLS_TARGET_PAIRS= \
+- mlib-tgt-specific.adb<mlib-tgt-specific-mingw.adb \
+- indepsw.adb<indepsw-mingw.adb
++ mlib-tgt-specific.adb<mlib-tgt-specific-$(W32_TARG).adb \
++ indepsw.adb<indepsw-$(W32_TARG).adb
+
+ GMEM_LIB = gmemlib
++ EH_MECHANISM=-gcc
+ EXTRA_GNATTOOLS = ../../gnatdll$(exeext)
+ EXTRA_GNATMAKE_OBJS = mdll.o mdll-utl.o mdll-fil.o
+ soext = .dll
+@@ -2535,7 +2556,7 @@ gnatlink-re: ../stamp-tools link.o targext.o gnatmake-re
+ true; \
+ fi
+
+-install-gnatlib: ../stamp-gnatlib-$(RTSDIR)
++$(INSTALL_GNATLIB_MAIN): ../stamp-gnatlib-$(RTSDIR)
+ # Create the directory before deleting it, in case the directory is
+ # a list of directories (as it may be on VMS). This ensures we are
+ # deleting the right one.
+@@ -2582,6 +2603,46 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR)
+ cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
+ cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
+
++$(INSTALL_GNATLIB_WIN32): ../stamp-gnatlib-$(RTSDIR)
++# Create the directory before deleting it, in case the directory is
++# a list of directories (as it may be on VMS). This ensures we are
++# deleting the right one.
++ -$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR)
++ -$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR)
++ $(RMDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR)
++ $(RMDIR) $(DESTDIR)$(ADA_INCLUDE_DIR)
++ -$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR)
++ -$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR)
++ for file in $(RTSDIR)/*.ali; do \
++ $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
++ done
++ -$(INSTALL_DATA) $(RTSDIR)/g-trasym$(objext) $(DESTDIR)$(ADA_RTL_OBJ_DIR)
++ -cd $(RTSDIR); for file in *$(arext);do \
++ $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
++ $(RANLIB_FOR_TARGET) $(DESTDIR)$(ADA_RTL_OBJ_DIR)/$$file; \
++ done
++ -$(foreach file, $(EXTRA_ADALIB_FILES), \
++ $(INSTALL_DATA_DATE) $(RTSDIR)/$(file) $(DESTDIR)$(ADA_RTL_OBJ_DIR) && \
++ ) true
++# Install the shared libraries, if any, using $(INSTALL) instead
++# of $(INSTALL_DATA). The latter may force a mode inappropriate
++# for shared libraries on some targets, e.g. on HP-UX where the x
++# permission is required. We are win32 here.
++ for file in gnat gnarl; do \
++ if [ -f $(RTSDIR)/$(LIBGNAT_SHARED_LIB_PREFIX)$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \
++ $(INSTALL) $(RTSDIR)/$(LIBGNAT_SHARED_LIB_PREFIX)$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ $(DESTDIR)$(bindir); \
++ $(LN_S) $(bindir)/$(LIBGNAT_SHARED_LIB_PREFIX)$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ $(DESTDIR)$(ADA_RTL_OBJ_DIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION).dll.a; \
++ fi; \
++ done
++# This copy must be done preserving the date on the original file.
++ for file in $(RTSDIR)/*.ad?; do \
++ $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_INCLUDE_DIR); \
++ done
++ cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
++ cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
++
+ ../stamp-gnatlib2-$(RTSDIR):
+ $(RM) $(RTSDIR)/s-*.ali
+ $(RM) $(RTSDIR)/s-*$(objext)
+@@ -2774,20 +2835,20 @@ gnatlib-shared-win32:
+ MULTISUBDIR="$(MULTISUBDIR)" \
+ THREAD_KIND="$(THREAD_KIND)" \
+ gnatlib
+- $(RM) $(RTSDIR)/libgna*$(soext)
++ $(RM) $(RTSDIR)/$(LIBGNAT_SHARED_LIB_PREFIX)gna*$(soext)
+ cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
+ | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared -shared-libgcc \
+ $(PICFLAG_FOR_TARGET) \
+- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ -o $(LIBGNAT_SHARED_LIB_PREFIX)gnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
+- $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB)
++ $(SO_OPTS)$(LIBGNAT_SHARED_LIB_PREFIX)gnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB)
+ cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
+ | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared -shared-libgcc \
+ $(PICFLAG_FOR_TARGET) \
+- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ -o $(LIBGNAT_SHARED_LIB_PREFIX)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ $(GNATRTL_TASKING_OBJS) \
+- $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+- $(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)
++ $(SO_OPTS)$(LIBGNAT_SHARED_LIB_PREFIX)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ $(THREADSLIB) -Wl,$(LIBGNAT_SHARED_LIB_PREFIX)gnat$(hyphen)$(LIBRARY_VERSION)$(soext)
+
+ gnatlib-shared-darwin:
+ $(MAKE) $(FLAGS_TO_PASS) \
+diff --git a/gcc/ada/gsocket.h b/gcc/ada/gsocket.h
+index e21d714..c18a891 100644
+--- a/gcc/ada/gsocket.h
++++ b/gcc/ada/gsocket.h
+@@ -199,7 +199,7 @@
+ #endif
+
+ #if defined (_AIX) || defined (__FreeBSD__) || defined (__hpux__) || \
+- defined (_WIN32) || defined (__APPLE__)
++ defined (_WIN32) || defined (__APPLE__) || defined (__CYGWIN__)
+ # define HAVE_THREAD_SAFE_GETxxxBYyyy 1
+
+ #elif defined (linux) || defined (__GLIBC__) || \
+diff --git a/gcc/ada/indepsw-cygwin.adb b/gcc/ada/indepsw-cygwin.adb
+new file mode 100644
+index 0000000..7632cf7
+--- /dev/null
++++ b/gcc/ada/indepsw-cygwin.adb
+@@ -0,0 +1,67 @@
++------------------------------------------------------------------------------
++-- --
++-- GNAT COMPILER COMPONENTS --
++-- --
++-- I N D E P S W --
++-- --
++-- B o d y --
++-- (Windows version) --
++-- --
++-- Copyright (C) 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. --
++-- --
++-- As a special exception under Section 7 of GPL version 3, you are granted --
++-- additional permissions described in the GCC Runtime Library Exception, --
++-- version 3.1, as published by the Free Software Foundation. --
++-- --
++-- You should have received a copy of the GNU General Public License and --
++-- a copy of the GCC Runtime Library Exception along with this program; --
++-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
++-- <http://www.gnu.org/licenses/>. --
++-- --
++-- 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;
+diff --git a/gcc/ada/initialize.c b/gcc/ada/initialize.c
+index 00c4d04..5971f79 100644
+--- a/gcc/ada/initialize.c
++++ b/gcc/ada/initialize.c
+@@ -297,6 +297,40 @@ __gnat_initialize (void *eh ATTRIBUTE_UNUSED)
+ __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
+
+ /* For all other versions of GNAT, the initialize routine and handler
+diff --git a/gcc/ada/mlib-tgt-specific-cygwin.adb b/gcc/ada/mlib-tgt-specific-cygwin.adb
+new file mode 100644
+index 0000000..8e0c0a1
+--- /dev/null
++++ b/gcc/ada/mlib-tgt-specific-cygwin.adb
+@@ -0,0 +1,162 @@
++------------------------------------------------------------------------------
++-- --
++-- 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-2010, 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;
++
++ Shared_Libgcc : aliased String := "-shared-libgcc";
++
++ Shared_Libgcc_Switch : constant Argument_List :=
++ (1 => Shared_Libgcc'Access);
++
++ ---------------------------
++ -- 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 => Shared_Libgcc_Switch,
++ 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;
+diff --git a/gcc/ada/s-gloloc-cygwin.adb b/gcc/ada/s-gloloc-cygwin.adb
+new file mode 100644
+index 0000000..b6050cb
+--- /dev/null
++++ b/gcc/ada/s-gloloc-cygwin.adb
+@@ -0,0 +1,107 @@
++------------------------------------------------------------------------------
++-- --
++-- 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-2010, 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 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. --
++-- --
++-- As a special exception under Section 7 of GPL version 3, you are granted --
++-- additional permissions described in the GCC Runtime Library Exception, --
++-- version 3.1, as published by the Free Software Foundation. --
++-- --
++-- You should have received a copy of the GNU General Public License and --
++-- a copy of the GCC Runtime Library Exception along with this program; --
++-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
++-- <http://www.gnu.org/licenses/>. --
++-- --
++-- 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.OS_Interface;
++with System.Task_Lock;
++with System.Win32;
++
++with Interfaces.C.Strings;
++
++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 Win32.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, Win32.FALSE, ICS.New_String (Name));
++ Lock := L;
++ end Create_Lock;
++
++ ------------------
++ -- Acquire_Lock --
++ ------------------
++
++ procedure Acquire_Lock (Lock : in out Lock_Type) is
++ use type Win32.DWORD;
++
++ Res : Win32.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 Win32.BOOL;
++
++ Res : Win32.BOOL;
++
++ begin
++ Res := OSI.ReleaseMutex (Lock_Table (Lock));
++
++ if Res = Win32.FALSE then
++ raise Lock_Error;
++ end if;
++ end Release_Lock;
++
++end System.Global_Locks;
+diff --git a/gcc/ada/s-oscons-tmplt.c b/gcc/ada/s-oscons-tmplt.c
+index 0964886..e08a079 100644
+--- a/gcc/ada/s-oscons-tmplt.c
++++ b/gcc/ada/s-oscons-tmplt.c
+@@ -973,7 +973,12 @@ CND(VEOL2, "Alternative EOL")
+
+ #endif /* HAVE_TERMIOS */
+
+-#ifdef __MINGW32__
++#ifdef __CYGWIN__
++#define RTS_CONTROL_ENABLE 0x1
++#define DTR_CONTROL_ENABLE 0x1
++#endif
++
++#if defined (__CYGWIN__) || defined (__MINGW32__)
+ CNU(DTR_CONTROL_ENABLE, "Enable DTR flow ctrl")
+ CNU(RTS_CONTROL_ENABLE, "Enable RTS flow ctrl")
+ #endif
+diff --git a/gcc/ada/s-osinte-cygwin.ads b/gcc/ada/s-osinte-cygwin.ads
+new file mode 100644
+index 0000000..2f656d2
+--- /dev/null
++++ b/gcc/ada/s-osinte-cygwin.ads
+@@ -0,0 +1,951 @@
++------------------------------------------------------------------------------
++-- --
++-- 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-2010, 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. --
++-- --
++-- As a special exception under Section 7 of GPL version 3, you are granted --
++-- additional permissions described in the GCC Runtime Library Exception, --
++-- version 3.1, as published by the Free Software Foundation. --
++-- --
++-- You should have received a copy of the GNU General Public License and --
++-- a copy of the GCC Runtime Library Exception along with this program; --
++-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
++-- <http://www.gnu.org/licenses/>. --
++-- --
++-- 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 DeleteCriticalSection
++ (pCriticalSection : access CRITICAL_SECTION);
++ pragma Import (Stdcall, DeleteCriticalSection, "DeleteCriticalSection");
++
++ -------------------------------------------------------------
++ -- Thread Creation, Activation, Suspension And Termination --
++ -------------------------------------------------------------
++
++ subtype ProcessorId is DWORD;
++
++ type PTHREAD_START_ROUTINE is access function
++ (pThreadParameter : PVOID) return DWORD;
++ pragma Convention (Stdcall, PTHREAD_START_ROUTINE);
++
++ function To_PTHREAD_START_ROUTINE is new
++ Ada.Unchecked_Conversion (System.Address, PTHREAD_START_ROUTINE);
++
++ type SECURITY_ATTRIBUTES is record
++ nLength : DWORD;
++ pSecurityDescriptor : PVOID;
++ bInheritHandle : BOOL;
++ end record;
++
++ type PSECURITY_ATTRIBUTES is access all SECURITY_ATTRIBUTES;
++
++ function CreateThread
++ (pThreadAttributes : PSECURITY_ATTRIBUTES;
++ dwStackSize : DWORD;
++ pStartAddress : PTHREAD_START_ROUTINE;
++ pParameter : PVOID;
++ dwCreationFlags : DWORD;
++ pThreadId : PDWORD) return HANDLE;
++ pragma Import (Stdcall, CreateThread, "CreateThread");
++
++ function BeginThreadEx
++ (pThreadAttributes : PSECURITY_ATTRIBUTES;
++ dwStackSize : DWORD;
++ pStartAddress : PTHREAD_START_ROUTINE;
++ pParameter : PVOID;
++ dwCreationFlags : DWORD;
++ pThreadId : PDWORD) return HANDLE;
++ pragma Import (C, BeginThreadEx, "_beginthreadex");
++
++ Debug_Process : constant := 16#00000001#;
++ Debug_Only_This_Process : constant := 16#00000002#;
++ Create_Suspended : constant := 16#00000004#;
++ Detached_Process : constant := 16#00000008#;
++ Create_New_Console : constant := 16#00000010#;
++
++ Create_New_Process_Group : constant := 16#00000200#;
++
++ Create_No_window : constant := 16#08000000#;
++
++ Profile_User : constant := 16#10000000#;
++ Profile_Kernel : constant := 16#20000000#;
++ Profile_Server : constant := 16#40000000#;
++
++ Stack_Size_Param_Is_A_Reservation : constant := 16#00010000#;
++
++ function GetExitCodeThread
++ (hThread : HANDLE;
++ pExitCode : PDWORD) return BOOL;
++ pragma Import (Stdcall, GetExitCodeThread, "GetExitCodeThread");
++
++ function ResumeThread (hThread : HANDLE) return DWORD;
++ pragma Import (Stdcall, ResumeThread, "ResumeThread");
++
++ function SuspendThread (hThread : HANDLE) return DWORD;
++ pragma Import (Stdcall, SuspendThread, "SuspendThread");
++
++ procedure ExitThread (dwExitCode : DWORD);
++ pragma Import (Stdcall, ExitThread, "ExitThread");
++
++ procedure EndThreadEx (dwExitCode : DWORD);
++ pragma Import (C, EndThreadEx, "_endthreadex");
++
++ function TerminateThread
++ (hThread : HANDLE;
++ dwExitCode : DWORD) return BOOL;
++ pragma Import (Stdcall, TerminateThread, "TerminateThread");
++
++ function GetCurrentThread return HANDLE;
++ pragma Import (Stdcall, GetCurrentThread, "GetCurrentThread");
++
++ function GetCurrentProcess return HANDLE;
++ pragma Import (Stdcall, GetCurrentProcess, "GetCurrentProcess");
++
++ function GetCurrentThreadId return DWORD;
++ pragma Import (Stdcall, GetCurrentThreadId, "GetCurrentThreadId");
++
++ function TlsAlloc return DWORD;
++ pragma Import (Stdcall, TlsAlloc, "TlsAlloc");
++
++ function TlsGetValue (dwTlsIndex : DWORD) return PVOID;
++ pragma Import (Stdcall, TlsGetValue, "TlsGetValue");
++
++ function TlsSetValue (dwTlsIndex : DWORD; pTlsValue : PVOID) return BOOL;
++ pragma Import (Stdcall, TlsSetValue, "TlsSetValue");
++
++ function TlsFree (dwTlsIndex : DWORD) return BOOL;
++ pragma Import (Stdcall, TlsFree, "TlsFree");
++
++ TLS_Nothing : constant := DWORD'Last;
++
++ procedure ExitProcess (uExitCode : Interfaces.C.unsigned);
++ pragma Import (Stdcall, ExitProcess, "ExitProcess");
++
++ function WaitForSingleObject
++ (hHandle : HANDLE;
++ dwMilliseconds : DWORD) return DWORD;
++ pragma Import (Stdcall, WaitForSingleObject, "WaitForSingleObject");
++
++ function WaitForSingleObjectEx
++ (hHandle : HANDLE;
++ dwMilliseconds : DWORD;
++ fAlertable : BOOL) return DWORD;
++ pragma Import (Stdcall, WaitForSingleObjectEx, "WaitForSingleObjectEx");
++
++ function SetThreadIdealProcessor
++ (hThread : HANDLE;
++ dwIdealProcessor : ProcessorId) return DWORD;
++ pragma Import (Stdcall, SetThreadIdealProcessor, "SetThreadIdealProcessor");
++
++ Wait_Infinite : constant := DWORD'Last;
++ WAIT_TIMEOUT : constant := 16#0000_0102#;
++ WAIT_FAILED : constant := 16#FFFF_FFFF#;
++
++ ------------------------------------
++ -- Semaphores, Events and Mutexes --
++ ------------------------------------
++
++ function CloseHandle (hObject : HANDLE) return BOOL;
++ pragma Import (Stdcall, CloseHandle, "CloseHandle");
++
++ function CreateSemaphore
++ (pSemaphoreAttributes : PSECURITY_ATTRIBUTES;
++ lInitialCount : Interfaces.C.long;
++ lMaximumCount : Interfaces.C.long;
++ pName : PSZ) return HANDLE;
++ pragma Import (Stdcall, CreateSemaphore, "CreateSemaphoreA");
++
++ function OpenSemaphore
++ (dwDesiredAccess : DWORD;
++ bInheritHandle : BOOL;
++ pName : PSZ) return HANDLE;
++ pragma Import (Stdcall, OpenSemaphore, "OpenSemaphoreA");
++
++ function ReleaseSemaphore
++ (hSemaphore : HANDLE;
++ lReleaseCount : Interfaces.C.long;
++ pPreviousCount : PLONG) return BOOL;
++ pragma Import (Stdcall, ReleaseSemaphore, "ReleaseSemaphore");
++
++ function CreateEvent
++ (pEventAttributes : PSECURITY_ATTRIBUTES;
++ bManualReset : BOOL;
++ bInitialState : BOOL;
++ pName : PSZ) return HANDLE;
++ pragma Import (Stdcall, CreateEvent, "CreateEventA");
++
++ function OpenEvent
++ (dwDesiredAccess : DWORD;
++ bInheritHandle : BOOL;
++ pName : PSZ) return HANDLE;
++ pragma Import (Stdcall, OpenEvent, "OpenEventA");
++
++ function SetEvent (hEvent : HANDLE) return BOOL;
++ pragma Import (Stdcall, SetEvent, "SetEvent");
++
++ function ResetEvent (hEvent : HANDLE) return BOOL;
++ pragma Import (Stdcall, ResetEvent, "ResetEvent");
++
++ function PulseEvent (hEvent : HANDLE) return BOOL;
++ pragma Import (Stdcall, PulseEvent, "PulseEvent");
++
++ function CreateMutex
++ (pMutexAttributes : PSECURITY_ATTRIBUTES;
++ bInitialOwner : BOOL;
++ pName : PSZ) return HANDLE;
++ pragma Import (Stdcall, CreateMutex, "CreateMutexA");
++
++ function OpenMutex
++ (dwDesiredAccess : DWORD;
++ bInheritHandle : BOOL;
++ pName : PSZ) return HANDLE;
++ pragma Import (Stdcall, OpenMutex, "OpenMutexA");
++
++ function ReleaseMutex (hMutex : HANDLE) return BOOL;
++ pragma Import (Stdcall, ReleaseMutex, "ReleaseMutex");
++
++ ---------------------------------------------------
++ -- Accessing properties of Threads and Processes --
++ ---------------------------------------------------
++
++ -----------------
++ -- Priorities --
++ -----------------
++
++ function SetThreadPriority
++ (hThread : HANDLE;
++ nPriority : Interfaces.C.int) return BOOL;
++ pragma Import (Stdcall, SetThreadPriority, "SetThreadPriority");
++
++ function GetThreadPriority (hThread : HANDLE) return Interfaces.C.int;
++ pragma Import (Stdcall, GetThreadPriority, "GetThreadPriority");
++
++ function SetPriorityClass
++ (hProcess : HANDLE;
++ dwPriorityClass : DWORD) return BOOL;
++ pragma Import (Stdcall, SetPriorityClass, "SetPriorityClass");
++
++ procedure SetThreadPriorityBoost
++ (hThread : HANDLE;
++ DisablePriorityBoost : BOOL);
++ pragma Import (Stdcall, SetThreadPriorityBoost, "SetThreadPriorityBoost");
++
++ Normal_Priority_Class : constant := 16#00000020#;
++ Idle_Priority_Class : constant := 16#00000040#;
++ High_Priority_Class : constant := 16#00000080#;
++ Realtime_Priority_Class : constant := 16#00000100#;
++
++ Thread_Priority_Idle : constant := -15;
++ Thread_Priority_Lowest : constant := -2;
++ Thread_Priority_Below_Normal : constant := -1;
++ Thread_Priority_Normal : constant := 0;
++ Thread_Priority_Above_Normal : constant := 1;
++ Thread_Priority_Highest : constant := 2;
++ Thread_Priority_Time_Critical : constant := 15;
++ Thread_Priority_Error_Return : constant := Interfaces.C.long'Last;
++
++ function GetLastError return DWORD;
++ pragma Import (Stdcall, GetLastError, "GetLastError");
++
++private
++
++ type sigset_t is array (0 .. 127) of unsigned_char;
++ pragma Convention (C, sigset_t);
++ for sigset_t'Alignment use unsigned_long'Alignment;
++
++ type pid_t is new int;
++
++ type time_t is new long;
++
++ type timespec is record
++ tv_sec : time_t;
++ tv_nsec : long;
++ end record;
++ pragma Convention (C, timespec);
++
++ type struct_timeval is record
++ tv_sec : time_t;
++ tv_usec : time_t;
++ end record;
++ pragma Convention (C, struct_timeval);
++
++ type pthread_attr_t is record
++ detachstate : int;
++ schedpolicy : int;
++ schedparam : struct_sched_param;
++ inheritsched : int;
++ scope : int;
++ guardsize : size_t;
++ stackaddr_set : int;
++ stackaddr : System.Address;
++ stacksize : size_t;
++ end record;
++ pragma Convention (C, pthread_attr_t);
++
++ type pthread_condattr_t is record
++ dummy : int;
++ end record;
++ pragma Convention (C, pthread_condattr_t);
++
++ type pthread_mutexattr_t is record
++ mutexkind : int;
++ end record;
++ pragma Convention (C, pthread_mutexattr_t);
++
++ type struct_pthread_fast_lock is record
++ status : long;
++ spinlock : int;
++ end record;
++ pragma Convention (C, struct_pthread_fast_lock);
++
++ type pthread_mutex_t is record
++ m_reserved : int;
++ m_count : int;
++ m_owner : System.Address;
++ m_kind : int;
++ m_lock : struct_pthread_fast_lock;
++ end record;
++ pragma Convention (C, pthread_mutex_t);
++
++ type pthread_cond_t is array (0 .. 47) of unsigned_char;
++ pragma Convention (C, pthread_cond_t);
++
++ type pthread_key_t is new unsigned;
++
++ -------------------
++ -- Win32 private --
++ -------------------
++
++ type CRITICAL_SECTION is record
++ DebugInfo : System.Address;
++ -- The following three fields control entering and
++ -- exiting the critical section for the resource
++ LockCount : Long_Integer;
++ RecursionCount : Long_Integer;
++ OwningThread : HANDLE;
++ LockSemaphore : HANDLE;
++ Reserved : DWORD;
++ end record;
++
++end System.OS_Interface;
+diff --git a/gcc/ada/s-taprop-cygwin.adb b/gcc/ada/s-taprop-cygwin.adb
+new file mode 100644
+index 0000000..782af9d
+--- /dev/null
++++ b/gcc/ada/s-taprop-cygwin.adb
+@@ -0,0 +1,1337 @@
++------------------------------------------------------------------------------
++-- --
++-- GNU ADA RUN-TIME LIBRARY (GNARL) COMPONENTS --
++-- --
++-- S Y S T E M . T A S K _ P R I M I T I V E S . O P E R A T I O N S --
++-- --
++-- B o d y --
++-- --
++-- Copyright (C) 1992-2011, 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 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. --
++-- --
++-- As a special exception under Section 7 of GPL version 3, you are granted --
++-- additional permissions described in the GCC Runtime Library Exception, --
++-- version 3.1, as published by the Free Software Foundation. --
++-- --
++-- You should have received a copy of the GNU General Public License and --
++-- a copy of the GCC Runtime Library Exception along with this program; --
++-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
++-- <http://www.gnu.org/licenses/>. --
++-- --
++-- 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 contains all the GNULL primitives that interface directly
++-- with the underlying OS.
++
++pragma Polling (Off);
++-- Turn off polling, we do not want ATC polling to take place during
++-- tasking operations. It causes infinite loops and other problems.
++
++with Interfaces.C;
++-- used for int
++-- size_t
++
++with System.Task_Info;
++-- used for Unspecified_Task_Info
++
++with System.Tasking.Debug;
++-- used for Known_Tasks
++
++with System.Interrupt_Management;
++-- used for Keep_Unmasked
++-- Abort_Task_Interrupt
++-- Interrupt_ID
++
++with System.OS_Primitives;
++-- used for Delay_Modes
++
++with System.Soft_Links;
++-- used for Abort_Defer/Undefer
++
++-- We use System.Soft_Links instead of System.Tasking.Initialization
++-- because the later is a higher level package that we shouldn't depend on.
++-- For example when using the restricted run time, it is replaced by
++-- System.Tasking.Restricted.Stages.
++
++with System.Storage_Elements;
++with System.Stack_Checking.Operations;
++-- Used for Invalidate_Stack_Cache and Notify_Stack_Attributes;
++
++with Ada.Exceptions;
++-- used for Raise_Exception
++-- Raise_From_Signal_Handler
++-- Exception_Id
++
++with Ada.Unchecked_Conversion;
++with Ada.Unchecked_Deallocation;
++
++package body System.Task_Primitives.Operations is
++
++ package SSL renames System.Soft_Links;
++ package SC renames System.Stack_Checking.Operations;
++
++ use System.Tasking.Debug;
++ use System.Tasking;
++ use Interfaces.C;
++ use System.OS_Interface;
++ use System.Parameters;
++ use System.OS_Primitives;
++ use System.Storage_Elements;
++ use System.Task_Info;
++
++ ----------------
++ -- Local Data --
++ ----------------
++
++ -- The followings are logically constants, but need to be initialized
++ -- at run time.
++
++ Single_RTS_Lock : aliased RTS_Lock;
++ -- This is a lock to allow only one thread of control in the RTS at
++ -- a time; it is used to execute in mutual exclusion from all other tasks.
++ -- Used mainly in Single_Lock mode, but also to protect All_Tasks_List
++
++ ATCB_Key : aliased pthread_key_t;
++ -- Key used to find the Ada Task_Id associated with a thread
++
++ Environment_Task_Id : Task_Id;
++ -- A variable to hold Task_Id for the environment task
++
++ Unblocked_Signal_Mask : aliased sigset_t;
++ -- The set of signals that should be unblocked in all tasks
++
++ -- The followings are internal configuration constants needed
++
++ Next_Serial_Number : Task_Serial_Number := 100;
++ -- We start at 100 (reserve some special values for using in error checks)
++
++ Time_Slice_Val : Integer;
++ pragma Import (C, Time_Slice_Val, "__gl_time_slice_val");
++
++ Dispatching_Policy : Character;
++ pragma Import (C, Dispatching_Policy, "__gl_task_dispatching_policy");
++
++ -- The following are effectively constants, but they need to be initialized
++ -- by calling a pthread_ function.
++
++ Mutex_Attr : aliased pthread_mutexattr_t;
++ Cond_Attr : aliased pthread_condattr_t;
++
++ Foreign_Task_Elaborated : aliased Boolean := True;
++ -- Used to identified fake tasks (i.e., non-Ada Threads)
++
++ --------------------
++ -- Local Packages --
++ --------------------
++
++ package Specific is
++
++ procedure Initialize (Environment_Task : Task_Id);
++ pragma Inline (Initialize);
++ -- Initialize various data needed by this package
++
++ function Is_Valid_Task return Boolean;
++ pragma Inline (Is_Valid_Task);
++ -- Does executing thread have a TCB?
++
++ procedure Set (Self_Id : Task_Id);
++ pragma Inline (Set);
++ -- Set the self id for the current task
++
++ function Self return Task_Id;
++ pragma Inline (Self);
++ -- Return a pointer to the Ada Task Control Block of the calling task
++
++ end Specific;
++
++ package body Specific is separate;
++ -- The body of this package is target specific
++
++ ---------------------------------
++ -- Support for foreign threads --
++ ---------------------------------
++
++ function Register_Foreign_Thread (Thread : Thread_Id) return Task_Id;
++ -- Allocate and Initialize a new ATCB for the current Thread
++
++ function Register_Foreign_Thread
++ (Thread : Thread_Id) return Task_Id is separate;
++
++ -----------------------
++ -- Local Subprograms --
++ -----------------------
++
++ subtype unsigned_long is Interfaces.C.unsigned_long;
++
++ procedure Abort_Handler (signo : Signal);
++
++ function To_pthread_t is new Ada.Unchecked_Conversion
++ (unsigned_long, System.OS_Interface.pthread_t);
++
++ procedure Get_Stack_Attributes
++ (T : Task_Id;
++ ISP : out System.Address;
++ Size : out Storage_Offset);
++ -- Fill ISP and Size with the Initial Stack Pointer value and the
++ -- thread stack size for task T.
++
++ -------------------
++ -- Abort_Handler --
++ -------------------
++
++ procedure Abort_Handler (signo : Signal) is
++ pragma Unreferenced (signo);
++
++ Self_Id : constant Task_Id := Self;
++ Result : Interfaces.C.int;
++ Old_Set : aliased sigset_t;
++
++ begin
++ if ZCX_By_Default and then GCC_ZCX_Support then
++ return;
++ end if;
++
++ if Self_Id.Deferral_Level = 0
++ and then Self_Id.Pending_ATC_Level < Self_Id.ATC_Nesting_Level
++ and then not Self_Id.Aborting
++ then
++ Self_Id.Aborting := True;
++
++ -- Make sure signals used for RTS internal purpose are unmasked
++
++ Result :=
++ pthread_sigmask
++ (SIG_UNBLOCK,
++ Unblocked_Signal_Mask'Access,
++ Old_Set'Access);
++ pragma Assert (Result = 0);
++
++ raise Standard'Abort_Signal;
++ end if;
++ end Abort_Handler;
++
++ --------------
++ -- Lock_RTS --
++ --------------
++
++ procedure Lock_RTS is
++ begin
++ Write_Lock (Single_RTS_Lock'Access, Global_Lock => True);
++ end Lock_RTS;
++
++ ----------------
++ -- Unlock_RTS --
++ ----------------
++
++ procedure Unlock_RTS is
++ begin
++ Unlock (Single_RTS_Lock'Access, Global_Lock => True);
++ end Unlock_RTS;
++
++ -----------------
++ -- Stack_Guard --
++ -----------------
++
++ -- The underlying thread system extends the memory (up to 2MB) when needed
++
++ procedure Stack_Guard (T : ST.Task_Id; On : Boolean) is
++ pragma Unreferenced (T);
++ pragma Unreferenced (On);
++ begin
++ null;
++ end Stack_Guard;
++
++ --------------------
++ -- Get_Thread_Id --
++ --------------------
++
++ function Get_Thread_Id (T : ST.Task_Id) return OSI.Thread_Id is
++ begin
++ return T.Common.LL.Thread;
++ end Get_Thread_Id;
++
++ ----------
++ -- Self --
++ ----------
++
++ function Self return Task_Id renames Specific.Self;
++
++ ---------------------
++ -- Initialize_Lock --
++ ---------------------
++
++ -- Note: mutexes and cond_variables needed per-task basis are
++ -- initialized in Initialize_TCB and the Storage_Error is
++ -- handled. Other mutexes (such as RTS_Lock, Memory_Lock...)
++ -- used in RTS is initialized before any status change of RTS.
++ -- Therefore rasing Storage_Error in the following routines
++ -- should be able to be handled safely.
++
++ procedure Initialize_Lock
++ (Prio : System.Any_Priority;
++ L : not null access Lock)
++ is
++ pragma Unreferenced (Prio);
++
++ Result : Interfaces.C.int;
++
++ begin
++ Result := pthread_mutex_init (L, Mutex_Attr'Access);
++
++ pragma Assert (Result = 0 or else Result = ENOMEM);
++
++ if Result = ENOMEM then
++ Ada.Exceptions.Raise_Exception (Storage_Error'Identity,
++ "Failed to allocate a lock");
++ end if;
++ end Initialize_Lock;
++
++ procedure Initialize_Lock
++ (L : not null access RTS_Lock;
++ Level : Lock_Level)
++ is
++ pragma Unreferenced (Level);
++
++ Result : Interfaces.C.int;
++
++ begin
++ Result := pthread_mutex_init (L, Mutex_Attr'Access);
++
++ pragma Assert (Result = 0 or else Result = ENOMEM);
++
++ if Result = ENOMEM then
++ raise Storage_Error;
++ end if;
++ end Initialize_Lock;
++
++ -------------------
++ -- Finalize_Lock --
++ -------------------
++
++ procedure Finalize_Lock (L : not null access Lock) is
++ Result : Interfaces.C.int;
++ begin
++ Result := pthread_mutex_destroy (L);
++ pragma Assert (Result = 0);
++ end Finalize_Lock;
++
++ procedure Finalize_Lock (L : not null access RTS_Lock) is
++ Result : Interfaces.C.int;
++ begin
++ Result := pthread_mutex_destroy (L);
++ pragma Assert (Result = 0);
++ end Finalize_Lock;
++
++ ----------------
++ -- Write_Lock --
++ ----------------
++
++ procedure Write_Lock
++ (L : not null access Lock;
++ Ceiling_Violation : out Boolean)
++ is
++ Result : Interfaces.C.int;
++ begin
++ Result := pthread_mutex_lock (L);
++ Ceiling_Violation := Result = EINVAL;
++
++ -- Assume the cause of EINVAL is a priority ceiling violation
++
++ pragma Assert (Result = 0 or else Result = EINVAL);
++ end Write_Lock;
++
++ procedure Write_Lock
++ (L : not null access RTS_Lock;
++ Global_Lock : Boolean := False)
++ is
++ Result : Interfaces.C.int;
++ begin
++ if not Single_Lock or else Global_Lock then
++ Result := pthread_mutex_lock (L);
++ pragma Assert (Result = 0);
++ end if;
++ end Write_Lock;
++
++ procedure Write_Lock (T : Task_Id) is
++ Result : Interfaces.C.int;
++ begin
++ if not Single_Lock then
++ Result := pthread_mutex_lock (T.Common.LL.L'Access);
++ pragma Assert (Result = 0);
++ end if;
++ end Write_Lock;
++
++ ---------------
++ -- Read_Lock --
++ ---------------
++
++ procedure Read_Lock
++ (L : not null access Lock;
++ Ceiling_Violation : out Boolean)
++ is
++ begin
++ Write_Lock (L, Ceiling_Violation);
++ end Read_Lock;
++
++ ------------
++ -- Unlock --
++ ------------
++
++ procedure Unlock (L : not null access Lock) is
++ Result : Interfaces.C.int;
++ begin
++ Result := pthread_mutex_unlock (L);
++ pragma Assert (Result = 0);
++ end Unlock;
++
++ procedure Unlock
++ (L : not null access RTS_Lock;
++ Global_Lock : Boolean := False)
++ is
++ Result : Interfaces.C.int;
++ begin
++ if not Single_Lock or else Global_Lock then
++ Result := pthread_mutex_unlock (L);
++ pragma Assert (Result = 0);
++ end if;
++ end Unlock;
++
++ procedure Unlock (T : Task_Id) is
++ Result : Interfaces.C.int;
++ begin
++ if not Single_Lock then
++ Result := pthread_mutex_unlock (T.Common.LL.L'Access);
++ pragma Assert (Result = 0);
++ end if;
++ end Unlock;
++
++ -----------------
++ -- Set_Ceiling --
++ -----------------
++
++ -- Dynamic priority ceilings are not supported by the underlying system
++
++ procedure Set_Ceiling
++ (L : not null access Lock;
++ Prio : System.Any_Priority)
++ is
++ pragma Unreferenced (L, Prio);
++ begin
++ null;
++ end Set_Ceiling;
++
++ -----------
++ -- Sleep --
++ -----------
++
++ procedure Sleep
++ (Self_ID : Task_Id;
++ Reason : System.Tasking.Task_States)
++ is
++ pragma Unreferenced (Reason);
++
++ Result : Interfaces.C.int;
++
++ begin
++ pragma Assert (Self_ID = Self);
++
++ if Single_Lock then
++ Result :=
++ pthread_cond_wait
++ (Self_ID.Common.LL.CV'Access, Single_RTS_Lock'Access);
++ else
++ Result :=
++ pthread_cond_wait
++ (Self_ID.Common.LL.CV'Access, Self_ID.Common.LL.L'Access);
++ end if;
++
++ -- EINTR is not considered a failure
++
++ pragma Assert (Result = 0 or else Result = EINTR);
++ end Sleep;
++
++ -----------------
++ -- Timed_Sleep --
++ -----------------
++
++ -- This is for use within the run-time system, so abort is
++ -- assumed to be already deferred, and the caller should be
++ -- holding its own ATCB lock.
++
++ procedure Timed_Sleep
++ (Self_ID : Task_Id;
++ Time : Duration;
++ Mode : ST.Delay_Modes;
++ Reason : System.Tasking.Task_States;
++ Timedout : out Boolean;
++ Yielded : out Boolean)
++ is
++ pragma Unreferenced (Reason);
++
++ Base_Time : constant Duration := Monotonic_Clock;
++ Check_Time : Duration := Base_Time;
++ Abs_Time : Duration;
++ Request : aliased timespec;
++ Result : Interfaces.C.int;
++
++ begin
++ Timedout := True;
++ Yielded := False;
++
++ if Mode = Relative then
++ Abs_Time := Duration'Min (Time, Max_Sensible_Delay) + Check_Time;
++ else
++ Abs_Time := Duration'Min (Check_Time + Max_Sensible_Delay, Time);
++ end if;
++
++ if Abs_Time > Check_Time then
++ Request := To_Timespec (Abs_Time);
++
++ loop
++ exit when Self_ID.Pending_ATC_Level < Self_ID.ATC_Nesting_Level;
++
++ if Single_Lock then
++ Result :=
++ pthread_cond_timedwait
++ (Self_ID.Common.LL.CV'Access,
++ Single_RTS_Lock'Access,
++ Request'Access);
++
++ else
++ Result :=
++ pthread_cond_timedwait
++ (Self_ID.Common.LL.CV'Access,
++ Self_ID.Common.LL.L'Access,
++ Request'Access);
++ end if;
++
++ Check_Time := Monotonic_Clock;
++ exit when Abs_Time <= Check_Time or else Check_Time < Base_Time;
++
++ if Result = 0 or else Result = EINTR then
++
++ -- Somebody may have called Wakeup for us
++
++ Timedout := False;
++ exit;
++ end if;
++
++ pragma Assert (Result = ETIMEDOUT);
++ end loop;
++ end if;
++ end Timed_Sleep;
++
++ -----------------
++ -- Timed_Delay --
++ -----------------
++
++ -- This is for use in implementing delay statements, so we assume the
++ -- caller is abort-deferred but is holding no locks.
++
++ procedure Timed_Delay
++ (Self_ID : Task_Id;
++ Time : Duration;
++ Mode : ST.Delay_Modes)
++ is
++ Base_Time : constant Duration := Monotonic_Clock;
++ Check_Time : Duration := Base_Time;
++ Abs_Time : Duration;
++ Request : aliased timespec;
++
++ Result : Interfaces.C.int;
++ pragma Warnings (Off, Result);
++
++ begin
++ if Single_Lock then
++ Lock_RTS;
++ end if;
++
++ Write_Lock (Self_ID);
++
++ if Mode = Relative then
++ Abs_Time := Time + Check_Time;
++ else
++ Abs_Time := Duration'Min (Check_Time + Max_Sensible_Delay, Time);
++ end if;
++
++ if Abs_Time > Check_Time then
++ Request := To_Timespec (Abs_Time);
++ Self_ID.Common.State := Delay_Sleep;
++
++ loop
++ exit when Self_ID.Pending_ATC_Level < Self_ID.ATC_Nesting_Level;
++
++ if Single_Lock then
++ Result := pthread_cond_timedwait
++ (Self_ID.Common.LL.CV'Access,
++ Single_RTS_Lock'Access,
++ Request'Access);
++ else
++ Result := pthread_cond_timedwait
++ (Self_ID.Common.LL.CV'Access,
++ Self_ID.Common.LL.L'Access,
++ Request'Access);
++ end if;
++
++ Check_Time := Monotonic_Clock;
++ exit when Abs_Time <= Check_Time or else Check_Time < Base_Time;
++
++ pragma Assert (Result = 0 or else
++ Result = ETIMEDOUT or else
++ Result = EINTR);
++ end loop;
++
++ Self_ID.Common.State := Runnable;
++ end if;
++
++ Unlock (Self_ID);
++
++ if Single_Lock then
++ Unlock_RTS;
++ end if;
++
++ Result := sched_yield;
++ end Timed_Delay;
++
++ ---------------------
++ -- Monotonic_Clock --
++ ---------------------
++
++ function Monotonic_Clock return Duration is
++ TV : aliased struct_timeval;
++ Result : Interfaces.C.int;
++ begin
++ Result := gettimeofday (TV'Access, System.Null_Address);
++ pragma Assert (Result = 0);
++ return To_Duration (TV);
++ end Monotonic_Clock;
++
++ -------------------
++ -- RT_Resolution --
++ -------------------
++
++ function RT_Resolution return Duration is
++ begin
++ return 10#1.0#E-6;
++ end RT_Resolution;
++
++ ------------
++ -- Wakeup --
++ ------------
++
++ procedure Wakeup (T : Task_Id; Reason : System.Tasking.Task_States) is
++ pragma Unreferenced (Reason);
++ Result : Interfaces.C.int;
++ begin
++ Result := pthread_cond_signal (T.Common.LL.CV'Access);
++ pragma Assert (Result = 0);
++ end Wakeup;
++
++ -----------
++ -- Yield --
++ -----------
++
++ procedure Yield (Do_Yield : Boolean := True) is
++ Result : Interfaces.C.int;
++ pragma Unreferenced (Result);
++ begin
++ if Do_Yield then
++ Result := sched_yield;
++ end if;
++ end Yield;
++
++ ------------------
++ -- Set_Priority --
++ ------------------
++
++ procedure Set_Priority
++ (T : Task_Id;
++ Prio : System.Any_Priority;
++ Loss_Of_Inheritance : Boolean := False)
++ is
++ pragma Unreferenced (Loss_Of_Inheritance);
++
++ Result : Interfaces.C.int;
++ Param : aliased struct_sched_param;
++
++ function Get_Policy (Prio : System.Any_Priority) return Character;
++ pragma Import (C, Get_Policy, "__gnat_get_specific_dispatching");
++ -- Get priority specific dispatching policy
++
++ Priority_Specific_Policy : constant Character := Get_Policy (Prio);
++ -- Upper case first character of the policy name corresponding to the
++ -- task as set by a Priority_Specific_Dispatching pragma.
++
++ begin
++ T.Common.Current_Priority := Prio;
++
++ -- Priorities on Cygwin follow Win32 standards, we use the
++ -- MinGW conversion table.
++
++ Param.sched_priority := Interfaces.C.int (Underlying_Priorities (Prio));
++
++ if Dispatching_Policy = 'R'
++ or else Priority_Specific_Policy = 'R'
++ or else Time_Slice_Val > 0
++ then
++ Result :=
++ pthread_setschedparam
++ (T.Common.LL.Thread, SCHED_RR, Param'Access);
++
++ elsif Dispatching_Policy = 'F'
++ or else Priority_Specific_Policy = 'F'
++ or else Time_Slice_Val = 0
++ then
++ Result :=
++ pthread_setschedparam
++ (T.Common.LL.Thread, SCHED_FIFO, Param'Access);
++
++ else
++ Param.sched_priority := 0;
++ Result :=
++ pthread_setschedparam
++ (T.Common.LL.Thread,
++ SCHED_OTHER, Param'Access);
++ end if;
++
++ pragma Assert (Result = 0 or else Result = EPERM);
++ end Set_Priority;
++
++ ------------------
++ -- Get_Priority --
++ ------------------
++
++ function Get_Priority (T : Task_Id) return System.Any_Priority is
++ begin
++ return T.Common.Current_Priority;
++ end Get_Priority;
++
++ --------------------------
++ -- Get_Stack_Attributes --
++ --------------------------
++
++ procedure Get_Stack_Attributes
++ (T : Task_Id;
++ ISP : out System.Address;
++ Size : out Storage_Offset)
++ is
++ function pthread_getattr_np
++ (thread : pthread_t;
++ attr : System.Address) return Interfaces.C.int;
++ pragma Import (C, pthread_getattr_np, "pthread_getattr_np");
++
++ function pthread_attr_getstack
++ (attr : System.Address;
++ base : System.Address;
++ size : System.Address) return Interfaces.C.int;
++ pragma Import (C, pthread_attr_getstack, "pthread_attr_getstack");
++
++ Result : Interfaces.C.int;
++
++ Attributes : aliased pthread_attr_t;
++ Stack_Base : aliased System.Address;
++ Stack_Size : aliased Storage_Offset;
++
++ begin
++ Result :=
++ pthread_getattr_np
++ (T.Common.LL.Thread, Attributes'Address);
++ pragma Assert (Result = 0);
++
++ Result :=
++ pthread_attr_getstack
++ (Attributes'Address, Stack_Base'Address, Stack_Size'Address);
++ pragma Assert (Result = 0);
++
++ Result := pthread_attr_destroy (Attributes'Access);
++ pragma Assert (Result = 0);
++
++ ISP := Stack_Base + Stack_Size;
++ Size := Stack_Size;
++ end Get_Stack_Attributes;
++
++ ----------------
++ -- Enter_Task --
++ ----------------
++
++ procedure Enter_Task (Self_ID : Task_Id) is
++ begin
++ if Self_ID.Common.Task_Info /= null
++ and then
++ Self_ID.Common.Task_Info.CPU_Affinity = No_CPU
++ then
++ raise Invalid_CPU_Number;
++ end if;
++
++ Self_ID.Common.LL.Thread := pthread_self;
++
++ Specific.Set (Self_ID);
++
++ Lock_RTS;
++
++ for J in Known_Tasks'Range loop
++ if Known_Tasks (J) = null then
++ Known_Tasks (J) := Self_ID;
++ Self_ID.Known_Tasks_Index := J;
++ exit;
++ end if;
++ end loop;
++
++ Unlock_RTS;
++
++ -- Determine where the task stack starts, how large it is, and let the
++ -- stack checking engine know about it.
++
++ declare
++ Initial_SP : System.Address;
++ Stack_Size : Storage_Offset;
++ begin
++ Get_Stack_Attributes (Self_ID, Initial_SP, Stack_Size);
++ System.Stack_Checking.Operations.Notify_Stack_Attributes
++ (Initial_SP, Stack_Size);
++ end;
++ end Enter_Task;
++
++ --------------
++ -- New_ATCB --
++ --------------
++
++ function New_ATCB (Entry_Num : Task_Entry_Index) return Task_Id is
++ begin
++ return new Ada_Task_Control_Block (Entry_Num);
++ end New_ATCB;
++
++ -------------------
++ -- Is_Valid_Task --
++ -------------------
++
++ function Is_Valid_Task return Boolean renames Specific.Is_Valid_Task;
++
++ -----------------------------
++ -- Register_Foreign_Thread --
++ -----------------------------
++
++ function Register_Foreign_Thread return Task_Id is
++ begin
++ if Is_Valid_Task then
++ return Self;
++ else
++ return Register_Foreign_Thread (pthread_self);
++ end if;
++ end Register_Foreign_Thread;
++
++ --------------------
++ -- Initialize_TCB --
++ --------------------
++
++ procedure Initialize_TCB (Self_ID : Task_Id; Succeeded : out Boolean) is
++ Result : Interfaces.C.int;
++
++ begin
++ -- Give the task a unique serial number
++
++ Self_ID.Serial_Number := Next_Serial_Number;
++ Next_Serial_Number := Next_Serial_Number + 1;
++ pragma Assert (Next_Serial_Number /= 0);
++
++ Self_ID.Common.LL.Thread := To_pthread_t (-1);
++
++ if not Single_Lock then
++ Result := pthread_mutex_init (Self_ID.Common.LL.L'Access,
++ Mutex_Attr'Access);
++ pragma Assert (Result = 0 or else Result = ENOMEM);
++
++ if Result /= 0 then
++ Succeeded := False;
++ return;
++ end if;
++ end if;
++
++ Result := pthread_cond_init (Self_ID.Common.LL.CV'Access,
++ Cond_Attr'Access);
++ pragma Assert (Result = 0 or else Result = ENOMEM);
++
++ if Result = 0 then
++ Succeeded := True;
++ else
++ if not Single_Lock then
++ Result := pthread_mutex_destroy (Self_ID.Common.LL.L'Access);
++ pragma Assert (Result = 0);
++ end if;
++
++ Succeeded := False;
++ end if;
++ end Initialize_TCB;
++
++ -----------------
++ -- Create_Task --
++ -----------------
++
++ procedure Create_Task
++ (T : Task_Id;
++ Wrapper : System.Address;
++ Stack_Size : System.Parameters.Size_Type;
++ Priority : System.Any_Priority;
++ Succeeded : out Boolean)
++ is
++ Attributes : aliased pthread_attr_t;
++ Result : Interfaces.C.int;
++
++ begin
++ Result := pthread_attr_init (Attributes'Access);
++ pragma Assert (Result = 0 or else Result = ENOMEM);
++
++ if Result /= 0 then
++ Succeeded := False;
++ return;
++ end if;
++
++ Result :=
++ pthread_attr_setstacksize
++ (Attributes'Access, Interfaces.C.size_t (Stack_Size));
++ pragma Assert (Result = 0);
++
++ Result :=
++ pthread_attr_setdetachstate
++ (Attributes'Access, PTHREAD_CREATE_DETACHED);
++ pragma Assert (Result = 0);
++
++ -- Since the initial signal mask of a thread is inherited from the
++ -- creator, and the Environment task has all its signals masked, we
++ -- do not need to manipulate caller's signal mask at this point.
++ -- All tasks in RTS will have All_Tasks_Mask initially.
++
++ Result := pthread_create
++ (T.Common.LL.Thread'Access,
++ Attributes'Access,
++ Thread_Body_Access (Wrapper),
++ To_Address (T));
++ pragma Assert (Result = 0 or else Result = EAGAIN);
++
++ Succeeded := Result = 0;
++
++ -- Handle Task_Info
++
++ if T.Common.Task_Info /= null then
++ if T.Common.Task_Info.CPU_Affinity /= Task_Info.Any_CPU then
++ Result :=
++ pthread_setaffinity_np
++ (T.Common.LL.Thread,
++ CPU_SETSIZE / 8,
++ T.Common.Task_Info.CPU_Affinity'Access);
++ pragma Assert (Result = 0);
++ end if;
++ end if;
++
++ Result := pthread_attr_destroy (Attributes'Access);
++ pragma Assert (Result = 0);
++
++ Set_Priority (T, Priority);
++ end Create_Task;
++
++ ------------------
++ -- Finalize_TCB --
++ ------------------
++
++ procedure Finalize_TCB (T : Task_Id) is
++ Result : Interfaces.C.int;
++ Tmp : Task_Id := T;
++ Is_Self : constant Boolean := T = Self;
++
++ procedure Free is new
++ Ada.Unchecked_Deallocation (Ada_Task_Control_Block, Task_Id);
++
++ begin
++ if not Single_Lock then
++ Result := pthread_mutex_destroy (T.Common.LL.L'Access);
++ pragma Assert (Result = 0);
++ end if;
++
++ Result := pthread_cond_destroy (T.Common.LL.CV'Access);
++ pragma Assert (Result = 0);
++
++ if T.Known_Tasks_Index /= -1 then
++ Known_Tasks (T.Known_Tasks_Index) := null;
++ end if;
++ SC.Invalidate_Stack_Cache (T.Common.Compiler_Data.Pri_Stack_Info'Access);
++ Free (Tmp);
++
++ if Is_Self then
++ Specific.Set (null);
++ end if;
++ end Finalize_TCB;
++
++ ---------------
++ -- Exit_Task --
++ ---------------
++
++ procedure Exit_Task is
++ begin
++ Specific.Set (null);
++ end Exit_Task;
++
++ ----------------
++ -- Abort_Task --
++ ----------------
++
++ procedure Abort_Task (T : Task_Id) is
++ Result : Interfaces.C.int;
++ begin
++ Result :=
++ pthread_kill
++ (T.Common.LL.Thread,
++ Signal (System.Interrupt_Management.Abort_Task_Interrupt));
++ pragma Assert (Result = 0);
++ end Abort_Task;
++
++ ----------------
++ -- Initialize --
++ ----------------
++
++ procedure Initialize (S : in out Suspension_Object) is
++ Result : Interfaces.C.int;
++
++ begin
++ -- Initialize internal state (always to False (RM D.10(6)))
++
++ S.State := False;
++ S.Waiting := False;
++
++ -- Initialize internal mutex
++
++ Result := pthread_mutex_init (S.L'Access, Mutex_Attr'Access);
++
++ pragma Assert (Result = 0 or else Result = ENOMEM);
++
++ if Result = ENOMEM then
++ raise Storage_Error;
++ end if;
++
++ -- Initialize internal condition variable
++
++ Result := pthread_cond_init (S.CV'Access, Cond_Attr'Access);
++
++ pragma Assert (Result = 0 or else Result = ENOMEM);
++
++ if Result /= 0 then
++ Result := pthread_mutex_destroy (S.L'Access);
++ pragma Assert (Result = 0);
++
++ if Result = ENOMEM then
++ raise Storage_Error;
++ end if;
++ end if;
++ end Initialize;
++
++ --------------
++ -- Finalize --
++ --------------
++
++ procedure Finalize (S : in out Suspension_Object) is
++ Result : Interfaces.C.int;
++
++ begin
++ -- Destroy internal mutex
++
++ Result := pthread_mutex_destroy (S.L'Access);
++ pragma Assert (Result = 0);
++
++ -- Destroy internal condition variable
++
++ Result := pthread_cond_destroy (S.CV'Access);
++ pragma Assert (Result = 0);
++ end Finalize;
++
++ -------------------
++ -- Current_State --
++ -------------------
++
++ function Current_State (S : Suspension_Object) return Boolean is
++ begin
++ -- We do not want to use lock on this read operation. State is marked
++ -- as Atomic so that we ensure that the value retrieved is correct.
++
++ return S.State;
++ end Current_State;
++
++ ---------------
++ -- Set_False --
++ ---------------
++
++ procedure Set_False (S : in out Suspension_Object) is
++ Result : Interfaces.C.int;
++
++ begin
++ SSL.Abort_Defer.all;
++
++ Result := pthread_mutex_lock (S.L'Access);
++ pragma Assert (Result = 0);
++
++ S.State := False;
++
++ Result := pthread_mutex_unlock (S.L'Access);
++ pragma Assert (Result = 0);
++
++ SSL.Abort_Undefer.all;
++ end Set_False;
++
++ --------------
++ -- Set_True --
++ --------------
++
++ procedure Set_True (S : in out Suspension_Object) is
++ Result : Interfaces.C.int;
++
++ begin
++ SSL.Abort_Defer.all;
++
++ Result := pthread_mutex_lock (S.L'Access);
++ pragma Assert (Result = 0);
++
++ -- If there is already a task waiting on this suspension object then
++ -- we resume it, leaving the state of the suspension object to False,
++ -- as it is specified in ARM D.10 par. 9. Otherwise, it just leaves
++ -- the state to True.
++
++ if S.Waiting then
++ S.Waiting := False;
++ S.State := False;
++
++ Result := pthread_cond_signal (S.CV'Access);
++ pragma Assert (Result = 0);
++
++ else
++ S.State := True;
++ end if;
++
++ Result := pthread_mutex_unlock (S.L'Access);
++ pragma Assert (Result = 0);
++
++ SSL.Abort_Undefer.all;
++ end Set_True;
++
++ ------------------------
++ -- Suspend_Until_True --
++ ------------------------
++
++ procedure Suspend_Until_True (S : in out Suspension_Object) is
++ Result : Interfaces.C.int;
++
++ begin
++ SSL.Abort_Defer.all;
++
++ Result := pthread_mutex_lock (S.L'Access);
++ pragma Assert (Result = 0);
++
++ if S.Waiting then
++
++ -- Program_Error must be raised upon calling Suspend_Until_True
++ -- if another task is already waiting on that suspension object
++ -- (RM D.10(10)).
++
++ Result := pthread_mutex_unlock (S.L'Access);
++ pragma Assert (Result = 0);
++
++ SSL.Abort_Undefer.all;
++
++ raise Program_Error;
++ else
++ -- Suspend the task if the state is False. Otherwise, the task
++ -- continues its execution, and the state of the suspension object
++ -- is set to False (ARM D.10 par. 9).
++
++ if S.State then
++ S.State := False;
++ else
++ S.Waiting := True;
++ Result := pthread_cond_wait (S.CV'Access, S.L'Access);
++ end if;
++
++ Result := pthread_mutex_unlock (S.L'Access);
++ pragma Assert (Result = 0);
++
++ SSL.Abort_Undefer.all;
++ end
++ if;
++ end Suspend_Until_True;
++
++ ----------------
++ -- Check_Exit --
++ ----------------
++
++ -- Dummy version
++
++ function Check_Exit (Self_ID : ST.Task_Id) return Boolean is
++ pragma Unreferenced (Self_ID);
++ begin
++ return True;
++ end Check_Exit;
++
++ --------------------
++ -- Check_No_Locks --
++ --------------------
++
++ function Check_No_Locks (Self_ID : ST.Task_Id) return Boolean is
++ pragma Unreferenced (Self_ID);
++ begin
++ return True;
++ end Check_No_Locks;
++
++ ----------------------
++ -- Environment_Task --
++ ----------------------
++
++ function Environment_Task return Task_Id is
++ begin
++ return Environment_Task_Id;
++ end Environment_Task;
++
++ ------------------
++ -- Suspend_Task --
++ ------------------
++
++ function Suspend_Task
++ (T : ST.Task_Id;
++ Thread_Self : Thread_Id) return Boolean
++ is
++ begin
++ if T.Common.LL.Thread /= Thread_Self then
++ return pthread_kill (T.Common.LL.Thread, SIGSTOP) = 0;
++ else
++ return True;
++ end if;
++ end Suspend_Task;
++
++ -----------------
++ -- Resume_Task --
++ -----------------
++
++ function Resume_Task
++ (T : ST.Task_Id;
++ Thread_Self : Thread_Id) return Boolean
++ is
++ begin
++ if T.Common.LL.Thread /= Thread_Self then
++ return pthread_kill (T.Common.LL.Thread, SIGCONT) = 0;
++ else
++ return True;
++ end if;
++ end Resume_Task;
++
++ --------------------
++ -- Stop_All_Tasks --
++ --------------------
++
++ procedure Stop_All_Tasks is
++ begin
++ null;
++ end Stop_All_Tasks;
++
++ ---------------
++ -- Stop_Task --
++ ---------------
++
++ function Stop_Task (T : ST.Task_Id) return Boolean is
++ pragma Unreferenced (T);
++ begin
++ return False;
++ end Stop_Task;
++
++ -------------------
++ -- Continue_Task --
++ -------------------
++
++ function Continue_Task (T : ST.Task_Id) return Boolean is
++ pragma Unreferenced (T);
++ begin
++ return False;
++ end Continue_Task;
++
++ ----------------
++ -- Initialize --
++ ----------------
++
++ procedure Initialize (Environment_Task : Task_Id) is
++ act : aliased struct_sigaction;
++ old_act : aliased struct_sigaction;
++ Tmp_Set : aliased sigset_t;
++ Result : Interfaces.C.int;
++
++ function State
++ (Int : System.Interrupt_Management.Interrupt_ID) return Character;
++ pragma Import (C, State, "__gnat_get_interrupt_state");
++ -- Get interrupt state. Defined in a-init.c
++ -- The input argument is the interrupt number,
++ -- and the result is one of the following:
++
++ Default : constant Character := 's';
++ -- 'n' this interrupt not set by any Interrupt_State pragma
++ -- 'u' Interrupt_State pragma set state to User
++ -- 'r' Interrupt_State pragma set state to Runtime
++ -- 's' Interrupt_State pragma set state to System (use "default"
++ -- system handler)
++
++ begin
++ Environment_Task_Id := Environment_Task;
++
++ Interrupt_Management.Initialize;
++
++ -- Prepare the set of signals that should be unblocked in all tasks
++
++ Result := sigemptyset (Unblocked_Signal_Mask'Access);
++ pragma Assert (Result = 0);
++
++ for J in Interrupt_Management.Interrupt_ID loop
++ if System.Interrupt_Management.Keep_Unmasked (J) then
++ Result := sigaddset (Unblocked_Signal_Mask'Access, Signal (J));
++ pragma Assert (Result = 0);
++ end if;
++ end loop;
++
++ Result := pthread_mutexattr_init (Mutex_Attr'Access);
++ pragma Assert (Result = 0);
++
++ Result := pthread_condattr_init (Cond_Attr'Access);
++ pragma Assert (Result = 0);
++
++ Initialize_Lock (Single_RTS_Lock'Access, RTS_Lock_Level);
++
++ -- Initialize the global RTS lock
++
++ Specific.Initialize (Environment_Task);
++
++ Enter_Task (Environment_Task);
++
++ -- Install the abort-signal handler
++
++ if State
++ (System.Interrupt_Management.Abort_Task_Interrupt) /= Default
++ then
++ act.sa_flags := 0;
++ act.sa_handler := Abort_Handler'Address;
++
++ Result := sigemptyset (Tmp_Set'Access);
++ pragma Assert (Result = 0);
++ act.sa_mask := Tmp_Set;
++
++ Result :=
++ sigaction
++ (Signal (Interrupt_Management.Abort_Task_Interrupt),
++ act'Unchecked_Access,
++ old_act'Unchecked_Access);
++ pragma Assert (Result = 0);
++ end if;
++ end Initialize;
++
++end System.Task_Primitives.Operations;
+diff --git a/gcc/ada/seh_init.c b/gcc/ada/seh_init.c
+index 0d04b50..3c3d4a2 100644
+--- a/gcc/ada/seh_init.c
++++ b/gcc/ada/seh_init.c
+@@ -40,6 +40,7 @@
+ #define xmalloc(S) malloc (S)
+
+ #else
++#define FLEX_SCANNER /* do not poison malloc */
+ #include "config.h"
+ #include "system.h"
+ #endif
+@@ -64,7 +65,7 @@ extern void Raise_From_Signal_Handler (struct Exception_Data *, const char *)
+ ATTRIBUTE_NORETURN;
+
+
+-#if defined (_WIN32)
++#if defined (_WIN32) || defined(__CYGWIN__)
+
+ #include <windows.h>
+ #include <excpt.h>
+@@ -170,7 +171,7 @@ __gnat_map_SEH (EXCEPTION_RECORD* ExceptionRecord, const char **msg)
+ }
+ }
+
+-#if !(defined (_WIN64) && defined (__SEH__))
++#if !(defined (__x86_64__) && defined (__SEH__))
+
+ EXCEPTION_DISPOSITION
+ __gnat_SEH_error_handler (struct _EXCEPTION_RECORD* ExceptionRecord,
+@@ -189,7 +190,7 @@ __gnat_SEH_error_handler (struct _EXCEPTION_RECORD* ExceptionRecord,
+ msg = "unhandled signal";
+ }
+
+-#if ! defined (_WIN64)
++#if !defined(_WIN64) && !defined(__CYGWIN__)
+ /* This call is important as it avoids locking the second time we catch a
+ signal. Note that this routine is documented as internal to Windows and
+ should not be used. */
+@@ -200,9 +201,9 @@ __gnat_SEH_error_handler (struct _EXCEPTION_RECORD* ExceptionRecord,
+
+ Raise_From_Signal_Handler (exception, msg);
+ }
+-#endif /* !(defined (_WIN64) && defined (__SEH__)) */
++#endif /* !(defined (__x86_64__) && defined (__SEH__)) */
+
+-#if defined (_WIN64)
++#if defined (__x86_64__)
+ /* On x86_64 windows exception mechanism is no more based on a chained list
+ of handlers addresses on the stack. Instead unwinding information is used
+ to retrieve the exception handler (similar to ZCX GCC mechanism). So in
+@@ -255,7 +256,7 @@ void __gnat_install_SEH_handler (void *eh ATTRIBUTE_UNUSED)
+ just above. */
+ }
+
+-#else /* defined (_WIN64) */
++#else /* defined (__x86_64__) */
+ /* Install the Win32 SEH exception handler. Note that the caller must have
+ allocated 8 bytes on the stack and pass the pointer to this stack
+ space. This is needed as the SEH exception handler must be on the stack of
+@@ -288,7 +289,7 @@ __gnat_install_SEH_handler (void *ER)
+ }
+ #endif
+
+-#else /* defined (_WIN32) */
++#else /* defined (_WIN32) || defined(__CYGWIN__) */
+ /* For all non Windows targets we provide a dummy SEH install handler. */
+ void __gnat_install_SEH_handler (void *eh ATTRIBUTE_UNUSED)
+ {
+diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c
+index 1eec8b9..8d58c17 100644
+--- a/gcc/ada/sysdep.c
++++ b/gcc/ada/sysdep.c
+@@ -314,7 +314,7 @@ getc_immediate_common (FILE *stream,
+ int waiting)
+ {
+ #if defined (linux) || defined (sun) \
+- || defined (__CYGWIN32__) || defined (__MACHTEN__) || defined (__hpux__) \
++ || defined (__CYGWIN__) || defined (__MACHTEN__) || defined (__hpux__) \
+ || defined (_AIX) || (defined (__svr4__) && defined (i386)) \
+ || defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) \
+ || defined (__GLIBC__) || defined (__APPLE__)
+@@ -595,6 +595,18 @@ rts_get_nShowCmd (void)
+ }
+
+ #endif /* WINNT */
++
++#ifdef __CYGWIN__
++
++#include <malloc.h>
++
++size_t _msize(void *memblock)
++{
++ return (size_t) malloc_usable_size (memblock);
++}
++
++#endif /* __CYGWIN__ */
++
+ #ifdef VMS
+
+ /* This gets around a problem with using the old threads library on VMS 7.0. */
+diff --git a/gcc/ada/system-cygwin-x86_64.ads b/gcc/ada/system-cygwin-x86_64.ads
+new file mode 100644
+index 0000000..9305ec1
+--- /dev/null
++++ b/gcc/ada/system-cygwin-x86_64.ads
+@@ -0,0 +1,198 @@
++------------------------------------------------------------------------------
++-- --
++-- GNAT RUN-TIME COMPONENTS --
++-- --
++-- S Y S T E M --
++-- --
++-- S p e c --
++-- (Cygwin Version) --
++-- --
++-- Copyright (C) 1992-2007, Free Software Foundation, Inc. --
++-- --
++-- This specification is derived from the Ada Reference Manual for use with --
++-- GNAT. The copyright notice above, and the license provisions that follow --
++-- apply solely to the contents of the part following the private keyword. --
++-- --
++-- 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. --
++-- --
++------------------------------------------------------------------------------
++
++package System is
++ pragma Pure;
++ -- Note that we take advantage of the implementation permission to make
++ -- this unit Pure instead of Preelaborable; see RM 13.7.1(15). In Ada
++ -- 2005, this is Pure in any case (AI-362).
++
++ type Name is (SYSTEM_NAME_GNAT);
++ System_Name : constant Name := SYSTEM_NAME_GNAT;
++
++ -- System-Dependent Named Numbers
++
++ Min_Int : constant := Long_Long_Integer'First;
++ Max_Int : constant := Long_Long_Integer'Last;
++
++ Max_Binary_Modulus : constant := 2 ** Long_Long_Integer'Size;
++ Max_Nonbinary_Modulus : constant := 2 ** Integer'Size - 1;
++
++ Max_Base_Digits : constant := Long_Long_Float'Digits;
++ Max_Digits : constant := Long_Long_Float'Digits;
++
++ Max_Mantissa : constant := 63;
++ Fine_Delta : constant := 2.0 ** (-Max_Mantissa);
++
++ Tick : constant := 0.01;
++
++ -- Storage-related Declarations
++
++ type Address is private;
++ pragma Preelaborable_Initialization (Address);
++ Null_Address : constant Address;
++
++ Storage_Unit : constant := 8;
++ Word_Size : constant := 64;
++ Memory_Size : constant := 2 ** 64;
++
++ -- Address comparison
++
++ function "<" (Left, Right : Address) return Boolean;
++ function "<=" (Left, Right : Address) return Boolean;
++ function ">" (Left, Right : Address) return Boolean;
++ function ">=" (Left, Right : Address) return Boolean;
++ function "=" (Left, Right : Address) return Boolean;
++
++ pragma Import (Intrinsic, "<");
++ pragma Import (Intrinsic, "<=");
++ pragma Import (Intrinsic, ">");
++ pragma Import (Intrinsic, ">=");
++ pragma Import (Intrinsic, "=");
++
++ -- Other System-Dependent Declarations
++
++ type Bit_Order is (High_Order_First, Low_Order_First);
++ Default_Bit_Order : constant Bit_Order := Low_Order_First;
++ pragma Warnings (Off, Default_Bit_Order); -- kill constant condition warning
++
++ -- Priority-related Declarations (RM D.1)
++
++ Max_Priority : constant Positive := 30;
++ Max_Interrupt_Priority : constant Positive := 31;
++
++ subtype Any_Priority is Integer range 0 .. 31;
++ subtype Priority is Any_Priority range 0 .. 30;
++ subtype Interrupt_Priority is Any_Priority range 31 .. 31;
++
++ Default_Priority : constant Priority := 15;
++
++private
++
++ type Address is mod Memory_Size;
++ Null_Address : constant Address := 0;
++
++ --------------------------------------
++ -- System Implementation Parameters --
++ --------------------------------------
++
++ -- These parameters provide information about the target that is used
++ -- by the compiler. They are in the private part of System, where they
++ -- can be accessed using the special circuitry in the Targparm unit
++ -- whose source should be consulted for more detailed descriptions
++ -- of the individual switch values.
++
++ Backend_Divide_Checks : constant Boolean := False;
++ Backend_Overflow_Checks : constant Boolean := False;
++ Command_Line_Args : constant Boolean := True;
++ Configurable_Run_Time : constant Boolean := False;
++ Denorm : constant Boolean := True;
++ Duration_32_Bits : constant Boolean := False;
++ Exit_Status_Supported : constant Boolean := True;
++ Fractional_Fixed_Ops : constant Boolean := False;
++ Frontend_Layout : constant Boolean := False;
++ Machine_Overflows : constant Boolean := False;
++ Machine_Rounds : constant Boolean := True;
++ Preallocated_Stacks : constant Boolean := False;
++ Signed_Zeros : constant Boolean := True;
++ Stack_Check_Default : constant Boolean := False;
++ Stack_Check_Probes : constant Boolean := True;
++ Stack_Check_Limits : constant Boolean := False;
++ Support_64_Bit_Divides : constant Boolean := True;
++ Support_Aggregates : constant Boolean := True;
++ Support_Composite_Assign : constant Boolean := True;
++ Support_Composite_Compare : constant Boolean := True;
++ Support_Long_Shifts : constant Boolean := True;
++ Always_Compatible_Rep : constant Boolean := True;
++ Suppress_Standard_Library : constant Boolean := False;
++ Use_Ada_Main_Program_Name : constant Boolean := False;
++ ZCX_By_Default : constant Boolean := True;
++
++ ---------------------------
++ -- Underlying Priorities --
++ ---------------------------
++
++ -- Important note: this section of the file must come AFTER the
++ -- definition of the system implementation parameters to ensure
++ -- that the value of these parameters is available for analysis
++ -- of the declarations here (using Rtsfind at compile time).
++
++ -- The underlying priorities table provides a generalized mechanism
++ -- for mapping from Ada priorities to system priorities. In some
++ -- cases a 1-1 mapping is not the convenient or optimal choice.
++
++ type Priorities_Mapping is array (Any_Priority) of Integer;
++ pragma Suppress_Initialization (Priorities_Mapping);
++ -- Suppress initialization in case gnat.adc specifies Normalize_Scalars
++
++ Underlying_Priorities : constant Priorities_Mapping :=
++ (Priority'First ..
++ Default_Priority - 8 => -15,
++ Default_Priority - 7 => -7,
++ Default_Priority - 6 => -6,
++ Default_Priority - 5 => -5,
++ Default_Priority - 4 => -4,
++ Default_Priority - 3 => -3,
++ Default_Priority - 2 => -2,
++ Default_Priority - 1 => -1,
++ Default_Priority => 0,
++ Default_Priority + 1 => 1,
++ Default_Priority + 2 => 2,
++ Default_Priority + 3 => 3,
++ Default_Priority + 4 => 4,
++ Default_Priority + 5 => 5,
++ Default_Priority + 6 ..
++ Priority'Last => 6,
++ Interrupt_Priority => 15);
++ -- The default mapping preserves the standard 31 priorities of the Ada
++ -- model, but maps them using compression onto the 7 priority levels
++ -- available in NT and on the 16 priority levels available in 2000/XP.
++
++ -- To replace the default values of the Underlying_Priorities mapping,
++ -- copy this source file into your build directory, edit the file to
++ -- reflect your desired behavior, and recompile using Makefile.adalib
++ -- which can be found under the adalib directory of your gnat installation
++
++ pragma Linker_Options ("-Wl,--stack=0x2000000");
++ -- This is used to change the default stack (32 MB) size for non tasking
++ -- programs. We change this value for GNAT on Windows here because the
++ -- binutils on this platform have switched to a too low value for Ada
++ -- programs. Note that we also set the stack size for tasking programs in
++ -- System.Task_Primitives.Operations.
++
++end System;
+diff --git a/gcc/ada/system-cygwin.ads b/gcc/ada/system-cygwin.ads
+new file mode 100644
+index 0000000..6d813f5
+--- /dev/null
++++ b/gcc/ada/system-cygwin.ads
+@@ -0,0 +1,198 @@
++------------------------------------------------------------------------------
++-- --
++-- GNAT RUN-TIME COMPONENTS --
++-- --
++-- S Y S T E M --
++-- --
++-- S p e c --
++-- (Cygwin Version) --
++-- --
++-- Copyright (C) 1992-2007, Free Software Foundation, Inc. --
++-- --
++-- This specification is derived from the Ada Reference Manual for use with --
++-- GNAT. The copyright notice above, and the license provisions that follow --
++-- apply solely to the contents of the part following the private keyword. --
++-- --
++-- 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. --
++-- --
++------------------------------------------------------------------------------
++
++package System is
++ pragma Pure;
++ -- Note that we take advantage of the implementation permission to make
++ -- this unit Pure instead of Preelaborable; see RM 13.7.1(15). In Ada
++ -- 2005, this is Pure in any case (AI-362).
++
++ type Name is (SYSTEM_NAME_GNAT);
++ System_Name : constant Name := SYSTEM_NAME_GNAT;
++
++ -- System-Dependent Named Numbers
++
++ Min_Int : constant := Long_Long_Integer'First;
++ Max_Int : constant := Long_Long_Integer'Last;
++
++ Max_Binary_Modulus : constant := 2 ** Long_Long_Integer'Size;
++ Max_Nonbinary_Modulus : constant := 2 ** Integer'Size - 1;
++
++ Max_Base_Digits : constant := Long_Long_Float'Digits;
++ Max_Digits : constant := Long_Long_Float'Digits;
++
++ Max_Mantissa : constant := 63;
++ Fine_Delta : constant := 2.0 ** (-Max_Mantissa);
++
++ Tick : constant := 0.01;
++
++ -- Storage-related Declarations
++
++ type Address is private;
++ pragma Preelaborable_Initialization (Address);
++ Null_Address : constant Address;
++
++ Storage_Unit : constant := 8;
++ Word_Size : constant := 32;
++ Memory_Size : constant := 2 ** 32;
++
++ -- Address comparison
++
++ function "<" (Left, Right : Address) return Boolean;
++ function "<=" (Left, Right : Address) return Boolean;
++ function ">" (Left, Right : Address) return Boolean;
++ function ">=" (Left, Right : Address) return Boolean;
++ function "=" (Left, Right : Address) return Boolean;
++
++ pragma Import (Intrinsic, "<");
++ pragma Import (Intrinsic, "<=");
++ pragma Import (Intrinsic, ">");
++ pragma Import (Intrinsic, ">=");
++ pragma Import (Intrinsic, "=");
++
++ -- Other System-Dependent Declarations
++
++ type Bit_Order is (High_Order_First, Low_Order_First);
++ Default_Bit_Order : constant Bit_Order := Low_Order_First;
++ pragma Warnings (Off, Default_Bit_Order); -- kill constant condition warning
++
++ -- Priority-related Declarations (RM D.1)
++
++ Max_Priority : constant Positive := 30;
++ Max_Interrupt_Priority : constant Positive := 31;
++
++ subtype Any_Priority is Integer range 0 .. 31;
++ subtype Priority is Any_Priority range 0 .. 30;
++ subtype Interrupt_Priority is Any_Priority range 31 .. 31;
++
++ Default_Priority : constant Priority := 15;
++
++private
++
++ type Address is mod Memory_Size;
++ Null_Address : constant Address := 0;
++
++ --------------------------------------
++ -- System Implementation Parameters --
++ --------------------------------------
++
++ -- These parameters provide information about the target that is used
++ -- by the compiler. They are in the private part of System, where they
++ -- can be accessed using the special circuitry in the Targparm unit
++ -- whose source should be consulted for more detailed descriptions
++ -- of the individual switch values.
++
++ Backend_Divide_Checks : constant Boolean := False;
++ Backend_Overflow_Checks : constant Boolean := False;
++ Command_Line_Args : constant Boolean := True;
++ Configurable_Run_Time : constant Boolean := False;
++ Denorm : constant Boolean := True;
++ Duration_32_Bits : constant Boolean := False;
++ Exit_Status_Supported : constant Boolean := True;
++ Fractional_Fixed_Ops : constant Boolean := False;
++ Frontend_Layout : constant Boolean := False;
++ Machine_Overflows : constant Boolean := False;
++ Machine_Rounds : constant Boolean := True;
++ Preallocated_Stacks : constant Boolean := False;
++ Signed_Zeros : constant Boolean := True;
++ Stack_Check_Default : constant Boolean := False;
++ Stack_Check_Probes : constant Boolean := True;
++ Stack_Check_Limits : constant Boolean := False;
++ Support_64_Bit_Divides : constant Boolean := True;
++ Support_Aggregates : constant Boolean := True;
++ Support_Composite_Assign : constant Boolean := True;
++ Support_Composite_Compare : constant Boolean := True;
++ Support_Long_Shifts : constant Boolean := True;
++ Always_Compatible_Rep : constant Boolean := True;
++ Suppress_Standard_Library : constant Boolean := False;
++ Use_Ada_Main_Program_Name : constant Boolean := False;
++ ZCX_By_Default : constant Boolean := True;
++
++ ---------------------------
++ -- Underlying Priorities --
++ ---------------------------
++
++ -- Important note: this section of the file must come AFTER the
++ -- definition of the system implementation parameters to ensure
++ -- that the value of these parameters is available for analysis
++ -- of the declarations here (using Rtsfind at compile time).
++
++ -- The underlying priorities table provides a generalized mechanism
++ -- for mapping from Ada priorities to system priorities. In some
++ -- cases a 1-1 mapping is not the convenient or optimal choice.
++
++ type Priorities_Mapping is array (Any_Priority) of Integer;
++ pragma Suppress_Initialization (Priorities_Mapping);
++ -- Suppress initialization in case gnat.adc specifies Normalize_Scalars
++
++ Underlying_Priorities : constant Priorities_Mapping :=
++ (Priority'First ..
++ Default_Priority - 8 => -15,
++ Default_Priority - 7 => -7,
++ Default_Priority - 6 => -6,
++ Default_Priority - 5 => -5,
++ Default_Priority - 4 => -4,
++ Default_Priority - 3 => -3,
++ Default_Priority - 2 => -2,
++ Default_Priority - 1 => -1,
++ Default_Priority => 0,
++ Default_Priority + 1 => 1,
++ Default_Priority + 2 => 2,
++ Default_Priority + 3 => 3,
++ Default_Priority + 4 => 4,
++ Default_Priority + 5 => 5,
++ Default_Priority + 6 ..
++ Priority'Last => 6,
++ Interrupt_Priority => 15);
++ -- The default mapping preserves the standard 31 priorities of the Ada
++ -- model, but maps them using compression onto the 7 priority levels
++ -- available in NT and on the 16 priority levels available in 2000/XP.
++
++ -- To replace the default values of the Underlying_Priorities mapping,
++ -- copy this source file into your build directory, edit the file to
++ -- reflect your desired behavior, and recompile using Makefile.adalib
++ -- which can be found under the adalib directory of your gnat installation
++
++ pragma Linker_Options ("-Wl,--stack=0x2000000");
++ -- This is used to change the default stack (32 MB) size for non tasking
++ -- programs. We change this value for GNAT on Windows here because the
++ -- binutils on this platform have switched to a too low value for Ada
++ -- programs. Note that we also set the stack size for tasking programs in
++ -- System.Task_Primitives.Operations.
++
++end System;
+diff --git a/gcc/ada/tracebak.c b/gcc/ada/tracebak.c
+index 4efb75e..1964c4f 100644
+--- a/gcc/ada/tracebak.c
++++ b/gcc/ada/tracebak.c
+@@ -107,7 +107,7 @@ extern void (*Unlock_Task) (void);
+
+ #include "tb-ivms.c"
+
+-#elif defined (_WIN64) && defined (__SEH__)
++#elif (defined (_WIN64) || defined(__CYGWIN__)) && defined (__SEH__)
+
+ #include <windows.h>
+
+diff --git a/gcc/builtin-attrs.def b/gcc/builtin-attrs.def
+index dcaeee9..44042de 100644
+--- a/gcc/builtin-attrs.def
++++ b/gcc/builtin-attrs.def
+@@ -107,6 +107,7 @@ DEF_ATTR_IDENT (ATTR_TYPEGENERIC, "type generic")
+ DEF_ATTR_IDENT (ATTR_TM_REGPARM, "*tm regparm")
+ DEF_ATTR_IDENT (ATTR_TM_TMPURE, "transaction_pure")
+ DEF_ATTR_IDENT (ATTR_RETURNS_TWICE, "returns_twice")
++DEF_ATTR_IDENT (ATTR_SYSV_ABI, "sysv_abi")
+
+ DEF_ATTR_TREE_LIST (ATTR_NOVOPS_LIST, ATTR_NOVOPS, ATTR_NULL, ATTR_NULL)
+
+@@ -254,6 +255,8 @@ DEF_ATTR_TREE_LIST (ATTR_TM_CONST_NOTHROW_LIST,
+ ATTR_TM_REGPARM, ATTR_NULL, ATTR_CONST_NOTHROW_LIST)
+ DEF_ATTR_TREE_LIST (ATTR_TM_NOTHROW_RT_LIST,
+ ATTR_RETURNS_TWICE, ATTR_NULL, ATTR_TM_NOTHROW_LIST)
++DEF_ATTR_TREE_LIST (ATTR_TM_NOTHROW_RT_SYSV_LIST,
++ ATTR_SYSV_ABI, ATTR_NULL, ATTR_TM_NOTHROW_RT_LIST)
+
+ /* Same attributes used for BUILT_IN_MALLOC except with TM_PURE thrown in. */
+ DEF_ATTR_TREE_LIST (ATTR_TMPURE_MALLOC_NOTHROW_LIST,
+diff --git a/gcc/config.build b/gcc/config.build
+index 0bc5ce8..12d5248 100644
+--- a/gcc/config.build
++++ b/gcc/config.build
+@@ -60,7 +60,7 @@ case $build in
+ # IBM 360/370/390 Architecture
+ build_xm_defines='FATAL_EXIT_CODE=12'
+ ;;
+- i[34567]86-*-cygwin* )
++ i[34567]86-*-cygwin* | x86_64-*-cygwin* )
+ build_xm_file=i386/xm-cygwin.h
+ build_exeext=.exe
+ ;;
+diff --git a/gcc/config.gcc b/gcc/config.gcc
+index 92d57dd..ec617cf 100644
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -1444,7 +1444,22 @@ 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"
+- extra_options="${extra_options} i386/cygming.opt"
++ 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-*-cygwin*)
++ need_64bit_isa=yes
++ tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/cygwin.h i386/cygwin-w64.h i386/cygwin-stdint.h"
++ xm_file=i386/xm-cygwin.h
++ tmake_file="${tmake_file} i386/t-cygming t-slibgcc i386/t-cygwin-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"
+@@ -3707,7 +3722,9 @@ case ${target} in
+ ;;
+ i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]*)
+ ;;
+- i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
++ i[34567]86-*-cygwin* | x86_64-*-cygwin*)
++ ;;
++ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ ;;
+ i[34567]86-*-freebsd* | x86_64-*-freebsd*)
+ ;;
+diff --git a/gcc/config.host b/gcc/config.host
+index 1196ec5..d871333 100644
+--- a/gcc/config.host
++++ b/gcc/config.host
+@@ -214,19 +214,19 @@ case ${host} in
+ ;;
+ esac
+ ;;
+- i[34567]86-*-cygwin*)
++ i[34567]86-*-cygwin* | x86_64-*-cygwin*)
+ host_xm_file=i386/xm-cygwin.h
+ out_host_hook_obj=host-cygwin.o
+ host_xmake_file="${host_xmake_file} i386/x-cygwin"
+ host_exeext=.exe
+- host_lto_plugin_soname=cyglto_plugin-0.dll
++ host_lto_plugin_soname=cyglto_plugin.dll
+ ;;
+ i[34567]86-*-mingw32*)
+ host_xm_file=i386/xm-mingw32.h
+ host_xmake_file="${host_xmake_file} i386/x-mingw32"
+ host_exeext=.exe
+ out_host_hook_obj=host-mingw32.o
+- host_lto_plugin_soname=liblto_plugin-0.dll
++ host_lto_plugin_soname=liblto_plugin.dll
+ ;;
+ x86_64-*-mingw*)
+ use_long_long_for_widest_fast_int=yes
+@@ -234,7 +234,7 @@ case ${host} in
+ host_xmake_file="${host_xmake_file} i386/x-mingw32"
+ host_exeext=.exe
+ out_host_hook_obj=host-mingw32.o
+- host_lto_plugin_soname=liblto_plugin-0.dll
++ host_lto_plugin_soname=liblto_plugin.dll
+ ;;
+ i[34567]86-*-uwin*)
+ echo "*** UWIN may not be used as a host platform because"
+diff --git a/gcc/config/i386/cygming.h b/gcc/config/i386/cygming.h
+index 50491c2..4be15c4 100644
+--- a/gcc/config/i386/cygming.h
++++ b/gcc/config/i386/cygming.h
+@@ -474,5 +474,8 @@ do { \
+ #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
+diff --git a/gcc/config/i386/cygming.opt b/gcc/config/i386/cygming.opt
+index 01fa0b6..32e44c9 100644
+--- a/gcc/config/i386/cygming.opt
++++ b/gcc/config/i386/cygming.opt
+@@ -50,6 +50,10 @@ muse-libstdc-wrappers
+ Target Condition({defined (USE_CYGWIN_LIBSTDCXX_WRAPPERS)})
+ Compile code that relies on Cygwin DLL wrappers to support C++ operator new/delete replacement
+
++fset-stack-executable
++Common Report Var(flag_setstackexecutable) Init(1) Optimization
++For nested functions on stack executable permission is set.
++
+ posix
+ Driver
+
+diff --git a/gcc/config/i386/cygwin-stdint.h b/gcc/config/i386/cygwin-stdint.h
+index f8c04a8..2dc207b 100644
+--- a/gcc/config/i386/cygwin-stdint.h
++++ b/gcc/config/i386/cygwin-stdint.h
+@@ -24,39 +24,71 @@ along with GCC; see the file COPYING3. If not see
+ #define INT8_TYPE "signed char"
+ #define INT16_TYPE "short int"
+ #define INT32_TYPE "int"
++#ifdef __x86_64__
++#define INT64_TYPE "long int"
++#else
+ #define INT64_TYPE "long long int"
++#endif
+
+ #define UINT8_TYPE "unsigned char"
+ #define UINT16_TYPE "short unsigned int"
+ #define UINT32_TYPE "unsigned int"
++#ifdef __x86_64__
++#define UINT64_TYPE "long unsigned int"
++#else
+ #define UINT64_TYPE "long long unsigned int"
++#endif
+
+ /* Minimum-width integer types */
+
+ #define INT_LEAST8_TYPE "signed char"
+ #define INT_LEAST16_TYPE "short int"
+ #define INT_LEAST32_TYPE "int"
++#ifdef __x86_64__
++#define INT_LEAST64_TYPE "long int"
++#else
+ #define INT_LEAST64_TYPE "long long int"
++#endif
+
+ #define UINT_LEAST8_TYPE "unsigned char"
+ #define UINT_LEAST16_TYPE "short unsigned int"
+ #define UINT_LEAST32_TYPE "unsigned int"
++#ifdef __x86_64__
++#define UINT_LEAST64_TYPE "long unsigned int"
++#else
+ #define UINT_LEAST64_TYPE "long long unsigned int"
++#endif
+
+ /* Fastest minimum-width integer types */
+
+ #define INT_FAST8_TYPE "signed char"
++#ifdef __x86_64__
++#define INT_FAST16_TYPE "long int"
++#define INT_FAST32_TYPE "long int"
++#define INT_FAST64_TYPE "long int"
++#else
+ #define INT_FAST16_TYPE "int"
+ #define INT_FAST32_TYPE "int"
+ #define INT_FAST64_TYPE "long long int"
++#endif
+
+ #define UINT_FAST8_TYPE "unsigned char"
++#ifdef __x86_64__
++#define UINT_FAST16_TYPE "long unsigned int"
++#define UINT_FAST32_TYPE "long unsigned int"
++#define UINT_FAST64_TYPE "long unsigned int"
++#else
+ #define UINT_FAST16_TYPE "unsigned int"
+ #define UINT_FAST32_TYPE "unsigned int"
+ #define UINT_FAST64_TYPE "long long unsigned int"
++#endif
+
+ /* Integer types capable of holding object pointers */
+
++#ifdef __x86_64__
++#define INTPTR_TYPE "long int"
++#define UINTPTR_TYPE "long unsigned int"
++#else
+ #define INTPTR_TYPE "int"
+ #define UINTPTR_TYPE "unsigned int"
+-
++#endif
+diff --git a/gcc/config/i386/cygwin-w64.h b/gcc/config/i386/cygwin-w64.h
+new file mode 100644
+index 0000000..152632e
+--- /dev/null
++++ b/gcc/config/i386/cygwin-w64.h
+@@ -0,0 +1,84 @@
++/* Operating system specific defines to be used when targeting GCC for
++ hosting on Windows 32/64 via Cygwin 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 __cygwin_dll_entry at 12"
++#define SUB_LINK_ENTRY64 "-e _cygwin_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=cyg \
++ %{rdynamic: --export-all-symbols} \
++ %{!shared: %{!mdll: %{" SPEC_32 ":--large-address-aware} --tsaware}}"
++
++/* Cygwin64 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 "cyggcc_s-seh-1.dll"
+diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h
+index 7f92ada..43072a1 100644
+--- a/gcc/config/i386/cygwin.h
++++ b/gcc/config/i386/cygwin.h
+@@ -18,11 +18,20 @@ 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() /* Nothing. */
++#define EXTRA_OS_CPP_BUILTINS() \
++ do \
++ { \
++ builtin_define ("__CYGWIN__"); \
++ 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} \
+- -D__CYGWIN32__ -D__CYGWIN__ %{!ansi:-Dunix} -D__unix__ -D__unix \
++ %{!ansi:-Dunix} %{pthread: } \
+ %{mwin32:-DWIN32 -D_WIN32 -D__WIN32 -D__WIN32__ %{!ansi:-DWINNT}} \
+ %{!nostdinc:%{!mno-win32:-idirafter ../include/w32api%s -idirafter ../../include/w32api%s}}\
+ "
+@@ -67,12 +76,14 @@ along with GCC; see the file COPYING3. If not see
+ #undef LIB_SPEC
+ #define LIB_SPEC "\
+ %{pg:-lgmon} \
++ %{pthread: } \
+ -lcygwin \
+ %{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 \
+@@ -110,7 +121,9 @@ along with GCC; see the file COPYING3. If not see
+ %{shared: --shared} %{mdll:--dll} \
+ %{static:-Bstatic} %{!static:-Bdynamic} \
+ %{shared|mdll: --enable-auto-image-base -e __cygwin_dll_entry at 12} \
+- --dll-search-prefix=cyg -tsaware"
++ --dll-search-prefix=cyg \
++ %{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. */
+@@ -133,5 +146,9 @@ along with GCC; see the file COPYING3. If not see
+ #define LIBGCC_SONAME "cyggcc_s" LIBGCC_EH_EXTN "-1.dll"
+
+ /* We should find a way to not have to update this manually. */
+-#define LIBGCJ_SONAME "cyggcj" /*LIBGCC_EH_EXTN*/ "-13.dll"
++#define LIBGCJ_SONAME "cyggcj" /*LIBGCC_EH_EXTN*/ "-14.dll"
+
++/* Make stack executable to avoid DEP problems with trampolines. */
++#define HAVE_ENABLE_EXECUTE_STACK
++#undef CHECK_EXECUTE_STACK_ENABLED
++#define CHECK_EXECUTE_STACK_ENABLED flag_setstackexecutable
+diff --git a/gcc/config/i386/cygwin.opt b/gcc/config/i386/cygwin.opt
+new file mode 100644
+index 0000000..4c69509
+--- /dev/null
++++ b/gcc/config/i386/cygwin.opt
+@@ -0,0 +1,27 @@
++; Cygwin-specific options.
++
++; Copyright (C) 2005, 2007, 2009, 2010, 2011 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/>.
++
++pthread
++Driver
++
++rdynamic
++Driver
++
++; Retain blank line above
+diff --git a/gcc/config/i386/i386-protos.h b/gcc/config/i386/i386-protos.h
+index 602e6fc..ef4dc76 100644
+--- a/gcc/config/i386/i386-protos.h
++++ b/gcc/config/i386/i386-protos.h
+@@ -260,6 +260,7 @@ extern void i386_pe_end_function (FILE *, const char *, tree);
+ 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 *);
+
+ extern void i386_pe_seh_init (FILE *);
+ extern void i386_pe_seh_end_prologue (FILE *);
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index 8475883..8f9ea91 100644
+--- a/gcc/config/i386/i386.c
++++ b/gcc/config/i386/i386.c
+@@ -64,6 +64,8 @@ along with GCC; see the file COPYING3. If not see
+ #include "tree-flow.h"
+
+ static rtx legitimize_dllimport_symbol (rtx, bool);
++static rtx legitimize_faraddr_symbol (rtx, bool);
++static rtx legitimize_pe_coff_symbol (rtx, bool);
+
+ #ifndef CHECK_STACK_LIMIT
+ #define CHECK_STACK_LIMIT (-1)
+@@ -3235,7 +3237,11 @@ ix86_option_override_internal (bool main_args_p)
+ would otherwise be needed if this object is to be placed in a
+ DLL, and is essentially just as efficient as direct addressing. */
+ if (TARGET_64BIT && DEFAULT_ABI == MS_ABI)
+- ix86_cmodel = CM_SMALL_PIC, flag_pic = 1;
++#ifdef TARGET_CYGWIN64
++ ix86_cmodel = CM_MEDIUM_PIC, flag_pic = 1;
++#else
++ ix86_cmodel = CM_MEDIUM_PIC, flag_pic = 1;
++#endif
+ else if (TARGET_64BIT && TARGET_RDOS)
+ ix86_cmodel = CM_MEDIUM_PIC, flag_pic = 1;
+ else if (TARGET_64BIT)
+@@ -10601,7 +10607,9 @@ ix86_expand_prologue (void)
+ ix86_emit_save_sse_regs_using_mov (frame.sse_reg_save_offset);
+
+ pic_reg_used = false;
++ /* 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))
+ {
+@@ -11406,7 +11414,8 @@ ix86_expand_split_stack_prologue (void)
+ use_reg (&call_fusage, rax);
+ }
+
+- if (ix86_cmodel == CM_LARGE || ix86_cmodel == CM_LARGE_PIC)
++ if ((ix86_cmodel == CM_LARGE || ix86_cmodel == CM_LARGE_PIC)
++ && DEFAULT_ABI != MS_ABI)
+ {
+ HOST_WIDE_INT argval;
+
+@@ -12024,6 +12033,19 @@ ix86_cannot_force_const_mem (enum machine_mode mode, rtx x)
+ 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)
++{
++ if (!TARGET_DLLIMPORT_DECL_ATTRIBUTES
++ || GET_CODE (x) != SYMBOL_REF)
++ 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
+@@ -12112,11 +12134,39 @@ legitimate_pic_address_disp_p (rtx disp)
+ /* FALLTHRU */
+
+ case SYMBOL_REF:
+- /* TLS references should always be enclosed in UNSPEC. */
+- if (SYMBOL_REF_TLS_MODEL (op0))
++ /* TLS references should always be enclosed in UNSPEC.
++ The dllimported symbol needs always to be resolved. */
++ if (SYMBOL_REF_TLS_MODEL (op0)
++ || (TARGET_DLLIMPORT_DECL_ATTRIBUTES && SYMBOL_REF_DLLIMPORT_P (op0)))
+ 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_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;
++ /* 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)
++ && SYMBOL_REF_LOCAL_P (op0)
++ && ix86_cmodel != CM_LARGE_PIC)
+ return true;
+ break;
+
+@@ -12177,7 +12227,7 @@ legitimate_pic_address_disp_p (rtx disp)
+ if ((GET_CODE (XVECEXP (disp, 0, 0)) == SYMBOL_REF
+ || GET_CODE (XVECEXP (disp, 0, 0)) == LABEL_REF)
+ && !TARGET_64BIT)
+- return gotoff_operand (XVECEXP (disp, 0, 0), Pmode);
++ return DEFAULT_ABI != MS_ABI && gotoff_operand (XVECEXP (disp, 0, 0), Pmode);
+ return false;
+ case UNSPEC_GOTTPOFF:
+ case UNSPEC_GOTNTPOFF:
+@@ -12512,11 +12562,17 @@ legitimize_pic_address (rtx orig, rtx reg)
+ }
+ #endif
+
++ if (TARGET_64BIT && TARGET_DLLIMPORT_DECL_ATTRIBUTES)
++ {
++ rtx tmp = legitimize_pe_coff_symbol (addr, true);
++ if (tmp)
++ return tmp;
++ }
++
+ if (TARGET_64BIT && legitimate_pic_address_disp_p (addr))
+ new_rtx = addr;
+- else if (TARGET_64BIT
+- && ix86_cmodel != CM_SMALL_PIC
+- && gotoff_operand (addr, Pmode))
++ else if (TARGET_64BIT && DEFAULT_ABI != MS_ABI
++ && ix86_cmodel != CM_SMALL_PIC && gotoff_operand (addr, Pmode))
+ {
+ rtx tmpreg;
+ /* This symbol may be referenced via a displacement from the PIC
+@@ -12547,9 +12603,10 @@ legitimize_pic_address (rtx orig, rtx reg)
+ tmpreg, 1, OPTAB_DIRECT);
+ new_rtx = reg;
+ }
+- else new_rtx = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, tmpreg);
++ else
++ new_rtx = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, tmpreg);
+ }
+- else if (!TARGET_64BIT && gotoff_operand (addr, Pmode))
++ else if (!TARGET_64BIT && DEFAULT_ABI != MS_ABI && gotoff_operand (addr, Pmode))
+ {
+ /* This symbol may be referenced via a displacement from the PIC
+ base address (@GOTOFF). */
+@@ -12580,31 +12637,22 @@ legitimize_pic_address (rtx orig, rtx reg)
+ see gotoff_operand. */
+ || (TARGET_VXWORKS_RTP && GET_CODE (addr) == LABEL_REF))
+ {
+- if (TARGET_DLLIMPORT_DECL_ATTRIBUTES)
+- {
+- if (GET_CODE (addr) == SYMBOL_REF && SYMBOL_REF_DLLIMPORT_P (addr))
+- return legitimize_dllimport_symbol (addr, true);
+- if (GET_CODE (addr) == CONST && GET_CODE (XEXP (addr, 0)) == PLUS
+- && GET_CODE (XEXP (XEXP (addr, 0), 0)) == SYMBOL_REF
+- && SYMBOL_REF_DLLIMPORT_P (XEXP (XEXP (addr, 0), 0)))
+- {
+- rtx t = legitimize_dllimport_symbol (XEXP (XEXP (addr, 0), 0), true);
+- return gen_rtx_PLUS (Pmode, t, XEXP (XEXP (addr, 0), 1));
+- }
+- }
++ rtx tmp = legitimize_pe_coff_symbol (addr, true);
++ if (tmp)
++ return tmp;
+
+ /* For x64 PE-COFF there is no GOT table. So we use address
+ directly. */
+ if (TARGET_64BIT && DEFAULT_ABI == MS_ABI)
+- {
++ {
+ new_rtx = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, addr), UNSPEC_PCREL);
+ new_rtx = gen_rtx_CONST (Pmode, new_rtx);
+
+ if (reg == 0)
+ reg = gen_reg_rtx (Pmode);
+- emit_move_insn (reg, new_rtx);
++ emit_move_insn (reg, new_rtx);
+ new_rtx = reg;
+- }
++ }
+ else if (TARGET_64BIT && ix86_cmodel != CM_LARGE_PIC)
+ {
+ new_rtx = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, addr), UNSPEC_GOTPCREL);
+@@ -12673,7 +12721,7 @@ legitimize_pic_address (rtx orig, rtx reg)
+
+ /* Check first to see if this is a constant offset from a @GOTOFF
+ symbol reference. */
+- if (gotoff_operand (op0, Pmode)
++ if (DEFAULT_ABI != MS_ABI && gotoff_operand (op0, Pmode)
+ && CONST_INT_P (op1))
+ {
+ if (!TARGET_64BIT)
+@@ -12817,7 +12865,7 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov)
+
+ if (!TARGET_64BIT)
+ {
+- if (flag_pic)
++ if (flag_pic && DEFAULT_ABI != MS_ABI)
+ pic = pic_offset_table_rtx;
+ else
+ {
+@@ -13032,7 +13080,7 @@ static GTY((if_marked ("tree_map_marked_p"), param_is (struct tree_map)))
+ htab_t dllimport_map;
+
+ static tree
+-get_dllimport_decl (tree decl)
++get_dllimport_decl (tree decl, bool beimport)
+ {
+ struct tree_map *h, in;
+ void **loc;
+@@ -13065,8 +13113,11 @@ get_dllimport_decl (tree decl)
+
+ name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
+ name = targetm.strip_name_encoding (name);
+- prefix = name[0] == FASTCALL_PREFIX || user_label_prefix[0] == 0
+- ? "*__imp_" : "*__imp__";
++ if (beimport)
++ prefix = name[0] == FASTCALL_PREFIX || user_label_prefix[0] == 0
++ ? "*__imp_" : "*__imp__";
++ else
++ prefix = user_label_prefix[0] == 0 ? "*.refptr." : "*refptr.";
+ namelen = strlen (name);
+ prefixlen = strlen (prefix);
+ imp_name = (char *) alloca (namelen + prefixlen + 1);
+@@ -13076,7 +13127,14 @@ get_dllimport_decl (tree decl)
+ 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_FLAG_STUBVAR;
++ if (!beimport)
++ {
++ SYMBOL_REF_FLAGS (rtl) |= SYMBOL_FLAG_EXTERNAL;
++#ifdef SUB_TARGET_RECORD_STUB
++ SUB_TARGET_RECORD_STUB (name);
++#endif
++ }
+
+ rtl = gen_const_mem (Pmode, rtl);
+ set_mem_alias_set (rtl, ix86_GOT_alias_set ());
+@@ -13087,6 +13145,24 @@ get_dllimport_decl (tree decl)
+ return to;
+ }
+
++/* Expand SYMBOL into its corresponding far-addresse symbol.
++ WANT_REG is true if we require the result be a register. */
++
++static rtx
++legitimize_faraddr_symbol (rtx symbol, bool want_reg)
++{
++ tree imp_decl;
++ rtx x;
++
++ gcc_assert (SYMBOL_REF_DECL (symbol));
++ imp_decl = get_dllimport_decl (SYMBOL_REF_DECL (symbol), false);
++
++ x = DECL_RTL (imp_decl);
++ if (want_reg)
++ x = force_reg (Pmode, x);
++ return x;
++}
++
+ /* Expand SYMBOL into its corresponding dllimport symbol. WANT_REG is
+ true if we require the result be a register. */
+
+@@ -13097,7 +13173,7 @@ legitimize_dllimport_symbol (rtx symbol, bool want_reg)
+ rtx x;
+
+ gcc_assert (SYMBOL_REF_DECL (symbol));
+- imp_decl = get_dllimport_decl (SYMBOL_REF_DECL (symbol));
++ imp_decl = get_dllimport_decl (SYMBOL_REF_DECL (symbol), true);
+
+ x = DECL_RTL (imp_decl);
+ if (want_reg)
+@@ -13105,6 +13181,47 @@ legitimize_dllimport_symbol (rtx symbol, bool want_reg)
+ return x;
+ }
+
++
++static rtx
++legitimize_pe_coff_symbol (rtx addr, bool inreg)
++{
++ if (DEFAULT_ABI != MS_ABI)
++ return NULL_RTX;
++
++ if (TARGET_DLLIMPORT_DECL_ATTRIBUTES)
++ {
++ if (GET_CODE (addr) == SYMBOL_REF && SYMBOL_REF_DLLIMPORT_P (addr))
++ return legitimize_dllimport_symbol (addr, inreg);
++ if (GET_CODE (addr) == CONST
++ && GET_CODE (XEXP (addr, 0)) == PLUS
++ && GET_CODE (XEXP (XEXP (addr, 0), 0)) == SYMBOL_REF
++ && SYMBOL_REF_DLLIMPORT_P (XEXP (XEXP (addr, 0), 0)))
++ {
++ rtx t = legitimize_dllimport_symbol (XEXP (XEXP (addr, 0), 0), inreg);
++ return gen_rtx_PLUS (Pmode, t, XEXP (XEXP (addr, 0), 1));
++ }
++ }
++ if (ix86_cmodel != CM_LARGE_PIC && ix86_cmodel != CM_MEDIUM_PIC)
++ return NULL_RTX;
++ if (GET_CODE (addr) == SYMBOL_REF
++ && !is_imported_p (addr)
++ && SYMBOL_REF_EXTERNAL_P (addr)
++ && SYMBOL_REF_DECL (addr))
++ return legitimize_faraddr_symbol (addr, inreg);
++
++ if (GET_CODE (addr) == CONST
++ && GET_CODE (XEXP (addr, 0)) == PLUS
++ && GET_CODE (XEXP (XEXP (addr, 0), 0)) == SYMBOL_REF
++ && !is_imported_p (XEXP (XEXP (addr, 0), 0))
++ && SYMBOL_REF_EXTERNAL_P (XEXP (XEXP (addr, 0), 0))
++ && SYMBOL_REF_DECL (XEXP (XEXP (addr, 0), 0)))
++ {
++ rtx t = legitimize_faraddr_symbol (XEXP (XEXP (addr, 0), 0), inreg);
++ return gen_rtx_PLUS (Pmode, t, XEXP (XEXP (addr, 0), 1));
++ }
++ return NULL_RTX;
++}
++
+ /* 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.
+@@ -13145,16 +13262,9 @@ ix86_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
+
+ if (TARGET_DLLIMPORT_DECL_ATTRIBUTES)
+ {
+- if (GET_CODE (x) == SYMBOL_REF && SYMBOL_REF_DLLIMPORT_P (x))
+- return legitimize_dllimport_symbol (x, true);
+- if (GET_CODE (x) == CONST
+- && GET_CODE (XEXP (x, 0)) == PLUS
+- && GET_CODE (XEXP (XEXP (x, 0), 0)) == SYMBOL_REF
+- && SYMBOL_REF_DLLIMPORT_P (XEXP (XEXP (x, 0), 0)))
+- {
+- rtx t = legitimize_dllimport_symbol (XEXP (XEXP (x, 0), 0), true);
+- return gen_rtx_PLUS (Pmode, t, XEXP (XEXP (x, 0), 1));
+- }
++ rtx tmp = legitimize_pe_coff_symbol (x, true);
++ if (tmp)
++ return tmp;
+ }
+
+ if (flag_pic && SYMBOLIC_CONST (x))
+@@ -15980,6 +16090,8 @@ ix86_expand_move (enum machine_mode mode, rtx operands[])
+
+ if (GET_CODE (op1) == SYMBOL_REF)
+ {
++ rtx tmp;
++
+ model = SYMBOL_REF_TLS_MODEL (op1);
+ if (model)
+ {
+@@ -15989,9 +16101,8 @@ ix86_expand_move (enum machine_mode mode, rtx operands[])
+ return;
+ op1 = convert_to_mode (mode, op1, 1);
+ }
+- else if (TARGET_DLLIMPORT_DECL_ATTRIBUTES
+- && SYMBOL_REF_DLLIMPORT_P (op1))
+- op1 = legitimize_dllimport_symbol (op1, false);
++ else if ((tmp = legitimize_pe_coff_symbol (op1, false)) != NULL_RTX)
++ op1 = tmp;
+ }
+ else if (GET_CODE (op1) == CONST
+ && GET_CODE (XEXP (op1, 0)) == PLUS
+@@ -15999,14 +16110,13 @@ ix86_expand_move (enum machine_mode mode, rtx operands[])
+ {
+ rtx addend = XEXP (XEXP (op1, 0), 1);
+ rtx symbol = XEXP (XEXP (op1, 0), 0);
+- rtx tmp = NULL;
++ rtx tmp;
+
+ model = SYMBOL_REF_TLS_MODEL (symbol);
+ if (model)
+ tmp = legitimize_tls_address (symbol, model, true);
+- else if (TARGET_DLLIMPORT_DECL_ATTRIBUTES
+- && SYMBOL_REF_DLLIMPORT_P (symbol))
+- tmp = legitimize_dllimport_symbol (symbol, true);
++ else
++ tmp = legitimize_pe_coff_symbol (symbol, true);
+
+ if (tmp)
+ {
+@@ -23612,7 +23722,7 @@ construct_plt_address (rtx symbol)
+ rtx tmp, unspec;
+
+ gcc_assert (GET_CODE (symbol) == SYMBOL_REF);
+- gcc_assert (ix86_cmodel == CM_LARGE_PIC);
++ gcc_assert (ix86_cmodel == CM_LARGE_PIC && DEFAULT_ABI != MS_ABI);
+ gcc_assert (Pmode == DImode);
+
+ tmp = gen_reg_rtx (Pmode);
+@@ -23654,7 +23764,8 @@ ix86_expand_call (rtx retval, rtx fnaddr, rtx callarg1,
+ else
+ {
+ /* Static functions and indirect calls don't need the pic register. */
+- if (flag_pic && (!TARGET_64BIT || ix86_cmodel == CM_LARGE_PIC)
++ if (flag_pic && (!TARGET_64BIT
++ || (ix86_cmodel == CM_LARGE_PIC && DEFAULT_ABI != MS_ABI))
+ && GET_CODE (XEXP (fnaddr, 0)) == SYMBOL_REF
+ && ! SYMBOL_REF_LOCAL_P (XEXP (fnaddr, 0)))
+ use_reg (&use, pic_offset_table_rtx);
+@@ -23668,6 +23779,7 @@ ix86_expand_call (rtx retval, rtx fnaddr, rtx callarg1,
+ }
+
+ if (ix86_cmodel == CM_LARGE_PIC
++ && DEFAULT_ABI != MS_ABI
+ && MEM_P (fnaddr)
+ && GET_CODE (XEXP (fnaddr, 0)) == SYMBOL_REF
+ && !local_symbolic_operand (XEXP (fnaddr, 0), VOIDmode))
+@@ -35014,7 +35126,7 @@ x86_output_mi_thunk (FILE *file,
+ if (TARGET_64BIT)
+ {
+ if (!flag_pic || targetm.binds_local_p (function)
+- || cfun->machine->call_abi == MS_ABI)
++ || DEFAULT_ABI == MS_ABI)
+ ;
+ else
+ {
+diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
+index a69862c..5d31f80 100644
+--- a/gcc/config/i386/i386.h
++++ b/gcc/config/i386/i386.h
+@@ -1179,7 +1179,8 @@ enum target_cpu_default
+ #define REAL_PIC_OFFSET_TABLE_REGNUM BX_REG
+
+ #define PIC_OFFSET_TABLE_REGNUM \
+- ((TARGET_64BIT && ix86_cmodel == CM_SMALL_PIC) \
++ ((TARGET_64BIT && (ix86_cmodel == CM_SMALL_PIC \
++ || DEFAULT_ABI == MS_ABI)) \
+ || !flag_pic ? INVALID_REGNUM \
+ : reload_completed ? REGNO (pic_offset_table_rtx) \
+ : REAL_PIC_OFFSET_TABLE_REGNUM)
+@@ -2379,6 +2380,10 @@ struct GTY(()) machine_function {
+ #define SYMBOL_REF_DLLEXPORT_P(X) \
+ ((SYMBOL_REF_FLAGS (X) & SYMBOL_FLAG_DLLEXPORT) != 0)
+
++#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);
+
+diff --git a/gcc/config/i386/mingw.opt b/gcc/config/i386/mingw.opt
+index 0341904..85ed5be 100644
+--- a/gcc/config/i386/mingw.opt
++++ b/gcc/config/i386/mingw.opt
+@@ -28,8 +28,4 @@ Wpedantic-ms-format
+ C ObjC C++ ObjC++ Var(warn_pedantic_ms_format) Init(1) Warning
+ Warn about none ISO msvcrt scanf/printf width extensions
+
+-fset-stack-executable
+-Common Report Var(flag_setstackexecutable) Init(1) Optimization
+-For nested functions on stack executable permission is set.
+-
+ ; Need to retain blank line above.
+diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
+index 1ac5544..92d3607 100644
+--- a/gcc/config/i386/mingw32.h
++++ b/gcc/config/i386/mingw32.h
+@@ -245,4 +245,4 @@ do { \
+ #define LIBGCC_SONAME "libgcc_s" LIBGCC_EH_EXTN "-1.dll"
+
+ /* We should find a way to not have to update this manually. */
+-#define LIBGCJ_SONAME "libgcj" /*LIBGCC_EH_EXTN*/ "-13.dll"
++#define LIBGCJ_SONAME "libgcj" /*LIBGCC_EH_EXTN*/ "-14.dll"
+diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md
+index 0e52c85..2d8e01a 100644
+--- a/gcc/config/i386/predicates.md
++++ b/gcc/config/i386/predicates.md
+@@ -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;
+
++ /* 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;
+
+diff --git a/gcc/config/i386/t-cygwin-w64 b/gcc/config/i386/t-cygwin-w64
+new file mode 100644
+index 0000000..01968fd
+--- /dev/null
++++ b/gcc/config/i386/t-cygwin-w64
+@@ -0,0 +1,3 @@
++MULTILIB_OPTIONS = m64/m32
++MULTILIB_DIRNAMES = 64
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
+index 7e7c155..f0f972c 100644
+--- a/gcc/config/i386/winnt.c
++++ b/gcc/config/i386/winnt.c
+@@ -646,8 +646,18 @@ struct GTY(()) export_list
+ int is_data; /* used to type tag exported symbols. */
+ };
+
++/* Keep a list of stub symbols. */
++
++struct GTY(()) stub_list
++{
++ struct stub_list *next;
++ const char *name;
++};
++
+ static GTY(()) struct export_list *export_head;
+
++static GTY(()) struct stub_list *stub_head;
++
+ /* Assemble an export symbol entry. We need to keep a list of
+ these, so that we can output the export list at the end of the
+ assembly. We used to output these export symbols in each function,
+@@ -678,6 +688,30 @@ i386_pe_maybe_record_exported_symbol (tree decl, const char *name, int is_data)
+ export_head = p;
+ }
+
++void
++i386_pe_record_stub (const char *name)
++{
++ struct stub_list *p;
++
++ if (!name || *name == 0)
++ return;
++
++ p = stub_head;
++ while (p != NULL)
++ {
++ if (p->name[0] == *name
++ && !strcmp (p->name, name))
++ return;
++ p = p->next;
++ }
++
++ p = ggc_alloc_stub_list ();
++ p->next = stub_head;
++ p->name = name;
++ stub_head = p;
++}
++
++
+ #ifdef CXX_WRAP_SPEC_LIST
+
+ /* Hash table equality helper function. */
+@@ -781,6 +815,30 @@ i386_pe_file_end (void)
+ (q->is_data ? ",data" : ""));
+ }
+ }
++
++ if (stub_head)
++ {
++ struct stub_list *q;
++
++ for (q = stub_head; q != NULL; q = q->next)
++ {
++ const char *name = q->name;
++ const char *oname;
++
++ if (name[0] == '*')
++ ++name;
++ oname = name;
++ if (name[0] == '.')
++ ++name;
++ if (strncmp (name, "refptr.", 7) != 0)
++ continue;
++ name += 7;
++ fprintf (asm_out_file, "\t.section\t.rdata$%s, \"dr\"\n"
++ "\t.globl\t%s\n"
++ "\t.linkonce\tdiscard\n", oname, oname);
++ fprintf (asm_out_file, "%s:\n\t.quad\t%s\n", oname, name);
++ }
++ }
+ }
+
+
+diff --git a/gcc/config/i386/xm-mingw32.h b/gcc/config/i386/xm-mingw32.h
+index 3e20481..3d90dec 100644
+--- a/gcc/config/i386/xm-mingw32.h
++++ b/gcc/config/i386/xm-mingw32.h
+@@ -29,6 +29,12 @@ along with GCC; see the file COPYING3. If not see
+ /* The st_ino field of struct stat is always 0. */
+ #define HOST_LACKS_INODE_NUMBERS
+
++#ifdef __MINGW32__
++#undef __USE_MINGW_ANSI_STDIO
++#define __USE_MINGW_ANSI_STDIO 1
++#else
+ /* MSVCRT does not support the "ll" format specifier for printing
+ "long long" values. Instead, we use "I64". */
+ #define HOST_LONG_LONG_FORMAT "I64"
++#endif
++
+diff --git a/gcc/configure b/gcc/configure
+index b9e8a8f..66a8f1c 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -4893,7 +4893,9 @@ case "${target}" in
+ hppa*64*-*-hpux*)
+ # PIC is the default for 64-bit PA HP-UX.
+ ;;
+- i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
++ i[34567]86-*-cygwin* | x86_64-*-cygwin*)
++ ;;
++ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ ;;
+ i[34567]86-*-interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+@@ -7079,7 +7081,7 @@ else
+ powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
+ i?86*-*-gnu* | \
+ i?86*-*-mingw* | x86_64*-*-mingw* | \
+- i?86*-*-cygwin*)
++ i?86*-*-cygwin* | x86_64*-*-cygwin*)
+ enable_decimal_float=yes
+ ;;
+ *)
+@@ -24273,7 +24275,7 @@ fi
+ # wrappers to aid in interposing and redirecting operators new, delete,
+ # etc., as per n2800 #17.6.4.6 [replacement.functions]. Check if we
+ # are configuring for a version of Cygwin that exports the wrappers.
+- if test x$host = x$target; then
++ if test x$host = x$target && test x$host_cpu = xi686; then
+ ac_fn_c_check_func "$LINENO" "__wrap__Znaj" "ac_cv_func___wrap__Znaj"
+ if test "x$ac_cv_func___wrap__Znaj" = x""yes; then :
+ gcc_ac_cygwin_dll_wrappers=yes
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 8e9626c..30e5f7c 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -3623,7 +3623,7 @@ changequote([,])dnl
+ # wrappers to aid in interposing and redirecting operators new, delete,
+ # etc., as per n2800 #17.6.4.6 [replacement.functions]. Check if we
+ # are configuring for a version of Cygwin that exports the wrappers.
+- if test x$host = x$target; then
++ if test x$host = x$target && test x$host_cpu = xi686; then
+ AC_CHECK_FUNC([__wrap__Znaj],[gcc_ac_cygwin_dll_wrappers=yes],[gcc_ac_cygwin_dll_wrappers=no])
+ else
+ # Can't check presence of libc functions during cross-compile, so
+diff --git a/gcc/gtm-builtins.def b/gcc/gtm-builtins.def
+index 171019e..df003fd 100644
+--- a/gcc/gtm-builtins.def
++++ b/gcc/gtm-builtins.def
+@@ -1,5 +1,5 @@
+ DEF_TM_BUILTIN (BUILT_IN_TM_START, "_ITM_beginTransaction",
+- BT_FN_UINT32_UINT32_VAR, ATTR_TM_NOTHROW_RT_LIST)
++ BT_FN_UINT32_UINT32_VAR, ATTR_TM_NOTHROW_RT_SYSV_LIST)
+
+ DEF_TM_BUILTIN (BUILT_IN_TM_COMMIT, "_ITM_commitTransaction",
+ BT_FN_VOID, ATTR_TM_NOTHROW_LIST)
+diff --git a/gcc/testsuite/gcc.target/i386/pr25993.c b/gcc/testsuite/gcc.target/i386/pr25993.c
+index b079e25..c30eaf5 100644
+--- a/gcc/testsuite/gcc.target/i386/pr25993.c
++++ b/gcc/testsuite/gcc.target/i386/pr25993.c
+@@ -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/libada/configure b/libada/configure
+index da92d0e..19d3e5e 100755
+--- a/libada/configure
++++ b/libada/configure
+@@ -2834,7 +2834,9 @@ case "${host}" in
+ hppa*64*-*-hpux*)
+ # PIC is the default for 64-bit PA HP-UX.
+ ;;
+- i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
++ i[34567]86-*-cygwin* | x86_64-*-cygwin*)
++ ;;
++ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ ;;
+ i[34567]86-*-interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
+index a98ee64..9f2a7ed 100644
+--- a/libatomic/Makefile.am
++++ b/libatomic/Makefile.am
+@@ -66,7 +66,7 @@ libatomic_version_dep =
+ endif
+ libatomic_version_info = -version-info $(libtool_VERSION)
+
+-libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script)
++libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) $(lt_host_flags)
+ libatomic_la_SOURCES = gload.c gstore.c gcas.c gexch.c glfree.c lock.c init.c
+
+ SIZEOBJS = load store cas exch fadd fsub fand fior fxor fnand tas
+diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in
+index 46e60c9..61bcf0d 100644
+--- a/libatomic/Makefile.in
++++ b/libatomic/Makefile.in
+@@ -244,6 +244,7 @@ libexecdir = @libexecdir@
+ libtool_VERSION = @libtool_VERSION@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_host_flags = @lt_host_flags@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ multi_basedir = @multi_basedir@
+@@ -285,7 +286,7 @@ noinst_LTLIBRARIES = libatomic_convenience.la
+ @LIBAT_BUILD_VERSIONED_SHLIB_GNU_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE at libatomic_version_dep = $(top_srcdir)/libatomic.map
+ @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE at libatomic_version_dep = libatomic.map-sun
+ libatomic_version_info = -version-info $(libtool_VERSION)
+-libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script)
++libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) $(lt_host_flags)
+ libatomic_la_SOURCES = gload.c gstore.c gcas.c gexch.c glfree.c lock.c init.c
+ SIZEOBJS = load store cas exch fadd fsub fand fior fxor fnand tas
+ EXTRA_libatomic_la_SOURCES = $(addsuffix _n.c,$(SIZEOBJS))
+diff --git a/libatomic/aclocal.m4 b/libatomic/aclocal.m4
+index 48f5ef5..b709f12 100644
+--- a/libatomic/aclocal.m4
++++ b/libatomic/aclocal.m4
+@@ -993,6 +993,7 @@ AC_SUBST([am__untar])
+ m4_include([../config/acx.m4])
+ m4_include([../config/depstand.m4])
+ m4_include([../config/lead-dot.m4])
++m4_include([../config/lthostflags.m4])
+ m4_include([../config/multi.m4])
+ m4_include([../config/override.m4])
+ m4_include([../config/stdint.m4])
+diff --git a/libatomic/configure b/libatomic/configure
+index a9dfa03..23e006e 100755
+--- a/libatomic/configure
++++ b/libatomic/configure
+@@ -627,6 +627,7 @@ MAINTAINER_MODE_FALSE
+ MAINTAINER_MODE_TRUE
+ enable_static
+ enable_shared
++lt_host_flags
+ CPP
+ OTOOL64
+ OTOOL
+@@ -11013,7 +11014,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11016 "configure"
++#line 11017 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11119,7 +11120,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11122 "configure"
++#line 11123 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11359,6 +11360,28 @@ CC="$lt_save_CC"
+
+
+
++case $host in
++ *-cygwin* | *-mingw*)
++ # 'host' will be top-level target in the case of a target lib,
++ # we must compare to with_cross_host to decide if this is a native
++ # or cross-compiler and select where to install dlls appropriately.
++ if test -n "$with_cross_host" &&
++ test x"$with_cross_host" != x"no"; then
++ lt_host_flags='-no-undefined -bindir "$(toolexeclibdir)"';
++ else
++ lt_host_flags='-no-undefined -bindir "$(bindir)"';
++ fi
++ ;;
++ *)
++ lt_host_flags=
++ ;;
++esac
++
++
++
++
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+ # Check whether --enable-maintainer-mode was given.
+diff --git a/libatomic/configure.ac b/libatomic/configure.ac
+index 0dc4a98..0110b93 100644
+--- a/libatomic/configure.ac
++++ b/libatomic/configure.ac
+@@ -143,6 +143,7 @@ AC_PROG_INSTALL
+
+ # Configure libtool
+ AM_PROG_LIBTOOL
++ACX_LT_HOST_FLAGS
+ AC_SUBST(enable_shared)
+ AC_SUBST(enable_static)
+ AM_MAINTAINER_MODE
+diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
+index b9e5d6c..6550285 100644
+--- a/libatomic/configure.tgt
++++ b/libatomic/configure.tgt
+@@ -108,7 +108,7 @@ case "${target}" in
+ *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu \
+ | *-*-netbsd* | *-*-freebsd* | *-*-openbsd* \
+ | *-*-solaris2* | *-*-sysv4* | *-*-irix6* | *-*-osf* | *-*-hpux11* \
+- | *-*-darwin* | *-*-aix*)
++ | *-*-darwin* | *-*-aix* | *-*-cygwin*)
+ # POSIX system. The OS is supported.
+ config_path="${config_path} posix"
+ ;;
+diff --git a/libdecnumber/configure b/libdecnumber/configure
+index 0466371..91721de 100755
+--- a/libdecnumber/configure
++++ b/libdecnumber/configure
+@@ -4613,7 +4613,7 @@ else
+ powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
+ i?86*-*-gnu* | \
+ i?86*-*-mingw* | x86_64*-*-mingw* | \
+- i?86*-*-cygwin*)
++ i?86*-*-cygwin* | x86_64*-*-cygwin*)
+ enable_decimal_float=yes
+ ;;
+ *)
+diff --git a/libffi/src/x86/ffi.c b/libffi/src/x86/ffi.c
+index 611e221..6338de2 100644
+--- a/libffi/src/x86/ffi.c
++++ b/libffi/src/x86/ffi.c
+@@ -28,7 +28,7 @@
+ DEALINGS IN THE SOFTWARE.
+ ----------------------------------------------------------------------- */
+
+-#if !defined(__x86_64__) || defined(_WIN64)
++#if !defined(__x86_64__) || defined(_WIN64) || defined(__CYGWIN__)
+
+ #ifdef _WIN64
+ #include <windows.h>
+diff --git a/libffi/src/x86/win64.S b/libffi/src/x86/win64.S
+index fcdb270..45fe150 100644
+--- a/libffi/src/x86/win64.S
++++ b/libffi/src/x86/win64.S
+@@ -295,7 +295,7 @@ SYMBOL_NAME(ffi_closure_win64):
+ mov %rax, %rcx # context is first parameter
+ mov %rsp, %rdx # stack is second parameter
+ add $48, %rdx # point to start of arguments
+- mov $SYMBOL_NAME(ffi_closure_win64_inner), %rax
++ lea SYMBOL_NAME(ffi_closure_win64_inner)(%rip), %rax
+ callq *%rax # call the real closure function
+ add $40, %rsp
+ movq %rax, %xmm0 # If the closure returned a float,
+diff --git a/libgcc/config.host b/libgcc/config.host
+index 259c9a7..dd4ec17 100644
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -274,6 +274,9 @@ case ${host} in
+ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ enable_execute_stack=config/i386/enable-execute-stack-mingw32.c
+ ;;
++i[34567]86-*-cygwin* | x86_64-*-cygwin*)
++ enable_execute_stack=config/i386/enable-execute-stack-mingw32.c
++ ;;
+ *)
+ enable_execute_stack=enable-execute-stack-empty.c;
+ ;;
+@@ -571,6 +574,23 @@ i[34567]86-*-cygwin*)
+ fi
+ tmake_file="${tmake_file} ${tmake_eh_file} ${tmake_dlldir_file} i386/t-slibgcc-cygming i386/t-cygming i386/t-cygwin i386/t-crtfm i386/t-chkstk t-dfprules"
+ ;;
++x86_64-*-cygwin*)
++ 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${build} = x${host} ; then
++ tmake_dlldir_file="i386/t-dlldir"
++ else
++ tmake_dlldir_file="i386/t-dlldir-x"
++ fi
++ # FIXME - dj - t-chkstk used to be in here, need a 64-bit version of that
++ tmake_file="${tmake_file} ${tmake_eh_file} ${tmake_dlldir_file} i386/t-slibgcc-cygming i386/t-cygming i386/t-cygwin 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
+@@ -1143,7 +1163,8 @@ i[34567]86-*-darwin* | x86_64-*-darwin* | \
+ i[34567]86-*-linux* | x86_64-*-linux* | \
+ i[34567]86-*-gnu* | \
+ i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]* | \
+- i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw* | \
++ i[34567]86-*-cygwin* | x86_64-*-cygwin* | \
++ i[34567]86-*-mingw* | x86_64-*-mingw* | \
+ i[34567]86-*-freebsd* | x86_64-*-freebsd* | \
+ i[34567]86-*-openbsd* | x86_64-*-openbsd*)
+ tmake_file="${tmake_file} t-softfp-tf"
+diff --git a/libgcc/config/i386/cygming-crtbegin.c b/libgcc/config/i386/cygming-crtbegin.c
+index 6a513cb..b5df948 100644
+--- a/libgcc/config/i386/cygming-crtbegin.c
++++ b/libgcc/config/i386/cygming-crtbegin.c
+@@ -46,14 +46,32 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+ #define LIBGCJ_SONAME "libgcj_s.dll"
+ #endif
+
+-
++#if DWARF2_UNWIND_INFO
+ /* Make the declarations weak. This is critical for
+ _Jv_RegisterClasses because it lives in libgcj.a */
+-extern void __register_frame_info (const void *, struct object *)
++extern void __register_frame_info (__attribute__((unused)) const void *,
++ __attribute__((unused)) struct object *)
+ TARGET_ATTRIBUTE_WEAK;
+-extern void *__deregister_frame_info (const void *)
++extern void *__deregister_frame_info (__attribute__((unused)) const void *)
+ TARGET_ATTRIBUTE_WEAK;
+-extern void _Jv_RegisterClasses (const void *) TARGET_ATTRIBUTE_WEAK;
++TARGET_ATTRIBUTE_WEAK void
++__register_frame_info (__attribute__((unused)) const void *p,
++ __attribute__((unused)) struct object *o)
++{}
++
++TARGET_ATTRIBUTE_WEAK void*
++__deregister_frame_info (__attribute__((unused)) const void *p)
++{ return NULL; }
++#endif /* DWARF2_UNWIND_INFO */
++
++#if TARGET_USE_JCR_SECTION
++extern void _Jv_RegisterClasses (__attribute__((unused)) const void *)
++ TARGET_ATTRIBUTE_WEAK;
++
++TARGET_ATTRIBUTE_WEAK void
++_Jv_RegisterClasses (__attribute__((unused)) const void *p)
++{}
++#endif /* TARGET_USE_JCR_SECTION */
+
+ #if defined(HAVE_LD_RO_RW_SECTION_MIXING)
+ # define EH_FRAME_SECTION_CONST const
+@@ -82,6 +100,8 @@ static void *__JCR_LIST__[]
+ extern void __gcc_register_frame (void);
+ extern void __gcc_deregister_frame (void);
+
++static HANDLE libgcc_dll;
++
+ void
+ __gcc_register_frame (void)
+ {
+@@ -94,8 +114,11 @@ __gcc_register_frame (void)
+ void (*register_frame_fn) (const void *, struct object *);
+ HANDLE h = GetModuleHandle (LIBGCC_SONAME);
+ if (h)
+- register_frame_fn = (void (*) (const void *, struct object *))
+- GetProcAddress (h, "__register_frame_info");
++ {
++ libgcc_dll = LoadLibrary (LIBGCC_SONAME); /* Hold reference */
++ register_frame_fn = (void (*) (const void *, struct object *))
++ GetProcAddress (h, "__register_frame_info");
++ }
+ else
+ register_frame_fn = __register_frame_info;
+ if (register_frame_fn)
+@@ -124,13 +147,16 @@ __gcc_deregister_frame (void)
+ {
+ #if DWARF2_UNWIND_INFO
+ void * (*deregister_frame_fn) (const void *);
+- HANDLE h = GetModuleHandle (LIBGCC_SONAME);
+- if (h)
++ if (libgcc_dll)
+ deregister_frame_fn = (void* (*) (const void *))
+- GetProcAddress (h, "__deregister_frame_info");
++ GetProcAddress (libgcc_dll, "__deregister_frame_info");
+ else
+ deregister_frame_fn = __deregister_frame_info;
+ if (deregister_frame_fn)
+ deregister_frame_fn (__EH_FRAME_BEGIN__);
++
++if (libgcc_dll)
++ FreeLibrary (libgcc_dll);
++
+ #endif
+ }
+diff --git a/libgcc/config/i386/cygwin.S b/libgcc/config/i386/cygwin.S
+index a72375a..45341a8 100644
+--- a/libgcc/config/i386/cygwin.S
++++ b/libgcc/config/i386/cygwin.S
+@@ -32,7 +32,7 @@
+ # define cfi_adjust_cfa_offset(X) .cfi_adjust_cfa_offset X
+ # define cfi_def_cfa_register(X) .cfi_def_cfa_register X
+ # define cfi_register(D,S) .cfi_register D, S
+-# ifdef _WIN64
++# ifdef __x86_64__
+ # define cfi_push(X) .cfi_adjust_cfa_offset 8; .cfi_rel_offset X, 0
+ # define cfi_pop(X) .cfi_adjust_cfa_offset -8; .cfi_restore X
+ # else
+@@ -57,7 +57,7 @@
+
+ .global ___chkstk
+ .global __alloca
+-#ifdef _WIN64
++#ifdef __x86_64__
+ /* __alloca is a normal function call, which uses %rcx as the argument. */
+ cfi_startproc()
+ __alloca:
+@@ -123,7 +123,7 @@ __alloca:
+ pushl 4(%eax)
+ ret
+ cfi_endproc()
+-#endif /* _WIN64 */
++#endif /* __x86_64__ */
+ #endif /* L_chkstk */
+
+ #ifdef L_chkstk_ms
+@@ -131,7 +131,7 @@ __alloca:
+ We avoid clobbering any registers. Unlike ___chkstk, it just probes the
+ stack and does no stack allocation. */
+ .global ___chkstk_ms
+-#ifdef _WIN64
++#ifdef __x86_64__
+ cfi_startproc()
+ ___chkstk_ms:
+ pushq %rcx /* save temps */
+@@ -183,5 +183,5 @@ ___chkstk_ms:
+ cfi_pop(%ecx)
+ ret
+ cfi_endproc()
+-#endif /* _WIN64 */
++#endif /* __x86_64__ */
+ #endif /* L_chkstk_ms */
+diff --git a/libgcc/configure b/libgcc/configure
+index 1425df6..bb36889 100644
+--- a/libgcc/configure
++++ b/libgcc/configure
+@@ -2228,7 +2228,9 @@ case "${host}" in
+ hppa*64*-*-hpux*)
+ # PIC is the default for 64-bit PA HP-UX.
+ ;;
+- i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
++ i[34567]86-*-cygwin* | x86_64-*-cygwin*)
++ ;;
++ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ ;;
+ i[34567]86-*-interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+@@ -4078,7 +4080,7 @@ else
+ powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
+ i?86*-*-gnu* | \
+ i?86*-*-mingw* | x86_64*-*-mingw* | \
+- i?86*-*-cygwin*)
++ i?86*-*-cygwin* | x86_64*-*-cygwin*)
+ enable_decimal_float=yes
+ ;;
+ *)
+diff --git a/libiberty/aclocal.m4 b/libiberty/aclocal.m4
+index bf8a907..6b5e66c 100644
+--- a/libiberty/aclocal.m4
++++ b/libiberty/aclocal.m4
+@@ -15,6 +15,8 @@ AC_CACHE_CHECK([for working strncmp], ac_cv_func_strncmp_works,
+ /* Test by Jim Wilson and Kaveh Ghazi.
+ Check whether strncmp reads past the end of its string parameters. */
+ #include <sys/types.h>
++#include <string.h>
++#include <stdlib.h>
+
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+@@ -147,7 +149,9 @@ if test $ac_cv_os_cray = yes; then
+ fi
+
+ AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
+-[AC_TRY_RUN([find_stack_direction ()
++[AC_TRY_RUN([
++#include <stdlib.h>
++find_stack_direction ()
+ {
+ static char *addr = 0;
+ auto char dummy;
+diff --git a/libiberty/configure b/libiberty/configure
+index 5367027..fd01f27 100755
+--- a/libiberty/configure
++++ b/libiberty/configure
+@@ -4865,7 +4865,9 @@ case "${host}" in
+ hppa*64*-*-hpux*)
+ # PIC is the default for 64-bit PA HP-UX.
+ ;;
+- i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
++ i[34567]86-*-cygwin* | x86_64-*-cygwin*)
++ ;;
++ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ ;;
+ i[34567]86-*-interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+@@ -6067,6 +6069,7 @@ else
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
++#include <stdlib.h>
+ find_stack_direction ()
+ {
+ static char *addr = 0;
+@@ -6836,6 +6839,8 @@ else
+ /* Test by Jim Wilson and Kaveh Ghazi.
+ Check whether strncmp reads past the end of its string parameters. */
+ #include <sys/types.h>
++#include <string.h>
++#include <stdlib.h>
+
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+diff --git a/libitm/Makefile.am b/libitm/Makefile.am
+index e754ccc..7bf9b70 100644
+--- a/libitm/Makefile.am
++++ b/libitm/Makefile.am
+@@ -54,7 +54,7 @@ libitm_version_info = -version-info $(libtool_VERSION)
+ # want or need libstdc++.
+ libitm_la_DEPENDENCIES = $(libitm_version_dep)
+ libitm_la_LINK = $(LINK) $(libitm_la_LDFLAGS)
+-libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script)
++libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script) $(lt_host_flags)
+
+ libitm_la_SOURCES = \
+ aatree.cc alloc.cc alloc_c.cc alloc_cpp.cc barrier.cc beginend.cc \
+diff --git a/libitm/Makefile.in b/libitm/Makefile.in
+index f44fd70..4ffef43 100644
+--- a/libitm/Makefile.in
++++ b/libitm/Makefile.in
+@@ -279,6 +279,7 @@ libtool_VERSION = @libtool_VERSION@
+ link_itm = @link_itm@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_host_flags = @lt_host_flags@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ multi_basedir = @multi_basedir@
+@@ -329,7 +330,7 @@ libitm_version_info = -version-info $(libtool_VERSION)
+ # want or need libstdc++.
+ libitm_la_DEPENDENCIES = $(libitm_version_dep)
+ libitm_la_LINK = $(LINK) $(libitm_la_LDFLAGS)
+-libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script)
++libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script) $(lt_host_flags)
+ libitm_la_SOURCES = aatree.cc alloc.cc alloc_c.cc alloc_cpp.cc \
+ barrier.cc beginend.cc clone.cc eh_cpp.cc local.cc query.cc \
+ retry.cc rwlock.cc useraction.cc util.cc sjlj.S tls.cc \
+diff --git a/libitm/aclocal.m4 b/libitm/aclocal.m4
+index 625404e..4be0d43 100644
+--- a/libitm/aclocal.m4
++++ b/libitm/aclocal.m4
+@@ -996,6 +996,7 @@ m4_include([../config/depstand.m4])
+ m4_include([../config/enable.m4])
+ m4_include([../config/futex.m4])
+ m4_include([../config/lead-dot.m4])
++m4_include([../config/lthostflags.m4])
+ m4_include([../config/mmap.m4])
+ m4_include([../config/multi.m4])
+ m4_include([../config/override.m4])
+diff --git a/libitm/configure b/libitm/configure
+index 7635a47..9d19922 100644
+--- a/libitm/configure
++++ b/libitm/configure
+@@ -630,6 +630,7 @@ MAINTAINER_MODE_FALSE
+ MAINTAINER_MODE_TRUE
+ enable_static
+ enable_shared
++lt_host_flags
+ CXXCPP
+ CPP
+ OTOOL64
+@@ -15141,6 +15142,28 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
++case $host in
++ *-cygwin* | *-mingw*)
++ # 'host' will be top-level target in the case of a target lib,
++ # we must compare to with_cross_host to decide if this is a native
++ # or cross-compiler and select where to install dlls appropriately.
++ if test -n "$with_cross_host" &&
++ test x"$with_cross_host" != x"no"; then
++ lt_host_flags='-no-undefined -bindir "$(toolexeclibdir)"';
++ else
++ lt_host_flags='-no-undefined -bindir "$(bindir)"';
++ fi
++ ;;
++ *)
++ lt_host_flags=
++ ;;
++esac
++
++
++
++
++
++
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+diff --git a/libitm/configure.ac b/libitm/configure.ac
+index 584a23b..c5459fe 100644
+--- a/libitm/configure.ac
++++ b/libitm/configure.ac
+@@ -147,6 +147,7 @@ AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes")
+
+ # Configure libtool
+ AM_PROG_LIBTOOL
++ACX_LT_HOST_FLAGS
+ AC_SUBST(enable_shared)
+ AC_SUBST(enable_static)
+
+diff --git a/libitm/configure.tgt b/libitm/configure.tgt
+index a20b410..77d071c 100644
+--- a/libitm/configure.tgt
++++ b/libitm/configure.tgt
+@@ -137,7 +137,7 @@ case "${target}" in
+ *-*-gnu* | *-*-k*bsd*-gnu \
+ | *-*-netbsd* | *-*-freebsd* | *-*-openbsd* \
+ | *-*-solaris2* | *-*-sysv4* | *-*-hpux11* \
+- | *-*-darwin* | *-*-aix*)
++ | *-*-darwin* | *-*-aix* | *-*-cygwin*)
+ # POSIX system. The OS is supported.
+ ;;
+
+diff --git a/libitm/libitm.h b/libitm/libitm.h
+index 20ac59a..9a7be25 100644
+--- a/libitm/libitm.h
++++ b/libitm/libitm.h
+@@ -45,6 +45,7 @@ extern "C" {
+
+ #define ITM_NORETURN __attribute__((noreturn))
+ #define ITM_PURE __attribute__((transaction_pure))
++#define ITM_SYSV __attribute__((sysv_abi))
+
+ /* The following are externally visible definitions and functions, though
+ only very few of these should be called by user code. */
+@@ -136,7 +137,7 @@ typedef uint64_t _ITM_transactionId_t; /* Transaction identifier */
+
+ extern _ITM_transactionId_t _ITM_getTransactionId(void) ITM_REGPARM;
+
+-extern uint32_t _ITM_beginTransaction(uint32_t, ...) ITM_REGPARM;
++extern uint32_t _ITM_beginTransaction(uint32_t, ...) ITM_REGPARM ITM_SYSV;
+
+ extern void _ITM_abortTransaction(_ITM_abortReason) ITM_REGPARM ITM_NORETURN;
+
+diff --git a/libitm/libitm_i.h b/libitm/libitm_i.h
+index 421b349..1c6ddf6 100644
+--- a/libitm/libitm_i.h
++++ b/libitm/libitm_i.h
+@@ -39,8 +39,10 @@
+ #include "local_type_traits"
+ #include "local_atomic"
+
++#ifndef __CYGWIN__
+ /* Don't require libgcc_s.so for exceptions. */
+ extern void _Unwind_DeleteException (_Unwind_Exception*) __attribute__((weak));
++#endif
+
+
+ #include "common.h"
+@@ -281,10 +283,10 @@ struct gtm_thread
+ #define UPFX1(t) UPFX(t)
+ #define UPFX(t) #t
+ static uint32_t begin_transaction(uint32_t, const gtm_jmpbuf *)
+- __asm__(UPFX1(__USER_LABEL_PREFIX__) "GTM_begin_transaction") ITM_REGPARM;
++ __asm__(UPFX1(__USER_LABEL_PREFIX__) "GTM_begin_transaction") ITM_REGPARM ITM_SYSV;
+ #else
+ static uint32_t begin_transaction(uint32_t, const gtm_jmpbuf *)
+- __asm__("GTM_begin_transaction") ITM_REGPARM;
++ __asm__("GTM_begin_transaction") ITM_REGPARM ITM_SYSV;
+ #endif
+ // In eh_cpp.cc
+ void revert_cpp_exceptions (gtm_transaction_cp *cp = 0);
+@@ -318,7 +320,7 @@ namespace GTM HIDDEN {
+ extern uint64_t gtm_spin_count_var;
+
+ extern "C" uint32_t GTM_longjmp (uint32_t, const gtm_jmpbuf *, uint32_t)
+- ITM_NORETURN ITM_REGPARM;
++ ITM_NORETURN ITM_REGPARM ITM_SYSV;
+
+ extern "C" void GTM_LB (const void *, size_t) ITM_REGPARM;
+
+diff --git a/libjava/classpath/configure b/libjava/classpath/configure
+index 23341df..02d8323 100755
+--- a/libjava/classpath/configure
++++ b/libjava/classpath/configure
+@@ -3173,7 +3173,7 @@ case "$host_os" in
+ cp_module=""
+ ;;
+ *)
+- cp_module="-module"
++ cp_module="-module -avoid-version"
+ ;;
+ esac
+
+diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac
+index 910c8f0..14a6543 100644
+--- a/libjava/classpath/configure.ac
++++ b/libjava/classpath/configure.ac
+@@ -64,7 +64,7 @@ case "$host_os" in
+ cp_module=""
+ ;;
+ *)
+- cp_module="-module"
++ cp_module="-module -avoid-version"
+ ;;
+ esac
+
+diff --git a/libjava/classpath/examples/gnu/classpath/examples/awt/HintingDemo.java b/libjava/classpath/examples/gnu/classpath/examples/awt/HintingDemo.java
+index 5ba44f6..068b596 100644
+--- a/libjava/classpath/examples/gnu/classpath/examples/awt/HintingDemo.java
++++ b/libjava/classpath/examples/gnu/classpath/examples/awt/HintingDemo.java
+@@ -211,7 +211,7 @@ public class HintingDemo extends JFrame {
+
+ HintingDemo()
+ {
+- File file = new File("/usr/share/fonts/truetype/freefont/FreeSans.ttf");
++ File file = new File("/usr/share/fonts/TTF/Vera.ttf");
+ loadFont(file);
+ setLayout(new BorderLayout());
+ chooser = new Chooser();
+diff --git a/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java b/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java
+index fd4f498..2935a5a 100644
+--- a/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java
++++ b/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java
+@@ -58,7 +58,7 @@ public class ClasspathDesktopPeer
+ implements DesktopPeer
+ {
+ /** This is the fallback browser, if no desktop was detected. */
+- protected static final String _DEFAULT_BROWSER = "firefox";
++ protected static final String _DEFAULT_BROWSER = "xdg-open";
+
+ /** gnu.java.awt.peer.Desktop.html.command */
+ protected static final String _BROWSE = "html";
+diff --git a/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java b/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java
+index 96677a4..101a85f 100644
+--- a/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java
++++ b/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java
+@@ -158,6 +158,8 @@ public abstract class ClasspathFontPeer
+
+ protected static boolean isLogicalFontName(String name)
+ {
++ return false;
++/*
+ String uname = name.toUpperCase ();
+ return (uname.equals ("SANSSERIF") ||
+ uname.equals ("SERIF") ||
+@@ -165,6 +167,7 @@ public abstract class ClasspathFontPeer
+ uname.equals ("DIALOG") ||
+ uname.equals ("DIALOGINPUT") ||
+ uname.equals ("DEFAULT"));
++*/
+ }
+
+ protected static String logicalFontNameToFaceName (String name)
+diff --git a/libjava/classpath/resource/gnu/java/awt/font/fonts.properties b/libjava/classpath/resource/gnu/java/awt/font/fonts.properties
+index 4fc0b10..1370469 100644
+--- a/libjava/classpath/resource/gnu/java/awt/font/fonts.properties
++++ b/libjava/classpath/resource/gnu/java/awt/font/fonts.properties
+@@ -36,20 +36,20 @@
+ # exception statement from your version.
+
+ # List of available fonts.
+-FreeMono/p=/usr/share/fonts/truetype/freefont/FreeMono.ttf
+-FreeMono/b=/usr/share/fonts/truetype/freefont/FreeMonoBold.ttf
+-FreeMono/bi=/usr/share/fonts/truetype/freefont/FreeMonoBoldOblique.ttf
+-FreeMono/i=/usr/share/fonts/truetype/freefont/FreeMonoOblique.ttf
++FreeMono/p=/usr/share/fonts/TTF/VeraMono.ttf
++FreeMono/b=/usr/share/fonts/TTF/VeraMoBd.ttf
++FreeMono/bi=/usr/share/fonts/TTF/VeraMoBI.ttf
++FreeMono/i=/usr/share/fonts/TTF/VeraMoIt.ttf
+
+-FreeSans/p=/usr/share/fonts/truetype/freefont/FreeSans.ttf
+-FreeSans/b=/usr/share/fonts/truetype/freefont/FreeSansBold.ttf
+-FreeSans/bi=/usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf
+-FreeSans/i=/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf
++FreeSans/p=/usr/share/fonts/TTF/Vera.ttf
++FreeSans/b=/usr/share/fonts/TTF/VeraBd.ttf
++FreeSans/bi=/usr/share/fonts/TTF/VeraBI.ttf
++FreeSans/i=/usr/share/fonts/TTF/VeraIt.ttf
+
+-FreeSerif/p=/usr/share/fonts/truetype/freefont/FreeSerif.ttf
+-FreeSerif/b=/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
+-FreeSerif/bi=/usr/share/fonts/truetype/freefont/FreeSerifBoldOblique.ttf
+-FreeSerif/i=/usr/share/fonts/truetype/freefont/FreeSerifOblique.ttf
++FreeSerif/p=/usr/share/fonts/TTF/VeraSe.ttf
++FreeSerif/b=/usr/share/fonts/TTF/VeraSeBd.ttf
++FreeSerif/bi=/usr/share/fonts/TTF/VeraSeBd.ttf
++FreeSerif/i=/usr/share/fonts/TTF/VeraSe.ttf
+
+ # List of aliases.
+ Dialog/a=FreeSans
+diff --git a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc
+index e05904c..0a2569c 100644
+--- a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc
++++ b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc
+@@ -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/libjava/include/posix.h b/libjava/include/posix.h
+index 6bd560c..cbda784 100644
+--- a/libjava/include/posix.h
++++ b/libjava/include/posix.h
+@@ -42,11 +42,17 @@ details. */
+ #include <java/util/Properties.h>
+
+ // Prefix and suffix for shared libraries.
++#ifdef __CYGWIN__
++#define _Jv_platform_solib_prefix "cyg"
++#else
+ #define _Jv_platform_solib_prefix "lib"
++#endif
+ #if defined(__APPLE__) && defined(__MACH__)
+ #define _Jv_platform_solib_suffix ".dylib"
+ #elif defined(HPUX) && defined(HP_PA)
+ #define _Jv_platform_solib_suffix ".sl"
++#elif defined(__CYGWIN__)
++#define _Jv_platform_solib_suffix ".dll"
+ #else
+ #define _Jv_platform_solib_suffix ".so"
+ #endif
+diff --git a/libjava/java/net/natVMURLConnection.cc b/libjava/java/net/natVMURLConnection.cc
+index 0a30a21..810e045 100644
+--- a/libjava/java/net/natVMURLConnection.cc
++++ b/libjava/java/net/natVMURLConnection.cc
+@@ -32,7 +32,11 @@ void
+ java::net::VMURLConnection::init ()
+ {
+ #if defined (HAVE_MAGIC_T) && defined (HAVE_MAGIC_H) && defined (USE_LTDL)
++#ifdef __CYGWIN__
++ lt_dlhandle handle = lt_dlopenext ("cygmagic-1.dll");
++#else
+ lt_dlhandle handle = lt_dlopenext ("libmagic.so");
++#endif
+ if (!handle)
+ return;
+
+diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
+index 57452f7..f8af3c7 100755
+--- a/libstdc++-v3/configure
++++ b/libstdc++-v3/configure
+@@ -46113,7 +46113,7 @@ $as_echo "#define HAVE_TLS 1" >>confdefs.h
+ ;;
+ 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
+diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
+index 943ea67..0112f6f 100644
+--- a/libstdc++-v3/crossconfig.m4
++++ b/libstdc++-v3/crossconfig.m4
+@@ -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
+diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
+index 51ff6dd..844c74a 100644
+--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
++++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
+@@ -144,6 +144,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/lto-plugin/Makefile.am b/lto-plugin/Makefile.am
+index b24015e..ea176d9 100644
+--- a/lto-plugin/Makefile.am
++++ b/lto-plugin/Makefile.am
+@@ -22,7 +22,7 @@ liblto_plugin_la_SOURCES = lto-plugin.c
+ liblto_plugin_la_LIBADD = \
+ $(if $(wildcard ../libiberty/pic/libiberty.a),$(Wc)../libiberty/pic/libiberty.a,)
+ # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS
+-liblto_plugin_la_LDFLAGS = $(lt_host_flags) -module -bindir $(libexecsubdir) \
++liblto_plugin_la_LDFLAGS = $(lt_host_flags) -module -avoid-version -bindir $(libexecsubdir) \
+ $(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a)
+ liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \
+ ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,)
+diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in
+index 0c8d89f..c591d5d 100644
+--- a/lto-plugin/Makefile.in
++++ b/lto-plugin/Makefile.in
+@@ -242,7 +242,7 @@ liblto_plugin_la_LIBADD = \
+ $(if $(wildcard ../libiberty/pic/libiberty.a),$(Wc)../libiberty/pic/libiberty.a,)
+
+ # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS
+-liblto_plugin_la_LDFLAGS = $(lt_host_flags) -module -bindir $(libexecsubdir) \
++liblto_plugin_la_LDFLAGS = $(lt_host_flags) -module -avoid-version -bindir $(libexecsubdir) \
+ $(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a)
+
+ liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \
More information about the vc
mailing list