diff --git a/ChangeLog b/ChangeLog
index 96487186dd..fc455ae577 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-12-06  Joseph Myers  <joseph@codesourcery.com>
 
+	* stdlib/strfromf.c: Include <bits/floatn.h>.
+	[__HAVE_FLOAT32 && !__HAVE_DISTINCT_FLOAT32] (strfromf32): Define
+	and later undefine as macro and define as weak alias.
+
 	* math/test-float32.h: New file.
 
 	* sysdeps/generic/libm-alias-float.h: Include <bits/floatn.h>.
diff --git a/stdlib/strfromf.c b/stdlib/strfromf.c
index 20c674414d..01bed92ac1 100644
--- a/stdlib/strfromf.c
+++ b/stdlib/strfromf.c
@@ -16,7 +16,23 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <bits/floatn.h>
+
 #define FLOAT		float
 #define STRFROM		strfromf
 
+#if __HAVE_FLOAT32 && !__HAVE_DISTINCT_FLOAT32
+# define strfromf32 __hide_strfromf32
+#endif
+
+#include <stdlib.h>
+
+#if __HAVE_FLOAT32 && !__HAVE_DISTINCT_FLOAT32
+# undef strfromf32
+#endif
+
 #include "strfrom-skeleton.c"
+
+#if __HAVE_FLOAT32 && !__HAVE_DISTINCT_FLOAT32
+weak_alias (strfromf, strfromf32)
+#endif