diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/nvptx/mkoffload.c | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index beea890..f05f82e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-07-15 Nathan Sidwell <nathan@codesourcery.com> + + * config/nvptx/mkoffload.c (process): Add C++ protection to + emitted code. + 2015-07-14 Michael Meissner <meissner@linux.vnet.ibm.com> PR target/66854 diff --git a/gcc/config/nvptx/mkoffload.c b/gcc/config/nvptx/mkoffload.c index 8bc08bf..42cce3b 100644 --- a/gcc/config/nvptx/mkoffload.c +++ b/gcc/config/nvptx/mkoffload.c @@ -867,7 +867,13 @@ process (FILE *in, FILE *out) "func_mappings\n", nvars, nfuncs); fprintf (out, "};\n\n"); - fprintf (out, "extern void GOMP_offload_register (const void *, int, void *);\n"); + fprintf (out, "#ifdef __cplusplus\n" + "extern \"C\" {\n" + "#endif\n"); + fprintf (out, "extern void GOMP_offload_register (void *, int, void *);\n"); + fprintf (out, "#ifdef __cplusplus\n" + "}\n" + "#endif\n"); fprintf (out, "extern void *__OFFLOAD_TABLE__[];\n\n"); fprintf (out, "static __attribute__((constructor)) void init (void)\n{\n"); |