I committed this to gomp4 branch to note why device type 3 is missing.
Someone's bound to forget ...
nathan
2015-08-01 Nathan Sidwell <nat...@codesourcery.com>
include/
* gomp-constants.h: Note why device 3 is missing.
libgomp/
* openacc.h: Note why device 3 is missing.
* openacc.f90: Likewise.
* openacc_lib.h: Likewise.
Index: include/gomp-constants.h
===================================================================
--- include/gomp-constants.h (revision 226469)
+++ include/gomp-constants.h (working copy)
@@ -109,11 +109,11 @@ enum gomp_map_kind
/* Device codes. Keep in sync with
- libgomp/{openacc.h,openacc.f90,openacc_lib.h}:acc_device_t as well as
- libgomp/libgomp_target.h. */
+ libgomp/{openacc.h,openacc.f90,openacc_lib.h}:acc_device_t. */
#define GOMP_DEVICE_NONE 0
#define GOMP_DEVICE_DEFAULT 1
#define GOMP_DEVICE_HOST 2
+/* 3 obsoleted. */
#define GOMP_DEVICE_NOT_HOST 4
#define GOMP_DEVICE_NVIDIA_PTX 5
#define GOMP_DEVICE_INTEL_MIC 6
@@ -147,6 +147,7 @@ enum gomp_map_kind
/* Versions of libgomp and device-specific plugins. */
#define GOMP_VERSION 0
#define GOMP_VERSION_NVIDIA_PTX 1
+#define GOMP_VERSION_INTEL_MIC 0
#define GOMP_VERSION_PACK(LIB, DEV) (((LIB) << 16) | (DEV))
#define GOMP_VERSION_LIB(PACK) (((PACK) >> 16) & 0xffff)
Index: libgomp/openacc.h
===================================================================
--- libgomp/openacc.h (revision 226469)
+++ libgomp/openacc.h (working copy)
@@ -53,6 +53,7 @@ typedef enum acc_device_t
acc_device_none = 0,
acc_device_default = 1,
acc_device_host = 2,
+ /* 3 obsoleted. */
acc_device_not_host = 4,
acc_device_nvidia = 5,
_ACC_device_hwm
Index: libgomp/openacc.f90
===================================================================
--- libgomp/openacc.f90 (revision 226469)
+++ libgomp/openacc.f90 (working copy)
@@ -43,6 +43,7 @@ module openacc_kinds
integer (acc_device_kind), parameter :: acc_device_none = 0
integer (acc_device_kind), parameter :: acc_device_default = 1
integer (acc_device_kind), parameter :: acc_device_host = 2
+ ! 3 obsoleted.
integer (acc_device_kind), parameter :: acc_device_not_host = 4
integer (acc_device_kind), parameter :: acc_device_nvidia = 5
Index: libgomp/openacc_lib.h
===================================================================
--- libgomp/openacc_lib.h (revision 226469)
+++ libgomp/openacc_lib.h (working copy)
@@ -38,6 +38,7 @@
integer (acc_device_kind), parameter :: acc_device_none = 0
integer (acc_device_kind), parameter :: acc_device_default = 1
integer (acc_device_kind), parameter :: acc_device_host = 2
+! 3 obsoleted.
integer (acc_device_kind), parameter :: acc_device_not_host = 4
integer (acc_device_kind), parameter :: acc_device_nvidia = 5
