Fix up gcc12-fortran-fdec-non-logical-if.patch.

This commit is contained in:
Jakub Jelinek 2022-08-18 18:57:31 +02:00
parent bfe43bb230
commit a72281a470

View File

@ -26,7 +26,7 @@ diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
index 4a269ebb22d..d886c2f33ed 100644 index 4a269ebb22d..d886c2f33ed 100644
--- a/gcc/fortran/lang.opt --- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt +++ b/gcc/fortran/lang.opt
@@ -497,6 +497,10 @@ fdec-override-kind @@ -506,6 +506,10 @@ fdec-override-kind
Fortran Var(flag_dec_override_kind) Fortran Var(flag_dec_override_kind)
Enable support for per variable kind specification. Enable support for per variable kind specification.
@ -34,16 +34,16 @@ index 4a269ebb22d..d886c2f33ed 100644
+Fortran Var(flag_dec_non_logical_if) +Fortran Var(flag_dec_non_logical_if)
+Enable support for non-logical expressions in if statements. +Enable support for non-logical expressions in if statements.
+ +
fdec-old-init fdec-structure
Fortran Var(flag_dec_old_init) Fortran Var(flag_dec_structure)
Enable support for old style initializers in derived types. Enable support for DEC STRUCTURE/RECORD.
diff --git a/gcc/fortran/options.cc b/gcc/fortran/options.cc diff --git a/gcc/fortran/options.cc b/gcc/fortran/options.cc
index edbab483b36..a946c86790a 100644 index edbab483b36..a946c86790a 100644
--- a/gcc/fortran/options.cc --- a/gcc/fortran/options.cc
+++ b/gcc/fortran/options.cc +++ b/gcc/fortran/options.cc
@@ -81,6 +81,7 @@ set_dec_flags (int value) @@ -79,6 +79,7 @@ set_dec_flags (int value)
SET_BITFLAG (flag_dec_non_integer_index, value, value); SET_BITFLAG (flag_dec_char_conversions, value, value);
SET_BITFLAG (flag_dec_old_init, value, value); SET_BITFLAG (flag_dec_duplicates, value, value);
SET_BITFLAG (flag_dec_override_kind, value, value); SET_BITFLAG (flag_dec_override_kind, value, value);
+ SET_BITFLAG (flag_dec_non_logical_if, value, value); + SET_BITFLAG (flag_dec_non_logical_if, value, value);
} }