diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2015-10-02 21:27:30 +0200 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2015-10-02 21:27:30 +0200 |
| commit | d4852cd492d78002c1a8e213ab858672ab54106e (patch) | |
| tree | 613e0d332cd269081841abe385531facb9b57700 | |
| parent | 54070b515503af0361d0d03851fd0082b2a8258e (diff) | |
| download | gcc-d4852cd492d78002c1a8e213ab858672ab54106e.zip gcc-d4852cd492d78002c1a8e213ab858672ab54106e.tar.gz gcc-d4852cd492d78002c1a8e213ab858672ab54106e.tar.bz2 | |
[PR target/67822] OpenMP offloading to nvptx fails
gcc/
PR target/67822
* config/nvptx/mkoffload.c (main): Scan the argument vector for
-fopenmp, and skip generating an offloading image if specified.
From-SVN: r228414
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/nvptx/mkoffload.c | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3f7561a..1317a2d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-10-02 Thomas Schwinge <thomas@codesourcery.com> + + PR target/67822 + * config/nvptx/mkoffload.c (main): Scan the argument vector for + -fopenmp, and skip generating an offloading image if specified. + 2015-10-02 Uros Bizjak <ubizjak@gmail.com> * system.h (ROUND_UP): New macro definition. diff --git a/gcc/config/nvptx/mkoffload.c b/gcc/config/nvptx/mkoffload.c index 926c82b..69eb4ea 100644 --- a/gcc/config/nvptx/mkoffload.c +++ b/gcc/config/nvptx/mkoffload.c @@ -1030,6 +1030,7 @@ main (int argc, char **argv) expandargv (&argc, &argv); /* Scan the argument vector. */ + bool fopenmp = false; for (int i = 1; i < argc; i++) { #define STR "-foffload-abi=" @@ -1044,6 +1045,8 @@ main (int argc, char **argv) "unrecognizable argument of option " STR); } #undef STR + else if (strcmp (argv[i], "-fopenmp") == 0) + fopenmp = true; else if (strcmp (argv[i], "-v") == 0) verbose = true; } @@ -1082,8 +1085,8 @@ main (int argc, char **argv) fatal_error (input_location, "cannot open '%s'", ptx_cfile_name); /* PR libgomp/65099: Currently, we only support offloading in 64-bit - configurations. */ - if (offload_abi == OFFLOAD_ABI_LP64) + configurations. PR target/67822: OpenMP offloading to nvptx fails. */ + if (offload_abi == OFFLOAD_ABI_LP64 && !fopenmp) { ptx_name = make_temp_file (".mkoffload"); obstack_ptr_grow (&argv_obstack, "-o"); |