From 7858bb9693e5a3c39e2cc5aede341895a9e6d1b3 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Fri, 13 Dec 2019 07:58:53 +0000 Subject: [PATCH] =?utf8?q?libgomp/openacc.f90=20=E2=80=93=20clean-up=20pub?= =?utf8?q?lic/private=20attributes?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit libgomp/ * openacc.f90 (module openacc_kinds): Use 'PUBLIC' to mark all symbols as public except for the 'use …, only' imported symbol, which is private. (module openacc): Default to 'PRIVATE' to exclude openacc_internal; mark all symbols from module openacc_kinds as PUBLIC; add missing PUBLIC attributes for acc_copyout_finalize and acc_delete_finalize. From-SVN: r279337 --- libgomp/ChangeLog | 9 +++++++++ libgomp/openacc.f90 | 20 +++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index dda2d9a09fc..136ba6cbdb3 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,12 @@ +2019-12-13 Tobias Burnus + + * openacc.f90 (module openacc_kinds): Use 'PUBLIC' to mark all symbols + as public except for the 'use …, only' imported symbol, which is + private. + (module openacc): Default to 'PRIVATE' to exclude openacc_internal; mark + all symbols from module openacc_kinds as PUBLIC; add missing PUBLIC + attributes for acc_copyout_finalize and acc_delete_finalize. + 2019-12-11 Jakub Jelinek PR fortran/92899 diff --git a/libgomp/openacc.f90 b/libgomp/openacc.f90 index 831a157e703..b37f1872d50 100644 --- a/libgomp/openacc.f90 +++ b/libgomp/openacc.f90 @@ -31,13 +31,12 @@ module openacc_kinds use iso_fortran_env, only: int32 implicit none + public private :: int32 - public :: acc_device_kind - integer, parameter :: acc_device_kind = int32 + ! When adding items, also update 'public' setting in 'module openmp' below. - public :: acc_device_none, acc_device_default, acc_device_host - public :: acc_device_not_host, acc_device_nvidia + integer, parameter :: acc_device_kind = int32 ! Keep in sync with include/gomp-constants.h. integer (acc_device_kind), parameter :: acc_device_none = 0 @@ -48,16 +47,11 @@ module openacc_kinds integer (acc_device_kind), parameter :: acc_device_nvidia = 5 integer (acc_device_kind), parameter :: acc_device_gcn = 8 - public :: acc_handle_kind - integer, parameter :: acc_handle_kind = int32 - public :: acc_async_noval, acc_async_sync - ! Keep in sync with include/gomp-constants.h. integer (acc_handle_kind), parameter :: acc_async_noval = -1 integer (acc_handle_kind), parameter :: acc_async_sync = -2 - end module module openacc_internal @@ -717,6 +711,13 @@ module openacc use openacc_internal implicit none + private + ! From openacc_kinds + public :: acc_device_kind, acc_handle_kind + public :: acc_device_none, acc_device_default, acc_device_host + public :: acc_device_not_host, acc_device_nvidia, acc_device_gcn + public :: acc_async_noval, acc_async_sync + public :: openacc_version public :: acc_get_num_devices, acc_set_device_type, acc_get_device_type @@ -730,6 +731,7 @@ module openacc public :: acc_update_device, acc_update_self, acc_is_present public :: acc_copyin_async, acc_create_async, acc_copyout_async public :: acc_delete_async, acc_update_device_async, acc_update_self_async + public :: acc_copyout_finalize, acc_delete_finalize integer, parameter :: openacc_version = 201306 -- 2.30.2