diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 78d64816ffb932f81b62af6798cf7c487b89cb61..152e52c21c11c9c0919cb1082b95d1543a2f3945 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2020-01-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR libgomp/93219
+	* libgomp.h (gomp_print_string): Change return type from void to int.
+	* affinity-fmt.c (gomp_print_string): Likewise.  Return true if
+	not all characters have been written.
+
 2020-01-08  Tobias Burnus  <tobias@codesourcery.com>
 
 	* libgomp.texi: Fix typos, use https.
diff --git a/libgomp/affinity-fmt.c b/libgomp/affinity-fmt.c
index c423e358dd1785c69d72d2745eee61f5d325b6f0..9a5334de26e1746f7d1b093be1b4597b7aa9e0e0 100644
--- a/libgomp/affinity-fmt.c
+++ b/libgomp/affinity-fmt.c
@@ -37,10 +37,10 @@
 #include <sys/utsname.h>
 #endif
 
-void
+bool
 gomp_print_string (const char *str, size_t len)
 {
-  fwrite (str, 1, len, stderr);
+  return fwrite (str, 1, len, stderr) != len;
 }
 
 void
diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h
index 01eb1fb29a24a2e1071832b08c89963ee368f16b..44703aaae6ae68ec5797f8b130a749dc33145758 100644
--- a/libgomp/libgomp.h
+++ b/libgomp/libgomp.h
@@ -832,7 +832,7 @@ extern void gomp_display_affinity_place (char *, size_t, size_t *, int);
 
 /* affinity-fmt.c */
 
-extern void gomp_print_string (const char *str, size_t len);
+extern bool gomp_print_string (const char *str, size_t len);
 extern void gomp_set_affinity_format (const char *, size_t);
 extern void gomp_display_string (char *, size_t, size_t *, const char *,
 				 size_t);