diff mbox

[fortran] PR 80687, 80696

Message ID 92b07e26-0783-481e-d92e-71d319cbfa9e@netcologne.de
State New
Headers show

Commit Message

Thomas Koenig May 9, 2017, 9:27 p.m. UTC
... forgot to copy in gcc-patches here...


-------- Weitergeleitete Nachricht --------
Betreff: [patch, fortran] PR 80687, 80696
Datum: Tue, 9 May 2017 23:14:30 +0200
Von: Thomas Koenig <tkoenig@netcologne.de>
An: fortran@gcc.gnu.org <fortran@gcc.gnu.org>

Hello world,

it appears that using VLAs also caused the strange errors reported
in PR 80696.  This, together with Janne's comment, has made me decide
that maybe using malloc/free is not such a bad idea after all.

So, here is the updated patch.  Running regression-testing with -m32
at the moment.  OK for trunk if it passes?

Regards

	Thomas

2017-05-09  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.
diff mbox

Patch

Index: generated/matmul_c10.c
===================================================================
--- generated/matmul_c10.c	(Revision 247753)
+++ generated/matmul_c10.c	(Arbeitskopie)
@@ -290,6 +290,7 @@  matmul_c10_avx (gfc_array_c10 * const restrict ret
 		 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 ret
       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 ret
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@  matmul_c10_avx2 (gfc_array_c10 * const restrict re
 		 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 re
       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 re
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@  matmul_c10_avx512f (gfc_array_c10 * const restrict
 		 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
       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
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@  matmul_c10_vanilla (gfc_array_c10 * const restrict
 		 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
       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
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@  matmul_c10 (gfc_array_c10 * const restrict retarra
 		 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 retarra
       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 retarra
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
Index: generated/matmul_c16.c
===================================================================
--- generated/matmul_c16.c	(Revision 247753)
+++ generated/matmul_c16.c	(Arbeitskopie)
@@ -290,6 +290,7 @@  matmul_c16_avx (gfc_array_c16 * const restrict ret
 		 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 ret
       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 ret
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@  matmul_c16_avx2 (gfc_array_c16 * const restrict re
 		 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 re
       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 re
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@  matmul_c16_avx512f (gfc_array_c16 * const restrict
 		 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
       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
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@  matmul_c16_vanilla (gfc_array_c16 * const restrict
 		 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
       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
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@  matmul_c16 (gfc_array_c16 * const restrict retarra
 		 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 retarra
       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 retarra
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
Index: generated/matmul_c4.c
===================================================================
--- generated/matmul_c4.c	(Revision 247753)
+++ generated/matmul_c4.c	(Arbeitskopie)
@@ -290,6 +290,7 @@  matmul_c4_avx (gfc_array_c4 * const restrict retar
 		 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 retar
       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 retar
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@  matmul_c4_avx2 (gfc_array_c4 * const restrict reta
 		 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 reta
       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 reta
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@  matmul_c4_avx512f (gfc_array_c4 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@  matmul_c4_vanilla (gfc_array_c4 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      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)
Index: generated/matmul_c8.c
===================================================================
--- generated/matmul_c8.c	(Revision 247753)
+++ generated/matmul_c8.c	(Arbeitskopie)
@@ -290,6 +290,7 @@  matmul_c8_avx (gfc_array_c8 * const restrict retar
 		 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 retar
       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 retar
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@  matmul_c8_avx2 (gfc_array_c8 * const restrict reta
 		 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 reta
       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 reta
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@  matmul_c8_avx512f (gfc_array_c8 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@  matmul_c8_vanilla (gfc_array_c8 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      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)
Index: generated/matmul_i1.c
===================================================================
--- generated/matmul_i1.c	(Revision 247753)
+++ generated/matmul_i1.c	(Arbeitskopie)
@@ -290,6 +290,7 @@  matmul_i1_avx (gfc_array_i1 * const restrict retar
 		 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 retar
       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 retar
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@  matmul_i1_avx2 (gfc_array_i1 * const restrict reta
 		 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 reta
       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 reta
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@  matmul_i1_avx512f (gfc_array_i1 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@  matmul_i1_vanilla (gfc_array_i1 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      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)
Index: generated/matmul_i16.c
===================================================================
--- generated/matmul_i16.c	(Revision 247753)
+++ generated/matmul_i16.c	(Arbeitskopie)
@@ -290,6 +290,7 @@  matmul_i16_avx (gfc_array_i16 * const restrict ret
 		 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 ret
       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 ret
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@  matmul_i16_avx2 (gfc_array_i16 * const restrict re
 		 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 re
       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 re
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@  matmul_i16_avx512f (gfc_array_i16 * const restrict
 		 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
       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
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@  matmul_i16_vanilla (gfc_array_i16 * const restrict
 		 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
       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
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@  matmul_i16 (gfc_array_i16 * const restrict retarra
 		 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 retarra
       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 retarra
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
Index: generated/matmul_i2.c
===================================================================
--- generated/matmul_i2.c	(Revision 247753)
+++ generated/matmul_i2.c	(Arbeitskopie)
@@ -290,6 +290,7 @@  matmul_i2_avx (gfc_array_i2 * const restrict retar
 		 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 retar
       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 retar
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@  matmul_i2_avx2 (gfc_array_i2 * const restrict reta
 		 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 reta
       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 reta
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@  matmul_i2_avx512f (gfc_array_i2 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@  matmul_i2_vanilla (gfc_array_i2 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      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)
Index: generated/matmul_i4.c
===================================================================
--- generated/matmul_i4.c	(Revision 247753)
+++ generated/matmul_i4.c	(Arbeitskopie)
@@ -290,6 +290,7 @@  matmul_i4_avx (gfc_array_i4 * const restrict retar
 		 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 retar
       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 retar
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@  matmul_i4_avx2 (gfc_array_i4 * const restrict reta
 		 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 reta
       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 reta
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@  matmul_i4_avx512f (gfc_array_i4 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@  matmul_i4_vanilla (gfc_array_i4 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      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)
Index: generated/matmul_i8.c
===================================================================
--- generated/matmul_i8.c	(Revision 247753)
+++ generated/matmul_i8.c	(Arbeitskopie)
@@ -290,6 +290,7 @@  matmul_i8_avx (gfc_array_i8 * const restrict retar
 		 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 retar
       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 retar
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@  matmul_i8_avx2 (gfc_array_i8 * const restrict reta
 		 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 reta
       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 reta
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@  matmul_i8_avx512f (gfc_array_i8 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@  matmul_i8_vanilla (gfc_array_i8 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      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)
Index: generated/matmul_r10.c
===================================================================
--- generated/matmul_r10.c	(Revision 247753)
+++ generated/matmul_r10.c	(Arbeitskopie)
@@ -290,6 +290,7 @@  matmul_r10_avx (gfc_array_r10 * const restrict ret
 		 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 ret
       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 ret
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@  matmul_r10_avx2 (gfc_array_r10 * const restrict re
 		 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 re
       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 re
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@  matmul_r10_avx512f (gfc_array_r10 * const restrict
 		 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
       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
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@  matmul_r10_vanilla (gfc_array_r10 * const restrict
 		 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
       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
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@  matmul_r10 (gfc_array_r10 * const restrict retarra
 		 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 retarra
       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 retarra
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
Index: generated/matmul_r16.c
===================================================================
--- generated/matmul_r16.c	(Revision 247753)
+++ generated/matmul_r16.c	(Arbeitskopie)
@@ -290,6 +290,7 @@  matmul_r16_avx (gfc_array_r16 * const restrict ret
 		 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 ret
       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 ret
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@  matmul_r16_avx2 (gfc_array_r16 * const restrict re
 		 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 re
       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 re
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@  matmul_r16_avx512f (gfc_array_r16 * const restrict
 		 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
       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
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@  matmul_r16_vanilla (gfc_array_r16 * const restrict
 		 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
       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
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -2552,6 +2548,7 @@  matmul_r16 (gfc_array_r16 * const restrict retarra
 		 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 retarra
       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 retarra
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
Index: generated/matmul_r4.c
===================================================================
--- generated/matmul_r4.c	(Revision 247753)
+++ generated/matmul_r4.c	(Arbeitskopie)
@@ -290,6 +290,7 @@  matmul_r4_avx (gfc_array_r4 * const restrict retar
 		 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 retar
       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 retar
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@  matmul_r4_avx2 (gfc_array_r4 * const restrict reta
 		 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 reta
       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 reta
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@  matmul_r4_avx512f (gfc_array_r4 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@  matmul_r4_vanilla (gfc_array_r4 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      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)
Index: generated/matmul_r8.c
===================================================================
--- generated/matmul_r8.c	(Revision 247753)
+++ generated/matmul_r8.c	(Arbeitskopie)
@@ -290,6 +290,7 @@  matmul_r8_avx (gfc_array_r8 * const restrict retar
 		 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 retar
       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 retar
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -843,6 +842,7 @@  matmul_r8_avx2 (gfc_array_r8 * const restrict reta
 		 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 reta
       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 reta
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1396,6 +1394,7 @@  matmul_r8_avx512f (gfc_array_r8 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)
@@ -1945,6 +1942,7 @@  matmul_r8_vanilla (gfc_array_r8 * const restrict r
 		 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 r
       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 r
 		}
 	    }
 	}
+      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)
Index: m4/matmul_internal.m4
===================================================================
--- m4/matmul_internal.m4	(Revision 247753)
+++ m4/matmul_internal.m4	(Arbeitskopie)
@@ -206,6 +206,7 @@  sinclude(`matmul_asm_'rtype_code`.m4')dnl
 		 f13, f14, f23, f24, f33, f34, f43, f44;
       index_type i, j, l, ii, jj, ll;
       index_type isec, jsec, lsec, uisec, ujsec, ulsec;
+      'rtype_name` *t1;
 
       a = abase;
       b = bbase;
@@ -232,10 +233,7 @@  sinclude(`matmul_asm_'rtype_code`.m4')dnl
       if (t1_dim > 65536)
 	t1_dim = 65536;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wvla"
-      'rtype_name` t1[t1_dim]; /* was [256][256] */
-#pragma GCC diagnostic pop
+      t1 = malloc (t1_dim * sizeof('rtype_name`));
 
       /* Empty c first.  */
       for (j=1; j<=n; j++)
@@ -451,6 +449,7 @@  sinclude(`matmul_asm_'rtype_code`.m4')dnl
 		}
 	    }
 	}
+      free(t1);
       return;
     }
   else if (rxstride == 1 && aystride == 1 && bxstride == 1)