From 91bc3c98851670360dfcd312399c3ba35fb50231 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Wed, 5 Feb 2020 17:40:48 +0100 Subject: [PATCH] =?utf8?q?[libgomp]=20=E2=80=93=20Fix=20check=5Feffective?= =?utf8?q?=5Ftarget=5Foffload=5Ftarget=5Fnvptx=20for=20remote=20execution?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * testsuite/lib/libgomp.exp (check_effective_target_offload_target_nvptx): Pass flags as 'options' and not as 'source' argument to libgomp_target_compile. --- libgomp/ChangeLog | 6 ++++++ libgomp/testsuite/lib/libgomp.exp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 9b20b461841..56e9da7b864 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2020-02-05 Tobias Burnus + + * 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 * 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 7e94527c7ca..e7ce784314d 100644 --- 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:"] -- 2.30.2