]> gcc.gnu.org Git - gcc.git/commitdiff
Merge remote-tracking branch 'origin/releases/gcc-10' into devel/omp/gcc-10
authorTobias Burnus <tobias@codesourcery.com>
Fri, 11 Sep 2020 11:36:30 +0000 (13:36 +0200)
committerTobias Burnus <tobias@codesourcery.com>
Fri, 11 Sep 2020 11:36:30 +0000 (13:36 +0200)
Merge up to 80ff137368412a1628cd56b76a860a76a08fd8ea (2020-09-11)

1  2 
gcc/cp/decl.c
gcc/doc/invoke.texi
gcc/flag-types.h
gcc/gimple.h
gcc/tree.h

diff --cc gcc/cp/decl.c
Simple merge
Simple merge
index 5a92fef196d1cd837cc4191d16226ee60e49253a,852ea76eaa241955409e68f2492f24ee7e176d96..e2255a56745b805d97af8ac21cc54ab4ed749a75
@@@ -368,16 -368,10 +368,17 @@@ enum cf_protection_leve
    CF_BRANCH = 1 << 0,
    CF_RETURN = 1 << 1,
    CF_FULL = CF_BRANCH | CF_RETURN,
-   CF_SET = 1 << 2
+   CF_SET = 1 << 2,
+   CF_CHECK = 1 << 3
  };
  
 +/* OpenACC 'kernels' constructs handling.  */
 +enum openacc_kernels
 +{
 +  OPENACC_KERNELS_SPLIT,
 +  OPENACC_KERNELS_PARLOOPS
 +};
 +
  /* Parloops schedule type.  */
  enum parloops_schedule_type
  {
diff --cc gcc/gimple.h
Simple merge
diff --cc gcc/tree.h
Simple merge
This page took 0.189141 seconds and 5 git commands to generate.