aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@codesourcery.com>2015-07-17 17:12:01 +0000
committerNathan Sidwell <nathan@gcc.gnu.org>2015-07-17 17:12:01 +0000
commitebe4a560737e72aa508af4c0d9e1ac6e84a97655 (patch)
tree0620634b02bd3dbd3f65141af8fbb850d2590361 /gcc
parent247577525613274ed246537f195eda285087d814 (diff)
downloadgcc-ebe4a560737e72aa508af4c0d9e1ac6e84a97655.zip
gcc-ebe4a560737e72aa508af4c0d9e1ac6e84a97655.tar.gz
gcc-ebe4a560737e72aa508af4c0d9e1ac6e84a97655.tar.bz2
mkoffload.c (process): Constify host data.
gcc/ * config/nvptx/mkoffload.c (process): Constify host data. * config/i386/intelmic-mkoffload.c (generate_target_descr_file): Constify host data. (generate_host_descr_file): Likewise. libgomp/ * target.c (struct_offload_image_descr): Constify host_table. (gomp_offload_image_to_device): Likewise. (GOMP_offload_register, GOMP_offload_unregister): Likewise. libgcc/ * offloadstuff.c: Constify host data. From-SVN: r225943
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config/i386/intelmic-mkoffload.c6
-rw-r--r--gcc/config/nvptx/mkoffload.c4
3 files changed, 12 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ca10a80..8ef4de4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-17 Nathan Sidwell <nathan@codesourcery.com>
+
+ * config/nvptx/mkoffload.c (process): Constify host data.
+ * config/i386/intelmic-mkoffload.c (generate_target_descr_file):
+ Constify host data.
+ (generate_host_descr_file): Likewise.
+
2015-07-17 Aditya Kumar <aditya.k7@samsung.com>
Sebastian Pop <s.pop@samsung.com>
diff --git a/gcc/config/i386/intelmic-mkoffload.c b/gcc/config/i386/intelmic-mkoffload.c
index a3b0a5c..ca15868 100644
--- a/gcc/config/i386/intelmic-mkoffload.c
+++ b/gcc/config/i386/intelmic-mkoffload.c
@@ -338,7 +338,7 @@ generate_host_descr_file (const char *host_compiler)
fatal_error (input_location, "cannot open '%s'", src_filename);
fprintf (src_file,
- "extern void *__OFFLOAD_TABLE__;\n"
+ "extern const void *const __OFFLOAD_TABLE__;\n"
"extern const void *const __offload_image_intelmic_start;\n"
"extern const void *const __offload_image_intelmic_end;\n\n"
@@ -350,11 +350,11 @@ generate_host_descr_file (const char *host_compiler)
"#ifdef __cplusplus\n"
"extern \"C\"\n"
"#endif\n"
- "void GOMP_offload_register (void *, int, const void *);\n"
+ "void GOMP_offload_register (const void *, int, const void *);\n"
"#ifdef __cplusplus\n"
"extern \"C\"\n"
"#endif\n"
- "void GOMP_offload_unregister (void *, int, const void *);\n\n"
+ "void GOMP_offload_unregister (const void *, int, const void *);\n\n"
"__attribute__((constructor))\n"
"static void\n"
diff --git a/gcc/config/nvptx/mkoffload.c b/gcc/config/nvptx/mkoffload.c
index 52f8bd9..ab38179 100644
--- a/gcc/config/nvptx/mkoffload.c
+++ b/gcc/config/nvptx/mkoffload.c
@@ -881,12 +881,12 @@ process (FILE *in, FILE *out)
"extern \"C\" {\n"
"#endif\n");
fprintf (out, "extern void GOMP_offload_register"
- " (void *, int, const void *);\n");
+ " (const void *, int, const void *);\n");
fprintf (out, "#ifdef __cplusplus\n"
"}\n"
"#endif\n");
- fprintf (out, "extern void *__OFFLOAD_TABLE__[];\n\n");
+ fprintf (out, "extern const void *const __OFFLOAD_TABLE__[];\n\n");
fprintf (out, "static __attribute__((constructor)) void init (void)\n{\n");
fprintf (out, " GOMP_offload_register (__OFFLOAD_TABLE__, %d,\n",
GOMP_DEVICE_NVIDIA_PTX);