3 files changed, 9 insertions, 3 deletions
diff --git a/winsup/cygwin/math/lrint.c b/winsup/cygwin/math/lrint.c
index 0409da660..0d3810732 100644
--- a/winsup/cygwin/math/lrint.c
+++ b/winsup/cygwin/math/lrint.c
@@ -21,7 +21,9 @@ asm(".def __lrint_internal; .scl 2; .type 32; .endef\n"
 long lrint (double x) 
 {
   long retval = 0L;
-#if defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__)
+#if defined (__x86_64__) && defined (__CYGWIN__)
+  __asm__ __volatile__ ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");
+#elif defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__)
   __asm__ __volatile__ ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");
 #elif defined(__arm__) || defined(_ARM_)
     retval = __lrint_internal(x);
diff --git a/winsup/cygwin/math/lrintf.c b/winsup/cygwin/math/lrintf.c
index 2b6d89318..9a300e16f 100644
--- a/winsup/cygwin/math/lrintf.c
+++ b/winsup/cygwin/math/lrintf.c
@@ -21,7 +21,9 @@ asm(".def __lrintf_internal; .scl 2; .type 32; .endef\n"
 long lrintf (float x) 
 {
   long retval = 0l;
-#if defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__)
+#if defined (__x86_64__) && defined (__CYGWIN__)
+  __asm__ __volatile__ ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");
+#elif defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__)
   __asm__ __volatile__ ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");
 #elif defined(__arm__) || defined(_ARM_)
     retval = __lrintf_internal(x);
diff --git a/winsup/cygwin/math/lrintl.c b/winsup/cygwin/math/lrintl.c
index 94c4e4924..c25df9226 100644
--- a/winsup/cygwin/math/lrintl.c
+++ b/winsup/cygwin/math/lrintl.c
@@ -8,7 +8,9 @@
 long lrintl (long double x) 
 {
   long retval = 0l;
-#if defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__)
+#if defined (__x86_64__) && defined (__CYGWIN__)
+  __asm__ __volatile__ ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");
+#elif defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__)
   __asm__ __volatile__ ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");
 #elif defined(__arm__) || defined(_ARM_)
     retval = lrint(x);