[rpms/gcc] rhel-f41-base: Make the Fortran patches hopefully apply again.

[rpms/gcc] rhel-f41-base: Make the Fortran patches hopefully apply again.

[Jakub Jelinek]

A new commit has been pushed.

Repo   : rpms/gcc
Branch : rhel-f41-base
Commit : f3a804c686d1b8a7f6f29b93193cb0108d86631b
Author : Jakub Jelinek <jakub@redhat.com>
Date   : 2023-06-16T20:17:58+02:00
Stats  : +10/-10 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/gcc/c/f3a804c686d1b8a7f6f29b93193cb0108d86631b?branch=rhel-f41-base

Log:
Make the Fortran patches hopefully apply again.

---
diff --git a/gcc13-fortran-fdec-non-logical-if.patch b/gcc13-fortran-fdec-non-logical-if.patch
index a3a830c..3e3c915 100644
--- a/gcc13-fortran-fdec-non-logical-if.patch
+++ b/gcc13-fortran-fdec-non-logical-if.patch
@@ -53,7 +53,7 @@ diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc
 index bc0df0fdb99..07dd039f3bf 100644
 --- a/gcc/fortran/resolve.cc
 +++ b/gcc/fortran/resolve.cc
-@@ -10789,10 +10789,31 @@ gfc_resolve_blocks (gfc_code *b, gfc_namespace *ns)
+@@ -11030,10 +11030,31 @@ gfc_resolve_blocks (gfc_code *b, gfc_nam
        switch (b->op)
  	{
  	case EXEC_IF:
@@ -89,7 +89,7 @@ index bc0df0fdb99..07dd039f3bf 100644
  	  break;
  
  	case EXEC_WHERE:
-@@ -12093,11 +12114,32 @@ start:
+@@ -12585,11 +12606,32 @@ start:
  	  break;
  
  	case EXEC_IF:

diff --git a/gcc13-fortran-flogical-as-integer.patch b/gcc13-fortran-flogical-as-integer.patch
index 28df5e1..f40b143 100644
--- a/gcc13-fortran-flogical-as-integer.patch
+++ b/gcc13-fortran-flogical-as-integer.patch
@@ -44,7 +44,7 @@ diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc
 index c075d0fa0c4..4b90cb59902 100644
 --- a/gcc/fortran/resolve.cc
 +++ b/gcc/fortran/resolve.cc
-@@ -3915,7 +3915,6 @@ lookup_uop_fuzzy (const char *op, gfc_symtree *uop)
+@@ -4035,7 +4035,6 @@ lookup_uop_fuzzy (const char *op, gfc_sy
    return gfc_closest_fuzzy_match (op, candidates);
  }
  
@@ -52,7 +52,7 @@ index c075d0fa0c4..4b90cb59902 100644
  /* Callback finding an impure function as an operand to an .and. or
     .or.  expression.  Remember the last function warned about to
     avoid double warnings when recursing.  */
-@@ -3975,6 +3974,22 @@ convert_hollerith_to_character (gfc_expr *e)
+@@ -4095,6 +4094,22 @@ convert_hollerith_to_character (gfc_expr
      }
  }
  
@@ -75,7 +75,7 @@ index c075d0fa0c4..4b90cb59902 100644
  /* Convert to numeric and issue a warning for the conversion.  */
  
  static void
-@@ -3987,6 +4002,22 @@ convert_to_numeric (gfc_expr *a, gfc_expr *b)
+@@ -4107,6 +4122,22 @@ convert_to_numeric (gfc_expr *a, gfc_exp
    gfc_convert_type_warn (a, &t, 2, 1);
  }
  
@@ -98,7 +98,7 @@ index c075d0fa0c4..4b90cb59902 100644
  /* Resolve an operator expression node.  This can involve replacing the
     operation with a user defined function call.  */
  
-@@ -4072,6 +4103,12 @@ resolve_operator (gfc_expr *e)
+@@ -4198,6 +4229,12 @@ resolve_operator (gfc_expr *e)
      case INTRINSIC_TIMES:
      case INTRINSIC_DIVIDE:
      case INTRINSIC_POWER:
@@ -110,8 +110,8 @@ index c075d0fa0c4..4b90cb59902 100644
 +
        if (gfc_numeric_ts (&op1->ts) && gfc_numeric_ts (&op2->ts))
  	{
- 	  gfc_type_convert_binary (e, 1);
-@@ -4108,6 +4145,13 @@ resolve_operator (gfc_expr *e)
+ 	  /* Do not perform conversions if operands are not conformable as
+@@ -4245,6 +4282,13 @@ resolve_operator (gfc_expr *e)
      case INTRINSIC_OR:
      case INTRINSIC_EQV:
      case INTRINSIC_NEQV:
@@ -125,7 +125,7 @@ index c075d0fa0c4..4b90cb59902 100644
        if (op1->ts.type == BT_LOGICAL && op2->ts.type == BT_LOGICAL)
  	{
  	  e->ts.type = BT_LOGICAL;
-@@ -4158,6 +4202,9 @@ resolve_operator (gfc_expr *e)
+@@ -4296,6 +4340,9 @@ resolve_operator (gfc_expr *e)
  	  goto simplify_op;
  	}
  
@@ -135,7 +135,7 @@ index c075d0fa0c4..4b90cb59902 100644
        if (op1->ts.type == BT_LOGICAL)
  	{
  	  e->ts.type = BT_LOGICAL;
-@@ -4198,6 +4245,12 @@ resolve_operator (gfc_expr *e)
+@@ -4336,6 +4383,12 @@ resolve_operator (gfc_expr *e)
  	  convert_hollerith_to_character (op2);
  	}