https://gcc.gnu.org/g:b0369e2f4e8f1d98b05b22006853bad540995d9c

commit b0369e2f4e8f1d98b05b22006853bad540995d9c
Author: Mikael Morin <[email protected]>
Date:   Tue Sep 9 22:27:48 2025 +0200

    Régénération des fichiers générés

Diff:
---
 libgfortran/generated/findloc1_c10.c | 24 ++++++++++++------------
 libgfortran/generated/findloc1_c16.c | 24 ++++++++++++------------
 libgfortran/generated/findloc1_c17.c | 24 ++++++++++++------------
 libgfortran/generated/findloc1_c4.c  | 24 ++++++++++++------------
 libgfortran/generated/findloc1_c8.c  | 24 ++++++++++++------------
 libgfortran/generated/findloc1_i1.c  | 24 ++++++++++++------------
 libgfortran/generated/findloc1_i16.c | 24 ++++++++++++------------
 libgfortran/generated/findloc1_i2.c  | 24 ++++++++++++------------
 libgfortran/generated/findloc1_i4.c  | 24 ++++++++++++------------
 libgfortran/generated/findloc1_i8.c  | 24 ++++++++++++------------
 libgfortran/generated/findloc1_r10.c | 24 ++++++++++++------------
 libgfortran/generated/findloc1_r16.c | 24 ++++++++++++------------
 libgfortran/generated/findloc1_r17.c | 24 ++++++++++++------------
 libgfortran/generated/findloc1_r4.c  | 24 ++++++++++++------------
 libgfortran/generated/findloc1_r8.c  | 24 ++++++++++++------------
 libgfortran/generated/findloc1_s1.c  | 24 ++++++++++++------------
 libgfortran/generated/findloc1_s4.c  | 24 ++++++++++++------------
 17 files changed, 204 insertions(+), 204 deletions(-)

diff --git a/libgfortran/generated/findloc1_c10.c 
b/libgfortran/generated/findloc1_c10.c
index 309f40553892..90bc1c5e86ec 100644
--- a/libgfortran/generated/findloc1_c10.c
+++ b/libgfortran/generated/findloc1_c10.c
@@ -139,7 +139,7 @@ findloc1_c10 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_COMPLEX_10 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_COMPLEX_10 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_c10 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_c10 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_c10 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_c10 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_COMPLEX_10 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_COMPLEX_10 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_c10 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_c10 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_c10 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_c16.c 
b/libgfortran/generated/findloc1_c16.c
index ab197f311424..3823bbb7c025 100644
--- a/libgfortran/generated/findloc1_c16.c
+++ b/libgfortran/generated/findloc1_c16.c
@@ -139,7 +139,7 @@ findloc1_c16 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_COMPLEX_16 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_COMPLEX_16 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_c16 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_c16 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_c16 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_c16 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_COMPLEX_16 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_COMPLEX_16 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_c16 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_c16 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_c16 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_c17.c 
b/libgfortran/generated/findloc1_c17.c
index 0faa9b52f931..6039412b1d1f 100644
--- a/libgfortran/generated/findloc1_c17.c
+++ b/libgfortran/generated/findloc1_c17.c
@@ -139,7 +139,7 @@ findloc1_c17 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_COMPLEX_17 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_COMPLEX_17 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_c17 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_c17 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_c17 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_c17 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_COMPLEX_17 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_COMPLEX_17 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_c17 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_c17 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_c17 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_c4.c 
b/libgfortran/generated/findloc1_c4.c
index 11fcb242fb09..8907721eb429 100644
--- a/libgfortran/generated/findloc1_c4.c
+++ b/libgfortran/generated/findloc1_c4.c
@@ -139,7 +139,7 @@ findloc1_c4 (gfc_array_index_type * const restrict retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_COMPLEX_4 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_COMPLEX_4 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_c4 (gfc_array_index_type * const restrict retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_c4 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_c4 (gfc_array_index_type * const restrict retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_c4 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_COMPLEX_4 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_COMPLEX_4 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_c4 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_c4 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_c4 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_c8.c 
b/libgfortran/generated/findloc1_c8.c
index bdca0845fde7..8d0e2ac568e5 100644
--- a/libgfortran/generated/findloc1_c8.c
+++ b/libgfortran/generated/findloc1_c8.c
@@ -139,7 +139,7 @@ findloc1_c8 (gfc_array_index_type * const restrict retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_COMPLEX_8 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_COMPLEX_8 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_c8 (gfc_array_index_type * const restrict retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_c8 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_c8 (gfc_array_index_type * const restrict retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_c8 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_COMPLEX_8 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_COMPLEX_8 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_c8 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_c8 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_c8 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_i1.c 
b/libgfortran/generated/findloc1_i1.c
index f3d3b493f8ce..56de7e205772 100644
--- a/libgfortran/generated/findloc1_i1.c
+++ b/libgfortran/generated/findloc1_i1.c
@@ -139,7 +139,7 @@ findloc1_i1 (gfc_array_index_type * const restrict retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_INTEGER_1 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_INTEGER_1 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_i1 (gfc_array_index_type * const restrict retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_i1 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_i1 (gfc_array_index_type * const restrict retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_i1 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_INTEGER_1 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_INTEGER_1 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_i1 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_i1 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_i1 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_i16.c 
b/libgfortran/generated/findloc1_i16.c
index 4d11b5a88677..5917ebfc7910 100644
--- a/libgfortran/generated/findloc1_i16.c
+++ b/libgfortran/generated/findloc1_i16.c
@@ -139,7 +139,7 @@ findloc1_i16 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_INTEGER_16 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_INTEGER_16 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_i16 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_i16 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_i16 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_i16 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_INTEGER_16 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_INTEGER_16 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_i16 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_i16 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_i16 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_i2.c 
b/libgfortran/generated/findloc1_i2.c
index 39cbf6c63467..bec080adf5a8 100644
--- a/libgfortran/generated/findloc1_i2.c
+++ b/libgfortran/generated/findloc1_i2.c
@@ -139,7 +139,7 @@ findloc1_i2 (gfc_array_index_type * const restrict retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_INTEGER_2 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_INTEGER_2 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_i2 (gfc_array_index_type * const restrict retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_i2 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_i2 (gfc_array_index_type * const restrict retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_i2 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_INTEGER_2 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_INTEGER_2 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_i2 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_i2 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_i2 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_i4.c 
b/libgfortran/generated/findloc1_i4.c
index d65a5c2d9825..c82c2c86b5b2 100644
--- a/libgfortran/generated/findloc1_i4.c
+++ b/libgfortran/generated/findloc1_i4.c
@@ -139,7 +139,7 @@ findloc1_i4 (gfc_array_index_type * const restrict retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_INTEGER_4 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_INTEGER_4 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_i4 (gfc_array_index_type * const restrict retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_i4 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_i4 (gfc_array_index_type * const restrict retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_i4 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_INTEGER_4 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_INTEGER_4 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_i4 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_i4 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_i4 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_i8.c 
b/libgfortran/generated/findloc1_i8.c
index 1f1a17361a43..3c69005935d0 100644
--- a/libgfortran/generated/findloc1_i8.c
+++ b/libgfortran/generated/findloc1_i8.c
@@ -139,7 +139,7 @@ findloc1_i8 (gfc_array_index_type * const restrict retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_INTEGER_8 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_INTEGER_8 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_i8 (gfc_array_index_type * const restrict retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_i8 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_i8 (gfc_array_index_type * const restrict retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_i8 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_INTEGER_8 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_INTEGER_8 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_i8 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_i8 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_i8 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_r10.c 
b/libgfortran/generated/findloc1_r10.c
index 62d29399d8f4..a3db95012cb0 100644
--- a/libgfortran/generated/findloc1_r10.c
+++ b/libgfortran/generated/findloc1_r10.c
@@ -139,7 +139,7 @@ findloc1_r10 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_REAL_10 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_REAL_10 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_r10 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_r10 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_r10 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_r10 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_REAL_10 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_REAL_10 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_r10 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_r10 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_r10 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_r16.c 
b/libgfortran/generated/findloc1_r16.c
index b15ea271ef89..0c29d3a9582c 100644
--- a/libgfortran/generated/findloc1_r16.c
+++ b/libgfortran/generated/findloc1_r16.c
@@ -139,7 +139,7 @@ findloc1_r16 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_REAL_16 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_REAL_16 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_r16 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_r16 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_r16 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_r16 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_REAL_16 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_REAL_16 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_r16 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_r16 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_r16 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_r17.c 
b/libgfortran/generated/findloc1_r17.c
index f519f95080bd..2a5711a0fbbd 100644
--- a/libgfortran/generated/findloc1_r17.c
+++ b/libgfortran/generated/findloc1_r17.c
@@ -139,7 +139,7 @@ findloc1_r17 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_REAL_17 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_REAL_17 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_r17 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_r17 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_r17 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_r17 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_REAL_17 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_REAL_17 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_r17 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_r17 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_r17 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_r4.c 
b/libgfortran/generated/findloc1_r4.c
index b9b35473cb9d..0bb9504951fc 100644
--- a/libgfortran/generated/findloc1_r4.c
+++ b/libgfortran/generated/findloc1_r4.c
@@ -139,7 +139,7 @@ findloc1_r4 (gfc_array_index_type * const restrict retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_REAL_4 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_REAL_4 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_r4 (gfc_array_index_type * const restrict retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_r4 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_r4 (gfc_array_index_type * const restrict retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_r4 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_REAL_4 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_REAL_4 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_r4 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_r4 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_r4 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_r8.c 
b/libgfortran/generated/findloc1_r8.c
index 496cfe5c7fe5..3a24334f66b8 100644
--- a/libgfortran/generated/findloc1_r8.c
+++ b/libgfortran/generated/findloc1_r8.c
@@ -139,7 +139,7 @@ findloc1_r8 (gfc_array_index_type * const restrict retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_REAL_8 * restrict) (((char*) base) + (len - 1) * 
delta * 1);
+         src = (const GFC_REAL_8 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (*src == value)
@@ -147,7 +147,7 @@ findloc1_r8 (gfc_array_index_type * const restrict retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -160,19 +160,19 @@ findloc1_r8 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -183,7 +183,7 @@ findloc1_r8 (gfc_array_index_type * const restrict retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -325,7 +325,7 @@ mfindloc1_r8 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_REAL_8 * restrict) (((char*)base) + (len - 1) * 
delta * 1);
+         src = (const GFC_REAL_8 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -334,7 +334,7 @@ mfindloc1_r8 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * 1);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -349,21 +349,21 @@ mfindloc1_r8 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * 1);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * 1);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * 1);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -375,7 +375,7 @@ mfindloc1_r8 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * 1);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_s1.c 
b/libgfortran/generated/findloc1_s1.c
index 848160a2b345..f6979b9c73dd 100644
--- a/libgfortran/generated/findloc1_s1.c
+++ b/libgfortran/generated/findloc1_s1.c
@@ -141,7 +141,7 @@ findloc1_s1 (gfc_array_index_type * const restrict retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_UINTEGER_1 * restrict) (((char*) base) + (len - 1) * 
delta * len_array);
+         src = (const GFC_UINTEGER_1 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (compare_string (len_array, (char *) src, len_value, (char *) 
value) == 0)
@@ -149,7 +149,7 @@ findloc1_s1 (gfc_array_index_type * const restrict retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * len_array);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -162,19 +162,19 @@ findloc1_s1 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * len_array);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * len_array);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * len_array);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -185,7 +185,7 @@ findloc1_s1 (gfc_array_index_type * const restrict retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * len_array);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -327,7 +327,7 @@ mfindloc1_s1 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_UINTEGER_1 * restrict) (((char*)base) + (len - 1) * 
delta * len_array);
+         src = (const GFC_UINTEGER_1 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -336,7 +336,7 @@ mfindloc1_s1 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * len_array);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -351,21 +351,21 @@ mfindloc1_s1 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * len_array);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * len_array);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * len_array);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -377,7 +377,7 @@ mfindloc1_s1 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * len_array);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
diff --git a/libgfortran/generated/findloc1_s4.c 
b/libgfortran/generated/findloc1_s4.c
index f86150264dc5..652aa79abbfd 100644
--- a/libgfortran/generated/findloc1_s4.c
+++ b/libgfortran/generated/findloc1_s4.c
@@ -141,7 +141,7 @@ findloc1_s4 (gfc_array_index_type * const restrict retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_UINTEGER_4 * restrict) (((char*) base) + (len - 1) * 
delta * len_array);
+         src = (const GFC_UINTEGER_4 * restrict) (((char*) base) + (len - 1) * 
delta);
          for (n = len; n > 0; n--)
            {
              if (compare_string_char4 (len_array, src, len_value, value) == 0)
@@ -149,7 +149,7 @@ findloc1_s4 (gfc_array_index_type * const restrict retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * len_array);
+             PTR_DECREMENT_BYTES (src, delta);
            }
        }
       else
@@ -162,19 +162,19 @@ findloc1_s4 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * len_array);
+             PTR_INCREMENT_BYTES (src, delta);
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * len_array);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * len_array);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          n++;
          if (n >= rank)
@@ -185,7 +185,7 @@ findloc1_s4 (gfc_array_index_type * const restrict retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * len_array);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }
@@ -327,7 +327,7 @@ mfindloc1_s4 (gfc_array_index_type * const restrict 
retarray,
       result = 0;
       if (back)
        {
-         src = (const GFC_UINTEGER_4 * restrict) (((char*)base) + (len - 1) * 
delta * len_array);
+         src = (const GFC_UINTEGER_4 * restrict) (((char*)base) + (len - 1) * 
delta);
          msrc = mbase + (len - 1) * mdelta; 
          for (n = len; n > 0; n--)
            {
@@ -336,7 +336,7 @@ mfindloc1_s4 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_DECREMENT_BYTES (src, delta * len_array);
+             PTR_DECREMENT_BYTES (src, delta);
              msrc -= mdelta;
            }
        }
@@ -351,21 +351,21 @@ mfindloc1_s4 (gfc_array_index_type * const restrict 
retarray,
                  result = n;
                  break;
                }
-             PTR_INCREMENT_BYTES (src, delta * len_array);
+             PTR_INCREMENT_BYTES (src, delta);
              msrc += mdelta;
            }
        }
       *dest = result;
 
       count[0]++;
-      PTR_INCREMENT_BYTES (base, sstride[0] * len_array);
+      PTR_INCREMENT_BYTES (base, sstride[0]);
       PTR_INCREMENT_BYTES (dest, dstride[0]);
       mbase += mstride[0];
       n = 0;
       while (count[n] == extent[n])
        {
          count[n] = 0;
-         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n] * len_array);
+         PTR_DECREMENT_BYTES (base, sstride[n] * extent[n]);
          PTR_DECREMENT_BYTES (dest, dstride[n] * extent[n]);
          mbase -= mstride[n] * extent[n];
          n++;
@@ -377,7 +377,7 @@ mfindloc1_s4 (gfc_array_index_type * const restrict 
retarray,
          else
            {
              count[n]++;
-             PTR_INCREMENT_BYTES (base, sstride[n] * len_array);
+             PTR_INCREMENT_BYTES (base, sstride[n]);
              PTR_INCREMENT_BYTES (dest, dstride[n]);
            }
        }

Reply via email to