aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorGCC Administrator <gccadmin@gcc.gnu.org>2024-07-16 00:26:23 +0000
committerGCC Administrator <gccadmin@gcc.gnu.org>2024-07-16 00:26:23 +0000
commit0fcadb3d51eb4f507ccddfad2e634e6894761faf (patch)
tree92b8716cd7dfd9ae9c0a04500a7784ec849c1a1b /gcc/fortran
parent71ec9ed7a7353f66d55b034a45336bf43a026b1d (diff)
downloadgcc-0fcadb3d51eb4f507ccddfad2e634e6894761faf.zip
gcc-0fcadb3d51eb4f507ccddfad2e634e6894761faf.tar.gz
gcc-0fcadb3d51eb4f507ccddfad2e634e6894761faf.tar.bz2
Daily bump.
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog12
1 files changed, 12 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 1095e0d..a2a37be 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,15 @@
+2024-07-15 Harald Anlauf <anlauf@gmx.de>
+
+ Backported from master:
+ 2024-05-24 Harald Anlauf <anlauf@gmx.de>
+ Steven G. Kargl <kargl@gcc.gnu.org>
+
+ PR fortran/93635
+ * symbol.cc (conflict_std): Helper function for reporting attribute
+ conflicts depending on the Fortran standard version.
+ (conf_std): Helper macro for checking standard-dependent conflicts.
+ (gfc_check_conflict): Use it.
+
2024-07-14 Mikael Morin <mikael@gcc.gnu.org>
Backported from master: