diff --git a/newlib/libm/common/nanl.c b/newlib/libm/common/nanl.c
index 40f898109..b8ae63ea7 100644
--- a/newlib/libm/common/nanl.c
+++ b/newlib/libm/common/nanl.c
@@ -38,5 +38,11 @@ nanl (const char *tagp)
 {
   return nan(tagp);
 }
+#elif __GNUC_PREREQ (3, 3)
+long double
+nanl (const char *tagp)
+{
+  return __builtin_nanl("");
+}
 #endif
 
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 966460da8..a232836e1 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -218,7 +218,6 @@ MATH_OFILES:= \
 	lrintl.o \
 	lroundl.o \
 	modfl.o \
-	nanl.o \
 	nearbyint.o \
 	nearbyintf.o \
 	nearbyintl.o \
diff --git a/winsup/cygwin/math/nanl.c b/winsup/cygwin/math/nanl.c
deleted file mode 100644
index f936b31cd..000000000
--- a/winsup/cygwin/math/nanl.c
+++ /dev/null
@@ -1,5 +0,0 @@
-long double
-nanl (const char *tagp)
-{
-  return __builtin_nanl ("");
-}