diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index d350e6770ef..77776ca8fca 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2017-12-27  Tom de Vries  <tom@codesourcery.com>
+
+	PR c++/83046
+	* testsuite/libgomp.oacc-c-c++-common/gang-static-2.c (test_static)
+	(test_nonstatic): Fix return type to workaround PR83046.
+
 2017-12-05  Jakub Jelinek  <jakub@redhat.com>
 
 	PR testsuite/83281
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/gang-static-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/gang-static-2.c
index ce9632cf1c0..6de739ae99f 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/gang-static-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/gang-static-2.c
@@ -14,7 +14,7 @@
        __asm__ volatile ("mov.u32 %0,%%ctaid.x;" : "=r" (__r));	\
        __r; }) : (I))
 
-int
+void
 test_static(int *a, int num_gangs, int sarg)
 {
   int i, j;
@@ -27,7 +27,7 @@ test_static(int *a, int num_gangs, int sarg)
       assert (a[i*sarg+j] == i % num_gangs);
 }
 
-int
+void
 test_nonstatic(int *a, int gangs)
 {
   int i, j;