]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
gomp/declare-variant-1*.f90: Update for Windows
authorTobias Burnus <tobias@codesourcery.com>
Fri, 27 Jan 2023 08:13:16 +0000 (09:13 +0100)
committerTobias Burnus <tobias@codesourcery.com>
Fri, 27 Jan 2023 08:19:51 +0000 (09:19 +0100)
Replace target selector 'lp64' by '! ilp32' to handle
Windows which uses 32bit long (and vice versa for '! lp64').

gcc/testsuite/ChangeLog:

* gfortran.dg/gomp/declare-variant-10.f90: Update scan-tree's
target selector to handle Windows.
* gfortran.dg/gomp/declare-variant-11.f90: Likewise.
* gfortran.dg/gomp/declare-variant-12.f90: Likewise.

gcc/testsuite/gfortran.dg/gomp/declare-variant-10.f90
gcc/testsuite/gfortran.dg/gomp/declare-variant-11.f90
gcc/testsuite/gfortran.dg/gomp/declare-variant-12.f90

index d6d2c8c262b4fe21cdd192ce5964550a63d7811b..2f09146a10d2b6f1c0bab44cdbd29ee72250446e 100644 (file)
@@ -69,8 +69,8 @@ contains
 #endif
   subroutine test2 ()
     !$omp target
-      call f04 ()      ! { dg-final { scan-tree-dump-times "f03 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && lp64 } } } }
-                       ! { dg-final { scan-tree-dump-times "f04 \\\(\\\);" 1 "gimple" { target { { ! lp64 } || { ! { i?86-*-* x86_64-*-* } } } } } }
+      call f04 () ! { dg-final { scan-tree-dump-times "f03 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! ilp32 } } } } }
+                  ! { dg-final { scan-tree-dump-times "f04 \\\(\\\);" 1 "gimple" { target { { ilp32 } || { ! { i?86-*-* x86_64-*-* } } } } } }
     !$omp end target
     !$omp target
       call f16 ()      ! { dg-final { scan-tree-dump-times "f15 \\\(\\\);" 1 "gimple" { target ia32 } } }
index 60aa0fcb3b09f0638787bdc19170f8396ee8ea7c..3593c9a5bb3016a8fd15771fc6d2879025e371e2 100644 (file)
@@ -126,8 +126,8 @@ contains
     end do
     !$omp end parallel do
 
-    call f27 ()        ! { dg-final { scan-tree-dump-times "f25 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && lp64 } } } }
-               ! { dg-final { scan-tree-dump-times "f24 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! lp64 } } } } }
+    call f27 () ! { dg-final { scan-tree-dump-times "f25 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! ilp32 } } } } }
+                ! { dg-final { scan-tree-dump-times "f24 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ilp32 } } } } }
                ! { dg-final { scan-tree-dump-times "f24 \\\(\\\);" 1 "gimple" { target { ! { nvptx*-*-* amdgcn*-*-* i?86-*-* x86_64-*-* } } } } }
                ! { dg-final { scan-tree-dump-times "f27 \\\(\\\);" 1 "gimple" { target { nvptx*-*-* amdgcn*-*-* } } } }
   end subroutine
index 610693e98070c740bdd3f2e92d526ee852f88bbe..2fd8abd0dc79adba1781509b6a192d41845d7c9c 100644 (file)
@@ -133,8 +133,8 @@ contains
     do i = 1, 2
       !$omp parallel do        ! 5 constructs in OpenMP context, arch is 2^6, isa 2^7.
       do j = 1, 2
-         call f13 ()   ! { dg-final { scan-tree-dump-times "f09 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && lp64 } } } }
-                       ! { dg-final { scan-tree-dump-times "f11 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! lp64 } } } } }
+          call f13 ()   ! { dg-final { scan-tree-dump-times "f09 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! ilp32 } } } } }
+                        ! { dg-final { scan-tree-dump-times "f11 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ilp32 } } } } }
                        ! { dg-final { scan-tree-dump-times "f10 \\\(\\\);" 1 "gimple" { target { ! { i?86-*-* x86_64-*-* } } } } }
          call f17 ()   ! { dg-final { scan-tree-dump-times "f14 \\\(\\\);" 1 "gimple" } }
          call f21 ()   ! { dg-final { scan-tree-dump-times "f19 \\\(\\\);" 1 "gimple" } }