From e9f223877f42c31353bd8b522596cb5fe1b87388 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Fri, 20 Jul 2018 13:55:26 +0200
Subject: [PATCH] Cygwin: move FP environment exports to common.din

We only have the symbols defined for i686 by accident since 2013...

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---
 winsup/cygwin/common.din     | 2 ++
 winsup/cygwin/i686.din       | 2 --
 winsup/cygwin/release/2.11.0 | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/common.din b/winsup/cygwin/common.din
index 1e971cf92..d81b9c5da 100644
--- a/winsup/cygwin/common.din
+++ b/winsup/cygwin/common.din
@@ -11,6 +11,8 @@ __stack_chk_guard DATA
 _check_for_executable DATA
 _ctype_ DATA
 _daylight DATA
+_fe_dfl_env DATA
+_fe_nomask_env DATA
 _impure_ptr DATA
 _sys_errlist DATA
 _sys_nerr DATA
diff --git a/winsup/cygwin/i686.din b/winsup/cygwin/i686.din
index f3cd2fd37..934243bbc 100644
--- a/winsup/cygwin/i686.din
+++ b/winsup/cygwin/i686.din
@@ -3,8 +3,6 @@ LIBRARY "cygwin1.dll" BASE=0x61000000
 EXPORTS
 #Exported variables
 __cygwin_environ DATA
-_fe_dfl_env DATA
-_fe_nomask_env DATA
 
 #Exported functions
 __argz_add = argz_add SIGFE
diff --git a/winsup/cygwin/release/2.11.0 b/winsup/cygwin/release/2.11.0
index 85cf8b2d6..512b89e91 100644
--- a/winsup/cygwin/release/2.11.0
+++ b/winsup/cygwin/release/2.11.0
@@ -47,3 +47,6 @@ Bug Fixes
 
 - Fix duration handling in sigtimedwait
   Addresses: https://cygwin.com/ml/cygwin-patches/2018-q3/msg00018.html
+
+- Make FP environment symbols available on x86_64.
+  Addresses: https://cygwin.com/ml/cygwin/2018-07/msg00183.html