re PR target/80687 (VLA usage in libgfortran; nvptx target: "sorry, unimplemented: target cannot support alloca")

2017-05-10  Thomas Koenig  <tkoenig@gcc.gnu.org>

        PR fortran/80687
        PR fortran/80696
        * m4/matmul_internal.m4:  'matmul_name`:  Always
        use malloc/free to allocate t1.
        * generated/matmul_c10.c: Regenerated.
        * generated/matmul_c16.c: Regenerated.
        * generated/matmul_c4.c: Regenerated.
        * generated/matmul_c8.c: Regenerated.
        * generated/matmul_i1.c: Regenerated.
        * generated/matmul_i16.c: Regenerated.
        * generated/matmul_i2.c: Regenerated.
        * generated/matmul_i4.c: Regenerated.
        * generated/matmul_i8.c: Regenerated.
        * generated/matmul_r10.c: Regenerated.
        * generated/matmul_r16.c: Regenerated.
        * generated/matmul_r4.c: Regenerated.
        * generated/matmul_r8.c: Regenerated.

From-SVN: r247839

13 files changed, 195 insertions, 260 deletions

diff --git a/libgfortran/generated/matmul_c10.c b/libgfortran/generated/matmul_c10.c
index 55f8fe9ab55..e247e8e6817 100644
--- a/libgfortran/generated/matmul_c10.c
+++ b/libgfortran/generated/matmul_c10.c
@@ -290,6 +290,7 @@ matmul_c10_avx (gfc_array_c10 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_10 *t1;
 
       a = abase;
       b = bbase;
@@ -316,10 +317,7 @@ matmul_c10_avx (gfc_array_c10 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_10 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_10));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -535,6 +533,7 @@ matmul_c10_avx (gfc_array_c10 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@ matmul_c10_avx2 (gfc_array_c10 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_10 *t1;
 
       a = abase;
       b = bbase;
@@ -869,10 +869,7 @@ matmul_c10_avx2 (gfc_array_c10 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_10 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_10));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1088,6 +1085,7 @@ matmul_c10_avx2 (gfc_array_c10 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@ matmul_c10_avx512f (gfc_array_c10 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_10 *t1;
 
       a = abase;
       b = bbase;
@@ -1422,10 +1421,7 @@ matmul_c10_avx512f (gfc_array_c10 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_10 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_10));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1641,6 +1637,7 @@ matmul_c10_avx512f (gfc_array_c10 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@ matmul_c10_vanilla (gfc_array_c10 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_10 *t1;
 
       a = abase;
       b = bbase;
@@ -1971,10 +1969,7 @@ matmul_c10_vanilla (gfc_array_c10 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_10 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_10));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2190,6 +2185,7 @@ matmul_c10_vanilla (gfc_array_c10 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@ matmul_c10 (gfc_array_c10 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_10 *t1;
 
       a = abase;
       b = bbase;
@@ -2578,10 +2575,7 @@ matmul_c10 (gfc_array_c10 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_10 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_10));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2797,6 +2791,7 @@ matmul_c10 (gfc_array_c10 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
diff --git a/libgfortran/generated/matmul_c16.c b/libgfortran/generated/matmul_c16.c
index bc90296f5e7..aa27f61ec95 100644
--- a/libgfortran/generated/matmul_c16.c
+++ b/libgfortran/generated/matmul_c16.c
@@ -290,6 +290,7 @@ matmul_c16_avx (gfc_array_c16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_16 *t1;
 
       a = abase;
       b = bbase;
@@ -316,10 +317,7 @@ matmul_c16_avx (gfc_array_c16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -535,6 +533,7 @@ matmul_c16_avx (gfc_array_c16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@ matmul_c16_avx2 (gfc_array_c16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_16 *t1;
 
       a = abase;
       b = bbase;
@@ -869,10 +869,7 @@ matmul_c16_avx2 (gfc_array_c16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1088,6 +1085,7 @@ matmul_c16_avx2 (gfc_array_c16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@ matmul_c16_avx512f (gfc_array_c16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_16 *t1;
 
       a = abase;
       b = bbase;
@@ -1422,10 +1421,7 @@ matmul_c16_avx512f (gfc_array_c16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1641,6 +1637,7 @@ matmul_c16_avx512f (gfc_array_c16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@ matmul_c16_vanilla (gfc_array_c16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_16 *t1;
 
       a = abase;
       b = bbase;
@@ -1971,10 +1969,7 @@ matmul_c16_vanilla (gfc_array_c16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2190,6 +2185,7 @@ matmul_c16_vanilla (gfc_array_c16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@ matmul_c16 (gfc_array_c16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_16 *t1;
 
       a = abase;
       b = bbase;
@@ -2578,10 +2575,7 @@ matmul_c16 (gfc_array_c16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2797,6 +2791,7 @@ matmul_c16 (gfc_array_c16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
diff --git a/libgfortran/generated/matmul_c4.c b/libgfortran/generated/matmul_c4.c
index 12418009c2e..3b2cd64ab4c 100644
--- a/libgfortran/generated/matmul_c4.c
+++ b/libgfortran/generated/matmul_c4.c
@@ -290,6 +290,7 @@ matmul_c4_avx (gfc_array_c4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_4 *t1;
 
       a = abase;
       b = bbase;
@@ -316,10 +317,7 @@ matmul_c4_avx (gfc_array_c4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -535,6 +533,7 @@ matmul_c4_avx (gfc_array_c4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@ matmul_c4_avx2 (gfc_array_c4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_4 *t1;
 
       a = abase;
       b = bbase;
@@ -869,10 +869,7 @@ matmul_c4_avx2 (gfc_array_c4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1088,6 +1085,7 @@ matmul_c4_avx2 (gfc_array_c4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@ matmul_c4_avx512f (gfc_array_c4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_4 *t1;
 
       a = abase;
       b = bbase;
@@ -1422,10 +1421,7 @@ matmul_c4_avx512f (gfc_array_c4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1641,6 +1637,7 @@ matmul_c4_avx512f (gfc_array_c4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@ matmul_c4_vanilla (gfc_array_c4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_4 *t1;
 
       a = abase;
       b = bbase;
@@ -1971,10 +1969,7 @@ matmul_c4_vanilla (gfc_array_c4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2190,6 +2185,7 @@ matmul_c4_vanilla (gfc_array_c4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@ matmul_c4 (gfc_array_c4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_4 *t1;
 
       a = abase;
       b = bbase;
@@ -2578,10 +2575,7 @@ matmul_c4 (gfc_array_c4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2797,6 +2791,7 @@ matmul_c4 (gfc_array_c4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
diff --git a/libgfortran/generated/matmul_c8.c b/libgfortran/generated/matmul_c8.c
index aafa3be1821..89153b2c9cb 100644
--- a/libgfortran/generated/matmul_c8.c
+++ b/libgfortran/generated/matmul_c8.c
@@ -290,6 +290,7 @@ matmul_c8_avx (gfc_array_c8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_8 *t1;
 
       a = abase;
       b = bbase;
@@ -316,10 +317,7 @@ matmul_c8_avx (gfc_array_c8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -535,6 +533,7 @@ matmul_c8_avx (gfc_array_c8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@ matmul_c8_avx2 (gfc_array_c8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_8 *t1;
 
       a = abase;
       b = bbase;
@@ -869,10 +869,7 @@ matmul_c8_avx2 (gfc_array_c8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1088,6 +1085,7 @@ matmul_c8_avx2 (gfc_array_c8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@ matmul_c8_avx512f (gfc_array_c8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_8 *t1;
 
       a = abase;
       b = bbase;
@@ -1422,10 +1421,7 @@ matmul_c8_avx512f (gfc_array_c8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1641,6 +1637,7 @@ matmul_c8_avx512f (gfc_array_c8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@ matmul_c8_vanilla (gfc_array_c8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_8 *t1;
 
       a = abase;
       b = bbase;
@@ -1971,10 +1969,7 @@ matmul_c8_vanilla (gfc_array_c8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2190,6 +2185,7 @@ matmul_c8_vanilla (gfc_array_c8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@ matmul_c8 (gfc_array_c8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_COMPLEX_8 *t1;
 
       a = abase;
       b = bbase;
@@ -2578,10 +2575,7 @@ matmul_c8 (gfc_array_c8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_COMPLEX_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2797,6 +2791,7 @@ matmul_c8 (gfc_array_c8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
diff --git a/libgfortran/generated/matmul_i1.c b/libgfortran/generated/matmul_i1.c
index bbf84a9c7dc..7a25d890fdd 100644
--- a/libgfortran/generated/matmul_i1.c
+++ b/libgfortran/generated/matmul_i1.c
@@ -290,6 +290,7 @@ matmul_i1_avx (gfc_array_i1 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_1 *t1;
 
       a = abase;
       b = bbase;
@@ -316,10 +317,7 @@ matmul_i1_avx (gfc_array_i1 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_1 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_1));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -535,6 +533,7 @@ matmul_i1_avx (gfc_array_i1 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@ matmul_i1_avx2 (gfc_array_i1 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_1 *t1;
 
       a = abase;
       b = bbase;
@@ -869,10 +869,7 @@ matmul_i1_avx2 (gfc_array_i1 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_1 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_1));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1088,6 +1085,7 @@ matmul_i1_avx2 (gfc_array_i1 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@ matmul_i1_avx512f (gfc_array_i1 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_1 *t1;
 
       a = abase;
       b = bbase;
@@ -1422,10 +1421,7 @@ matmul_i1_avx512f (gfc_array_i1 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_1 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_1));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1641,6 +1637,7 @@ matmul_i1_avx512f (gfc_array_i1 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@ matmul_i1_vanilla (gfc_array_i1 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_1 *t1;
 
       a = abase;
       b = bbase;
@@ -1971,10 +1969,7 @@ matmul_i1_vanilla (gfc_array_i1 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_1 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_1));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2190,6 +2185,7 @@ matmul_i1_vanilla (gfc_array_i1 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@ matmul_i1 (gfc_array_i1 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_1 *t1;
 
       a = abase;
       b = bbase;
@@ -2578,10 +2575,7 @@ matmul_i1 (gfc_array_i1 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_1 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_1));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2797,6 +2791,7 @@ matmul_i1 (gfc_array_i1 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
diff --git a/libgfortran/generated/matmul_i16.c b/libgfortran/generated/matmul_i16.c
index 1394aba0aa7..a8640047bdd 100644
--- a/libgfortran/generated/matmul_i16.c
+++ b/libgfortran/generated/matmul_i16.c
@@ -290,6 +290,7 @@ matmul_i16_avx (gfc_array_i16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_16 *t1;
 
       a = abase;
       b = bbase;
@@ -316,10 +317,7 @@ matmul_i16_avx (gfc_array_i16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -535,6 +533,7 @@ matmul_i16_avx (gfc_array_i16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@ matmul_i16_avx2 (gfc_array_i16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_16 *t1;
 
       a = abase;
       b = bbase;
@@ -869,10 +869,7 @@ matmul_i16_avx2 (gfc_array_i16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1088,6 +1085,7 @@ matmul_i16_avx2 (gfc_array_i16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@ matmul_i16_avx512f (gfc_array_i16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_16 *t1;
 
       a = abase;
       b = bbase;
@@ -1422,10 +1421,7 @@ matmul_i16_avx512f (gfc_array_i16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1641,6 +1637,7 @@ matmul_i16_avx512f (gfc_array_i16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@ matmul_i16_vanilla (gfc_array_i16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_16 *t1;
 
       a = abase;
       b = bbase;
@@ -1971,10 +1969,7 @@ matmul_i16_vanilla (gfc_array_i16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2190,6 +2185,7 @@ matmul_i16_vanilla (gfc_array_i16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@ matmul_i16 (gfc_array_i16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_16 *t1;
 
       a = abase;
       b = bbase;
@@ -2578,10 +2575,7 @@ matmul_i16 (gfc_array_i16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2797,6 +2791,7 @@ matmul_i16 (gfc_array_i16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
diff --git a/libgfortran/generated/matmul_i2.c b/libgfortran/generated/matmul_i2.c
index 9ffe75bdff8..4b8b9f2b3bb 100644
--- a/libgfortran/generated/matmul_i2.c
+++ b/libgfortran/generated/matmul_i2.c
@@ -290,6 +290,7 @@ matmul_i2_avx (gfc_array_i2 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_2 *t1;
 
       a = abase;
       b = bbase;
@@ -316,10 +317,7 @@ matmul_i2_avx (gfc_array_i2 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_2 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_2));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -535,6 +533,7 @@ matmul_i2_avx (gfc_array_i2 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@ matmul_i2_avx2 (gfc_array_i2 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_2 *t1;
 
       a = abase;
       b = bbase;
@@ -869,10 +869,7 @@ matmul_i2_avx2 (gfc_array_i2 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_2 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_2));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1088,6 +1085,7 @@ matmul_i2_avx2 (gfc_array_i2 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@ matmul_i2_avx512f (gfc_array_i2 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_2 *t1;
 
       a = abase;
       b = bbase;
@@ -1422,10 +1421,7 @@ matmul_i2_avx512f (gfc_array_i2 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_2 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_2));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1641,6 +1637,7 @@ matmul_i2_avx512f (gfc_array_i2 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@ matmul_i2_vanilla (gfc_array_i2 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_2 *t1;
 
       a = abase;
       b = bbase;
@@ -1971,10 +1969,7 @@ matmul_i2_vanilla (gfc_array_i2 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_2 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_2));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2190,6 +2185,7 @@ matmul_i2_vanilla (gfc_array_i2 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@ matmul_i2 (gfc_array_i2 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_2 *t1;
 
       a = abase;
       b = bbase;
@@ -2578,10 +2575,7 @@ matmul_i2 (gfc_array_i2 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_2 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_2));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2797,6 +2791,7 @@ matmul_i2 (gfc_array_i2 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
diff --git a/libgfortran/generated/matmul_i4.c b/libgfortran/generated/matmul_i4.c
index eab6c773d99..19f7ad9e3d0 100644
--- a/libgfortran/generated/matmul_i4.c
+++ b/libgfortran/generated/matmul_i4.c
@@ -290,6 +290,7 @@ matmul_i4_avx (gfc_array_i4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_4 *t1;
 
       a = abase;
       b = bbase;
@@ -316,10 +317,7 @@ matmul_i4_avx (gfc_array_i4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -535,6 +533,7 @@ matmul_i4_avx (gfc_array_i4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@ matmul_i4_avx2 (gfc_array_i4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_4 *t1;
 
       a = abase;
       b = bbase;
@@ -869,10 +869,7 @@ matmul_i4_avx2 (gfc_array_i4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1088,6 +1085,7 @@ matmul_i4_avx2 (gfc_array_i4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@ matmul_i4_avx512f (gfc_array_i4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_4 *t1;
 
       a = abase;
       b = bbase;
@@ -1422,10 +1421,7 @@ matmul_i4_avx512f (gfc_array_i4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1641,6 +1637,7 @@ matmul_i4_avx512f (gfc_array_i4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@ matmul_i4_vanilla (gfc_array_i4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_4 *t1;
 
       a = abase;
       b = bbase;
@@ -1971,10 +1969,7 @@ matmul_i4_vanilla (gfc_array_i4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2190,6 +2185,7 @@ matmul_i4_vanilla (gfc_array_i4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@ matmul_i4 (gfc_array_i4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_4 *t1;
 
       a = abase;
       b = bbase;
@@ -2578,10 +2575,7 @@ matmul_i4 (gfc_array_i4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2797,6 +2791,7 @@ matmul_i4 (gfc_array_i4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
diff --git a/libgfortran/generated/matmul_i8.c b/libgfortran/generated/matmul_i8.c
index 4dee0abbd7e..cbfad6c6bcf 100644
--- a/libgfortran/generated/matmul_i8.c
+++ b/libgfortran/generated/matmul_i8.c
@@ -290,6 +290,7 @@ matmul_i8_avx (gfc_array_i8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_8 *t1;
 
       a = abase;
       b = bbase;
@@ -316,10 +317,7 @@ matmul_i8_avx (gfc_array_i8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -535,6 +533,7 @@ matmul_i8_avx (gfc_array_i8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@ matmul_i8_avx2 (gfc_array_i8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_8 *t1;
 
       a = abase;
       b = bbase;
@@ -869,10 +869,7 @@ matmul_i8_avx2 (gfc_array_i8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1088,6 +1085,7 @@ matmul_i8_avx2 (gfc_array_i8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@ matmul_i8_avx512f (gfc_array_i8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_8 *t1;
 
       a = abase;
       b = bbase;
@@ -1422,10 +1421,7 @@ matmul_i8_avx512f (gfc_array_i8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1641,6 +1637,7 @@ matmul_i8_avx512f (gfc_array_i8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@ matmul_i8_vanilla (gfc_array_i8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_8 *t1;
 
       a = abase;
       b = bbase;
@@ -1971,10 +1969,7 @@ matmul_i8_vanilla (gfc_array_i8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2190,6 +2185,7 @@ matmul_i8_vanilla (gfc_array_i8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@ matmul_i8 (gfc_array_i8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_INTEGER_8 *t1;
 
       a = abase;
       b = bbase;
@@ -2578,10 +2575,7 @@ matmul_i8 (gfc_array_i8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_INTEGER_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_INTEGER_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2797,6 +2791,7 @@ matmul_i8 (gfc_array_i8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
diff --git a/libgfortran/generated/matmul_r10.c b/libgfortran/generated/matmul_r10.c
index 4b66a8494b3..46bc7feec6b 100644
--- a/libgfortran/generated/matmul_r10.c
+++ b/libgfortran/generated/matmul_r10.c
@@ -290,6 +290,7 @@ matmul_r10_avx (gfc_array_r10 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_10 *t1;
 
       a = abase;
       b = bbase;
@@ -316,10 +317,7 @@ matmul_r10_avx (gfc_array_r10 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_10 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_10));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -535,6 +533,7 @@ matmul_r10_avx (gfc_array_r10 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@ matmul_r10_avx2 (gfc_array_r10 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_10 *t1;
 
       a = abase;
       b = bbase;
@@ -869,10 +869,7 @@ matmul_r10_avx2 (gfc_array_r10 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_10 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_10));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1088,6 +1085,7 @@ matmul_r10_avx2 (gfc_array_r10 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@ matmul_r10_avx512f (gfc_array_r10 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_10 *t1;
 
       a = abase;
       b = bbase;
@@ -1422,10 +1421,7 @@ matmul_r10_avx512f (gfc_array_r10 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_10 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_10));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1641,6 +1637,7 @@ matmul_r10_avx512f (gfc_array_r10 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@ matmul_r10_vanilla (gfc_array_r10 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_10 *t1;
 
       a = abase;
       b = bbase;
@@ -1971,10 +1969,7 @@ matmul_r10_vanilla (gfc_array_r10 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_10 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_10));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2190,6 +2185,7 @@ matmul_r10_vanilla (gfc_array_r10 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@ matmul_r10 (gfc_array_r10 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_10 *t1;
 
       a = abase;
       b = bbase;
@@ -2578,10 +2575,7 @@ matmul_r10 (gfc_array_r10 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_10 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_10));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2797,6 +2791,7 @@ matmul_r10 (gfc_array_r10 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
diff --git a/libgfortran/generated/matmul_r16.c b/libgfortran/generated/matmul_r16.c
index fcef45b9905..fc2b37b48c1 100644
--- a/libgfortran/generated/matmul_r16.c
+++ b/libgfortran/generated/matmul_r16.c
@@ -290,6 +290,7 @@ matmul_r16_avx (gfc_array_r16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_16 *t1;
 
       a = abase;
       b = bbase;
@@ -316,10 +317,7 @@ matmul_r16_avx (gfc_array_r16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -535,6 +533,7 @@ matmul_r16_avx (gfc_array_r16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@ matmul_r16_avx2 (gfc_array_r16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_16 *t1;
 
       a = abase;
       b = bbase;
@@ -869,10 +869,7 @@ matmul_r16_avx2 (gfc_array_r16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1088,6 +1085,7 @@ matmul_r16_avx2 (gfc_array_r16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@ matmul_r16_avx512f (gfc_array_r16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_16 *t1;
 
       a = abase;
       b = bbase;
@@ -1422,10 +1421,7 @@ matmul_r16_avx512f (gfc_array_r16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1641,6 +1637,7 @@ matmul_r16_avx512f (gfc_array_r16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@ matmul_r16_vanilla (gfc_array_r16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_16 *t1;
 
       a = abase;
       b = bbase;
@@ -1971,10 +1969,7 @@ matmul_r16_vanilla (gfc_array_r16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2190,6 +2185,7 @@ matmul_r16_vanilla (gfc_array_r16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@ matmul_r16 (gfc_array_r16 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_16 *t1;
 
       a = abase;
       b = bbase;
@@ -2578,10 +2575,7 @@ matmul_r16 (gfc_array_r16 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_16 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_16));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2797,6 +2791,7 @@ matmul_r16 (gfc_array_r16 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
diff --git a/libgfortran/generated/matmul_r4.c b/libgfortran/generated/matmul_r4.c
index 0996c69ad04..53e57d64f5d 100644
--- a/libgfortran/generated/matmul_r4.c
+++ b/libgfortran/generated/matmul_r4.c
@@ -290,6 +290,7 @@ matmul_r4_avx (gfc_array_r4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_4 *t1;
 
       a = abase;
       b = bbase;
@@ -316,10 +317,7 @@ matmul_r4_avx (gfc_array_r4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -535,6 +533,7 @@ matmul_r4_avx (gfc_array_r4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@ matmul_r4_avx2 (gfc_array_r4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_4 *t1;
 
       a = abase;
       b = bbase;
@@ -869,10 +869,7 @@ matmul_r4_avx2 (gfc_array_r4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1088,6 +1085,7 @@ matmul_r4_avx2 (gfc_array_r4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@ matmul_r4_avx512f (gfc_array_r4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_4 *t1;
 
       a = abase;
       b = bbase;
@@ -1422,10 +1421,7 @@ matmul_r4_avx512f (gfc_array_r4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1641,6 +1637,7 @@ matmul_r4_avx512f (gfc_array_r4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@ matmul_r4_vanilla (gfc_array_r4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_4 *t1;
 
       a = abase;
       b = bbase;
@@ -1971,10 +1969,7 @@ matmul_r4_vanilla (gfc_array_r4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2190,6 +2185,7 @@ matmul_r4_vanilla (gfc_array_r4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@ matmul_r4 (gfc_array_r4 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_4 *t1;
 
       a = abase;
       b = bbase;
@@ -2578,10 +2575,7 @@ matmul_r4 (gfc_array_r4 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_4 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_4));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2797,6 +2791,7 @@ matmul_r4 (gfc_array_r4 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
diff --git a/libgfortran/generated/matmul_r8.c b/libgfortran/generated/matmul_r8.c
index 1d75e5c9560..132e536169d 100644
--- a/libgfortran/generated/matmul_r8.c
+++ b/libgfortran/generated/matmul_r8.c
@@ -290,6 +290,7 @@ matmul_r8_avx (gfc_array_r8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_8 *t1;
 
       a = abase;
       b = bbase;
@@ -316,10 +317,7 @@ matmul_r8_avx (gfc_array_r8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -535,6 +533,7 @@ matmul_r8_avx (gfc_array_r8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@ matmul_r8_avx2 (gfc_array_r8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_8 *t1;
 
       a = abase;
       b = bbase;
@@ -869,10 +869,7 @@ matmul_r8_avx2 (gfc_array_r8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1088,6 +1085,7 @@ matmul_r8_avx2 (gfc_array_r8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@ matmul_r8_avx512f (gfc_array_r8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_8 *t1;
 
       a = abase;
       b = bbase;
@@ -1422,10 +1421,7 @@ matmul_r8_avx512f (gfc_array_r8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -1641,6 +1637,7 @@ matmul_r8_avx512f (gfc_array_r8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@ matmul_r8_vanilla (gfc_array_r8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_8 *t1;
 
       a = abase;
       b = bbase;
@@ -1971,10 +1969,7 @@ matmul_r8_vanilla (gfc_array_r8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2190,6 +2185,7 @@ matmul_r8_vanilla (gfc_array_r8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@ matmul_r8 (gfc_array_r8 * const restrict retarray,
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      GFC_REAL_8 *t1;
 
       a = abase;
       b = bbase;
@@ -2578,10 +2575,7 @@ matmul_r8 (gfc_array_r8 * const restrict retarray,
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      GFC_REAL_8 t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof(GFC_REAL_8));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -2797,6 +2791,7 @@ matmul_r8 (gfc_array_r8 * const restrict retarray,
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)