[PATCH 5/5] OpenACC 2.0 support for libgomp - temporary test harness tweaks

[Julian Brown]

Hi,

As mentioned in the previous mail in this series, testing the OpenACC
runtime support in libgomp is going to be awkward until the associated
middle-end pieces are ready. This stop-gap patch helps to allow tests
(that don't use any of the pragmas, only calling the run-time library
directly) to run successfully.

OK to apply?

Thanks,

Julian

ChangeLog

    libgomp/
    * testsuite/libgomp.oacc-c++/c++.exp (ALWAYS_CFLAGS): Temporarily
    replace -fopenacc with -lgomp -lpthread, until -fopenacc support
    lands upstream.
    * testsuite/libgomp.oacc-c/c.exp (ALWAYS_CFLAGS): Likewise.
    * testsuite/libgomp.oacc-fortran/fortran.exp (ALWAYS_CFLAGS):
    Similar, but without -lpthread.

>From c70f2aca94bc306e4600282aa81bc1a758ad81fa Mon Sep 17 00:00:00 2001
From: Julian Brown <jul...@codesourcery.com>
Date: Tue, 11 Nov 2014 02:54:09 -0800
Subject: [PATCH 5/5] Temporary testing tweaks

    libgomp/
    * testsuite/libgomp.oacc-c++/c++.exp (ALWAYS_CFLAGS): Temporarily replace
    -fopenacc with -lgomp -lpthread, until -fopenacc support lands upstream.
    * testsuite/libgomp.oacc-c/c.exp (ALWAYS_CFLAGS): Likewise.
    * testsuite/libgomp.oacc-fortran/fortran.exp (ALWAYS_CFLAGS): Similar, but
    without -lpthread.
---
 libgomp/testsuite/libgomp.oacc-c++/c++.exp         |    4 +++-
 libgomp/testsuite/libgomp.oacc-c/c.exp             |    4 +++-
 libgomp/testsuite/libgomp.oacc-fortran/fortran.exp |    4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/libgomp/testsuite/libgomp.oacc-c++/c++.exp b/libgomp/testsuite/libgomp.oacc-c++/c++.exp
index b8b3e85..1060344 100644
--- a/libgomp/testsuite/libgomp.oacc-c++/c++.exp
+++ b/libgomp/testsuite/libgomp.oacc-c++/c++.exp
@@ -23,7 +23,9 @@ dg-init
 
 # Turn on OpenACC.
 # XXX (TEMPORARY): Remove the -flto once that's properly integrated.
-lappend ALWAYS_CFLAGS "additional_flags=-fopenacc -flto"
+#lappend ALWAYS_CFLAGS "additional_flags=-fopenacc -flto"
+# TODO: Revert this temporary hack when OpenACC middle-end pieces are submitted.
+lappend ALWAYS_CFLAGS "additional_flags=-lgomp -flto -lpthread"
 
 set blddir [lookfor_file [get_multilibs] libgomp]
 
diff --git a/libgomp/testsuite/libgomp.oacc-c/c.exp b/libgomp/testsuite/libgomp.oacc-c/c.exp
index 5558ec8..85528aa 100644
--- a/libgomp/testsuite/libgomp.oacc-c/c.exp
+++ b/libgomp/testsuite/libgomp.oacc-c/c.exp
@@ -28,7 +28,9 @@ dg-init
 
 # Turn on OpenACC.
 # XXX (TEMPORARY): Remove the -flto once that's properly integrated.
-lappend ALWAYS_CFLAGS "additional_flags=-fopenacc -flto"
+#lappend ALWAYS_CFLAGS "additional_flags=-fopenacc -flto"
+# TODO: Revert temporary hack when OpenACC middle-end pieces are submitted.
+lappend ALWAYS_CFLAGS "additional_flags=-lgomp -flto -lpthread"
 
 lappend libgomp_compile_options "compiler=$GCC_UNDER_TEST"
 
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp b/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp
index 0ada038..27cf4d5 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp
+++ b/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp
@@ -23,7 +23,9 @@ dg-init
 
 # Turn on OpenACC.
 # XXX (TEMPORARY): Remove the -flto once that's properly integrated.
-lappend ALWAYS_CFLAGS "additional_flags=-fopenacc -flto"
+#lappend ALWAYS_CFLAGS "additional_flags=-fopenacc -flto"
+# TODO: Revert this temporary hack when OpenACC middle-end pieces are submitted.
+lappend ALWAYS_CFLAGS "additional_flags=-lgomp -flto"
 
 if { $blddir != "" } {
     set lang_source_re {^.*\.[fF](|90|95|03|08)$}
-- 
1.7.10.4