[PATCH 1/2] Fix warnings reported with -Wreturn-type after patching PR c/48116.
Marcin Baczyński
marbacz@gmail.com
Wed Jun 1 11:55:00 GMT 2016
libgomp/ChangeLog:
* fortran.c (omp_set_default_device_, omp_set_default_device_8):
don't put a void expression in a return,
* oacc-mem.c (acc_free): likewise,
* target.c (GOMP_target, GOMP_target_data, GOMP_target_data_ext):
likewise.
---
libgomp/fortran.c | 4 ++--
libgomp/oacc-mem.c | 5 ++++-
libgomp/target.c | 15 ++++++++++++---
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/libgomp/fortran.c b/libgomp/fortran.c
index 6b1ef37..1eb9340 100644
--- a/libgomp/fortran.c
+++ b/libgomp/fortran.c
@@ -526,13 +526,13 @@ omp_get_partition_place_nums_8_ (int64_t *place_nums)
void
omp_set_default_device_ (const int32_t *device_num)
{
- return omp_set_default_device (*device_num);
+ omp_set_default_device (*device_num);
}
void
omp_set_default_device_8_ (const int64_t *device_num)
{
- return omp_set_default_device (TO_INT (*device_num));
+ omp_set_default_device (TO_INT (*device_num));
}
int32_t
diff --git a/libgomp/oacc-mem.c b/libgomp/oacc-mem.c
index bd4b62b..87f9435 100644
--- a/libgomp/oacc-mem.c
+++ b/libgomp/oacc-mem.c
@@ -129,7 +129,10 @@ acc_free (void *d)
struct gomp_device_descr *acc_dev = thr->dev;
if (acc_dev->capabilities & GOMP_OFFLOAD_CAP_SHARED_MEM)
- return free (d);
+ {
+ free (d);
+ return;
+ }
gomp_mutex_lock (&acc_dev->lock);
diff --git a/libgomp/target.c b/libgomp/target.c
index 48b9ab8..bf2fa5f 100644
--- a/libgomp/target.c
+++ b/libgomp/target.c
@@ -1426,7 +1426,10 @@ GOMP_target (int device, void (*fn) (void *), const void *unused,
/* All shared memory devices should use the GOMP_target_ext function. */
|| devicep->capabilities & GOMP_OFFLOAD_CAP_SHARED_MEM
|| !(fn_addr = gomp_get_target_fn_addr (devicep, fn)))
- return gomp_target_fallback (fn, hostaddrs);
+ {
+ gomp_target_fallback (fn, hostaddrs);
+ return;
+ }
struct target_mem_desc *tgt_vars
= gomp_map_vars (devicep, mapnum, hostaddrs, NULL, sizes, kinds, false,
@@ -1609,7 +1612,10 @@ GOMP_target_data (int device, const void *unused, size_t mapnum,
if (devicep == NULL
|| !(devicep->capabilities & GOMP_OFFLOAD_CAP_OPENMP_400)
|| (devicep->capabilities & GOMP_OFFLOAD_CAP_SHARED_MEM))
- return gomp_target_data_fallback ();
+ {
+ gomp_target_data_fallback ();
+ return;
+ }
struct target_mem_desc *tgt
= gomp_map_vars (devicep, mapnum, hostaddrs, NULL, sizes, kinds, false,
@@ -1628,7 +1634,10 @@ GOMP_target_data_ext (int device, size_t mapnum, void **hostaddrs,
if (devicep == NULL
|| !(devicep->capabilities & GOMP_OFFLOAD_CAP_OPENMP_400)
|| devicep->capabilities & GOMP_OFFLOAD_CAP_SHARED_MEM)
- return gomp_target_data_fallback ();
+ {
+ gomp_target_data_fallback ();
+ return;
+ }
struct target_mem_desc *tgt
= gomp_map_vars (devicep, mapnum, hostaddrs, NULL, sizes, kinds, true,
--
2.8.3
More information about the Gcc-patches
mailing list