Fix interleaving of Fortran STOP messages

Fortran STOP and ERROR STOP use a different function to print the "STOP" string
and the message string.  On GCN this results in out-of-order output, such as
"<msg>ERROR STOP ".

This patch fixes the problem by making estr_write use the proper Fortran write,
not C printf, so both parts are now output the same way.  This also ensures
that both parts are output to STDERR (not that that means anything on GCN).

2018-09-12  Kwok Cheung Yeung  <kcy@codesourcery.com>

	libgfortran/
	* runtime/minimal.c (estr_write): Define in terms of write.

From-SVN: r264239

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 00a07b19255bdddc6b20b13108e4e6193c07e786..1120d30fd2a695044fce8e209ac2df11ad496cef 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-12  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+       * runtime/minimal.c (estr_write): Define in terms of write.
+
 2018-09-12  Andrew Stubbs  <ams@codesourcery.com>
 
        * runtime/minimal.c (exit): Only work around nvptx bugs on nvptx.

diff --git a/libgfortran/runtime/minimal.c b/libgfortran/runtime/minimal.c
index 8940f975160cce369bfac2d810ef4eb292168c4a..b6d26fd22288038338cf752df97f285c0f1a6bcc 100644 (file)
--- a/libgfortran/runtime/minimal.c
+++ b/libgfortran/runtime/minimal.c
@@ -196,7 +196,7 @@ sys_abort (void)
 #undef st_printf
 #define st_printf printf
 #undef estr_write
-#define estr_write printf
+#define estr_write(X) write(STDERR_FILENO, (X), strlen (X))
 #if __nvptx__
 /* Map "exit" to "abort"; see PR85463 '[nvptx] "exit" in offloaded region
    doesn't terminate process'.  */