[gcc/devel/omp/gcc-10] openmp: Fix g++.dg/gomp/declare-target-3.C testcase when offloading is disabled

[gcc/devel/omp/gcc-10] openmp: Fix g++.dg/gomp/declare-target-3.C testcase when offloading is disabled

[Kwok Yeung]

https://gcc.gnu.org/g:a3108e0b52bae3783a705ce38d4a1f82ed3443a2

commit a3108e0b52bae3783a705ce38d4a1f82ed3443a2
Author: Kwok Cheung Yeung <kcy@codesourcery.com>
Date:   Fri Dec 18 12:05:20 2020 -0800

    openmp: Fix g++.dg/gomp/declare-target-3.C testcase when offloading is disabled
    
    This is a backport from mainline of commit
    bfb37fa4dd49ee775ae90355464265a2f60c1067.
    
    2020-12-18  Kwok Cheung Yeung  <kcy@codesourcery.com>
    
            gcc/testsuite/
            * g++.dg/gomp/declare-target-3.C: Only check .offload_var_table
            entries if offloading is enabled.

Diff:
---
 gcc/testsuite/ChangeLog.omp                  |  8 ++++++++
 gcc/testsuite/g++.dg/gomp/declare-target-3.C | 14 +++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index bff88afbf0d..7705855308d 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,11 @@
+2020-12-18  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+	Backport from mainline
+	2020-12-18  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+	* g++.dg/gomp/declare-target-3.C: Only check .offload_var_table
+	entries if offloading is enabled.
+
 2020-12-18  Kwok Cheung Yeung  <kcy@codesourcery.com>
 
 	Backport from mainline
diff --git a/gcc/testsuite/g++.dg/gomp/declare-target-3.C b/gcc/testsuite/g++.dg/gomp/declare-target-3.C
index 8e9eafc8968..0df440d5d63 100644
--- a/gcc/testsuite/g++.dg/gomp/declare-target-3.C
+++ b/gcc/testsuite/g++.dg/gomp/declare-target-3.C
@@ -22,10 +22,10 @@ int *g = &f;	// Explicitly marked
 // { dg-final { scan-tree-dump "__attribute__\\\(\\\(omp declare target\\\)\\\)\\\nbar \\\(\\\)" "gimple" } }
 // { dg-final { scan-tree-dump "__attribute__\\\(\\\(omp declare target\\\)\\\)\\\nbaz \\\(\\\)" "gimple" } }
 // { dg-final { scan-tree-dump "__attribute__\\\(\\\(omp declare target\\\)\\\)\\\nqux \\\(\\\)" "gimple" } }
-// { dg-final { scan-assembler-not "\\\.offload_var_table:\\n.+\\\.quad\\s+a" } }
-// { dg-final { scan-assembler "\\\.offload_var_table:\\n.+\\\.quad\\s+b" } }
-// { dg-final { scan-assembler "\\\.offload_var_table:\\n.+\\\.quad\\s+c" } }
-// { dg-final { scan-assembler "\\\.offload_var_table:\\n.+\\\.quad\\s+d" } }
-// { dg-final { scan-assembler "\\\.offload_var_table:\\n.+\\\.quad\\s+e" } }
-// { dg-final { scan-assembler "\\\.offload_var_table:\\n.+\\\.quad\\s+f" } }
-// { dg-final { scan-assembler "\\\.offload_var_table:\\n.+\\\.quad\\s+g" } }
+// { dg-final { scan-assembler-not "\\\.offload_var_table:\\n.+\\\.quad\\s+a" { target { offloading_enabled } } } }
+// { dg-final { scan-assembler "\\\.offload_var_table:\\n.+\\\.quad\\s+b" { target { offloading_enabled } } } }
+// { dg-final { scan-assembler "\\\.offload_var_table:\\n.+\\\.quad\\s+c" { target { offloading_enabled } } } }
+// { dg-final { scan-assembler "\\\.offload_var_table:\\n.+\\\.quad\\s+d" { target { offloading_enabled } } } }
+// { dg-final { scan-assembler "\\\.offload_var_table:\\n.+\\\.quad\\s+e" { target { offloading_enabled } } } }
+// { dg-final { scan-assembler "\\\.offload_var_table:\\n.+\\\.quad\\s+f" { target { offloading_enabled } } } }
+// { dg-final { scan-assembler "\\\.offload_var_table:\\n.+\\\.quad\\s+g" { target { offloading_enabled } } } }