From: Tobias Burnus <tobias@codesourcery.com>
Date: Thu, 5 Mar 2020 13:39:50 +0000 (+0100)
Subject: Merge commit 'a0c06cc27d2146b7d86758ffa236516c6143d62c' into devel/omp/gcc-9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=526632f93d07589d0e8ebe401b4761ff0159d0df;p=thirdparty%2Fgcc.git

Merge commit 'a0c06cc27d2146b7d86758ffa236516c6143d62c' into devel/omp/gcc-9

This merges all patches after releases/gcc-9.1.0 until and including
to the commit belonging to the tag 'releases/gcc-9.2.0'. That's
r9-7613-ga0c06cc27d2146b7d86758ffa236516c6143d62c on the releases/gcc-9
branch.
---

526632f93d07589d0e8ebe401b4761ff0159d0df
diff --cc gcc/config/gcn/gcn-run.c
index 65c5bc30fb73,d3def1369c71..cf4870ff4be7
--- a/gcc/config/gcn/gcn-run.c
+++ b/gcc/config/gcn/gcn-run.c
@@@ -880,12 -827,12 +880,15 @@@ main (int argc, char *argv[]
    unsigned int return_value =
      (unsigned int) kernargs->output_data.return_value;
  
 +  /* Run destructors on the GPU.  */
 +  run (fini_array_kernel, kernargs);
 +
    unsigned int upper = (return_value & ~0xffff) >> 16;
    if (upper == 0xcafe)
-     printf ("Kernel exit value was never set\n");
+     {
+       printf ("Kernel exit value was never set\n");
+       return_value = 0xff;
+     }
    else if (upper == 0xffff)
      ; /* Set by exit.  */
    else if (upper == 0)
diff --cc gcc/gimplify.c
index d95ad5d4baa3,98408b981dcc..3670849528f6
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@@ -230,13 -210,8 +230,14 @@@ struct gimplify_omp_ct
    bool combined_loop;
    bool distribute;
    bool target_firstprivatize_array_bases;
+   bool add_safelen1;
    int defaultmap[4];
 +  hash_map<tree, oacc_array_mapping_info> *decl_data_clause;
 +};
 +
 +struct privatize_reduction
 +{
 +  tree ref_var, local_var;
  };
  
  static struct gimplify_ctx *gimplify_ctxp;