From: nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 15 Jul 2015 18:54:18 +0000 (+0000)
Subject: 	* config/nvptx/mkoffload.c (process): Add C++ protection to
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a68026c8caad66299633eb2c79917738af62ccf0;p=thirdparty%2Fgcc.git

	* config/nvptx/mkoffload.c (process): Add C++ protection to
	emitted code.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@225844 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index beea890e672d..f05f82ece791 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 8bc08bfeaeb1..42cce3b7e07e 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");