diff options
| -rw-r--r-- | libgomp/ChangeLog | 3 | ||||
| -rw-r--r-- | libgomp/oacc-init.c | 2 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.oacc-c-c++-common/lib-8.c | 19 |
3 files changed, 24 insertions, 0 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index e99f9241d07..ad970df522f 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,5 +1,8 @@ 2015-10-26 Thomas Schwinge <thomas@codesourcery.com> + * oacc-init.c (acc_shutdown): Call gomp_init_targets_once. + * testsuite/libgomp.oacc-c-c++-common/lib-8.c: New file. + PR libgomp/66518 * testsuite/libgomp.oacc-c-c++-common/lib-3.c: Resolve XFAIL. diff --git a/libgomp/oacc-init.c b/libgomp/oacc-init.c index a0e62a40cc4..9a9a0b0333f 100644 --- a/libgomp/oacc-init.c +++ b/libgomp/oacc-init.c @@ -449,6 +449,8 @@ ialias (acc_init) void acc_shutdown (acc_device_t d) { + gomp_init_targets_once (); + gomp_mutex_lock (&acc_device_lock); acc_shutdown_1 (d); diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-8.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-8.c new file mode 100644 index 00000000000..ea28b6bacf9 --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-8.c @@ -0,0 +1,19 @@ +/* Expect error message when shutting down a device that has never been + initialized. */ +/* { dg-do run } */ + +#include <stdio.h> +#include <openacc.h> + +int +main (int argc, char **argv) +{ + fprintf (stderr, "CheCKpOInT\n"); + acc_shutdown (acc_device_default); + + return 0; +} + +/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */ +/* { dg-output "no device initialized" } */ +/* { dg-shouldfail "" } */ |