[libgomp] – Fix check_effective_target_offload_target_nvptx for remote execution

	* testsuite/lib/libgomp.exp
	(check_effective_target_offload_target_nvptx): Pass flags as 'options'
	and not as 'source' argument to libgomp_target_compile.

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 9b20b461841809b3adde93b0c6f7ebd4b9e2603f..56e9da7b8647ee4242d531511aec754373e7979a 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2020-02-05  Tobias Burnus  <tobias@codesourcery.com>
+
+       * testsuite/lib/libgomp.exp
+       (check_effective_target_offload_target_nvptx): Pass flags as 'options'
+       and not as 'source' argument to libgomp_target_compile.
+
 2020-02-03  Andrew Stubbs  <ams@codesourcery.com>
 
        * plugin/plugin-gcn.c (EF_AMDGPU_MACH_AMDGCN_GFX801): Remove.

diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 7e94527c7cae1ddcbf38020cb22301ccd6ea719b..e7ce784314d915371b4771ad068d393264dd11f3 100644 (file)
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -346,11 +346,11 @@ proc check_effective_target_offload_target_nvptx { } {
     # files; in particular, '-foffload', 'libgomp.oacc-*/*.exp'), which don't
     # get passed on to 'check_effective_target_*' functions.  (Not caching the
     # result due to that.)
-    set options [current_compiler_flags]
+    set options [list "additional_flags=[concat "-v" [current_compiler_flags]]"]
     # Instead of inspecting command-line options, look what the compiler driver
     # decides.  This is somewhat modelled after
     # 'gcc/testsuite/lib/target-supports.exp:check_configured_with'.
-    set gcc_output [libgomp_target_compile "-v $options" "" "none" ""]
+    set gcc_output [libgomp_target_compile "" "" "none" $options]
     if [regexp "(?n)^OFFLOAD_TARGET_NAMES=(.*)" $gcc_output dummy offload_targets] {
        verbose "compiling for offload targets: $offload_targets"
        return [string match "*:nvptx*:*" ":$offload_targets:"]