]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Merge branch 'releases/gcc-10' into devel/omp/gcc-10
authorTobias Burnus <tobias@codesourcery.com>
Wed, 10 Jun 2020 09:47:49 +0000 (11:47 +0200)
committerTobias Burnus <tobias@codesourcery.com>
Wed, 10 Jun 2020 09:47:49 +0000 (11:47 +0200)
Merged up to cc00eb0af30ab3281d4dbade9f2c1b3a4b63f99f (Jun 10, 2020)

18 files changed:
1  2 
gcc/c-family/c-common.c
gcc/c/c-decl.c
gcc/config/gcn/gcn.c
gcc/cp/cp-tree.h
gcc/cp/decl.c
gcc/cp/parser.c
gcc/cp/pt.c
gcc/doc/invoke.texi
gcc/fortran/gfortran.h
gcc/fortran/trans-array.c
gcc/fortran/trans-decl.c
gcc/fortran/trans-openmp.c
gcc/fortran/trans.h
gcc/gimplify.c
gcc/internal-fn.c
gcc/tree-ssa-structalias.c
gcc/tree.c
libgomp/oacc-mem.c

Simple merge
diff --cc gcc/c/c-decl.c
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
diff --cc gcc/gimplify.c
Simple merge
Simple merge
Simple merge
diff --cc gcc/tree.c
Simple merge
index 98f573fc5af00909a94bb96e3927d1c5ab805b43,936ae649dd934be6403705a3a22b337d74f06440..01addd2cf628d9e97cb3b00995fd17f307dbfb99
@@@ -1224,25 -1179,13 +1234,31 @@@ goacc_exit_data_internal (struct gomp_d
          }
          break;
  
 +      case GOMP_MAP_DECLARE_DEALLOCATE:
 +        {
 +          bool deallocate_pointer
 +            = i + 1 < mapnum && (kinds[i + 1] & 0xff) == GOMP_MAP_TO_PSET;
 +          gomp_mutex_unlock (&acc_dev->lock);
 +          gomp_acc_declare_allocate (false, deallocate_pointer,
 +                                     &hostaddrs[i], &sizes[i], &kinds[i]);
 +          gomp_mutex_lock (&acc_dev->lock);
 +          if (deallocate_pointer)
 +            {
 +              i++;
 +              while (i + 1 < mapnum
 +                     && (kinds[i + 1] & 0xff) == GOMP_MAP_POINTER)
 +                i++;
 +            }
 +        }
 +        break;
 +
+       case GOMP_MAP_STRUCT:
+         /* Skip the 'GOMP_MAP_STRUCT' itself, and use the regular processing
+            for all its entries.  This special handling exists for GCC 10.1
+            compatibility; afterwards, we're not generating these no-op
+            'GOMP_MAP_STRUCT's anymore.  */
+         break;
        default:
          gomp_fatal (">>>> goacc_exit_data_internal UNHANDLED kind 0x%.2x",
                          kind);