Re: nvptx offloading patches [4/n]

[Thomas Schwinge]

Hi!

On Wed, 28 Jan 2015 18:05:25 +0100, I wrote:
> On Sat, 1 Nov 2014 13:11:29 +0100, Bernd Schmidt <ber...@codesourcery.com> 
> wrote:
> > I'm sending this for reference more than anything else - this is the 
> > patch that adds the target support for offloading to the nvptx port. It 
> > depends on the other offloading patches Ilya is currently submitting.
> 
> Committed to trunk in r220209:
> 
> commit 9c08fbb35aa95420268c2762151f22a6a9b90e85
> Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
> Date:   Wed Jan 28 17:03:44 2015 +0000
> 
>     nvptx mkoffload.

Committed to trunk in r220620:

commit c84c7f1923ab042478d73029475cf7f1aab6a61a
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Wed Feb 11 14:15:38 2015 +0000

    nvptx mkoffload: __OPENMP_TARGET__ -> __OFFLOAD_TABLE__.
    
        gcc/
        * config/nvptx/mkoffload.c (process): Refer to __OFFLOAD_TABLE__
        instead of __OPENMP_TARGET__.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220620 
138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog                | 3 +++
 gcc/config/nvptx/mkoffload.c | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git gcc/ChangeLog gcc/ChangeLog
index 1479dcb..bc4a050 100644
--- gcc/ChangeLog
+++ gcc/ChangeLog
@@ -1,5 +1,8 @@
 2015-02-11  Thomas Schwinge  <tho...@codesourcery.com>
 
+       * config/nvptx/mkoffload.c (process): Refer to __OFFLOAD_TABLE__
+       instead of __OPENMP_TARGET__.
+
        * config/nvptx/mkoffload.c: Include "gomp-constants.h".
        (process): Use its GOMP_DEVICE_NVIDIA_PTX instead of (wrongly)
        hard-coding PTX_ID.
diff --git gcc/config/nvptx/mkoffload.c gcc/config/nvptx/mkoffload.c
index 8f359cf..2287316 100644
--- gcc/config/nvptx/mkoffload.c
+++ gcc/config/nvptx/mkoffload.c
@@ -791,9 +791,9 @@ process (FILE *in, FILE *out)
 
   fprintf (out, "extern void GOMP_offload_register (const void *, int, void 
*);\n");
 
-  fprintf (out, "extern void *__OPENMP_TARGET__[];\n\n");
+  fprintf (out, "extern void *__OFFLOAD_TABLE__[];\n\n");
   fprintf (out, "static __attribute__((constructor)) void init (void)\n{\n");
-  fprintf (out, "  GOMP_offload_register (__OPENMP_TARGET__, %d,\n",
+  fprintf (out, "  GOMP_offload_register (__OFFLOAD_TABLE__, %d,\n",
           GOMP_DEVICE_NVIDIA_PTX);
   fprintf (out, "                         &target_data);\n");
   fprintf (out, "};\n");


Grüße,
 Thomas

pgp1FDb66hFdS.pgp
Description: PGP signature