]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Merge commit 'a0c06cc27d2146b7d86758ffa236516c6143d62c' into devel/omp/gcc-9
authorTobias Burnus <tobias@codesourcery.com>
Thu, 5 Mar 2020 13:39:50 +0000 (14:39 +0100)
committerTobias Burnus <tobias@codesourcery.com>
Thu, 5 Mar 2020 13:39:50 +0000 (14:39 +0100)
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.

42 files changed:
1  2 
gcc/c-family/c-omp.c
gcc/c/c-parser.c
gcc/c/c-typeck.c
gcc/config.gcc
gcc/config/gcn/gcn-run.c
gcc/config/gcn/gcn.c
gcc/config/gcn/gcn.md
gcc/config/i386/i386.c
gcc/config/nvptx/nvptx.c
gcc/cp/constexpr.c
gcc/cp/decl.c
gcc/cp/parser.c
gcc/cp/pt.c
gcc/cp/semantics.c
gcc/doc/invoke.texi
gcc/fortran/dump-parse-tree.c
gcc/fortran/gfortran.h
gcc/fortran/gfortran.texi
gcc/fortran/intrinsic.texi
gcc/fortran/lang.opt
gcc/fortran/match.c
gcc/fortran/parse.c
gcc/fortran/resolve.c
gcc/fortran/trans-array.c
gcc/fortran/trans-decl.c
gcc/fortran/trans-expr.c
gcc/fortran/trans-stmt.c
gcc/fortran/trans.c
gcc/fortran/trans.h
gcc/gimplify.c
gcc/omp-expand.c
gcc/omp-low.c
gcc/tree-core.h
gcc/tree-pass.h
gcc/tree-ssa-structalias.c
gcc/tree-vrp.c
gcc/tree.h
libgfortran/configure
libgfortran/configure.ac
libgomp/plugin/plugin-hsa.c
libstdc++-v3/acinclude.m4
libstdc++-v3/configure

Simple merge
Simple merge
Simple merge
diff --cc gcc/config.gcc
Simple merge
index 65c5bc30fb7362b94ee72f773d0de8debcd3a2eb,d3def1369c71ea02d2f602bc10799e6a43550bc3..cf4870ff4be72cd1a4298f4bc535ae11a3573743
@@@ -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)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc gcc/cp/decl.c
Simple merge
diff --cc gcc/cp/parser.c
Simple merge
diff --cc gcc/cp/pt.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc gcc/gimplify.c
index d95ad5d4baa3d2fdcd6a24e481357610ff99d0c9,98408b981dcc3a1c1f2e38af8b8985616cf4c4c4..3670849528f6c991cbedb35d7173d0b42182d9df
@@@ -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;
Simple merge
diff --cc gcc/omp-low.c
Simple merge
diff --cc gcc/tree-core.h
Simple merge
diff --cc gcc/tree-pass.h
Simple merge
Simple merge
diff --cc gcc/tree-vrp.c
Simple merge
diff --cc gcc/tree.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge