Hi! On Fri, 18 Sep 2015 06:51:18 -0700, Cesar Philippidis <ce...@codesourcery.com> wrote: > On 09/18/2015 01:39 AM, Thomas Schwinge wrote: > > > On Tue, 1 Sep 2015 18:29:55 +0200, Tom de Vries <tom_devr...@mentor.com> > > wrote: > >> On 27/08/15 03:37, Cesar Philippidis wrote: > >>> - ctx->ganglocal_size_host = align_and_expand (&gl_host, host_size, > >>> align); > >> > >> I suspect this caused a bootstrap failure (align_and_expand unused). > >> Worked-around as attached.
> > If I remember correctly, this has only ever been used in the "ganglocal"
> > implementation -- which is now gone. So, should align_and_expand also be
> > elided (Cesar)?
>
> Most likely. I probably overlooked it when I was working on that
> ganglocal removal patch. Can you remove it please? I'm already juggling
> a couple of patches right now.
Together with removal of printing the declarator for sdata, committed to
gomp-4_0-branch in r228038:
commit f5890b47c1b6f09134c4bfadcc7ece0d5403a1d7
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed Sep 23 10:35:31 2015 +0000
More "ganglocal" cleanup
gcc/
* config/nvptx/nvptx.c (nvptx_file_start): Don't print declaration
of sdata.
* omp-low.c (align_and_expand): Remove function.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@228038
138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog.gomp | 6 ++++++
gcc/config/nvptx/nvptx.c | 1 -
gcc/omp-low.c | 15 ---------------
3 files changed, 6 insertions(+), 16 deletions(-)
diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp
index 21c6fa0..c66f80a 100644
--- gcc/ChangeLog.gomp
+++ gcc/ChangeLog.gomp
@@ -1,3 +1,9 @@
+2015-09-23 Thomas Schwinge <tho...@codesourcery.com>
+
+ * config/nvptx/nvptx.c (nvptx_file_start): Don't print declaration
+ of sdata.
+ * omp-low.c (align_and_expand): Remove function.
+
2015-09-22 Cesar Philippidis <ce...@codesourcery.com>
* gimplify.c (oacc_default_clause): Inspect pointer types when
diff --git gcc/config/nvptx/nvptx.c gcc/config/nvptx/nvptx.c
index 5640e34..37b50a3 100644
--- gcc/config/nvptx/nvptx.c
+++ gcc/config/nvptx/nvptx.c
@@ -4063,7 +4063,6 @@ nvptx_file_start (void)
else
fputs ("\t.target\tsm_30\n", asm_out_file);
fprintf (asm_out_file, "\t.address_size %d\n", GET_MODE_BITSIZE (Pmode));
- fprintf (asm_out_file, "\t.extern .shared .u8 sdata[];\n");
fputs ("// END PREAMBLE\n", asm_out_file);
}
diff --git gcc/omp-low.c gcc/omp-low.c
index ee527d0..ec76096 100644
--- gcc/omp-low.c
+++ gcc/omp-low.c
@@ -1446,21 +1446,6 @@ omp_copy_decl (tree var, copy_body_data *cb)
return error_mark_node;
}
-/* Modify the old size *POLDSZ to align it up to ALIGN, and then return
- a value with SIZE added to it. */
-static tree ATTRIBUTE_UNUSED
-align_and_expand (tree *poldsz, tree size, unsigned int align)
-{
- tree oldsz = *poldsz;
- oldsz = fold_build2 (BIT_AND_EXPR, size_type_node,
- fold_build2 (PLUS_EXPR, size_type_node,
- oldsz, size_int (align - 1)),
- fold_build1 (BIT_NOT_EXPR, size_type_node,
- size_int (align - 1)));
- *poldsz = oldsz;
- return fold_build2 (PLUS_EXPR, size_type_node, oldsz, size);
-}
-
/* Debugging dumps for parallel regions. */
void dump_omp_region (FILE *, struct omp_region *, int);
void debug_omp_region (struct omp_region *);
Grüße,
Thomas
signature.asc
Description: PGP signature
