https://gcc.gnu.org/g:4d76fe46875b14296ffc675b9580cb3c543d2310
commit 4d76fe46875b14296ffc675b9580cb3c543d2310
Author: Tobias Burnus <tbur...@baylibre.com>
Date: Tue Jul 30 10:35:11 2024 +0200
gfortran.dg/compiler-directive_2.f: Update dg-error
This is a fallout of commit r15-2378-g29b1587e7d3466
OpenMP/Fortran: Fix handling of 'declare target' with 'link' clause
[PR115559]
where the '!GCC$' attributes were added in reverse order.
Result: The error diagnostic for the stdcall/fastcall was reversed.
Solution: Swap the order in dg-error.
gcc/testsuite/ChangeLog:
* gfortran.dg/compiler-directive_2.f: Update dg-error.
(cherry picked from commit 15158a8853a69f27a3c14644f35a93029dea6a84)
Diff:
---
gcc/testsuite/ChangeLog.omp | 7 +++++++
gcc/testsuite/gfortran.dg/compiler-directive_2.f | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 055730cbdebb..3df8cf8b3b87 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,10 @@
+2024-07-30 Tobias Burnus <tbur...@baylibre.com>
+
+ Backported from master:
+ 2024-07-30 Tobias Burnus <tbur...@baylibre.com>
+
+ * gfortran.dg/compiler-directive_2.f: Update dg-error.
+
2024-05-28 Tobias Burnus <tbur...@baylibre.com>
* c-c++-common/gomp/lastprivate-conditional-1.c: Remove
diff --git a/gcc/testsuite/gfortran.dg/compiler-directive_2.f
b/gcc/testsuite/gfortran.dg/compiler-directive_2.f
index 79169a896ae6..c31349f3348c 100644
--- a/gcc/testsuite/gfortran.dg/compiler-directive_2.f
+++ b/gcc/testsuite/gfortran.dg/compiler-directive_2.f
@@ -5,6 +5,6 @@
! Check for calling convention consitency
! in procedure-pointer assignments.
!
- subroutine test() ! { dg-error "fastcall and stdcall attributes are not
compatible" }
+ subroutine test() ! { dg-error "stdcall and fastcall attributes are not
compatible" }
cGCC$ attributes stdcall, fastcall::test
end subroutine test
