diff options
| author | Andrew Stubbs <ams@codesourcery.com> | 2018-09-12 13:53:32 +0000 |
|---|---|---|
| committer | Andrew Stubbs <ams@gcc.gnu.org> | 2018-09-12 13:53:32 +0000 |
| commit | 4986a9568afe47845e3bd51fb7d2c5c1dd065ba2 (patch) | |
| tree | ed04a88ab1106260ab083397525b09131b3e54e0 | |
| parent | 28c4b740a64ccc3412ef4c01e3012e9013ad5bcb (diff) | |
| download | gcc-4986a9568afe47845e3bd51fb7d2c5c1dd065ba2.zip gcc-4986a9568afe47845e3bd51fb7d2c5c1dd065ba2.tar.gz gcc-4986a9568afe47845e3bd51fb7d2c5c1dd065ba2.tar.bz2 | |
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
| -rw-r--r-- | libgfortran/ChangeLog | 4 | ||||
| -rw-r--r-- | libgfortran/runtime/minimal.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index e13390b..00a07b1 100644 --- 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 0b1efeb..8940f97 100644 --- 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) |