libgomp: Add '__attribute__((unused))' to variables used only in 'assert(...)'

Without this attribute, the building process will fail if GCC is configured
with 'CFLAGS=-DNDEBUG'.

libgomp/ChangeLog:

	* oacc-mem.c (acc_unmap_data, goacc_exit_datum_1, find_group_last,
	goacc_enter_data_internal): Add '__attribute__((unused))'.
	* target.c (gomp_unmap_vars_internal): Likewise.

diff --git a/libgomp/oacc-mem.c b/libgomp/oacc-mem.c
index c75471bc2beafc6aa8a4f3f360ded8e015d19204..718252b44ba769ff8eba69fd04c1ca943d4f5942 100644 (file)
--- a/libgomp/oacc-mem.c
+++ b/libgomp/oacc-mem.c
@@ -480,7 +480,7 @@ acc_unmap_data (void *h)
   tgt->tgt_end = 0;
   tgt->to_free = NULL;
 
-  bool is_tgt_unmapped = gomp_remove_var (acc_dev, n);
+  bool is_tgt_unmapped __attribute__((unused)) = gomp_remove_var (acc_dev, n);
   assert (is_tgt_unmapped);
 
   gomp_mutex_unlock (&acc_dev->lock);
@@ -743,7 +743,8 @@ goacc_exit_datum_1 (struct gomp_device_descr *acc_dev, void *h, size_t s,
            if (n->tgt->list[l_i].key
                && !n->tgt->list[l_i].is_attach)
              ++num_mappings;
-         bool is_tgt_unmapped = gomp_remove_var (acc_dev, n);
+         bool is_tgt_unmapped __attribute__((unused))
+           = gomp_remove_var (acc_dev, n);
          assert (is_tgt_unmapped || num_mappings > 1);
        }
     }
@@ -1023,7 +1024,7 @@ static int
 find_group_last (int pos, size_t mapnum, size_t *sizes, unsigned short *kinds)
 {
   unsigned char kind0 = kinds[pos] & 0xff;
-  int first_pos = pos;
+  int first_pos __attribute__((unused)) = pos;
 
   switch (kind0)
     {
@@ -1203,7 +1204,7 @@ goacc_enter_data_internal (struct gomp_device_descr *acc_dev, size_t mapnum,
              /* Let 'goacc_map_vars' -> 'gomp_map_vars_internal' handle
                 this.  */
              gomp_mutex_unlock (&acc_dev->lock);
-             struct target_mem_desc *tgt_
+             struct target_mem_desc *tgt_ __attribute__((unused))
                = goacc_map_vars (acc_dev, aq, groupnum, &hostaddrs[i], NULL,
                                  &sizes[i], &kinds[i], true,
                                  GOMP_MAP_VARS_ENTER_DATA);

diff --git a/libgomp/target.c b/libgomp/target.c
index 9fc51b160f0996d056e48394437caf3339d8aa1b..dbc4535b96f33ad97af2ba745e77b3b7c7090461 100644 (file)
--- a/libgomp/target.c
+++ b/libgomp/target.c
@@ -2092,8 +2092,9 @@ gomp_unmap_vars_internal (struct target_mem_desc *tgt, bool do_copyfrom,
                            tgt->list[i].length);
       if (do_remove)
        {
-         struct target_mem_desc *k_tgt = k->tgt;
-         bool is_tgt_unmapped = gomp_remove_var (devicep, k);
+         struct target_mem_desc *k_tgt __attribute__((unused)) = k->tgt;
+         bool is_tgt_unmapped __attribute__((unused))
+           = gomp_remove_var (devicep, k);
          /* It would be bad if TGT got unmapped while we're still iterating
             over its LIST_COUNT, and also expect to use it in the following
             code.  */