@@ -1,5 +1,8 @@
2014-12-22 Thomas Schwinge <thomas@codesourcery.com>
+ * libgomp.h (struct gomp_device_descr): Remove id member. Update
+ all users.
+
* libgomp.h (gomp_init_tables): Remove const qualifier from struct
gomp_device_descr. Change all users.
* oacc-int.h (base_dev, goacc_register): Likewise.
@@ -736,10 +736,6 @@ struct gomp_device_descr
/* Capabilities of device (supports OpenACC, OpenMP). */
unsigned int capabilities;
- /* This is the ID number of device. It could be specified in DEVICE-clause of
- TARGET construct. */
- int id;
-
/* This is the ID number of device among devices of the same type. */
int target_id;
@@ -38,7 +38,6 @@ static struct gomp_device_descr host_dispatch =
.capabilities = (GOMP_OFFLOAD_CAP_OPENACC_200
| GOMP_OFFLOAD_CAP_NATIVE_EXEC
| GOMP_OFFLOAD_CAP_SHARED_MEM),
- .id = 0,
.is_initialized = false,
.offload_regions_registered = false,
@@ -1108,7 +1108,6 @@ gomp_target_init (void)
current_device.openacc.target_data = NULL;
for (i = 0; i < new_num_devices; i++)
{
- current_device.id = num_devices + 1;
current_device.target_id = i;
devices[num_devices] = current_device;
gomp_mutex_init (&devices[num_devices].mem_map.lock);
@@ -1136,9 +1135,7 @@ gomp_target_init (void)
{
struct gomp_device_descr device_tmp = devices[d];
devices[d] = devices[i];
- devices[d].id = d + 1;
devices[i] = device_tmp;
- devices[i].id = i + 1;
break;
}