Fix Fortran STOP.

The minimal libgfortran setup was created for NVPTX, but will also be used by
AMD GCN.

This patch simply removes an assumption that NVPTX is the only user.
Specifically, NVPTX exit is broken, but AMD GCN exit works just fine.

2018-09-12  Andrew Stubbs  <ams@codesourcery.com>

	libgfortran/
	* runtime/minimal.c (exit): Only work around nvptx bugs on nvptx.

From-SVN: r264238

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index e13390bd23b876753f042cdb86325486f491141a..00a07b19255bdddc6b20b13108e4e6193c07e786 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-12  Andrew Stubbs  <ams@codesourcery.com>
+
+       * runtime/minimal.c (exit): Only work around nvptx bugs on nvptx.
+
 2018-09-07  Janne Blomqvist  <jb@gcc.gnu.org>
 
        * runtime/environ.c (init_unsigned_integer): Remove.

diff --git a/libgfortran/runtime/minimal.c b/libgfortran/runtime/minimal.c
index 0b1efeb0d58bfee448677bcf52026565f3a13fc9..8940f975160cce369bfac2d810ef4eb292168c4a 100644 (file)
--- a/libgfortran/runtime/minimal.c
+++ b/libgfortran/runtime/minimal.c
@@ -197,10 +197,12 @@ sys_abort (void)
 #define st_printf printf
 #undef estr_write
 #define estr_write printf
+#if __nvptx__
 /* Map "exit" to "abort"; see PR85463 '[nvptx] "exit" in offloaded region
    doesn't terminate process'.  */
 #undef exit
 #define exit(...) do { abort (); } while (0)
+#endif
 #undef exit_error
 #define exit_error(...) do { abort (); } while (0)