libgfortran ChangeLog:

2005-11-27  Janne Blomqvist  <jb@gcc.gnu.org>

	* m4/*: Add const restrict to function arguments.
	* generated/*.c: Regenerate.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107573 138bc75d-0d04-0410-961f-82ee72b054a4

175 files changed, 2583 insertions, 1739 deletions

diff --git a/libgfortran/generated/all_l16.c b/libgfortran/generated/all_l16.c
index 40851eb2c19..78df909369b 100644
--- a/libgfortran/generated/all_l16.c
+++ b/libgfortran/generated/all_l16.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_16) && defined (HAVE_GFC_LOGICAL_16)
 
 
-extern void all_l16 (gfc_array_l16 *, gfc_array_l16 *, index_type *);
+extern void all_l16 (gfc_array_l16 * const restrict, 
+	gfc_array_l16 * const restrict, const index_type * const restrict);
 export_proto(all_l16);
 
 void
-all_l16 (gfc_array_l16 *retarray, gfc_array_l16 *array, index_type *pdim)
+all_l16 (gfc_array_l16 * const restrict retarray, 
+	gfc_array_l16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_16 *base;
-  GFC_LOGICAL_16 *dest;
+  const GFC_LOGICAL_16 * restrict base;
+  GFC_LOGICAL_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ all_l16 (gfc_array_l16 *retarray, gfc_array_l16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_16 *src;
+      const GFC_LOGICAL_16 * restrict src;
       GFC_LOGICAL_16 result;
       src = base;
       {
diff --git a/libgfortran/generated/all_l4.c b/libgfortran/generated/all_l4.c
index 246ec07a507..0a6f44de381 100644
--- a/libgfortran/generated/all_l4.c
+++ b/libgfortran/generated/all_l4.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_4) && defined (HAVE_GFC_LOGICAL_4)
 
 
-extern void all_l4 (gfc_array_l4 *, gfc_array_l4 *, index_type *);
+extern void all_l4 (gfc_array_l4 * const restrict, 
+	gfc_array_l4 * const restrict, const index_type * const restrict);
 export_proto(all_l4);
 
 void
-all_l4 (gfc_array_l4 *retarray, gfc_array_l4 *array, index_type *pdim)
+all_l4 (gfc_array_l4 * const restrict retarray, 
+	gfc_array_l4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_4 *base;
-  GFC_LOGICAL_4 *dest;
+  const GFC_LOGICAL_4 * restrict base;
+  GFC_LOGICAL_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ all_l4 (gfc_array_l4 *retarray, gfc_array_l4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_4 *src;
+      const GFC_LOGICAL_4 * restrict src;
       GFC_LOGICAL_4 result;
       src = base;
       {
diff --git a/libgfortran/generated/all_l8.c b/libgfortran/generated/all_l8.c
index 996ce3560bf..74a3731c5ee 100644
--- a/libgfortran/generated/all_l8.c
+++ b/libgfortran/generated/all_l8.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_8) && defined (HAVE_GFC_LOGICAL_8)
 
 
-extern void all_l8 (gfc_array_l8 *, gfc_array_l8 *, index_type *);
+extern void all_l8 (gfc_array_l8 * const restrict, 
+	gfc_array_l8 * const restrict, const index_type * const restrict);
 export_proto(all_l8);
 
 void
-all_l8 (gfc_array_l8 *retarray, gfc_array_l8 *array, index_type *pdim)
+all_l8 (gfc_array_l8 * const restrict retarray, 
+	gfc_array_l8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_8 *base;
-  GFC_LOGICAL_8 *dest;
+  const GFC_LOGICAL_8 * restrict base;
+  GFC_LOGICAL_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ all_l8 (gfc_array_l8 *retarray, gfc_array_l8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_8 *src;
+      const GFC_LOGICAL_8 * restrict src;
       GFC_LOGICAL_8 result;
       src = base;
       {
diff --git a/libgfortran/generated/any_l16.c b/libgfortran/generated/any_l16.c
index cf4798e7962..11468808459 100644
--- a/libgfortran/generated/any_l16.c
+++ b/libgfortran/generated/any_l16.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_16) && defined (HAVE_GFC_LOGICAL_16)
 
 
-extern void any_l16 (gfc_array_l16 *, gfc_array_l16 *, index_type *);
+extern void any_l16 (gfc_array_l16 * const restrict, 
+	gfc_array_l16 * const restrict, const index_type * const restrict);
 export_proto(any_l16);
 
 void
-any_l16 (gfc_array_l16 *retarray, gfc_array_l16 *array, index_type *pdim)
+any_l16 (gfc_array_l16 * const restrict retarray, 
+	gfc_array_l16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_16 *base;
-  GFC_LOGICAL_16 *dest;
+  const GFC_LOGICAL_16 * restrict base;
+  GFC_LOGICAL_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ any_l16 (gfc_array_l16 *retarray, gfc_array_l16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_16 *src;
+      const GFC_LOGICAL_16 * restrict src;
       GFC_LOGICAL_16 result;
       src = base;
       {
diff --git a/libgfortran/generated/any_l4.c b/libgfortran/generated/any_l4.c
index 994014a2cac..4a650f019a8 100644
--- a/libgfortran/generated/any_l4.c
+++ b/libgfortran/generated/any_l4.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_4) && defined (HAVE_GFC_LOGICAL_4)
 
 
-extern void any_l4 (gfc_array_l4 *, gfc_array_l4 *, index_type *);
+extern void any_l4 (gfc_array_l4 * const restrict, 
+	gfc_array_l4 * const restrict, const index_type * const restrict);
 export_proto(any_l4);
 
 void
-any_l4 (gfc_array_l4 *retarray, gfc_array_l4 *array, index_type *pdim)
+any_l4 (gfc_array_l4 * const restrict retarray, 
+	gfc_array_l4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_4 *base;
-  GFC_LOGICAL_4 *dest;
+  const GFC_LOGICAL_4 * restrict base;
+  GFC_LOGICAL_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ any_l4 (gfc_array_l4 *retarray, gfc_array_l4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_4 *src;
+      const GFC_LOGICAL_4 * restrict src;
       GFC_LOGICAL_4 result;
       src = base;
       {
diff --git a/libgfortran/generated/any_l8.c b/libgfortran/generated/any_l8.c
index 9d52b15c509..ed45e790db2 100644
--- a/libgfortran/generated/any_l8.c
+++ b/libgfortran/generated/any_l8.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_8) && defined (HAVE_GFC_LOGICAL_8)
 
 
-extern void any_l8 (gfc_array_l8 *, gfc_array_l8 *, index_type *);
+extern void any_l8 (gfc_array_l8 * const restrict, 
+	gfc_array_l8 * const restrict, const index_type * const restrict);
 export_proto(any_l8);
 
 void
-any_l8 (gfc_array_l8 *retarray, gfc_array_l8 *array, index_type *pdim)
+any_l8 (gfc_array_l8 * const restrict retarray, 
+	gfc_array_l8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_8 *base;
-  GFC_LOGICAL_8 *dest;
+  const GFC_LOGICAL_8 * restrict base;
+  GFC_LOGICAL_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ any_l8 (gfc_array_l8 *retarray, gfc_array_l8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_8 *src;
+      const GFC_LOGICAL_8 * restrict src;
       GFC_LOGICAL_8 result;
       src = base;
       {
diff --git a/libgfortran/generated/count_16_l16.c b/libgfortran/generated/count_16_l16.c
index 8cb795faf5e..5d27d652213 100644
--- a/libgfortran/generated/count_16_l16.c
+++ b/libgfortran/generated/count_16_l16.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_16) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void count_16_l16 (gfc_array_i16 *, gfc_array_l16 *, index_type *);
+extern void count_16_l16 (gfc_array_i16 * const restrict, 
+	gfc_array_l16 * const restrict, const index_type * const restrict);
 export_proto(count_16_l16);
 
 void
-count_16_l16 (gfc_array_i16 *retarray, gfc_array_l16 *array, index_type *pdim)
+count_16_l16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_l16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_16 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_LOGICAL_16 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ count_16_l16 (gfc_array_i16 *retarray, gfc_array_l16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_16 *src;
+      const GFC_LOGICAL_16 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
diff --git a/libgfortran/generated/count_16_l4.c b/libgfortran/generated/count_16_l4.c
index f4af5ba3152..b491e90e044 100644
--- a/libgfortran/generated/count_16_l4.c
+++ b/libgfortran/generated/count_16_l4.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_4) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void count_16_l4 (gfc_array_i16 *, gfc_array_l4 *, index_type *);
+extern void count_16_l4 (gfc_array_i16 * const restrict, 
+	gfc_array_l4 * const restrict, const index_type * const restrict);
 export_proto(count_16_l4);
 
 void
-count_16_l4 (gfc_array_i16 *retarray, gfc_array_l4 *array, index_type *pdim)
+count_16_l4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_l4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_4 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_LOGICAL_4 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ count_16_l4 (gfc_array_i16 *retarray, gfc_array_l4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_4 *src;
+      const GFC_LOGICAL_4 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
diff --git a/libgfortran/generated/count_16_l8.c b/libgfortran/generated/count_16_l8.c
index 6134f5b13c6..03ff91f32dd 100644
--- a/libgfortran/generated/count_16_l8.c
+++ b/libgfortran/generated/count_16_l8.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_8) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void count_16_l8 (gfc_array_i16 *, gfc_array_l8 *, index_type *);
+extern void count_16_l8 (gfc_array_i16 * const restrict, 
+	gfc_array_l8 * const restrict, const index_type * const restrict);
 export_proto(count_16_l8);
 
 void
-count_16_l8 (gfc_array_i16 *retarray, gfc_array_l8 *array, index_type *pdim)
+count_16_l8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_l8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_8 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_LOGICAL_8 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ count_16_l8 (gfc_array_i16 *retarray, gfc_array_l8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_8 *src;
+      const GFC_LOGICAL_8 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
diff --git a/libgfortran/generated/count_4_l16.c b/libgfortran/generated/count_4_l16.c
index cbd1717df25..bad5d5e8a8e 100644
--- a/libgfortran/generated/count_4_l16.c
+++ b/libgfortran/generated/count_4_l16.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_16) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void count_4_l16 (gfc_array_i4 *, gfc_array_l16 *, index_type *);
+extern void count_4_l16 (gfc_array_i4 * const restrict, 
+	gfc_array_l16 * const restrict, const index_type * const restrict);
 export_proto(count_4_l16);
 
 void
-count_4_l16 (gfc_array_i4 *retarray, gfc_array_l16 *array, index_type *pdim)
+count_4_l16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_l16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_16 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_LOGICAL_16 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ count_4_l16 (gfc_array_i4 *retarray, gfc_array_l16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_16 *src;
+      const GFC_LOGICAL_16 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
diff --git a/libgfortran/generated/count_4_l4.c b/libgfortran/generated/count_4_l4.c
index aa98bfc66c1..440a549b954 100644
--- a/libgfortran/generated/count_4_l4.c
+++ b/libgfortran/generated/count_4_l4.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_4) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void count_4_l4 (gfc_array_i4 *, gfc_array_l4 *, index_type *);
+extern void count_4_l4 (gfc_array_i4 * const restrict, 
+	gfc_array_l4 * const restrict, const index_type * const restrict);
 export_proto(count_4_l4);
 
 void
-count_4_l4 (gfc_array_i4 *retarray, gfc_array_l4 *array, index_type *pdim)
+count_4_l4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_l4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_4 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_LOGICAL_4 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ count_4_l4 (gfc_array_i4 *retarray, gfc_array_l4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_4 *src;
+      const GFC_LOGICAL_4 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
diff --git a/libgfortran/generated/count_4_l8.c b/libgfortran/generated/count_4_l8.c
index fe9eae530cf..4992b771206 100644
--- a/libgfortran/generated/count_4_l8.c
+++ b/libgfortran/generated/count_4_l8.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_8) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void count_4_l8 (gfc_array_i4 *, gfc_array_l8 *, index_type *);
+extern void count_4_l8 (gfc_array_i4 * const restrict, 
+	gfc_array_l8 * const restrict, const index_type * const restrict);
 export_proto(count_4_l8);
 
 void
-count_4_l8 (gfc_array_i4 *retarray, gfc_array_l8 *array, index_type *pdim)
+count_4_l8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_l8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_8 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_LOGICAL_8 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ count_4_l8 (gfc_array_i4 *retarray, gfc_array_l8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_8 *src;
+      const GFC_LOGICAL_8 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
diff --git a/libgfortran/generated/count_8_l16.c b/libgfortran/generated/count_8_l16.c
index 4df2aeb8214..ec236772982 100644
--- a/libgfortran/generated/count_8_l16.c
+++ b/libgfortran/generated/count_8_l16.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_16) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void count_8_l16 (gfc_array_i8 *, gfc_array_l16 *, index_type *);
+extern void count_8_l16 (gfc_array_i8 * const restrict, 
+	gfc_array_l16 * const restrict, const index_type * const restrict);
 export_proto(count_8_l16);
 
 void
-count_8_l16 (gfc_array_i8 *retarray, gfc_array_l16 *array, index_type *pdim)
+count_8_l16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_l16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_16 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_LOGICAL_16 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ count_8_l16 (gfc_array_i8 *retarray, gfc_array_l16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_16 *src;
+      const GFC_LOGICAL_16 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
diff --git a/libgfortran/generated/count_8_l4.c b/libgfortran/generated/count_8_l4.c
index b32b30e173a..97ae10e97fb 100644
--- a/libgfortran/generated/count_8_l4.c
+++ b/libgfortran/generated/count_8_l4.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_4) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void count_8_l4 (gfc_array_i8 *, gfc_array_l4 *, index_type *);
+extern void count_8_l4 (gfc_array_i8 * const restrict, 
+	gfc_array_l4 * const restrict, const index_type * const restrict);
 export_proto(count_8_l4);
 
 void
-count_8_l4 (gfc_array_i8 *retarray, gfc_array_l4 *array, index_type *pdim)
+count_8_l4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_l4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_4 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_LOGICAL_4 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ count_8_l4 (gfc_array_i8 *retarray, gfc_array_l4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_4 *src;
+      const GFC_LOGICAL_4 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
diff --git a/libgfortran/generated/count_8_l8.c b/libgfortran/generated/count_8_l8.c
index 670fc1d1cf1..b2d06b96873 100644
--- a/libgfortran/generated/count_8_l8.c
+++ b/libgfortran/generated/count_8_l8.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_LOGICAL_8) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void count_8_l8 (gfc_array_i8 *, gfc_array_l8 *, index_type *);
+extern void count_8_l8 (gfc_array_i8 * const restrict, 
+	gfc_array_l8 * const restrict, const index_type * const restrict);
 export_proto(count_8_l8);
 
 void
-count_8_l8 (gfc_array_i8 *retarray, gfc_array_l8 *array, index_type *pdim)
+count_8_l8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_l8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_LOGICAL_8 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_LOGICAL_8 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ count_8_l8 (gfc_array_i8 *retarray, gfc_array_l8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_LOGICAL_8 *src;
+      const GFC_LOGICAL_8 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
diff --git a/libgfortran/generated/cshift1_16.c b/libgfortran/generated/cshift1_16.c
index bff20d3b4be..c264bb13f92 100644
--- a/libgfortran/generated/cshift1_16.c
+++ b/libgfortran/generated/cshift1_16.c
@@ -37,8 +37,11 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16)
 
 static void
-cshift1 (gfc_array_char * ret, const gfc_array_char * array,
-	 const gfc_array_i16 * h, const GFC_INTEGER_16 * pwhich, index_type size)
+cshift1 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array,
+	const gfc_array_i16 * const restrict h, 
+	const GFC_INTEGER_16 * const restrict pwhich, 
+	index_type size)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS];
@@ -194,30 +197,36 @@ cshift1 (gfc_array_char * ret, const gfc_array_char * array,
     }
 }
 
-void cshift1_16 (gfc_array_char *, const gfc_array_char *,
-			   const gfc_array_i16 *, const GFC_INTEGER_16 *);
+void cshift1_16 (gfc_array_char * const restrict, 
+	const gfc_array_char * const restrict,
+	const gfc_array_i16 * const restrict, 
+	const GFC_INTEGER_16 * const restrict);
 export_proto(cshift1_16);
 
 void
-cshift1_16 (gfc_array_char * ret,
-		      const gfc_array_char * array,
-		      const gfc_array_i16 * h, const GFC_INTEGER_16 * pwhich)
+cshift1_16 (gfc_array_char * const restrict ret,
+	const gfc_array_char * const restrict array,
+	const gfc_array_i16 * const restrict h, 
+	const GFC_INTEGER_16 * const restrict pwhich)
 {
   cshift1 (ret, array, h, pwhich, GFC_DESCRIPTOR_SIZE (array));
 }
 
-void cshift1_16_char (gfc_array_char * ret, GFC_INTEGER_4,
-				  const gfc_array_char * array,
-				  const gfc_array_i16 * h, const GFC_INTEGER_16 * pwhich,
-				  GFC_INTEGER_4);
+void cshift1_16_char (gfc_array_char * const restrict ret, 
+	GFC_INTEGER_4,
+	const gfc_array_char * const restrict array,
+	const gfc_array_i16 * const restrict h, 
+	const GFC_INTEGER_16 * const restrict pwhich,
+	GFC_INTEGER_4);
 export_proto(cshift1_16_char);
 
 void
-cshift1_16_char (gfc_array_char * ret,
-			     GFC_INTEGER_4 ret_length __attribute__((unused)),
-			     const gfc_array_char * array,
-			     const gfc_array_i16 * h, const GFC_INTEGER_16 * pwhich,
-			     GFC_INTEGER_4 array_length)
+cshift1_16_char (gfc_array_char * const restrict ret,
+	GFC_INTEGER_4 ret_length __attribute__((unused)),
+	const gfc_array_char * const restrict array,
+	const gfc_array_i16 * const restrict h, 
+	const GFC_INTEGER_16 * const restrict pwhich,
+	GFC_INTEGER_4 array_length)
 {
   cshift1 (ret, array, h, pwhich, array_length);
 }
diff --git a/libgfortran/generated/cshift1_4.c b/libgfortran/generated/cshift1_4.c
index 9f9bea07c1e..8eba7b331aa 100644
--- a/libgfortran/generated/cshift1_4.c
+++ b/libgfortran/generated/cshift1_4.c
@@ -37,8 +37,11 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4)
 
 static void
-cshift1 (gfc_array_char * ret, const gfc_array_char * array,
-	 const gfc_array_i4 * h, const GFC_INTEGER_4 * pwhich, index_type size)
+cshift1 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array,
+	const gfc_array_i4 * const restrict h, 
+	const GFC_INTEGER_4 * const restrict pwhich, 
+	index_type size)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS];
@@ -194,30 +197,36 @@ cshift1 (gfc_array_char * ret, const gfc_array_char * array,
     }
 }
 
-void cshift1_4 (gfc_array_char *, const gfc_array_char *,
-			   const gfc_array_i4 *, const GFC_INTEGER_4 *);
+void cshift1_4 (gfc_array_char * const restrict, 
+	const gfc_array_char * const restrict,
+	const gfc_array_i4 * const restrict, 
+	const GFC_INTEGER_4 * const restrict);
 export_proto(cshift1_4);
 
 void
-cshift1_4 (gfc_array_char * ret,
-		      const gfc_array_char * array,
-		      const gfc_array_i4 * h, const GFC_INTEGER_4 * pwhich)
+cshift1_4 (gfc_array_char * const restrict ret,
+	const gfc_array_char * const restrict array,
+	const gfc_array_i4 * const restrict h, 
+	const GFC_INTEGER_4 * const restrict pwhich)
 {
   cshift1 (ret, array, h, pwhich, GFC_DESCRIPTOR_SIZE (array));
 }
 
-void cshift1_4_char (gfc_array_char * ret, GFC_INTEGER_4,
-				  const gfc_array_char * array,
-				  const gfc_array_i4 * h, const GFC_INTEGER_4 * pwhich,
-				  GFC_INTEGER_4);
+void cshift1_4_char (gfc_array_char * const restrict ret, 
+	GFC_INTEGER_4,
+	const gfc_array_char * const restrict array,
+	const gfc_array_i4 * const restrict h, 
+	const GFC_INTEGER_4 * const restrict pwhich,
+	GFC_INTEGER_4);
 export_proto(cshift1_4_char);
 
 void
-cshift1_4_char (gfc_array_char * ret,
-			     GFC_INTEGER_4 ret_length __attribute__((unused)),
-			     const gfc_array_char * array,
-			     const gfc_array_i4 * h, const GFC_INTEGER_4 * pwhich,
-			     GFC_INTEGER_4 array_length)
+cshift1_4_char (gfc_array_char * const restrict ret,
+	GFC_INTEGER_4 ret_length __attribute__((unused)),
+	const gfc_array_char * const restrict array,
+	const gfc_array_i4 * const restrict h, 
+	const GFC_INTEGER_4 * const restrict pwhich,
+	GFC_INTEGER_4 array_length)
 {
   cshift1 (ret, array, h, pwhich, array_length);
 }
diff --git a/libgfortran/generated/cshift1_8.c b/libgfortran/generated/cshift1_8.c
index 3a7c509b00c..d8d0f898377 100644
--- a/libgfortran/generated/cshift1_8.c
+++ b/libgfortran/generated/cshift1_8.c
@@ -37,8 +37,11 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8)
 
 static void
-cshift1 (gfc_array_char * ret, const gfc_array_char * array,
-	 const gfc_array_i8 * h, const GFC_INTEGER_8 * pwhich, index_type size)
+cshift1 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array,
+	const gfc_array_i8 * const restrict h, 
+	const GFC_INTEGER_8 * const restrict pwhich, 
+	index_type size)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS];
@@ -194,30 +197,36 @@ cshift1 (gfc_array_char * ret, const gfc_array_char * array,
     }
 }
 
-void cshift1_8 (gfc_array_char *, const gfc_array_char *,
-			   const gfc_array_i8 *, const GFC_INTEGER_8 *);
+void cshift1_8 (gfc_array_char * const restrict, 
+	const gfc_array_char * const restrict,
+	const gfc_array_i8 * const restrict, 
+	const GFC_INTEGER_8 * const restrict);
 export_proto(cshift1_8);
 
 void
-cshift1_8 (gfc_array_char * ret,
-		      const gfc_array_char * array,
-		      const gfc_array_i8 * h, const GFC_INTEGER_8 * pwhich)
+cshift1_8 (gfc_array_char * const restrict ret,
+	const gfc_array_char * const restrict array,
+	const gfc_array_i8 * const restrict h, 
+	const GFC_INTEGER_8 * const restrict pwhich)
 {
   cshift1 (ret, array, h, pwhich, GFC_DESCRIPTOR_SIZE (array));
 }
 
-void cshift1_8_char (gfc_array_char * ret, GFC_INTEGER_4,
-				  const gfc_array_char * array,
-				  const gfc_array_i8 * h, const GFC_INTEGER_8 * pwhich,
-				  GFC_INTEGER_4);
+void cshift1_8_char (gfc_array_char * const restrict ret, 
+	GFC_INTEGER_4,
+	const gfc_array_char * const restrict array,
+	const gfc_array_i8 * const restrict h, 
+	const GFC_INTEGER_8 * const restrict pwhich,
+	GFC_INTEGER_4);
 export_proto(cshift1_8_char);
 
 void
-cshift1_8_char (gfc_array_char * ret,
-			     GFC_INTEGER_4 ret_length __attribute__((unused)),
-			     const gfc_array_char * array,
-			     const gfc_array_i8 * h, const GFC_INTEGER_8 * pwhich,
-			     GFC_INTEGER_4 array_length)
+cshift1_8_char (gfc_array_char * const restrict ret,
+	GFC_INTEGER_4 ret_length __attribute__((unused)),
+	const gfc_array_char * const restrict array,
+	const gfc_array_i8 * const restrict h, 
+	const GFC_INTEGER_8 * const restrict pwhich,
+	GFC_INTEGER_4 array_length)
 {
   cshift1 (ret, array, h, pwhich, array_length);
 }
diff --git a/libgfortran/generated/dotprod_c10.c b/libgfortran/generated/dotprod_c10.c
index 3fa5955e200..0dccca71ec7 100644
--- a/libgfortran/generated/dotprod_c10.c
+++ b/libgfortran/generated/dotprod_c10.c
@@ -38,15 +38,16 @@ Boston, MA 02110-1301, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_COMPLEX_10 dot_product_c10 (gfc_array_c10 * a, gfc_array_c10 * b);
+extern GFC_COMPLEX_10 dot_product_c10 (gfc_array_c10 * const restrict a, 
+	gfc_array_c10 * const restrict b);
 export_proto(dot_product_c10);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_COMPLEX_10
-dot_product_c10 (gfc_array_c10 * a, gfc_array_c10 * b)
+dot_product_c10 (gfc_array_c10 * const restrict a, gfc_array_c10 * const restrict b)
 {
-  GFC_COMPLEX_10 *pa;
-  GFC_COMPLEX_10 *pb;
+  const GFC_COMPLEX_10 * restrict pa;
+  const GFC_COMPLEX_10 * restrict pb;
   GFC_COMPLEX_10 res;
   GFC_COMPLEX_10 conjga;
   index_type count;
diff --git a/libgfortran/generated/dotprod_c16.c b/libgfortran/generated/dotprod_c16.c
index a526b533d44..6d17ba7409d 100644
--- a/libgfortran/generated/dotprod_c16.c
+++ b/libgfortran/generated/dotprod_c16.c
@@ -38,15 +38,16 @@ Boston, MA 02110-1301, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_COMPLEX_16 dot_product_c16 (gfc_array_c16 * a, gfc_array_c16 * b);
+extern GFC_COMPLEX_16 dot_product_c16 (gfc_array_c16 * const restrict a, 
+	gfc_array_c16 * const restrict b);
 export_proto(dot_product_c16);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_COMPLEX_16
-dot_product_c16 (gfc_array_c16 * a, gfc_array_c16 * b)
+dot_product_c16 (gfc_array_c16 * const restrict a, gfc_array_c16 * const restrict b)
 {
-  GFC_COMPLEX_16 *pa;
-  GFC_COMPLEX_16 *pb;
+  const GFC_COMPLEX_16 * restrict pa;
+  const GFC_COMPLEX_16 * restrict pb;
   GFC_COMPLEX_16 res;
   GFC_COMPLEX_16 conjga;
   index_type count;
diff --git a/libgfortran/generated/dotprod_c4.c b/libgfortran/generated/dotprod_c4.c
index ea27dd8457e..a575dc98969 100644
--- a/libgfortran/generated/dotprod_c4.c
+++ b/libgfortran/generated/dotprod_c4.c
@@ -38,15 +38,16 @@ Boston, MA 02110-1301, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_COMPLEX_4 dot_product_c4 (gfc_array_c4 * a, gfc_array_c4 * b);
+extern GFC_COMPLEX_4 dot_product_c4 (gfc_array_c4 * const restrict a, 
+	gfc_array_c4 * const restrict b);
 export_proto(dot_product_c4);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_COMPLEX_4
-dot_product_c4 (gfc_array_c4 * a, gfc_array_c4 * b)
+dot_product_c4 (gfc_array_c4 * const restrict a, gfc_array_c4 * const restrict b)
 {
-  GFC_COMPLEX_4 *pa;
-  GFC_COMPLEX_4 *pb;
+  const GFC_COMPLEX_4 * restrict pa;
+  const GFC_COMPLEX_4 * restrict pb;
   GFC_COMPLEX_4 res;
   GFC_COMPLEX_4 conjga;
   index_type count;
diff --git a/libgfortran/generated/dotprod_c8.c b/libgfortran/generated/dotprod_c8.c
index aec5fb5a3bc..00ac8a9d0cc 100644
--- a/libgfortran/generated/dotprod_c8.c
+++ b/libgfortran/generated/dotprod_c8.c
@@ -38,15 +38,16 @@ Boston, MA 02110-1301, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_COMPLEX_8 dot_product_c8 (gfc_array_c8 * a, gfc_array_c8 * b);
+extern GFC_COMPLEX_8 dot_product_c8 (gfc_array_c8 * const restrict a, 
+	gfc_array_c8 * const restrict b);
 export_proto(dot_product_c8);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_COMPLEX_8
-dot_product_c8 (gfc_array_c8 * a, gfc_array_c8 * b)
+dot_product_c8 (gfc_array_c8 * const restrict a, gfc_array_c8 * const restrict b)
 {
-  GFC_COMPLEX_8 *pa;
-  GFC_COMPLEX_8 *pb;
+  const GFC_COMPLEX_8 * restrict pa;
+  const GFC_COMPLEX_8 * restrict pb;
   GFC_COMPLEX_8 res;
   GFC_COMPLEX_8 conjga;
   index_type count;
diff --git a/libgfortran/generated/dotprod_i16.c b/libgfortran/generated/dotprod_i16.c
index 1c3e5825d0e..292f0786538 100644
--- a/libgfortran/generated/dotprod_i16.c
+++ b/libgfortran/generated/dotprod_i16.c
@@ -37,15 +37,16 @@ Boston, MA 02110-1301, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_INTEGER_16 dot_product_i16 (gfc_array_i16 * a, gfc_array_i16 * b);
+extern GFC_INTEGER_16 dot_product_i16 (gfc_array_i16 * const restrict a, 
+	gfc_array_i16 * const restrict b);
 export_proto(dot_product_i16);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_INTEGER_16
-dot_product_i16 (gfc_array_i16 * a, gfc_array_i16 * b)
+dot_product_i16 (gfc_array_i16 * const restrict a, gfc_array_i16 * const restrict b)
 {
-  GFC_INTEGER_16 *pa;
-  GFC_INTEGER_16 *pb;
+  const GFC_INTEGER_16 * restrict pa;
+  const GFC_INTEGER_16 * restrict pb;
   GFC_INTEGER_16 res;
   index_type count;
   index_type astride;
diff --git a/libgfortran/generated/dotprod_i4.c b/libgfortran/generated/dotprod_i4.c
index aaf8b8d4efa..5a8dcd930fe 100644
--- a/libgfortran/generated/dotprod_i4.c
+++ b/libgfortran/generated/dotprod_i4.c
@@ -37,15 +37,16 @@ Boston, MA 02110-1301, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_INTEGER_4 dot_product_i4 (gfc_array_i4 * a, gfc_array_i4 * b);
+extern GFC_INTEGER_4 dot_product_i4 (gfc_array_i4 * const restrict a, 
+	gfc_array_i4 * const restrict b);
 export_proto(dot_product_i4);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_INTEGER_4
-dot_product_i4 (gfc_array_i4 * a, gfc_array_i4 * b)
+dot_product_i4 (gfc_array_i4 * const restrict a, gfc_array_i4 * const restrict b)
 {
-  GFC_INTEGER_4 *pa;
-  GFC_INTEGER_4 *pb;
+  const GFC_INTEGER_4 * restrict pa;
+  const GFC_INTEGER_4 * restrict pb;
   GFC_INTEGER_4 res;
   index_type count;
   index_type astride;
diff --git a/libgfortran/generated/dotprod_i8.c b/libgfortran/generated/dotprod_i8.c
index 44af1f15954..c03cbc311e9 100644
--- a/libgfortran/generated/dotprod_i8.c
+++ b/libgfortran/generated/dotprod_i8.c
@@ -37,15 +37,16 @@ Boston, MA 02110-1301, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_INTEGER_8 dot_product_i8 (gfc_array_i8 * a, gfc_array_i8 * b);
+extern GFC_INTEGER_8 dot_product_i8 (gfc_array_i8 * const restrict a, 
+	gfc_array_i8 * const restrict b);
 export_proto(dot_product_i8);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_INTEGER_8
-dot_product_i8 (gfc_array_i8 * a, gfc_array_i8 * b)
+dot_product_i8 (gfc_array_i8 * const restrict a, gfc_array_i8 * const restrict b)
 {
-  GFC_INTEGER_8 *pa;
-  GFC_INTEGER_8 *pb;
+  const GFC_INTEGER_8 * restrict pa;
+  const GFC_INTEGER_8 * restrict pb;
   GFC_INTEGER_8 res;
   index_type count;
   index_type astride;
diff --git a/libgfortran/generated/dotprod_l16.c b/libgfortran/generated/dotprod_l16.c
index 977eb4a3915..c53b1bb7af5 100644
--- a/libgfortran/generated/dotprod_l16.c
+++ b/libgfortran/generated/dotprod_l16.c
@@ -35,14 +35,16 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_LOGICAL_16)
 
-extern GFC_LOGICAL_16 dot_product_l16 (gfc_array_l4 *, gfc_array_l4 *);
+extern GFC_LOGICAL_16 dot_product_l16 (gfc_array_l4 * const restrict, 
+	gfc_array_l4 * const restrict);
 export_proto(dot_product_l16);
 
 GFC_LOGICAL_16
-dot_product_l16 (gfc_array_l4 * a, gfc_array_l4 * b)
+dot_product_l16 (gfc_array_l4 * const restrict a, 
+	gfc_array_l4 * const restrict b)
 {
-  GFC_LOGICAL_4 *pa;
-  GFC_LOGICAL_4 *pb;
+  const GFC_LOGICAL_4 * restrict pa;
+  const GFC_LOGICAL_4 * restrict pb;
   index_type count;
   index_type astride;
   index_type bstride;
diff --git a/libgfortran/generated/dotprod_l4.c b/libgfortran/generated/dotprod_l4.c
index 50db3981285..dcec980b564 100644
--- a/libgfortran/generated/dotprod_l4.c
+++ b/libgfortran/generated/dotprod_l4.c
@@ -35,14 +35,16 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_LOGICAL_4)
 
-extern GFC_LOGICAL_4 dot_product_l4 (gfc_array_l4 *, gfc_array_l4 *);
+extern GFC_LOGICAL_4 dot_product_l4 (gfc_array_l4 * const restrict, 
+	gfc_array_l4 * const restrict);
 export_proto(dot_product_l4);
 
 GFC_LOGICAL_4
-dot_product_l4 (gfc_array_l4 * a, gfc_array_l4 * b)
+dot_product_l4 (gfc_array_l4 * const restrict a, 
+	gfc_array_l4 * const restrict b)
 {
-  GFC_LOGICAL_4 *pa;
-  GFC_LOGICAL_4 *pb;
+  const GFC_LOGICAL_4 * restrict pa;
+  const GFC_LOGICAL_4 * restrict pb;
   index_type count;
   index_type astride;
   index_type bstride;
diff --git a/libgfortran/generated/dotprod_l8.c b/libgfortran/generated/dotprod_l8.c
index f857d08ecd5..b579f2ff9ed 100644
--- a/libgfortran/generated/dotprod_l8.c
+++ b/libgfortran/generated/dotprod_l8.c
@@ -35,14 +35,16 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_LOGICAL_8)
 
-extern GFC_LOGICAL_8 dot_product_l8 (gfc_array_l4 *, gfc_array_l4 *);
+extern GFC_LOGICAL_8 dot_product_l8 (gfc_array_l4 * const restrict, 
+	gfc_array_l4 * const restrict);
 export_proto(dot_product_l8);
 
 GFC_LOGICAL_8
-dot_product_l8 (gfc_array_l4 * a, gfc_array_l4 * b)
+dot_product_l8 (gfc_array_l4 * const restrict a, 
+	gfc_array_l4 * const restrict b)
 {
-  GFC_LOGICAL_4 *pa;
-  GFC_LOGICAL_4 *pb;
+  const GFC_LOGICAL_4 * restrict pa;
+  const GFC_LOGICAL_4 * restrict pb;
   index_type count;
   index_type astride;
   index_type bstride;
diff --git a/libgfortran/generated/dotprod_r10.c b/libgfortran/generated/dotprod_r10.c
index 055c28837c4..e2160c796a2 100644
--- a/libgfortran/generated/dotprod_r10.c
+++ b/libgfortran/generated/dotprod_r10.c
@@ -37,15 +37,16 @@ Boston, MA 02110-1301, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_REAL_10 dot_product_r10 (gfc_array_r10 * a, gfc_array_r10 * b);
+extern GFC_REAL_10 dot_product_r10 (gfc_array_r10 * const restrict a, 
+	gfc_array_r10 * const restrict b);
 export_proto(dot_product_r10);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_REAL_10
-dot_product_r10 (gfc_array_r10 * a, gfc_array_r10 * b)
+dot_product_r10 (gfc_array_r10 * const restrict a, gfc_array_r10 * const restrict b)
 {
-  GFC_REAL_10 *pa;
-  GFC_REAL_10 *pb;
+  const GFC_REAL_10 * restrict pa;
+  const GFC_REAL_10 * restrict pb;
   GFC_REAL_10 res;
   index_type count;
   index_type astride;
diff --git a/libgfortran/generated/dotprod_r16.c b/libgfortran/generated/dotprod_r16.c
index e14eaac4208..40edc497a0d 100644
--- a/libgfortran/generated/dotprod_r16.c
+++ b/libgfortran/generated/dotprod_r16.c
@@ -37,15 +37,16 @@ Boston, MA 02110-1301, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_REAL_16 dot_product_r16 (gfc_array_r16 * a, gfc_array_r16 * b);
+extern GFC_REAL_16 dot_product_r16 (gfc_array_r16 * const restrict a, 
+	gfc_array_r16 * const restrict b);
 export_proto(dot_product_r16);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_REAL_16
-dot_product_r16 (gfc_array_r16 * a, gfc_array_r16 * b)
+dot_product_r16 (gfc_array_r16 * const restrict a, gfc_array_r16 * const restrict b)
 {
-  GFC_REAL_16 *pa;
-  GFC_REAL_16 *pb;
+  const GFC_REAL_16 * restrict pa;
+  const GFC_REAL_16 * restrict pb;
   GFC_REAL_16 res;
   index_type count;
   index_type astride;
diff --git a/libgfortran/generated/dotprod_r4.c b/libgfortran/generated/dotprod_r4.c
index bae99ab3f36..7fdc57fa0a5 100644
--- a/libgfortran/generated/dotprod_r4.c
+++ b/libgfortran/generated/dotprod_r4.c
@@ -37,15 +37,16 @@ Boston, MA 02110-1301, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_REAL_4 dot_product_r4 (gfc_array_r4 * a, gfc_array_r4 * b);
+extern GFC_REAL_4 dot_product_r4 (gfc_array_r4 * const restrict a, 
+	gfc_array_r4 * const restrict b);
 export_proto(dot_product_r4);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_REAL_4
-dot_product_r4 (gfc_array_r4 * a, gfc_array_r4 * b)
+dot_product_r4 (gfc_array_r4 * const restrict a, gfc_array_r4 * const restrict b)
 {
-  GFC_REAL_4 *pa;
-  GFC_REAL_4 *pb;
+  const GFC_REAL_4 * restrict pa;
+  const GFC_REAL_4 * restrict pb;
   GFC_REAL_4 res;
   index_type count;
   index_type astride;
diff --git a/libgfortran/generated/dotprod_r8.c b/libgfortran/generated/dotprod_r8.c
index 84a6aaa0110..760407736c9 100644
--- a/libgfortran/generated/dotprod_r8.c
+++ b/libgfortran/generated/dotprod_r8.c
@@ -37,15 +37,16 @@ Boston, MA 02110-1301, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_REAL_8 dot_product_r8 (gfc_array_r8 * a, gfc_array_r8 * b);
+extern GFC_REAL_8 dot_product_r8 (gfc_array_r8 * const restrict a, 
+	gfc_array_r8 * const restrict b);
 export_proto(dot_product_r8);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_REAL_8
-dot_product_r8 (gfc_array_r8 * a, gfc_array_r8 * b)
+dot_product_r8 (gfc_array_r8 * const restrict a, gfc_array_r8 * const restrict b)
 {
-  GFC_REAL_8 *pa;
-  GFC_REAL_8 *pb;
+  const GFC_REAL_8 * restrict pa;
+  const GFC_REAL_8 * restrict pb;
   GFC_REAL_8 res;
   index_type count;
   index_type astride;
diff --git a/libgfortran/generated/eoshift1_16.c b/libgfortran/generated/eoshift1_16.c
index c548fef3ae4..bfb051fe1c6 100644
--- a/libgfortran/generated/eoshift1_16.c
+++ b/libgfortran/generated/eoshift1_16.c
@@ -37,9 +37,12 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16)
 
 static void
-eoshift1 (gfc_array_char *ret, const gfc_array_char *array, const gfc_array_i16 *h,
-	  const char *pbound, const GFC_INTEGER_16 *pwhich, index_type size,
-	  char filler)
+eoshift1 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array, 
+	const gfc_array_i16 * const restrict h,
+	const char * const restrict pbound, 
+	const GFC_INTEGER_16 * const restrict pwhich, 
+	index_type size, char filler)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS];
@@ -218,32 +221,40 @@ eoshift1 (gfc_array_char *ret, const gfc_array_char *array, const gfc_array_i16
     }
 }
 
-void eoshift1_16 (gfc_array_char *, const gfc_array_char *,
-			    const gfc_array_i16 *, const char *, const GFC_INTEGER_16 *);
+void eoshift1_16 (gfc_array_char * const restrict, 
+	const gfc_array_char * const restrict,
+	const gfc_array_i16 * const restrict, const char * const restrict, 
+	const GFC_INTEGER_16 * const restrict);
 export_proto(eoshift1_16);
 
 void
-eoshift1_16 (gfc_array_char *ret, const gfc_array_char *array,
-		       const gfc_array_i16 *h, const char *pbound,
-		       const GFC_INTEGER_16 *pwhich)
+eoshift1_16 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array,
+	const gfc_array_i16 * const restrict h, 
+	const char * const restrict pbound,
+	const GFC_INTEGER_16 * const restrict pwhich)
 {
   eoshift1 (ret, array, h, pbound, pwhich, GFC_DESCRIPTOR_SIZE (array), 0);
 }
 
-void eoshift1_16_char (gfc_array_char *, GFC_INTEGER_4,
-				   const gfc_array_char *, const gfc_array_i16 *,
-				   const char *, const GFC_INTEGER_16 *,
-				   GFC_INTEGER_4, GFC_INTEGER_4);
+void eoshift1_16_char (gfc_array_char * const restrict, 
+	GFC_INTEGER_4,
+	const gfc_array_char * const restrict, 
+	const gfc_array_i16 * const restrict,
+	const char * const restrict, 
+	const GFC_INTEGER_16 * const restrict,
+	GFC_INTEGER_4, GFC_INTEGER_4);
 export_proto(eoshift1_16_char);
 
 void
-eoshift1_16_char (gfc_array_char *ret,
-			      GFC_INTEGER_4 ret_length __attribute__((unused)),
-			      const gfc_array_char *array, const gfc_array_i16 *h,
-			      const char *pbound, const GFC_INTEGER_16 *pwhich,
-			      GFC_INTEGER_4 array_length,
-			      GFC_INTEGER_4 bound_length
-				__attribute__((unused)))
+eoshift1_16_char (gfc_array_char * const restrict ret,
+	GFC_INTEGER_4 ret_length __attribute__((unused)),
+	const gfc_array_char * const restrict array, 
+	const gfc_array_i16 * const restrict h,
+	const char *  const restrict pbound, 
+	const GFC_INTEGER_16 * const restrict pwhich,
+	GFC_INTEGER_4 array_length,
+	GFC_INTEGER_4 bound_length __attribute__((unused)))
 {
   eoshift1 (ret, array, h, pbound, pwhich, array_length, ' ');
 }
diff --git a/libgfortran/generated/eoshift1_4.c b/libgfortran/generated/eoshift1_4.c
index 8045679ce92..922c46c6830 100644
--- a/libgfortran/generated/eoshift1_4.c
+++ b/libgfortran/generated/eoshift1_4.c
@@ -37,9 +37,12 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4)
 
 static void
-eoshift1 (gfc_array_char *ret, const gfc_array_char *array, const gfc_array_i4 *h,
-	  const char *pbound, const GFC_INTEGER_4 *pwhich, index_type size,
-	  char filler)
+eoshift1 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array, 
+	const gfc_array_i4 * const restrict h,
+	const char * const restrict pbound, 
+	const GFC_INTEGER_4 * const restrict pwhich, 
+	index_type size, char filler)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS];
@@ -218,32 +221,40 @@ eoshift1 (gfc_array_char *ret, const gfc_array_char *array, const gfc_array_i4 *
     }
 }
 
-void eoshift1_4 (gfc_array_char *, const gfc_array_char *,
-			    const gfc_array_i4 *, const char *, const GFC_INTEGER_4 *);
+void eoshift1_4 (gfc_array_char * const restrict, 
+	const gfc_array_char * const restrict,
+	const gfc_array_i4 * const restrict, const char * const restrict, 
+	const GFC_INTEGER_4 * const restrict);
 export_proto(eoshift1_4);
 
 void
-eoshift1_4 (gfc_array_char *ret, const gfc_array_char *array,
-		       const gfc_array_i4 *h, const char *pbound,
-		       const GFC_INTEGER_4 *pwhich)
+eoshift1_4 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array,
+	const gfc_array_i4 * const restrict h, 
+	const char * const restrict pbound,
+	const GFC_INTEGER_4 * const restrict pwhich)
 {
   eoshift1 (ret, array, h, pbound, pwhich, GFC_DESCRIPTOR_SIZE (array), 0);
 }
 
-void eoshift1_4_char (gfc_array_char *, GFC_INTEGER_4,
-				   const gfc_array_char *, const gfc_array_i4 *,
-				   const char *, const GFC_INTEGER_4 *,
-				   GFC_INTEGER_4, GFC_INTEGER_4);
+void eoshift1_4_char (gfc_array_char * const restrict, 
+	GFC_INTEGER_4,
+	const gfc_array_char * const restrict, 
+	const gfc_array_i4 * const restrict,
+	const char * const restrict, 
+	const GFC_INTEGER_4 * const restrict,
+	GFC_INTEGER_4, GFC_INTEGER_4);
 export_proto(eoshift1_4_char);
 
 void
-eoshift1_4_char (gfc_array_char *ret,
-			      GFC_INTEGER_4 ret_length __attribute__((unused)),
-			      const gfc_array_char *array, const gfc_array_i4 *h,
-			      const char *pbound, const GFC_INTEGER_4 *pwhich,
-			      GFC_INTEGER_4 array_length,
-			      GFC_INTEGER_4 bound_length
-				__attribute__((unused)))
+eoshift1_4_char (gfc_array_char * const restrict ret,
+	GFC_INTEGER_4 ret_length __attribute__((unused)),
+	const gfc_array_char * const restrict array, 
+	const gfc_array_i4 * const restrict h,
+	const char *  const restrict pbound, 
+	const GFC_INTEGER_4 * const restrict pwhich,
+	GFC_INTEGER_4 array_length,
+	GFC_INTEGER_4 bound_length __attribute__((unused)))
 {
   eoshift1 (ret, array, h, pbound, pwhich, array_length, ' ');
 }
diff --git a/libgfortran/generated/eoshift1_8.c b/libgfortran/generated/eoshift1_8.c
index bcc53ab7054..ea23adfaabf 100644
--- a/libgfortran/generated/eoshift1_8.c
+++ b/libgfortran/generated/eoshift1_8.c
@@ -37,9 +37,12 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8)
 
 static void
-eoshift1 (gfc_array_char *ret, const gfc_array_char *array, const gfc_array_i8 *h,
-	  const char *pbound, const GFC_INTEGER_8 *pwhich, index_type size,
-	  char filler)
+eoshift1 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array, 
+	const gfc_array_i8 * const restrict h,
+	const char * const restrict pbound, 
+	const GFC_INTEGER_8 * const restrict pwhich, 
+	index_type size, char filler)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS];
@@ -218,32 +221,40 @@ eoshift1 (gfc_array_char *ret, const gfc_array_char *array, const gfc_array_i8 *
     }
 }
 
-void eoshift1_8 (gfc_array_char *, const gfc_array_char *,
-			    const gfc_array_i8 *, const char *, const GFC_INTEGER_8 *);
+void eoshift1_8 (gfc_array_char * const restrict, 
+	const gfc_array_char * const restrict,
+	const gfc_array_i8 * const restrict, const char * const restrict, 
+	const GFC_INTEGER_8 * const restrict);
 export_proto(eoshift1_8);
 
 void
-eoshift1_8 (gfc_array_char *ret, const gfc_array_char *array,
-		       const gfc_array_i8 *h, const char *pbound,
-		       const GFC_INTEGER_8 *pwhich)
+eoshift1_8 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array,
+	const gfc_array_i8 * const restrict h, 
+	const char * const restrict pbound,
+	const GFC_INTEGER_8 * const restrict pwhich)
 {
   eoshift1 (ret, array, h, pbound, pwhich, GFC_DESCRIPTOR_SIZE (array), 0);
 }
 
-void eoshift1_8_char (gfc_array_char *, GFC_INTEGER_4,
-				   const gfc_array_char *, const gfc_array_i8 *,
-				   const char *, const GFC_INTEGER_8 *,
-				   GFC_INTEGER_4, GFC_INTEGER_4);
+void eoshift1_8_char (gfc_array_char * const restrict, 
+	GFC_INTEGER_4,
+	const gfc_array_char * const restrict, 
+	const gfc_array_i8 * const restrict,
+	const char * const restrict, 
+	const GFC_INTEGER_8 * const restrict,
+	GFC_INTEGER_4, GFC_INTEGER_4);
 export_proto(eoshift1_8_char);
 
 void
-eoshift1_8_char (gfc_array_char *ret,
-			      GFC_INTEGER_4 ret_length __attribute__((unused)),
-			      const gfc_array_char *array, const gfc_array_i8 *h,
-			      const char *pbound, const GFC_INTEGER_8 *pwhich,
-			      GFC_INTEGER_4 array_length,
-			      GFC_INTEGER_4 bound_length
-				__attribute__((unused)))
+eoshift1_8_char (gfc_array_char * const restrict ret,
+	GFC_INTEGER_4 ret_length __attribute__((unused)),
+	const gfc_array_char * const restrict array, 
+	const gfc_array_i8 * const restrict h,
+	const char *  const restrict pbound, 
+	const GFC_INTEGER_8 * const restrict pwhich,
+	GFC_INTEGER_4 array_length,
+	GFC_INTEGER_4 bound_length __attribute__((unused)))
 {
   eoshift1 (ret, array, h, pbound, pwhich, array_length, ' ');
 }
diff --git a/libgfortran/generated/eoshift3_16.c b/libgfortran/generated/eoshift3_16.c
index d03c1c7f1c9..3a8b046bc8e 100644
--- a/libgfortran/generated/eoshift3_16.c
+++ b/libgfortran/generated/eoshift3_16.c
@@ -37,9 +37,12 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16)
 
 static void
-eoshift3 (gfc_array_char *ret, const gfc_array_char *array, const gfc_array_i16 *h,
-	  const gfc_array_char *bound, const GFC_INTEGER_16 *pwhich,
-	  index_type size, char filler)
+eoshift3 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array, 
+	const gfc_array_i16 * const restrict h,
+	const gfc_array_char * const restrict bound, 
+	const GFC_INTEGER_16 * const restrict pwhich,
+	index_type size, char filler)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS];
@@ -236,36 +239,41 @@ eoshift3 (gfc_array_char *ret, const gfc_array_char *array, const gfc_array_i16
     }
 }
 
-extern void eoshift3_16 (gfc_array_char *, const gfc_array_char *,
-				   const gfc_array_i16 *, const gfc_array_char *,
-				   const GFC_INTEGER_16 *);
+extern void eoshift3_16 (gfc_array_char * const restrict, 
+	const gfc_array_char * const restrict,
+	const gfc_array_i16 * const restrict, 
+	const gfc_array_char * const restrict,
+	const GFC_INTEGER_16 *);
 export_proto(eoshift3_16);
 
 void
-eoshift3_16 (gfc_array_char *ret, const gfc_array_char *array,
-		       const gfc_array_i16 *h, const gfc_array_char *bound,
-		       const GFC_INTEGER_16 *pwhich)
+eoshift3_16 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array,
+	const gfc_array_i16 * const restrict h, 
+	const gfc_array_char * const restrict bound,
+	const GFC_INTEGER_16 * const restrict pwhich)
 {
   eoshift3 (ret, array, h, bound, pwhich, GFC_DESCRIPTOR_SIZE (array), 0);
 }
 
-extern void eoshift3_16_char (gfc_array_char *, GFC_INTEGER_4,
-					  const gfc_array_char *,
-					  const gfc_array_i16 *,
-					  const gfc_array_char *,
-					  const GFC_INTEGER_16 *, GFC_INTEGER_4,
-					  GFC_INTEGER_4);
+extern void eoshift3_16_char (gfc_array_char * const restrict, 
+	GFC_INTEGER_4,
+	const gfc_array_char * const restrict,
+	const gfc_array_i16 * const restrict,
+	const gfc_array_char * const restrict,
+	const GFC_INTEGER_16 * const restrict, 
+	GFC_INTEGER_4, GFC_INTEGER_4);
 export_proto(eoshift3_16_char);
 
 void
-eoshift3_16_char (gfc_array_char *ret,
-			      GFC_INTEGER_4 ret_length __attribute__((unused)),
-			      const gfc_array_char *array, const gfc_array_i16 *h,
-			      const gfc_array_char *bound,
-			      const GFC_INTEGER_16 *pwhich,
-			      GFC_INTEGER_4 array_length,
-			      GFC_INTEGER_4 bound_length
-				__attribute__((unused)))
+eoshift3_16_char (gfc_array_char * const restrict ret,
+	GFC_INTEGER_4 ret_length __attribute__((unused)),
+	const gfc_array_char * const restrict array, 
+	const gfc_array_i16 *  const restrict h,
+	const gfc_array_char * const restrict bound,
+	const GFC_INTEGER_16 * const restrict pwhich,
+	GFC_INTEGER_4 array_length,
+	GFC_INTEGER_4 bound_length __attribute__((unused)))
 {
   eoshift3 (ret, array, h, bound, pwhich, array_length, ' ');
 }
diff --git a/libgfortran/generated/eoshift3_4.c b/libgfortran/generated/eoshift3_4.c
index 2b84ece377c..cfbf449901e 100644
--- a/libgfortran/generated/eoshift3_4.c
+++ b/libgfortran/generated/eoshift3_4.c
@@ -37,9 +37,12 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4)
 
 static void
-eoshift3 (gfc_array_char *ret, const gfc_array_char *array, const gfc_array_i4 *h,
-	  const gfc_array_char *bound, const GFC_INTEGER_4 *pwhich,
-	  index_type size, char filler)
+eoshift3 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array, 
+	const gfc_array_i4 * const restrict h,
+	const gfc_array_char * const restrict bound, 
+	const GFC_INTEGER_4 * const restrict pwhich,
+	index_type size, char filler)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS];
@@ -236,36 +239,41 @@ eoshift3 (gfc_array_char *ret, const gfc_array_char *array, const gfc_array_i4 *
     }
 }
 
-extern void eoshift3_4 (gfc_array_char *, const gfc_array_char *,
-				   const gfc_array_i4 *, const gfc_array_char *,
-				   const GFC_INTEGER_4 *);
+extern void eoshift3_4 (gfc_array_char * const restrict, 
+	const gfc_array_char * const restrict,
+	const gfc_array_i4 * const restrict, 
+	const gfc_array_char * const restrict,
+	const GFC_INTEGER_4 *);
 export_proto(eoshift3_4);
 
 void
-eoshift3_4 (gfc_array_char *ret, const gfc_array_char *array,
-		       const gfc_array_i4 *h, const gfc_array_char *bound,
-		       const GFC_INTEGER_4 *pwhich)
+eoshift3_4 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array,
+	const gfc_array_i4 * const restrict h, 
+	const gfc_array_char * const restrict bound,
+	const GFC_INTEGER_4 * const restrict pwhich)
 {
   eoshift3 (ret, array, h, bound, pwhich, GFC_DESCRIPTOR_SIZE (array), 0);
 }
 
-extern void eoshift3_4_char (gfc_array_char *, GFC_INTEGER_4,
-					  const gfc_array_char *,
-					  const gfc_array_i4 *,
-					  const gfc_array_char *,
-					  const GFC_INTEGER_4 *, GFC_INTEGER_4,
-					  GFC_INTEGER_4);
+extern void eoshift3_4_char (gfc_array_char * const restrict, 
+	GFC_INTEGER_4,
+	const gfc_array_char * const restrict,
+	const gfc_array_i4 * const restrict,
+	const gfc_array_char * const restrict,
+	const GFC_INTEGER_4 * const restrict, 
+	GFC_INTEGER_4, GFC_INTEGER_4);
 export_proto(eoshift3_4_char);
 
 void
-eoshift3_4_char (gfc_array_char *ret,
-			      GFC_INTEGER_4 ret_length __attribute__((unused)),
-			      const gfc_array_char *array, const gfc_array_i4 *h,
-			      const gfc_array_char *bound,
-			      const GFC_INTEGER_4 *pwhich,
-			      GFC_INTEGER_4 array_length,
-			      GFC_INTEGER_4 bound_length
-				__attribute__((unused)))
+eoshift3_4_char (gfc_array_char * const restrict ret,
+	GFC_INTEGER_4 ret_length __attribute__((unused)),
+	const gfc_array_char * const restrict array, 
+	const gfc_array_i4 *  const restrict h,
+	const gfc_array_char * const restrict bound,
+	const GFC_INTEGER_4 * const restrict pwhich,
+	GFC_INTEGER_4 array_length,
+	GFC_INTEGER_4 bound_length __attribute__((unused)))
 {
   eoshift3 (ret, array, h, bound, pwhich, array_length, ' ');
 }
diff --git a/libgfortran/generated/eoshift3_8.c b/libgfortran/generated/eoshift3_8.c
index ba2ef1faa33..402318ff606 100644
--- a/libgfortran/generated/eoshift3_8.c
+++ b/libgfortran/generated/eoshift3_8.c
@@ -37,9 +37,12 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8)
 
 static void
-eoshift3 (gfc_array_char *ret, const gfc_array_char *array, const gfc_array_i8 *h,
-	  const gfc_array_char *bound, const GFC_INTEGER_8 *pwhich,
-	  index_type size, char filler)
+eoshift3 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array, 
+	const gfc_array_i8 * const restrict h,
+	const gfc_array_char * const restrict bound, 
+	const GFC_INTEGER_8 * const restrict pwhich,
+	index_type size, char filler)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS];
@@ -236,36 +239,41 @@ eoshift3 (gfc_array_char *ret, const gfc_array_char *array, const gfc_array_i8 *
     }
 }
 
-extern void eoshift3_8 (gfc_array_char *, const gfc_array_char *,
-				   const gfc_array_i8 *, const gfc_array_char *,
-				   const GFC_INTEGER_8 *);
+extern void eoshift3_8 (gfc_array_char * const restrict, 
+	const gfc_array_char * const restrict,
+	const gfc_array_i8 * const restrict, 
+	const gfc_array_char * const restrict,
+	const GFC_INTEGER_8 *);
 export_proto(eoshift3_8);
 
 void
-eoshift3_8 (gfc_array_char *ret, const gfc_array_char *array,
-		       const gfc_array_i8 *h, const gfc_array_char *bound,
-		       const GFC_INTEGER_8 *pwhich)
+eoshift3_8 (gfc_array_char * const restrict ret, 
+	const gfc_array_char * const restrict array,
+	const gfc_array_i8 * const restrict h, 
+	const gfc_array_char * const restrict bound,
+	const GFC_INTEGER_8 * const restrict pwhich)
 {
   eoshift3 (ret, array, h, bound, pwhich, GFC_DESCRIPTOR_SIZE (array), 0);
 }
 
-extern void eoshift3_8_char (gfc_array_char *, GFC_INTEGER_4,
-					  const gfc_array_char *,
-					  const gfc_array_i8 *,
-					  const gfc_array_char *,
-					  const GFC_INTEGER_8 *, GFC_INTEGER_4,
-					  GFC_INTEGER_4);
+extern void eoshift3_8_char (gfc_array_char * const restrict, 
+	GFC_INTEGER_4,
+	const gfc_array_char * const restrict,
+	const gfc_array_i8 * const restrict,
+	const gfc_array_char * const restrict,
+	const GFC_INTEGER_8 * const restrict, 
+	GFC_INTEGER_4, GFC_INTEGER_4);
 export_proto(eoshift3_8_char);
 
 void
-eoshift3_8_char (gfc_array_char *ret,
-			      GFC_INTEGER_4 ret_length __attribute__((unused)),
-			      const gfc_array_char *array, const gfc_array_i8 *h,
-			      const gfc_array_char *bound,
-			      const GFC_INTEGER_8 *pwhich,
-			      GFC_INTEGER_4 array_length,
-			      GFC_INTEGER_4 bound_length
-				__attribute__((unused)))
+eoshift3_8_char (gfc_array_char * const restrict ret,
+	GFC_INTEGER_4 ret_length __attribute__((unused)),
+	const gfc_array_char * const restrict array, 
+	const gfc_array_i8 *  const restrict h,
+	const gfc_array_char * const restrict bound,
+	const GFC_INTEGER_8 * const restrict pwhich,
+	GFC_INTEGER_4 array_length,
+	GFC_INTEGER_4 bound_length __attribute__((unused)))
 {
   eoshift3 (ret, array, h, bound, pwhich, array_length, ' ');
 }
diff --git a/libgfortran/generated/maxloc0_16_i16.c b/libgfortran/generated/maxloc0_16_i16.c
index ca934a14d70..f61fe0b78d3 100644
--- a/libgfortran/generated/maxloc0_16_i16.c
+++ b/libgfortran/generated/maxloc0_16_i16.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxloc0_16_i16 (gfc_array_i16 * retarray, gfc_array_i16 *array);
+extern void maxloc0_16_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array);
 export_proto(maxloc0_16_i16);
 
 void
-maxloc0_16_i16 (gfc_array_i16 * retarray, gfc_array_i16 *array)
+maxloc0_16_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_16 *base;
+  const GFC_INTEGER_16 *base;
   GFC_INTEGER_16 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_16_i16 (gfc_array_i16 * retarray, gfc_array_i16 *array)
 }
 
 
-extern void mmaxloc0_16_i16 (gfc_array_i16 *, gfc_array_i16 *, gfc_array_l4 *);
+extern void mmaxloc0_16_i16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_16_i16);
 
 void
-mmaxloc0_16_i16 (gfc_array_i16 * retarray, gfc_array_i16 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_16_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_16_i16 (gfc_array_i16 * retarray, gfc_array_i16 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_16 *dest;
-  GFC_INTEGER_16 *base;
+  const GFC_INTEGER_16 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_16_i4.c b/libgfortran/generated/maxloc0_16_i4.c
index 9dcd7b48a50..da64cddaa5b 100644
--- a/libgfortran/generated/maxloc0_16_i4.c
+++ b/libgfortran/generated/maxloc0_16_i4.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxloc0_16_i4 (gfc_array_i16 * retarray, gfc_array_i4 *array);
+extern void maxloc0_16_i4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i4 * const restrict array);
 export_proto(maxloc0_16_i4);
 
 void
-maxloc0_16_i4 (gfc_array_i16 * retarray, gfc_array_i4 *array)
+maxloc0_16_i4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i4 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_4 *base;
+  const GFC_INTEGER_4 *base;
   GFC_INTEGER_16 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_16_i4 (gfc_array_i16 * retarray, gfc_array_i4 *array)
 }
 
 
-extern void mmaxloc0_16_i4 (gfc_array_i16 *, gfc_array_i4 *, gfc_array_l4 *);
+extern void mmaxloc0_16_i4 (gfc_array_i16 * const restrict, 
+	gfc_array_i4 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_16_i4);
 
 void
-mmaxloc0_16_i4 (gfc_array_i16 * retarray, gfc_array_i4 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_16_i4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i4 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_16_i4 (gfc_array_i16 * retarray, gfc_array_i4 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_16 *dest;
-  GFC_INTEGER_4 *base;
+  const GFC_INTEGER_4 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_16_i8.c b/libgfortran/generated/maxloc0_16_i8.c
index d8a6261ea44..07cb378d40d 100644
--- a/libgfortran/generated/maxloc0_16_i8.c
+++ b/libgfortran/generated/maxloc0_16_i8.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxloc0_16_i8 (gfc_array_i16 * retarray, gfc_array_i8 *array);
+extern void maxloc0_16_i8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i8 * const restrict array);
 export_proto(maxloc0_16_i8);
 
 void
-maxloc0_16_i8 (gfc_array_i16 * retarray, gfc_array_i8 *array)
+maxloc0_16_i8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i8 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_8 *base;
+  const GFC_INTEGER_8 *base;
   GFC_INTEGER_16 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_16_i8 (gfc_array_i16 * retarray, gfc_array_i8 *array)
 }
 
 
-extern void mmaxloc0_16_i8 (gfc_array_i16 *, gfc_array_i8 *, gfc_array_l4 *);
+extern void mmaxloc0_16_i8 (gfc_array_i16 * const restrict, 
+	gfc_array_i8 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_16_i8);
 
 void
-mmaxloc0_16_i8 (gfc_array_i16 * retarray, gfc_array_i8 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_16_i8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i8 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_16_i8 (gfc_array_i16 * retarray, gfc_array_i8 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_16 *dest;
-  GFC_INTEGER_8 *base;
+  const GFC_INTEGER_8 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_16_r10.c b/libgfortran/generated/maxloc0_16_r10.c
index 1f0dfb0383e..e8ff7c4aae7 100644
--- a/libgfortran/generated/maxloc0_16_r10.c
+++ b/libgfortran/generated/maxloc0_16_r10.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxloc0_16_r10 (gfc_array_i16 * retarray, gfc_array_r10 *array);
+extern void maxloc0_16_r10 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r10 * const restrict array);
 export_proto(maxloc0_16_r10);
 
 void
-maxloc0_16_r10 (gfc_array_i16 * retarray, gfc_array_r10 *array)
+maxloc0_16_r10 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r10 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_10 *base;
+  const GFC_REAL_10 *base;
   GFC_INTEGER_16 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_16_r10 (gfc_array_i16 * retarray, gfc_array_r10 *array)
 }
 
 
-extern void mmaxloc0_16_r10 (gfc_array_i16 *, gfc_array_r10 *, gfc_array_l4 *);
+extern void mmaxloc0_16_r10 (gfc_array_i16 * const restrict, 
+	gfc_array_r10 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_16_r10);
 
 void
-mmaxloc0_16_r10 (gfc_array_i16 * retarray, gfc_array_r10 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_16_r10 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r10 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_16_r10 (gfc_array_i16 * retarray, gfc_array_r10 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_16 *dest;
-  GFC_REAL_10 *base;
+  const GFC_REAL_10 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_16_r16.c b/libgfortran/generated/maxloc0_16_r16.c
index d9e3780470c..da6a3e9c2fd 100644
--- a/libgfortran/generated/maxloc0_16_r16.c
+++ b/libgfortran/generated/maxloc0_16_r16.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxloc0_16_r16 (gfc_array_i16 * retarray, gfc_array_r16 *array);
+extern void maxloc0_16_r16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array);
 export_proto(maxloc0_16_r16);
 
 void
-maxloc0_16_r16 (gfc_array_i16 * retarray, gfc_array_r16 *array)
+maxloc0_16_r16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_16 *base;
+  const GFC_REAL_16 *base;
   GFC_INTEGER_16 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_16_r16 (gfc_array_i16 * retarray, gfc_array_r16 *array)
 }
 
 
-extern void mmaxloc0_16_r16 (gfc_array_i16 *, gfc_array_r16 *, gfc_array_l4 *);
+extern void mmaxloc0_16_r16 (gfc_array_i16 * const restrict, 
+	gfc_array_r16 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_16_r16);
 
 void
-mmaxloc0_16_r16 (gfc_array_i16 * retarray, gfc_array_r16 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_16_r16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_16_r16 (gfc_array_i16 * retarray, gfc_array_r16 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_16 *dest;
-  GFC_REAL_16 *base;
+  const GFC_REAL_16 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_16_r4.c b/libgfortran/generated/maxloc0_16_r4.c
index 6e0e92aa372..6797bd9d52b 100644
--- a/libgfortran/generated/maxloc0_16_r4.c
+++ b/libgfortran/generated/maxloc0_16_r4.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxloc0_16_r4 (gfc_array_i16 * retarray, gfc_array_r4 *array);
+extern void maxloc0_16_r4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r4 * const restrict array);
 export_proto(maxloc0_16_r4);
 
 void
-maxloc0_16_r4 (gfc_array_i16 * retarray, gfc_array_r4 *array)
+maxloc0_16_r4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r4 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_4 *base;
+  const GFC_REAL_4 *base;
   GFC_INTEGER_16 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_16_r4 (gfc_array_i16 * retarray, gfc_array_r4 *array)
 }
 
 
-extern void mmaxloc0_16_r4 (gfc_array_i16 *, gfc_array_r4 *, gfc_array_l4 *);
+extern void mmaxloc0_16_r4 (gfc_array_i16 * const restrict, 
+	gfc_array_r4 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_16_r4);
 
 void
-mmaxloc0_16_r4 (gfc_array_i16 * retarray, gfc_array_r4 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_16_r4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r4 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_16_r4 (gfc_array_i16 * retarray, gfc_array_r4 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_16 *dest;
-  GFC_REAL_4 *base;
+  const GFC_REAL_4 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_16_r8.c b/libgfortran/generated/maxloc0_16_r8.c
index 878e21e1e16..f03019bd90b 100644
--- a/libgfortran/generated/maxloc0_16_r8.c
+++ b/libgfortran/generated/maxloc0_16_r8.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxloc0_16_r8 (gfc_array_i16 * retarray, gfc_array_r8 *array);
+extern void maxloc0_16_r8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r8 * const restrict array);
 export_proto(maxloc0_16_r8);
 
 void
-maxloc0_16_r8 (gfc_array_i16 * retarray, gfc_array_r8 *array)
+maxloc0_16_r8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r8 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_8 *base;
+  const GFC_REAL_8 *base;
   GFC_INTEGER_16 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_16_r8 (gfc_array_i16 * retarray, gfc_array_r8 *array)
 }
 
 
-extern void mmaxloc0_16_r8 (gfc_array_i16 *, gfc_array_r8 *, gfc_array_l4 *);
+extern void mmaxloc0_16_r8 (gfc_array_i16 * const restrict, 
+	gfc_array_r8 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_16_r8);
 
 void
-mmaxloc0_16_r8 (gfc_array_i16 * retarray, gfc_array_r8 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_16_r8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r8 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_16_r8 (gfc_array_i16 * retarray, gfc_array_r8 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_16 *dest;
-  GFC_REAL_8 *base;
+  const GFC_REAL_8 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_4_i16.c b/libgfortran/generated/maxloc0_4_i16.c
index e41953010aa..aa1c0c0d514 100644
--- a/libgfortran/generated/maxloc0_4_i16.c
+++ b/libgfortran/generated/maxloc0_4_i16.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxloc0_4_i16 (gfc_array_i4 * retarray, gfc_array_i16 *array);
+extern void maxloc0_4_i16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i16 * const restrict array);
 export_proto(maxloc0_4_i16);
 
 void
-maxloc0_4_i16 (gfc_array_i4 * retarray, gfc_array_i16 *array)
+maxloc0_4_i16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i16 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_16 *base;
+  const GFC_INTEGER_16 *base;
   GFC_INTEGER_4 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_4_i16 (gfc_array_i4 * retarray, gfc_array_i16 *array)
 }
 
 
-extern void mmaxloc0_4_i16 (gfc_array_i4 *, gfc_array_i16 *, gfc_array_l4 *);
+extern void mmaxloc0_4_i16 (gfc_array_i4 * const restrict, 
+	gfc_array_i16 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_4_i16);
 
 void
-mmaxloc0_4_i16 (gfc_array_i4 * retarray, gfc_array_i16 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_4_i16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i16 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_4_i16 (gfc_array_i4 * retarray, gfc_array_i16 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_4 *dest;
-  GFC_INTEGER_16 *base;
+  const GFC_INTEGER_16 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_4_i4.c b/libgfortran/generated/maxloc0_4_i4.c
index d88212411cf..e95e040538f 100644
--- a/libgfortran/generated/maxloc0_4_i4.c
+++ b/libgfortran/generated/maxloc0_4_i4.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array);
+extern void maxloc0_4_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array);
 export_proto(maxloc0_4_i4);
 
 void
-maxloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array)
+maxloc0_4_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_4 *base;
+  const GFC_INTEGER_4 *base;
   GFC_INTEGER_4 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array)
 }
 
 
-extern void mmaxloc0_4_i4 (gfc_array_i4 *, gfc_array_i4 *, gfc_array_l4 *);
+extern void mmaxloc0_4_i4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_4_i4);
 
 void
-mmaxloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_4_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_4 *dest;
-  GFC_INTEGER_4 *base;
+  const GFC_INTEGER_4 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_4_i8.c b/libgfortran/generated/maxloc0_4_i8.c
index e709d8308f1..94c4997139a 100644
--- a/libgfortran/generated/maxloc0_4_i8.c
+++ b/libgfortran/generated/maxloc0_4_i8.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array);
+extern void maxloc0_4_i8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i8 * const restrict array);
 export_proto(maxloc0_4_i8);
 
 void
-maxloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array)
+maxloc0_4_i8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i8 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_8 *base;
+  const GFC_INTEGER_8 *base;
   GFC_INTEGER_4 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array)
 }
 
 
-extern void mmaxloc0_4_i8 (gfc_array_i4 *, gfc_array_i8 *, gfc_array_l4 *);
+extern void mmaxloc0_4_i8 (gfc_array_i4 * const restrict, 
+	gfc_array_i8 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_4_i8);
 
 void
-mmaxloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_4_i8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i8 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_4 *dest;
-  GFC_INTEGER_8 *base;
+  const GFC_INTEGER_8 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_4_r10.c b/libgfortran/generated/maxloc0_4_r10.c
index 63b4ab3b345..4e9dead2e93 100644
--- a/libgfortran/generated/maxloc0_4_r10.c
+++ b/libgfortran/generated/maxloc0_4_r10.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxloc0_4_r10 (gfc_array_i4 * retarray, gfc_array_r10 *array);
+extern void maxloc0_4_r10 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r10 * const restrict array);
 export_proto(maxloc0_4_r10);
 
 void
-maxloc0_4_r10 (gfc_array_i4 * retarray, gfc_array_r10 *array)
+maxloc0_4_r10 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r10 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_10 *base;
+  const GFC_REAL_10 *base;
   GFC_INTEGER_4 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_4_r10 (gfc_array_i4 * retarray, gfc_array_r10 *array)
 }
 
 
-extern void mmaxloc0_4_r10 (gfc_array_i4 *, gfc_array_r10 *, gfc_array_l4 *);
+extern void mmaxloc0_4_r10 (gfc_array_i4 * const restrict, 
+	gfc_array_r10 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_4_r10);
 
 void
-mmaxloc0_4_r10 (gfc_array_i4 * retarray, gfc_array_r10 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_4_r10 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r10 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_4_r10 (gfc_array_i4 * retarray, gfc_array_r10 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_4 *dest;
-  GFC_REAL_10 *base;
+  const GFC_REAL_10 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_4_r16.c b/libgfortran/generated/maxloc0_4_r16.c
index 41cecafe38a..6059c8793f8 100644
--- a/libgfortran/generated/maxloc0_4_r16.c
+++ b/libgfortran/generated/maxloc0_4_r16.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxloc0_4_r16 (gfc_array_i4 * retarray, gfc_array_r16 *array);
+extern void maxloc0_4_r16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r16 * const restrict array);
 export_proto(maxloc0_4_r16);
 
 void
-maxloc0_4_r16 (gfc_array_i4 * retarray, gfc_array_r16 *array)
+maxloc0_4_r16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r16 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_16 *base;
+  const GFC_REAL_16 *base;
   GFC_INTEGER_4 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_4_r16 (gfc_array_i4 * retarray, gfc_array_r16 *array)
 }
 
 
-extern void mmaxloc0_4_r16 (gfc_array_i4 *, gfc_array_r16 *, gfc_array_l4 *);
+extern void mmaxloc0_4_r16 (gfc_array_i4 * const restrict, 
+	gfc_array_r16 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_4_r16);
 
 void
-mmaxloc0_4_r16 (gfc_array_i4 * retarray, gfc_array_r16 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_4_r16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r16 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_4_r16 (gfc_array_i4 * retarray, gfc_array_r16 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_4 *dest;
-  GFC_REAL_16 *base;
+  const GFC_REAL_16 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_4_r4.c b/libgfortran/generated/maxloc0_4_r4.c
index 3eba4f2cc24..260c3d35e66 100644
--- a/libgfortran/generated/maxloc0_4_r4.c
+++ b/libgfortran/generated/maxloc0_4_r4.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array);
+extern void maxloc0_4_r4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array);
 export_proto(maxloc0_4_r4);
 
 void
-maxloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array)
+maxloc0_4_r4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_4 *base;
+  const GFC_REAL_4 *base;
   GFC_INTEGER_4 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array)
 }
 
 
-extern void mmaxloc0_4_r4 (gfc_array_i4 *, gfc_array_r4 *, gfc_array_l4 *);
+extern void mmaxloc0_4_r4 (gfc_array_i4 * const restrict, 
+	gfc_array_r4 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_4_r4);
 
 void
-mmaxloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_4_r4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_4 *dest;
-  GFC_REAL_4 *base;
+  const GFC_REAL_4 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_4_r8.c b/libgfortran/generated/maxloc0_4_r8.c
index 3a5f3f2d38a..001b6bf2436 100644
--- a/libgfortran/generated/maxloc0_4_r8.c
+++ b/libgfortran/generated/maxloc0_4_r8.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array);
+extern void maxloc0_4_r8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r8 * const restrict array);
 export_proto(maxloc0_4_r8);
 
 void
-maxloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array)
+maxloc0_4_r8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r8 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_8 *base;
+  const GFC_REAL_8 *base;
   GFC_INTEGER_4 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array)
 }
 
 
-extern void mmaxloc0_4_r8 (gfc_array_i4 *, gfc_array_r8 *, gfc_array_l4 *);
+extern void mmaxloc0_4_r8 (gfc_array_i4 * const restrict, 
+	gfc_array_r8 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_4_r8);
 
 void
-mmaxloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_4_r8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r8 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_4 *dest;
-  GFC_REAL_8 *base;
+  const GFC_REAL_8 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_8_i16.c b/libgfortran/generated/maxloc0_8_i16.c
index 52316ed0850..273ceb7c558 100644
--- a/libgfortran/generated/maxloc0_8_i16.c
+++ b/libgfortran/generated/maxloc0_8_i16.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxloc0_8_i16 (gfc_array_i8 * retarray, gfc_array_i16 *array);
+extern void maxloc0_8_i16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i16 * const restrict array);
 export_proto(maxloc0_8_i16);
 
 void
-maxloc0_8_i16 (gfc_array_i8 * retarray, gfc_array_i16 *array)
+maxloc0_8_i16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i16 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_16 *base;
+  const GFC_INTEGER_16 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_8_i16 (gfc_array_i8 * retarray, gfc_array_i16 *array)
 }
 
 
-extern void mmaxloc0_8_i16 (gfc_array_i8 *, gfc_array_i16 *, gfc_array_l4 *);
+extern void mmaxloc0_8_i16 (gfc_array_i8 * const restrict, 
+	gfc_array_i16 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_8_i16);
 
 void
-mmaxloc0_8_i16 (gfc_array_i8 * retarray, gfc_array_i16 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_8_i16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i16 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_8_i16 (gfc_array_i8 * retarray, gfc_array_i16 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_INTEGER_16 *base;
+  const GFC_INTEGER_16 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_8_i4.c b/libgfortran/generated/maxloc0_8_i4.c
index aa37b6d1f38..4860ccc2253 100644
--- a/libgfortran/generated/maxloc0_8_i4.c
+++ b/libgfortran/generated/maxloc0_8_i4.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array);
+extern void maxloc0_8_i4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i4 * const restrict array);
 export_proto(maxloc0_8_i4);
 
 void
-maxloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
+maxloc0_8_i4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i4 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_4 *base;
+  const GFC_INTEGER_4 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
 }
 
 
-extern void mmaxloc0_8_i4 (gfc_array_i8 *, gfc_array_i4 *, gfc_array_l4 *);
+extern void mmaxloc0_8_i4 (gfc_array_i8 * const restrict, 
+	gfc_array_i4 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_8_i4);
 
 void
-mmaxloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_8_i4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i4 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_INTEGER_4 *base;
+  const GFC_INTEGER_4 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_8_i8.c b/libgfortran/generated/maxloc0_8_i8.c
index 8c825c4a45a..786bf70a295 100644
--- a/libgfortran/generated/maxloc0_8_i8.c
+++ b/libgfortran/generated/maxloc0_8_i8.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array);
+extern void maxloc0_8_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array);
 export_proto(maxloc0_8_i8);
 
 void
-maxloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array)
+maxloc0_8_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_8 *base;
+  const GFC_INTEGER_8 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array)
 }
 
 
-extern void mmaxloc0_8_i8 (gfc_array_i8 *, gfc_array_i8 *, gfc_array_l4 *);
+extern void mmaxloc0_8_i8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_8_i8);
 
 void
-mmaxloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_8_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_INTEGER_8 *base;
+  const GFC_INTEGER_8 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_8_r10.c b/libgfortran/generated/maxloc0_8_r10.c
index 6add1779ef1..566757febc7 100644
--- a/libgfortran/generated/maxloc0_8_r10.c
+++ b/libgfortran/generated/maxloc0_8_r10.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxloc0_8_r10 (gfc_array_i8 * retarray, gfc_array_r10 *array);
+extern void maxloc0_8_r10 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r10 * const restrict array);
 export_proto(maxloc0_8_r10);
 
 void
-maxloc0_8_r10 (gfc_array_i8 * retarray, gfc_array_r10 *array)
+maxloc0_8_r10 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r10 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_10 *base;
+  const GFC_REAL_10 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_8_r10 (gfc_array_i8 * retarray, gfc_array_r10 *array)
 }
 
 
-extern void mmaxloc0_8_r10 (gfc_array_i8 *, gfc_array_r10 *, gfc_array_l4 *);
+extern void mmaxloc0_8_r10 (gfc_array_i8 * const restrict, 
+	gfc_array_r10 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_8_r10);
 
 void
-mmaxloc0_8_r10 (gfc_array_i8 * retarray, gfc_array_r10 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_8_r10 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r10 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_8_r10 (gfc_array_i8 * retarray, gfc_array_r10 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_REAL_10 *base;
+  const GFC_REAL_10 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_8_r16.c b/libgfortran/generated/maxloc0_8_r16.c
index 92f0884f7a5..d5232a48248 100644
--- a/libgfortran/generated/maxloc0_8_r16.c
+++ b/libgfortran/generated/maxloc0_8_r16.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxloc0_8_r16 (gfc_array_i8 * retarray, gfc_array_r16 *array);
+extern void maxloc0_8_r16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r16 * const restrict array);
 export_proto(maxloc0_8_r16);
 
 void
-maxloc0_8_r16 (gfc_array_i8 * retarray, gfc_array_r16 *array)
+maxloc0_8_r16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r16 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_16 *base;
+  const GFC_REAL_16 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_8_r16 (gfc_array_i8 * retarray, gfc_array_r16 *array)
 }
 
 
-extern void mmaxloc0_8_r16 (gfc_array_i8 *, gfc_array_r16 *, gfc_array_l4 *);
+extern void mmaxloc0_8_r16 (gfc_array_i8 * const restrict, 
+	gfc_array_r16 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_8_r16);
 
 void
-mmaxloc0_8_r16 (gfc_array_i8 * retarray, gfc_array_r16 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_8_r16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r16 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_8_r16 (gfc_array_i8 * retarray, gfc_array_r16 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_REAL_16 *base;
+  const GFC_REAL_16 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_8_r4.c b/libgfortran/generated/maxloc0_8_r4.c
index 07cebb37702..1effd3a277f 100644
--- a/libgfortran/generated/maxloc0_8_r4.c
+++ b/libgfortran/generated/maxloc0_8_r4.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array);
+extern void maxloc0_8_r4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r4 * const restrict array);
 export_proto(maxloc0_8_r4);
 
 void
-maxloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array)
+maxloc0_8_r4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r4 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_4 *base;
+  const GFC_REAL_4 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array)
 }
 
 
-extern void mmaxloc0_8_r4 (gfc_array_i8 *, gfc_array_r4 *, gfc_array_l4 *);
+extern void mmaxloc0_8_r4 (gfc_array_i8 * const restrict, 
+	gfc_array_r4 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_8_r4);
 
 void
-mmaxloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_8_r4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r4 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_REAL_4 *base;
+  const GFC_REAL_4 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc0_8_r8.c b/libgfortran/generated/maxloc0_8_r8.c
index 92f2805a5b2..18b7687d0c8 100644
--- a/libgfortran/generated/maxloc0_8_r8.c
+++ b/libgfortran/generated/maxloc0_8_r8.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array);
+extern void maxloc0_8_r8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array);
 export_proto(maxloc0_8_r8);
 
 void
-maxloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array)
+maxloc0_8_r8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_8 *base;
+  const GFC_REAL_8 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ maxloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array)
 }
 
 
-extern void mmaxloc0_8_r8 (gfc_array_i8 *, gfc_array_r8 *, gfc_array_l4 *);
+extern void mmaxloc0_8_r8 (gfc_array_i8 * const restrict, 
+	gfc_array_r8 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mmaxloc0_8_r8);
 
 void
-mmaxloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array,
-				  gfc_array_l4 * mask)
+mmaxloc0_8_r8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mmaxloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_REAL_8 *base;
+  const GFC_REAL_8 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/maxloc1_16_i16.c b/libgfortran/generated/maxloc1_16_i16.c
index d9666bdbe1b..430e6eedcf4 100644
--- a/libgfortran/generated/maxloc1_16_i16.c
+++ b/libgfortran/generated/maxloc1_16_i16.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxloc1_16_i16 (gfc_array_i16 *, gfc_array_i16 *, index_type *);
+extern void maxloc1_16_i16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_16_i16);
 
 void
-maxloc1_16_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
+maxloc1_16_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_INTEGER_16 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_16_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
+      const GFC_INTEGER_16 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_16_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_16_i16 (gfc_array_i16 *, gfc_array_i16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_16_i16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_16_i16);
 
 void
-mmaxloc1_16_i16 (gfc_array_i16 * retarray, gfc_array_i16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_16_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_INTEGER_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_INTEGER_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_16_i16 (gfc_array_i16 * retarray, gfc_array_i16 * array,
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_16_i4.c b/libgfortran/generated/maxloc1_16_i4.c
index 9df85ec107a..458b72e7d72 100644
--- a/libgfortran/generated/maxloc1_16_i4.c
+++ b/libgfortran/generated/maxloc1_16_i4.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxloc1_16_i4 (gfc_array_i16 *, gfc_array_i4 *, index_type *);
+extern void maxloc1_16_i4 (gfc_array_i16 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_16_i4);
 
 void
-maxloc1_16_i4 (gfc_array_i16 *retarray, gfc_array_i4 *array, index_type *pdim)
+maxloc1_16_i4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_INTEGER_4 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_16_i4 (gfc_array_i16 *retarray, gfc_array_i4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
+      const GFC_INTEGER_4 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_16_i4 (gfc_array_i16 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_16_i4 (gfc_array_i16 *, gfc_array_i4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_16_i4 (gfc_array_i16 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_16_i4);
 
 void
-mmaxloc1_16_i4 (gfc_array_i16 * retarray, gfc_array_i4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_16_i4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_INTEGER_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_INTEGER_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_16_i4 (gfc_array_i16 * retarray, gfc_array_i4 * array,
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_16_i8.c b/libgfortran/generated/maxloc1_16_i8.c
index 8d6e003f383..cda852e1327 100644
--- a/libgfortran/generated/maxloc1_16_i8.c
+++ b/libgfortran/generated/maxloc1_16_i8.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxloc1_16_i8 (gfc_array_i16 *, gfc_array_i8 *, index_type *);
+extern void maxloc1_16_i8 (gfc_array_i16 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_16_i8);
 
 void
-maxloc1_16_i8 (gfc_array_i16 *retarray, gfc_array_i8 *array, index_type *pdim)
+maxloc1_16_i8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_INTEGER_8 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_16_i8 (gfc_array_i16 *retarray, gfc_array_i8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
+      const GFC_INTEGER_8 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_16_i8 (gfc_array_i16 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_16_i8 (gfc_array_i16 *, gfc_array_i8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_16_i8 (gfc_array_i16 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_16_i8);
 
 void
-mmaxloc1_16_i8 (gfc_array_i16 * retarray, gfc_array_i8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_16_i8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_INTEGER_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_INTEGER_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_16_i8 (gfc_array_i16 * retarray, gfc_array_i8 * array,
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_16_r10.c b/libgfortran/generated/maxloc1_16_r10.c
index 64b277005ac..e368bd900e0 100644
--- a/libgfortran/generated/maxloc1_16_r10.c
+++ b/libgfortran/generated/maxloc1_16_r10.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxloc1_16_r10 (gfc_array_i16 *, gfc_array_r10 *, index_type *);
+extern void maxloc1_16_r10 (gfc_array_i16 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_16_r10);
 
 void
-maxloc1_16_r10 (gfc_array_i16 *retarray, gfc_array_r10 *array, index_type *pdim)
+maxloc1_16_r10 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_10 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_REAL_10 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_16_r10 (gfc_array_i16 *retarray, gfc_array_r10 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_10 *src;
+      const GFC_REAL_10 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_16_r10 (gfc_array_i16 *retarray, gfc_array_r10 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_16_r10 (gfc_array_i16 *, gfc_array_r10 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_16_r10 (gfc_array_i16 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_16_r10);
 
 void
-mmaxloc1_16_r10 (gfc_array_i16 * retarray, gfc_array_r10 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_16_r10 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_REAL_10 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_REAL_10 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_16_r10 (gfc_array_i16 * retarray, gfc_array_r10 * array,
 
   while (base)
     {
-      GFC_REAL_10 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_10 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_16_r16.c b/libgfortran/generated/maxloc1_16_r16.c
index f6718083f5c..2d2ec0cfadd 100644
--- a/libgfortran/generated/maxloc1_16_r16.c
+++ b/libgfortran/generated/maxloc1_16_r16.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxloc1_16_r16 (gfc_array_i16 *, gfc_array_r16 *, index_type *);
+extern void maxloc1_16_r16 (gfc_array_i16 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_16_r16);
 
 void
-maxloc1_16_r16 (gfc_array_i16 *retarray, gfc_array_r16 *array, index_type *pdim)
+maxloc1_16_r16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_16 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_REAL_16 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_16_r16 (gfc_array_i16 *retarray, gfc_array_r16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_16 *src;
+      const GFC_REAL_16 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_16_r16 (gfc_array_i16 *retarray, gfc_array_r16 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_16_r16 (gfc_array_i16 *, gfc_array_r16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_16_r16 (gfc_array_i16 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_16_r16);
 
 void
-mmaxloc1_16_r16 (gfc_array_i16 * retarray, gfc_array_r16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_16_r16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_REAL_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_REAL_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_16_r16 (gfc_array_i16 * retarray, gfc_array_r16 * array,
 
   while (base)
     {
-      GFC_REAL_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_16_r4.c b/libgfortran/generated/maxloc1_16_r4.c
index 902e97c994e..c5dfba11d1a 100644
--- a/libgfortran/generated/maxloc1_16_r4.c
+++ b/libgfortran/generated/maxloc1_16_r4.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxloc1_16_r4 (gfc_array_i16 *, gfc_array_r4 *, index_type *);
+extern void maxloc1_16_r4 (gfc_array_i16 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_16_r4);
 
 void
-maxloc1_16_r4 (gfc_array_i16 *retarray, gfc_array_r4 *array, index_type *pdim)
+maxloc1_16_r4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_4 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_REAL_4 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_16_r4 (gfc_array_i16 *retarray, gfc_array_r4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_4 *src;
+      const GFC_REAL_4 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_16_r4 (gfc_array_i16 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_16_r4 (gfc_array_i16 *, gfc_array_r4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_16_r4 (gfc_array_i16 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_16_r4);
 
 void
-mmaxloc1_16_r4 (gfc_array_i16 * retarray, gfc_array_r4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_16_r4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_REAL_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_REAL_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_16_r4 (gfc_array_i16 * retarray, gfc_array_r4 * array,
 
   while (base)
     {
-      GFC_REAL_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_16_r8.c b/libgfortran/generated/maxloc1_16_r8.c
index 3e28d6706e2..5e965b26903 100644
--- a/libgfortran/generated/maxloc1_16_r8.c
+++ b/libgfortran/generated/maxloc1_16_r8.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxloc1_16_r8 (gfc_array_i16 *, gfc_array_r8 *, index_type *);
+extern void maxloc1_16_r8 (gfc_array_i16 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_16_r8);
 
 void
-maxloc1_16_r8 (gfc_array_i16 *retarray, gfc_array_r8 *array, index_type *pdim)
+maxloc1_16_r8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_8 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_REAL_8 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_16_r8 (gfc_array_i16 *retarray, gfc_array_r8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_8 *src;
+      const GFC_REAL_8 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_16_r8 (gfc_array_i16 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_16_r8 (gfc_array_i16 *, gfc_array_r8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_16_r8 (gfc_array_i16 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_16_r8);
 
 void
-mmaxloc1_16_r8 (gfc_array_i16 * retarray, gfc_array_r8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_16_r8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_REAL_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_REAL_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_16_r8 (gfc_array_i16 * retarray, gfc_array_r8 * array,
 
   while (base)
     {
-      GFC_REAL_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_4_i16.c b/libgfortran/generated/maxloc1_4_i16.c
index 8ca2cf1195b..c801e0ec7a5 100644
--- a/libgfortran/generated/maxloc1_4_i16.c
+++ b/libgfortran/generated/maxloc1_4_i16.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxloc1_4_i16 (gfc_array_i4 *, gfc_array_i16 *, index_type *);
+extern void maxloc1_4_i16 (gfc_array_i4 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_4_i16);
 
 void
-maxloc1_4_i16 (gfc_array_i4 *retarray, gfc_array_i16 *array, index_type *pdim)
+maxloc1_4_i16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_INTEGER_16 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_4_i16 (gfc_array_i4 *retarray, gfc_array_i16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
+      const GFC_INTEGER_16 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_4_i16 (gfc_array_i4 *retarray, gfc_array_i16 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_4_i16 (gfc_array_i4 *, gfc_array_i16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_4_i16 (gfc_array_i4 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_4_i16);
 
 void
-mmaxloc1_4_i16 (gfc_array_i4 * retarray, gfc_array_i16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_4_i16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_INTEGER_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_INTEGER_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_4_i16 (gfc_array_i4 * retarray, gfc_array_i16 * array,
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_4_i4.c b/libgfortran/generated/maxloc1_4_i4.c
index 06a657cca4e..cd6f93a12f5 100644
--- a/libgfortran/generated/maxloc1_4_i4.c
+++ b/libgfortran/generated/maxloc1_4_i4.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxloc1_4_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
+extern void maxloc1_4_i4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_4_i4);
 
 void
-maxloc1_4_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
+maxloc1_4_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_INTEGER_4 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_4_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
+      const GFC_INTEGER_4 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_4_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_4_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_4_i4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_4_i4);
 
 void
-mmaxloc1_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_4_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_INTEGER_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_INTEGER_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array,
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_4_i8.c b/libgfortran/generated/maxloc1_4_i8.c
index f03b36ca6a6..6d0353b0a78 100644
--- a/libgfortran/generated/maxloc1_4_i8.c
+++ b/libgfortran/generated/maxloc1_4_i8.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxloc1_4_i8 (gfc_array_i4 *, gfc_array_i8 *, index_type *);
+extern void maxloc1_4_i8 (gfc_array_i4 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_4_i8);
 
 void
-maxloc1_4_i8 (gfc_array_i4 *retarray, gfc_array_i8 *array, index_type *pdim)
+maxloc1_4_i8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_INTEGER_8 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_4_i8 (gfc_array_i4 *retarray, gfc_array_i8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
+      const GFC_INTEGER_8 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_4_i8 (gfc_array_i4 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_4_i8 (gfc_array_i4 *, gfc_array_i8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_4_i8 (gfc_array_i4 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_4_i8);
 
 void
-mmaxloc1_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_4_i8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_INTEGER_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_INTEGER_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 * array,
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_4_r10.c b/libgfortran/generated/maxloc1_4_r10.c
index 854b0b8042e..e8364e2dcea 100644
--- a/libgfortran/generated/maxloc1_4_r10.c
+++ b/libgfortran/generated/maxloc1_4_r10.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxloc1_4_r10 (gfc_array_i4 *, gfc_array_r10 *, index_type *);
+extern void maxloc1_4_r10 (gfc_array_i4 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_4_r10);
 
 void
-maxloc1_4_r10 (gfc_array_i4 *retarray, gfc_array_r10 *array, index_type *pdim)
+maxloc1_4_r10 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_10 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_REAL_10 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_4_r10 (gfc_array_i4 *retarray, gfc_array_r10 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_10 *src;
+      const GFC_REAL_10 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_4_r10 (gfc_array_i4 *retarray, gfc_array_r10 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_4_r10 (gfc_array_i4 *, gfc_array_r10 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_4_r10 (gfc_array_i4 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_4_r10);
 
 void
-mmaxloc1_4_r10 (gfc_array_i4 * retarray, gfc_array_r10 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_4_r10 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_REAL_10 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_REAL_10 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_4_r10 (gfc_array_i4 * retarray, gfc_array_r10 * array,
 
   while (base)
     {
-      GFC_REAL_10 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_10 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_4_r16.c b/libgfortran/generated/maxloc1_4_r16.c
index fdabd1ae4f2..5d7a5a15bd0 100644
--- a/libgfortran/generated/maxloc1_4_r16.c
+++ b/libgfortran/generated/maxloc1_4_r16.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxloc1_4_r16 (gfc_array_i4 *, gfc_array_r16 *, index_type *);
+extern void maxloc1_4_r16 (gfc_array_i4 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_4_r16);
 
 void
-maxloc1_4_r16 (gfc_array_i4 *retarray, gfc_array_r16 *array, index_type *pdim)
+maxloc1_4_r16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_16 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_REAL_16 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_4_r16 (gfc_array_i4 *retarray, gfc_array_r16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_16 *src;
+      const GFC_REAL_16 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_4_r16 (gfc_array_i4 *retarray, gfc_array_r16 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_4_r16 (gfc_array_i4 *, gfc_array_r16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_4_r16 (gfc_array_i4 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_4_r16);
 
 void
-mmaxloc1_4_r16 (gfc_array_i4 * retarray, gfc_array_r16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_4_r16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_REAL_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_REAL_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_4_r16 (gfc_array_i4 * retarray, gfc_array_r16 * array,
 
   while (base)
     {
-      GFC_REAL_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_4_r4.c b/libgfortran/generated/maxloc1_4_r4.c
index 34510e7de1a..dd0de4b9ee0 100644
--- a/libgfortran/generated/maxloc1_4_r4.c
+++ b/libgfortran/generated/maxloc1_4_r4.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxloc1_4_r4 (gfc_array_i4 *, gfc_array_r4 *, index_type *);
+extern void maxloc1_4_r4 (gfc_array_i4 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_4_r4);
 
 void
-maxloc1_4_r4 (gfc_array_i4 *retarray, gfc_array_r4 *array, index_type *pdim)
+maxloc1_4_r4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_4 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_REAL_4 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_4_r4 (gfc_array_i4 *retarray, gfc_array_r4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_4 *src;
+      const GFC_REAL_4 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_4_r4 (gfc_array_i4 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_4_r4 (gfc_array_i4 *, gfc_array_r4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_4_r4 (gfc_array_i4 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_4_r4);
 
 void
-mmaxloc1_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_4_r4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_REAL_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_REAL_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 * array,
 
   while (base)
     {
-      GFC_REAL_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_4_r8.c b/libgfortran/generated/maxloc1_4_r8.c
index ea67079c6c0..fc0f9f534cf 100644
--- a/libgfortran/generated/maxloc1_4_r8.c
+++ b/libgfortran/generated/maxloc1_4_r8.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxloc1_4_r8 (gfc_array_i4 *, gfc_array_r8 *, index_type *);
+extern void maxloc1_4_r8 (gfc_array_i4 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_4_r8);
 
 void
-maxloc1_4_r8 (gfc_array_i4 *retarray, gfc_array_r8 *array, index_type *pdim)
+maxloc1_4_r8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_8 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_REAL_8 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_4_r8 (gfc_array_i4 *retarray, gfc_array_r8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_8 *src;
+      const GFC_REAL_8 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_4_r8 (gfc_array_i4 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_4_r8 (gfc_array_i4 *, gfc_array_r8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_4_r8 (gfc_array_i4 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_4_r8);
 
 void
-mmaxloc1_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_4_r8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_REAL_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_REAL_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 * array,
 
   while (base)
     {
-      GFC_REAL_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_8_i16.c b/libgfortran/generated/maxloc1_8_i16.c
index f3ba50b32c3..8feecfaaf7d 100644
--- a/libgfortran/generated/maxloc1_8_i16.c
+++ b/libgfortran/generated/maxloc1_8_i16.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxloc1_8_i16 (gfc_array_i8 *, gfc_array_i16 *, index_type *);
+extern void maxloc1_8_i16 (gfc_array_i8 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_8_i16);
 
 void
-maxloc1_8_i16 (gfc_array_i8 *retarray, gfc_array_i16 *array, index_type *pdim)
+maxloc1_8_i16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_INTEGER_16 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_8_i16 (gfc_array_i8 *retarray, gfc_array_i16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
+      const GFC_INTEGER_16 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_8_i16 (gfc_array_i8 *retarray, gfc_array_i16 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_8_i16 (gfc_array_i8 *, gfc_array_i16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_8_i16 (gfc_array_i8 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_8_i16);
 
 void
-mmaxloc1_8_i16 (gfc_array_i8 * retarray, gfc_array_i16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_8_i16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_INTEGER_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_INTEGER_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_8_i16 (gfc_array_i8 * retarray, gfc_array_i16 * array,
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_8_i4.c b/libgfortran/generated/maxloc1_8_i4.c
index 1c095ff7bb9..0bc3cd8bc97 100644
--- a/libgfortran/generated/maxloc1_8_i4.c
+++ b/libgfortran/generated/maxloc1_8_i4.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxloc1_8_i4 (gfc_array_i8 *, gfc_array_i4 *, index_type *);
+extern void maxloc1_8_i4 (gfc_array_i8 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_8_i4);
 
 void
-maxloc1_8_i4 (gfc_array_i8 *retarray, gfc_array_i4 *array, index_type *pdim)
+maxloc1_8_i4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_INTEGER_4 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_8_i4 (gfc_array_i8 *retarray, gfc_array_i4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
+      const GFC_INTEGER_4 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_8_i4 (gfc_array_i8 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_8_i4 (gfc_array_i8 *, gfc_array_i4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_8_i4 (gfc_array_i8 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_8_i4);
 
 void
-mmaxloc1_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_8_i4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_INTEGER_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_INTEGER_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 * array,
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_8_i8.c b/libgfortran/generated/maxloc1_8_i8.c
index ee6d269f307..dccffc0d8d0 100644
--- a/libgfortran/generated/maxloc1_8_i8.c
+++ b/libgfortran/generated/maxloc1_8_i8.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxloc1_8_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
+extern void maxloc1_8_i8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_8_i8);
 
 void
-maxloc1_8_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
+maxloc1_8_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_INTEGER_8 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_8_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
+      const GFC_INTEGER_8 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_8_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_8_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_8_i8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_8_i8);
 
 void
-mmaxloc1_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_8_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_INTEGER_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_INTEGER_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array,
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_8_r10.c b/libgfortran/generated/maxloc1_8_r10.c
index 67c77330142..06c8cce9836 100644
--- a/libgfortran/generated/maxloc1_8_r10.c
+++ b/libgfortran/generated/maxloc1_8_r10.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxloc1_8_r10 (gfc_array_i8 *, gfc_array_r10 *, index_type *);
+extern void maxloc1_8_r10 (gfc_array_i8 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_8_r10);
 
 void
-maxloc1_8_r10 (gfc_array_i8 *retarray, gfc_array_r10 *array, index_type *pdim)
+maxloc1_8_r10 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_10 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_REAL_10 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_8_r10 (gfc_array_i8 *retarray, gfc_array_r10 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_10 *src;
+      const GFC_REAL_10 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_8_r10 (gfc_array_i8 *retarray, gfc_array_r10 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_8_r10 (gfc_array_i8 *, gfc_array_r10 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_8_r10 (gfc_array_i8 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_8_r10);
 
 void
-mmaxloc1_8_r10 (gfc_array_i8 * retarray, gfc_array_r10 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_8_r10 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_REAL_10 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_REAL_10 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_8_r10 (gfc_array_i8 * retarray, gfc_array_r10 * array,
 
   while (base)
     {
-      GFC_REAL_10 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_10 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_8_r16.c b/libgfortran/generated/maxloc1_8_r16.c
index d0b607f25dc..057724ad80e 100644
--- a/libgfortran/generated/maxloc1_8_r16.c
+++ b/libgfortran/generated/maxloc1_8_r16.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxloc1_8_r16 (gfc_array_i8 *, gfc_array_r16 *, index_type *);
+extern void maxloc1_8_r16 (gfc_array_i8 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_8_r16);
 
 void
-maxloc1_8_r16 (gfc_array_i8 *retarray, gfc_array_r16 *array, index_type *pdim)
+maxloc1_8_r16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_16 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_REAL_16 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_8_r16 (gfc_array_i8 *retarray, gfc_array_r16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_16 *src;
+      const GFC_REAL_16 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_8_r16 (gfc_array_i8 *retarray, gfc_array_r16 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_8_r16 (gfc_array_i8 *, gfc_array_r16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_8_r16 (gfc_array_i8 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_8_r16);
 
 void
-mmaxloc1_8_r16 (gfc_array_i8 * retarray, gfc_array_r16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_8_r16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_REAL_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_REAL_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_8_r16 (gfc_array_i8 * retarray, gfc_array_r16 * array,
 
   while (base)
     {
-      GFC_REAL_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_8_r4.c b/libgfortran/generated/maxloc1_8_r4.c
index a7dd5ca1c0e..4775da23190 100644
--- a/libgfortran/generated/maxloc1_8_r4.c
+++ b/libgfortran/generated/maxloc1_8_r4.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxloc1_8_r4 (gfc_array_i8 *, gfc_array_r4 *, index_type *);
+extern void maxloc1_8_r4 (gfc_array_i8 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_8_r4);
 
 void
-maxloc1_8_r4 (gfc_array_i8 *retarray, gfc_array_r4 *array, index_type *pdim)
+maxloc1_8_r4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_4 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_REAL_4 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_8_r4 (gfc_array_i8 *retarray, gfc_array_r4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_4 *src;
+      const GFC_REAL_4 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_8_r4 (gfc_array_i8 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_8_r4 (gfc_array_i8 *, gfc_array_r4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_8_r4 (gfc_array_i8 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_8_r4);
 
 void
-mmaxloc1_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_8_r4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_REAL_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_REAL_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 * array,
 
   while (base)
     {
-      GFC_REAL_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxloc1_8_r8.c b/libgfortran/generated/maxloc1_8_r8.c
index 188a4105a5c..8035aa2196b 100644
--- a/libgfortran/generated/maxloc1_8_r8.c
+++ b/libgfortran/generated/maxloc1_8_r8.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxloc1_8_r8 (gfc_array_i8 *, gfc_array_r8 *, index_type *);
+extern void maxloc1_8_r8 (gfc_array_i8 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict);
 export_proto(maxloc1_8_r8);
 
 void
-maxloc1_8_r8 (gfc_array_i8 *retarray, gfc_array_r8 *array, index_type *pdim)
+maxloc1_8_r8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_8 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_REAL_8 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ maxloc1_8_r8 (gfc_array_i8 *retarray, gfc_array_r8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_8 *src;
+      const GFC_REAL_8 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -178,22 +181,25 @@ maxloc1_8_r8 (gfc_array_i8 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void mmaxloc1_8_r8 (gfc_array_i8 *, gfc_array_r8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxloc1_8_r8 (gfc_array_i8 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxloc1_8_r8);
 
 void
-mmaxloc1_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_8_r8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_REAL_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_REAL_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mmaxloc1_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 * array,
 
   while (base)
     {
-      GFC_REAL_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxval_i16.c b/libgfortran/generated/maxval_i16.c
index cdcfe020727..9ae812ed7ea 100644
--- a/libgfortran/generated/maxval_i16.c
+++ b/libgfortran/generated/maxval_i16.c
@@ -38,18 +38,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void maxval_i16 (gfc_array_i16 *, gfc_array_i16 *, index_type *);
+extern void maxval_i16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict);
 export_proto(maxval_i16);
 
 void
-maxval_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
+maxval_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_INTEGER_16 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -121,7 +124,7 @@ maxval_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
+      const GFC_INTEGER_16 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -172,22 +175,25 @@ maxval_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
 }
 
 
-extern void mmaxval_i16 (gfc_array_i16 *, gfc_array_i16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxval_i16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxval_i16);
 
 void
-mmaxval_i16 (gfc_array_i16 * retarray, gfc_array_i16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxval_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_INTEGER_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_INTEGER_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -278,8 +284,8 @@ mmaxval_i16 (gfc_array_i16 * retarray, gfc_array_i16 * array,
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxval_i4.c b/libgfortran/generated/maxval_i4.c
index 5f1ba4d65b1..3ee7ce04edd 100644
--- a/libgfortran/generated/maxval_i4.c
+++ b/libgfortran/generated/maxval_i4.c
@@ -38,18 +38,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void maxval_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
+extern void maxval_i4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict);
 export_proto(maxval_i4);
 
 void
-maxval_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
+maxval_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_INTEGER_4 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -121,7 +124,7 @@ maxval_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
+      const GFC_INTEGER_4 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -172,22 +175,25 @@ maxval_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void mmaxval_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxval_i4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxval_i4);
 
 void
-mmaxval_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxval_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_INTEGER_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_INTEGER_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -278,8 +284,8 @@ mmaxval_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array,
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxval_i8.c b/libgfortran/generated/maxval_i8.c
index f1d16f3b389..f2cf7fc908f 100644
--- a/libgfortran/generated/maxval_i8.c
+++ b/libgfortran/generated/maxval_i8.c
@@ -38,18 +38,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void maxval_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
+extern void maxval_i8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict);
 export_proto(maxval_i8);
 
 void
-maxval_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
+maxval_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_INTEGER_8 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -121,7 +124,7 @@ maxval_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
+      const GFC_INTEGER_8 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -172,22 +175,25 @@ maxval_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void mmaxval_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxval_i8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxval_i8);
 
 void
-mmaxval_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxval_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_INTEGER_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_INTEGER_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -278,8 +284,8 @@ mmaxval_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array,
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxval_r10.c b/libgfortran/generated/maxval_r10.c
index 07c7d7d462a..9efa92aac8d 100644
--- a/libgfortran/generated/maxval_r10.c
+++ b/libgfortran/generated/maxval_r10.c
@@ -38,18 +38,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_REAL_10)
 
 
-extern void maxval_r10 (gfc_array_r10 *, gfc_array_r10 *, index_type *);
+extern void maxval_r10 (gfc_array_r10 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict);
 export_proto(maxval_r10);
 
 void
-maxval_r10 (gfc_array_r10 *retarray, gfc_array_r10 *array, index_type *pdim)
+maxval_r10 (gfc_array_r10 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_10 *base;
-  GFC_REAL_10 *dest;
+  const GFC_REAL_10 * restrict base;
+  GFC_REAL_10 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -121,7 +124,7 @@ maxval_r10 (gfc_array_r10 *retarray, gfc_array_r10 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_10 *src;
+      const GFC_REAL_10 * restrict src;
       GFC_REAL_10 result;
       src = base;
       {
@@ -172,22 +175,25 @@ maxval_r10 (gfc_array_r10 *retarray, gfc_array_r10 *array, index_type *pdim)
 }
 
 
-extern void mmaxval_r10 (gfc_array_r10 *, gfc_array_r10 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxval_r10 (gfc_array_r10 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxval_r10);
 
 void
-mmaxval_r10 (gfc_array_r10 * retarray, gfc_array_r10 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxval_r10 (gfc_array_r10 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_10 *dest;
-  GFC_REAL_10 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_10 * restrict dest;
+  const GFC_REAL_10 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -278,8 +284,8 @@ mmaxval_r10 (gfc_array_r10 * retarray, gfc_array_r10 * array,
 
   while (base)
     {
-      GFC_REAL_10 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_10 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_10 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxval_r16.c b/libgfortran/generated/maxval_r16.c
index 0f8f246fb17..a4d27be7316 100644
--- a/libgfortran/generated/maxval_r16.c
+++ b/libgfortran/generated/maxval_r16.c
@@ -38,18 +38,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_REAL_16)
 
 
-extern void maxval_r16 (gfc_array_r16 *, gfc_array_r16 *, index_type *);
+extern void maxval_r16 (gfc_array_r16 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict);
 export_proto(maxval_r16);
 
 void
-maxval_r16 (gfc_array_r16 *retarray, gfc_array_r16 *array, index_type *pdim)
+maxval_r16 (gfc_array_r16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_16 *base;
-  GFC_REAL_16 *dest;
+  const GFC_REAL_16 * restrict base;
+  GFC_REAL_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -121,7 +124,7 @@ maxval_r16 (gfc_array_r16 *retarray, gfc_array_r16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_16 *src;
+      const GFC_REAL_16 * restrict src;
       GFC_REAL_16 result;
       src = base;
       {
@@ -172,22 +175,25 @@ maxval_r16 (gfc_array_r16 *retarray, gfc_array_r16 *array, index_type *pdim)
 }
 
 
-extern void mmaxval_r16 (gfc_array_r16 *, gfc_array_r16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxval_r16 (gfc_array_r16 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxval_r16);
 
 void
-mmaxval_r16 (gfc_array_r16 * retarray, gfc_array_r16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxval_r16 (gfc_array_r16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_16 *dest;
-  GFC_REAL_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_16 * restrict dest;
+  const GFC_REAL_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -278,8 +284,8 @@ mmaxval_r16 (gfc_array_r16 * retarray, gfc_array_r16 * array,
 
   while (base)
     {
-      GFC_REAL_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxval_r4.c b/libgfortran/generated/maxval_r4.c
index 4d56bbf5b16..42f95a18adb 100644
--- a/libgfortran/generated/maxval_r4.c
+++ b/libgfortran/generated/maxval_r4.c
@@ -38,18 +38,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_REAL_4)
 
 
-extern void maxval_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *);
+extern void maxval_r4 (gfc_array_r4 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict);
 export_proto(maxval_r4);
 
 void
-maxval_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
+maxval_r4 (gfc_array_r4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_4 *base;
-  GFC_REAL_4 *dest;
+  const GFC_REAL_4 * restrict base;
+  GFC_REAL_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -121,7 +124,7 @@ maxval_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_4 *src;
+      const GFC_REAL_4 * restrict src;
       GFC_REAL_4 result;
       src = base;
       {
@@ -172,22 +175,25 @@ maxval_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void mmaxval_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxval_r4 (gfc_array_r4 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxval_r4);
 
 void
-mmaxval_r4 (gfc_array_r4 * retarray, gfc_array_r4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxval_r4 (gfc_array_r4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_4 *dest;
-  GFC_REAL_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_4 * restrict dest;
+  const GFC_REAL_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -278,8 +284,8 @@ mmaxval_r4 (gfc_array_r4 * retarray, gfc_array_r4 * array,
 
   while (base)
     {
-      GFC_REAL_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/maxval_r8.c b/libgfortran/generated/maxval_r8.c
index d84e18ccd0c..f70442506dc 100644
--- a/libgfortran/generated/maxval_r8.c
+++ b/libgfortran/generated/maxval_r8.c
@@ -38,18 +38,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_REAL_8)
 
 
-extern void maxval_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *);
+extern void maxval_r8 (gfc_array_r8 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict);
 export_proto(maxval_r8);
 
 void
-maxval_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
+maxval_r8 (gfc_array_r8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_8 *base;
-  GFC_REAL_8 *dest;
+  const GFC_REAL_8 * restrict base;
+  GFC_REAL_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -121,7 +124,7 @@ maxval_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_8 *src;
+      const GFC_REAL_8 * restrict src;
       GFC_REAL_8 result;
       src = base;
       {
@@ -172,22 +175,25 @@ maxval_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void mmaxval_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mmaxval_r8 (gfc_array_r8 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mmaxval_r8);
 
 void
-mmaxval_r8 (gfc_array_r8 * retarray, gfc_array_r8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mmaxval_r8 (gfc_array_r8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_8 *dest;
-  GFC_REAL_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_8 * restrict dest;
+  const GFC_REAL_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -278,8 +284,8 @@ mmaxval_r8 (gfc_array_r8 * retarray, gfc_array_r8 * array,
 
   while (base)
     {
-      GFC_REAL_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc0_16_i16.c b/libgfortran/generated/minloc0_16_i16.c
index af097faad01..99d51efe947 100644
--- a/libgfortran/generated/minloc0_16_i16.c
+++ b/libgfortran/generated/minloc0_16_i16.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minloc0_16_i16 (gfc_array_i16 * retarray, gfc_array_i16 *array);
+extern void minloc0_16_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array);
 export_proto(minloc0_16_i16);
 
 void
-minloc0_16_i16 (gfc_array_i16 * retarray, gfc_array_i16 *array)
+minloc0_16_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_16 *base;
+  const GFC_INTEGER_16 *base;
   GFC_INTEGER_16 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_16_i16 (gfc_array_i16 * retarray, gfc_array_i16 *array)
 }
 
 
-extern void mminloc0_16_i16 (gfc_array_i16 *, gfc_array_i16 *, gfc_array_l4 *);
+extern void mminloc0_16_i16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_16_i16);
 
 void
-mminloc0_16_i16 (gfc_array_i16 * retarray, gfc_array_i16 *array,
-				  gfc_array_l4 * mask)
+mminloc0_16_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_16_i16 (gfc_array_i16 * retarray, gfc_array_i16 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_16 *dest;
-  GFC_INTEGER_16 *base;
+  const GFC_INTEGER_16 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_16_i4.c b/libgfortran/generated/minloc0_16_i4.c
index 156938158fe..27b2bebf021 100644
--- a/libgfortran/generated/minloc0_16_i4.c
+++ b/libgfortran/generated/minloc0_16_i4.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minloc0_16_i4 (gfc_array_i16 * retarray, gfc_array_i4 *array);
+extern void minloc0_16_i4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i4 * const restrict array);
 export_proto(minloc0_16_i4);
 
 void
-minloc0_16_i4 (gfc_array_i16 * retarray, gfc_array_i4 *array)
+minloc0_16_i4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i4 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_4 *base;
+  const GFC_INTEGER_4 *base;
   GFC_INTEGER_16 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_16_i4 (gfc_array_i16 * retarray, gfc_array_i4 *array)
 }
 
 
-extern void mminloc0_16_i4 (gfc_array_i16 *, gfc_array_i4 *, gfc_array_l4 *);
+extern void mminloc0_16_i4 (gfc_array_i16 * const restrict, 
+	gfc_array_i4 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_16_i4);
 
 void
-mminloc0_16_i4 (gfc_array_i16 * retarray, gfc_array_i4 *array,
-				  gfc_array_l4 * mask)
+mminloc0_16_i4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i4 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_16_i4 (gfc_array_i16 * retarray, gfc_array_i4 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_16 *dest;
-  GFC_INTEGER_4 *base;
+  const GFC_INTEGER_4 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_16_i8.c b/libgfortran/generated/minloc0_16_i8.c
index 57af8927c5b..eed2f9c7a10 100644
--- a/libgfortran/generated/minloc0_16_i8.c
+++ b/libgfortran/generated/minloc0_16_i8.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minloc0_16_i8 (gfc_array_i16 * retarray, gfc_array_i8 *array);
+extern void minloc0_16_i8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i8 * const restrict array);
 export_proto(minloc0_16_i8);
 
 void
-minloc0_16_i8 (gfc_array_i16 * retarray, gfc_array_i8 *array)
+minloc0_16_i8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i8 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_8 *base;
+  const GFC_INTEGER_8 *base;
   GFC_INTEGER_16 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_16_i8 (gfc_array_i16 * retarray, gfc_array_i8 *array)
 }
 
 
-extern void mminloc0_16_i8 (gfc_array_i16 *, gfc_array_i8 *, gfc_array_l4 *);
+extern void mminloc0_16_i8 (gfc_array_i16 * const restrict, 
+	gfc_array_i8 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_16_i8);
 
 void
-mminloc0_16_i8 (gfc_array_i16 * retarray, gfc_array_i8 *array,
-				  gfc_array_l4 * mask)
+mminloc0_16_i8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i8 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_16_i8 (gfc_array_i16 * retarray, gfc_array_i8 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_16 *dest;
-  GFC_INTEGER_8 *base;
+  const GFC_INTEGER_8 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_16_r10.c b/libgfortran/generated/minloc0_16_r10.c
index 58ed79d5fef..412676059b9 100644
--- a/libgfortran/generated/minloc0_16_r10.c
+++ b/libgfortran/generated/minloc0_16_r10.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minloc0_16_r10 (gfc_array_i16 * retarray, gfc_array_r10 *array);
+extern void minloc0_16_r10 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r10 * const restrict array);
 export_proto(minloc0_16_r10);
 
 void
-minloc0_16_r10 (gfc_array_i16 * retarray, gfc_array_r10 *array)
+minloc0_16_r10 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r10 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_10 *base;
+  const GFC_REAL_10 *base;
   GFC_INTEGER_16 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_16_r10 (gfc_array_i16 * retarray, gfc_array_r10 *array)
 }
 
 
-extern void mminloc0_16_r10 (gfc_array_i16 *, gfc_array_r10 *, gfc_array_l4 *);
+extern void mminloc0_16_r10 (gfc_array_i16 * const restrict, 
+	gfc_array_r10 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_16_r10);
 
 void
-mminloc0_16_r10 (gfc_array_i16 * retarray, gfc_array_r10 *array,
-				  gfc_array_l4 * mask)
+mminloc0_16_r10 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r10 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_16_r10 (gfc_array_i16 * retarray, gfc_array_r10 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_16 *dest;
-  GFC_REAL_10 *base;
+  const GFC_REAL_10 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_16_r16.c b/libgfortran/generated/minloc0_16_r16.c
index 90c8c311df7..aad0889e039 100644
--- a/libgfortran/generated/minloc0_16_r16.c
+++ b/libgfortran/generated/minloc0_16_r16.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minloc0_16_r16 (gfc_array_i16 * retarray, gfc_array_r16 *array);
+extern void minloc0_16_r16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array);
 export_proto(minloc0_16_r16);
 
 void
-minloc0_16_r16 (gfc_array_i16 * retarray, gfc_array_r16 *array)
+minloc0_16_r16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_16 *base;
+  const GFC_REAL_16 *base;
   GFC_INTEGER_16 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_16_r16 (gfc_array_i16 * retarray, gfc_array_r16 *array)
 }
 
 
-extern void mminloc0_16_r16 (gfc_array_i16 *, gfc_array_r16 *, gfc_array_l4 *);
+extern void mminloc0_16_r16 (gfc_array_i16 * const restrict, 
+	gfc_array_r16 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_16_r16);
 
 void
-mminloc0_16_r16 (gfc_array_i16 * retarray, gfc_array_r16 *array,
-				  gfc_array_l4 * mask)
+mminloc0_16_r16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_16_r16 (gfc_array_i16 * retarray, gfc_array_r16 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_16 *dest;
-  GFC_REAL_16 *base;
+  const GFC_REAL_16 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_16_r4.c b/libgfortran/generated/minloc0_16_r4.c
index 6fba3ddd12b..6a89b9be361 100644
--- a/libgfortran/generated/minloc0_16_r4.c
+++ b/libgfortran/generated/minloc0_16_r4.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minloc0_16_r4 (gfc_array_i16 * retarray, gfc_array_r4 *array);
+extern void minloc0_16_r4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r4 * const restrict array);
 export_proto(minloc0_16_r4);
 
 void
-minloc0_16_r4 (gfc_array_i16 * retarray, gfc_array_r4 *array)
+minloc0_16_r4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r4 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_4 *base;
+  const GFC_REAL_4 *base;
   GFC_INTEGER_16 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_16_r4 (gfc_array_i16 * retarray, gfc_array_r4 *array)
 }
 
 
-extern void mminloc0_16_r4 (gfc_array_i16 *, gfc_array_r4 *, gfc_array_l4 *);
+extern void mminloc0_16_r4 (gfc_array_i16 * const restrict, 
+	gfc_array_r4 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_16_r4);
 
 void
-mminloc0_16_r4 (gfc_array_i16 * retarray, gfc_array_r4 *array,
-				  gfc_array_l4 * mask)
+mminloc0_16_r4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r4 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_16_r4 (gfc_array_i16 * retarray, gfc_array_r4 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_16 *dest;
-  GFC_REAL_4 *base;
+  const GFC_REAL_4 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_16_r8.c b/libgfortran/generated/minloc0_16_r8.c
index 37b9e178e11..3eee3cf501a 100644
--- a/libgfortran/generated/minloc0_16_r8.c
+++ b/libgfortran/generated/minloc0_16_r8.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minloc0_16_r8 (gfc_array_i16 * retarray, gfc_array_r8 *array);
+extern void minloc0_16_r8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r8 * const restrict array);
 export_proto(minloc0_16_r8);
 
 void
-minloc0_16_r8 (gfc_array_i16 * retarray, gfc_array_r8 *array)
+minloc0_16_r8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r8 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_8 *base;
+  const GFC_REAL_8 *base;
   GFC_INTEGER_16 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_16_r8 (gfc_array_i16 * retarray, gfc_array_r8 *array)
 }
 
 
-extern void mminloc0_16_r8 (gfc_array_i16 *, gfc_array_r8 *, gfc_array_l4 *);
+extern void mminloc0_16_r8 (gfc_array_i16 * const restrict, 
+	gfc_array_r8 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_16_r8);
 
 void
-mminloc0_16_r8 (gfc_array_i16 * retarray, gfc_array_r8 *array,
-				  gfc_array_l4 * mask)
+mminloc0_16_r8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r8 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_16_r8 (gfc_array_i16 * retarray, gfc_array_r8 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_16 *dest;
-  GFC_REAL_8 *base;
+  const GFC_REAL_8 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_4_i16.c b/libgfortran/generated/minloc0_4_i16.c
index 068bbd5137c..dde98ec86e6 100644
--- a/libgfortran/generated/minloc0_4_i16.c
+++ b/libgfortran/generated/minloc0_4_i16.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minloc0_4_i16 (gfc_array_i4 * retarray, gfc_array_i16 *array);
+extern void minloc0_4_i16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i16 * const restrict array);
 export_proto(minloc0_4_i16);
 
 void
-minloc0_4_i16 (gfc_array_i4 * retarray, gfc_array_i16 *array)
+minloc0_4_i16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i16 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_16 *base;
+  const GFC_INTEGER_16 *base;
   GFC_INTEGER_4 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_4_i16 (gfc_array_i4 * retarray, gfc_array_i16 *array)
 }
 
 
-extern void mminloc0_4_i16 (gfc_array_i4 *, gfc_array_i16 *, gfc_array_l4 *);
+extern void mminloc0_4_i16 (gfc_array_i4 * const restrict, 
+	gfc_array_i16 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_4_i16);
 
 void
-mminloc0_4_i16 (gfc_array_i4 * retarray, gfc_array_i16 *array,
-				  gfc_array_l4 * mask)
+mminloc0_4_i16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i16 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_4_i16 (gfc_array_i4 * retarray, gfc_array_i16 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_4 *dest;
-  GFC_INTEGER_16 *base;
+  const GFC_INTEGER_16 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_4_i4.c b/libgfortran/generated/minloc0_4_i4.c
index e3b15ae895b..eb12d04c4ba 100644
--- a/libgfortran/generated/minloc0_4_i4.c
+++ b/libgfortran/generated/minloc0_4_i4.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array);
+extern void minloc0_4_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array);
 export_proto(minloc0_4_i4);
 
 void
-minloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array)
+minloc0_4_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_4 *base;
+  const GFC_INTEGER_4 *base;
   GFC_INTEGER_4 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array)
 }
 
 
-extern void mminloc0_4_i4 (gfc_array_i4 *, gfc_array_i4 *, gfc_array_l4 *);
+extern void mminloc0_4_i4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_4_i4);
 
 void
-mminloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array,
-				  gfc_array_l4 * mask)
+mminloc0_4_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_4 *dest;
-  GFC_INTEGER_4 *base;
+  const GFC_INTEGER_4 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_4_i8.c b/libgfortran/generated/minloc0_4_i8.c
index a0214913eb1..715f932f5d2 100644
--- a/libgfortran/generated/minloc0_4_i8.c
+++ b/libgfortran/generated/minloc0_4_i8.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array);
+extern void minloc0_4_i8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i8 * const restrict array);
 export_proto(minloc0_4_i8);
 
 void
-minloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array)
+minloc0_4_i8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i8 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_8 *base;
+  const GFC_INTEGER_8 *base;
   GFC_INTEGER_4 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array)
 }
 
 
-extern void mminloc0_4_i8 (gfc_array_i4 *, gfc_array_i8 *, gfc_array_l4 *);
+extern void mminloc0_4_i8 (gfc_array_i4 * const restrict, 
+	gfc_array_i8 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_4_i8);
 
 void
-mminloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array,
-				  gfc_array_l4 * mask)
+mminloc0_4_i8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i8 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_4 *dest;
-  GFC_INTEGER_8 *base;
+  const GFC_INTEGER_8 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_4_r10.c b/libgfortran/generated/minloc0_4_r10.c
index 3f5ddd95d2e..43118cee8f6 100644
--- a/libgfortran/generated/minloc0_4_r10.c
+++ b/libgfortran/generated/minloc0_4_r10.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minloc0_4_r10 (gfc_array_i4 * retarray, gfc_array_r10 *array);
+extern void minloc0_4_r10 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r10 * const restrict array);
 export_proto(minloc0_4_r10);
 
 void
-minloc0_4_r10 (gfc_array_i4 * retarray, gfc_array_r10 *array)
+minloc0_4_r10 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r10 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_10 *base;
+  const GFC_REAL_10 *base;
   GFC_INTEGER_4 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_4_r10 (gfc_array_i4 * retarray, gfc_array_r10 *array)
 }
 
 
-extern void mminloc0_4_r10 (gfc_array_i4 *, gfc_array_r10 *, gfc_array_l4 *);
+extern void mminloc0_4_r10 (gfc_array_i4 * const restrict, 
+	gfc_array_r10 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_4_r10);
 
 void
-mminloc0_4_r10 (gfc_array_i4 * retarray, gfc_array_r10 *array,
-				  gfc_array_l4 * mask)
+mminloc0_4_r10 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r10 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_4_r10 (gfc_array_i4 * retarray, gfc_array_r10 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_4 *dest;
-  GFC_REAL_10 *base;
+  const GFC_REAL_10 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_4_r16.c b/libgfortran/generated/minloc0_4_r16.c
index 82c5f6a01b2..3751d0748e3 100644
--- a/libgfortran/generated/minloc0_4_r16.c
+++ b/libgfortran/generated/minloc0_4_r16.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minloc0_4_r16 (gfc_array_i4 * retarray, gfc_array_r16 *array);
+extern void minloc0_4_r16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r16 * const restrict array);
 export_proto(minloc0_4_r16);
 
 void
-minloc0_4_r16 (gfc_array_i4 * retarray, gfc_array_r16 *array)
+minloc0_4_r16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r16 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_16 *base;
+  const GFC_REAL_16 *base;
   GFC_INTEGER_4 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_4_r16 (gfc_array_i4 * retarray, gfc_array_r16 *array)
 }
 
 
-extern void mminloc0_4_r16 (gfc_array_i4 *, gfc_array_r16 *, gfc_array_l4 *);
+extern void mminloc0_4_r16 (gfc_array_i4 * const restrict, 
+	gfc_array_r16 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_4_r16);
 
 void
-mminloc0_4_r16 (gfc_array_i4 * retarray, gfc_array_r16 *array,
-				  gfc_array_l4 * mask)
+mminloc0_4_r16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r16 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_4_r16 (gfc_array_i4 * retarray, gfc_array_r16 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_4 *dest;
-  GFC_REAL_16 *base;
+  const GFC_REAL_16 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_4_r4.c b/libgfortran/generated/minloc0_4_r4.c
index f8cce29a119..0c93800a8b8 100644
--- a/libgfortran/generated/minloc0_4_r4.c
+++ b/libgfortran/generated/minloc0_4_r4.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array);
+extern void minloc0_4_r4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array);
 export_proto(minloc0_4_r4);
 
 void
-minloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array)
+minloc0_4_r4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_4 *base;
+  const GFC_REAL_4 *base;
   GFC_INTEGER_4 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array)
 }
 
 
-extern void mminloc0_4_r4 (gfc_array_i4 *, gfc_array_r4 *, gfc_array_l4 *);
+extern void mminloc0_4_r4 (gfc_array_i4 * const restrict, 
+	gfc_array_r4 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_4_r4);
 
 void
-mminloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array,
-				  gfc_array_l4 * mask)
+mminloc0_4_r4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_4 *dest;
-  GFC_REAL_4 *base;
+  const GFC_REAL_4 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_4_r8.c b/libgfortran/generated/minloc0_4_r8.c
index dbfa667abad..4226dfd6753 100644
--- a/libgfortran/generated/minloc0_4_r8.c
+++ b/libgfortran/generated/minloc0_4_r8.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array);
+extern void minloc0_4_r8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r8 * const restrict array);
 export_proto(minloc0_4_r8);
 
 void
-minloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array)
+minloc0_4_r8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r8 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_8 *base;
+  const GFC_REAL_8 *base;
   GFC_INTEGER_4 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array)
 }
 
 
-extern void mminloc0_4_r8 (gfc_array_i4 *, gfc_array_r8 *, gfc_array_l4 *);
+extern void mminloc0_4_r8 (gfc_array_i4 * const restrict, 
+	gfc_array_r8 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_4_r8);
 
 void
-mminloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array,
-				  gfc_array_l4 * mask)
+mminloc0_4_r8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r8 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_4 *dest;
-  GFC_REAL_8 *base;
+  const GFC_REAL_8 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_8_i16.c b/libgfortran/generated/minloc0_8_i16.c
index 8fabf52e46e..71eaec4ad4d 100644
--- a/libgfortran/generated/minloc0_8_i16.c
+++ b/libgfortran/generated/minloc0_8_i16.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minloc0_8_i16 (gfc_array_i8 * retarray, gfc_array_i16 *array);
+extern void minloc0_8_i16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i16 * const restrict array);
 export_proto(minloc0_8_i16);
 
 void
-minloc0_8_i16 (gfc_array_i8 * retarray, gfc_array_i16 *array)
+minloc0_8_i16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i16 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_16 *base;
+  const GFC_INTEGER_16 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_8_i16 (gfc_array_i8 * retarray, gfc_array_i16 *array)
 }
 
 
-extern void mminloc0_8_i16 (gfc_array_i8 *, gfc_array_i16 *, gfc_array_l4 *);
+extern void mminloc0_8_i16 (gfc_array_i8 * const restrict, 
+	gfc_array_i16 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_8_i16);
 
 void
-mminloc0_8_i16 (gfc_array_i8 * retarray, gfc_array_i16 *array,
-				  gfc_array_l4 * mask)
+mminloc0_8_i16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i16 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_8_i16 (gfc_array_i8 * retarray, gfc_array_i16 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_INTEGER_16 *base;
+  const GFC_INTEGER_16 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_8_i4.c b/libgfortran/generated/minloc0_8_i4.c
index 49fe0f4b36e..c1871f25918 100644
--- a/libgfortran/generated/minloc0_8_i4.c
+++ b/libgfortran/generated/minloc0_8_i4.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array);
+extern void minloc0_8_i4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i4 * const restrict array);
 export_proto(minloc0_8_i4);
 
 void
-minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
+minloc0_8_i4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i4 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_4 *base;
+  const GFC_INTEGER_4 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
 }
 
 
-extern void mminloc0_8_i4 (gfc_array_i8 *, gfc_array_i4 *, gfc_array_l4 *);
+extern void mminloc0_8_i4 (gfc_array_i8 * const restrict, 
+	gfc_array_i4 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_8_i4);
 
 void
-mminloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array,
-				  gfc_array_l4 * mask)
+mminloc0_8_i4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i4 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_INTEGER_4 *base;
+  const GFC_INTEGER_4 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_8_i8.c b/libgfortran/generated/minloc0_8_i8.c
index d4327f05546..b3fbaff5279 100644
--- a/libgfortran/generated/minloc0_8_i8.c
+++ b/libgfortran/generated/minloc0_8_i8.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array);
+extern void minloc0_8_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array);
 export_proto(minloc0_8_i8);
 
 void
-minloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array)
+minloc0_8_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_8 *base;
+  const GFC_INTEGER_8 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array)
 }
 
 
-extern void mminloc0_8_i8 (gfc_array_i8 *, gfc_array_i8 *, gfc_array_l4 *);
+extern void mminloc0_8_i8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_8_i8);
 
 void
-mminloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array,
-				  gfc_array_l4 * mask)
+mminloc0_8_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_INTEGER_8 *base;
+  const GFC_INTEGER_8 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_8_r10.c b/libgfortran/generated/minloc0_8_r10.c
index 2cd231b387a..9cdf5c611f7 100644
--- a/libgfortran/generated/minloc0_8_r10.c
+++ b/libgfortran/generated/minloc0_8_r10.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minloc0_8_r10 (gfc_array_i8 * retarray, gfc_array_r10 *array);
+extern void minloc0_8_r10 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r10 * const restrict array);
 export_proto(minloc0_8_r10);
 
 void
-minloc0_8_r10 (gfc_array_i8 * retarray, gfc_array_r10 *array)
+minloc0_8_r10 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r10 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_10 *base;
+  const GFC_REAL_10 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_8_r10 (gfc_array_i8 * retarray, gfc_array_r10 *array)
 }
 
 
-extern void mminloc0_8_r10 (gfc_array_i8 *, gfc_array_r10 *, gfc_array_l4 *);
+extern void mminloc0_8_r10 (gfc_array_i8 * const restrict, 
+	gfc_array_r10 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_8_r10);
 
 void
-mminloc0_8_r10 (gfc_array_i8 * retarray, gfc_array_r10 *array,
-				  gfc_array_l4 * mask)
+mminloc0_8_r10 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r10 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_8_r10 (gfc_array_i8 * retarray, gfc_array_r10 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_REAL_10 *base;
+  const GFC_REAL_10 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_8_r16.c b/libgfortran/generated/minloc0_8_r16.c
index ff5925bd8eb..dc86f6f539f 100644
--- a/libgfortran/generated/minloc0_8_r16.c
+++ b/libgfortran/generated/minloc0_8_r16.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minloc0_8_r16 (gfc_array_i8 * retarray, gfc_array_r16 *array);
+extern void minloc0_8_r16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r16 * const restrict array);
 export_proto(minloc0_8_r16);
 
 void
-minloc0_8_r16 (gfc_array_i8 * retarray, gfc_array_r16 *array)
+minloc0_8_r16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r16 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_16 *base;
+  const GFC_REAL_16 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_8_r16 (gfc_array_i8 * retarray, gfc_array_r16 *array)
 }
 
 
-extern void mminloc0_8_r16 (gfc_array_i8 *, gfc_array_r16 *, gfc_array_l4 *);
+extern void mminloc0_8_r16 (gfc_array_i8 * const restrict, 
+	gfc_array_r16 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_8_r16);
 
 void
-mminloc0_8_r16 (gfc_array_i8 * retarray, gfc_array_r16 *array,
-				  gfc_array_l4 * mask)
+mminloc0_8_r16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r16 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_8_r16 (gfc_array_i8 * retarray, gfc_array_r16 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_REAL_16 *base;
+  const GFC_REAL_16 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_8_r4.c b/libgfortran/generated/minloc0_8_r4.c
index a522c755162..985d60c2dd5 100644
--- a/libgfortran/generated/minloc0_8_r4.c
+++ b/libgfortran/generated/minloc0_8_r4.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array);
+extern void minloc0_8_r4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r4 * const restrict array);
 export_proto(minloc0_8_r4);
 
 void
-minloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array)
+minloc0_8_r4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r4 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_4 *base;
+  const GFC_REAL_4 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array)
 }
 
 
-extern void mminloc0_8_r4 (gfc_array_i8 *, gfc_array_r4 *, gfc_array_l4 *);
+extern void mminloc0_8_r4 (gfc_array_i8 * const restrict, 
+	gfc_array_r4 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_8_r4);
 
 void
-mminloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array,
-				  gfc_array_l4 * mask)
+mminloc0_8_r4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r4 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_REAL_4 *base;
+  const GFC_REAL_4 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc0_8_r8.c b/libgfortran/generated/minloc0_8_r8.c
index ba3cfe625ee..fe98a1e3d14 100644
--- a/libgfortran/generated/minloc0_8_r8.c
+++ b/libgfortran/generated/minloc0_8_r8.c
@@ -39,17 +39,19 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array);
+extern void minloc0_8_r8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array);
 export_proto(minloc0_8_r8);
 
 void
-minloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array)
+minloc0_8_r8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_REAL_8 *base;
+  const GFC_REAL_8 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -154,12 +156,14 @@ minloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array)
 }
 
 
-extern void mminloc0_8_r8 (gfc_array_i8 *, gfc_array_r8 *, gfc_array_l4 *);
+extern void mminloc0_8_r8 (gfc_array_i8 * const restrict, 
+	gfc_array_r8 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_8_r8);
 
 void
-mminloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array,
-				  gfc_array_l4 * mask)
+mminloc0_8_r8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array,
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -167,7 +171,7 @@ mminloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_REAL_8 *base;
+  const GFC_REAL_8 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
diff --git a/libgfortran/generated/minloc1_16_i16.c b/libgfortran/generated/minloc1_16_i16.c
index 906030c9b6d..5b69c5566b6 100644
--- a/libgfortran/generated/minloc1_16_i16.c
+++ b/libgfortran/generated/minloc1_16_i16.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minloc1_16_i16 (gfc_array_i16 *, gfc_array_i16 *, index_type *);
+extern void minloc1_16_i16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict);
 export_proto(minloc1_16_i16);
 
 void
-minloc1_16_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
+minloc1_16_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_INTEGER_16 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_16_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
+      const GFC_INTEGER_16 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_16_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_16_i16 (gfc_array_i16 *, gfc_array_i16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_16_i16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_16_i16);
 
 void
-mminloc1_16_i16 (gfc_array_i16 * retarray, gfc_array_i16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_16_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_INTEGER_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_INTEGER_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_16_i16 (gfc_array_i16 * retarray, gfc_array_i16 * array,
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_16_i4.c b/libgfortran/generated/minloc1_16_i4.c
index b7fe1a0843f..8d5918972a6 100644
--- a/libgfortran/generated/minloc1_16_i4.c
+++ b/libgfortran/generated/minloc1_16_i4.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minloc1_16_i4 (gfc_array_i16 *, gfc_array_i4 *, index_type *);
+extern void minloc1_16_i4 (gfc_array_i16 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict);
 export_proto(minloc1_16_i4);
 
 void
-minloc1_16_i4 (gfc_array_i16 *retarray, gfc_array_i4 *array, index_type *pdim)
+minloc1_16_i4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_INTEGER_4 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_16_i4 (gfc_array_i16 *retarray, gfc_array_i4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
+      const GFC_INTEGER_4 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_16_i4 (gfc_array_i16 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_16_i4 (gfc_array_i16 *, gfc_array_i4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_16_i4 (gfc_array_i16 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_16_i4);
 
 void
-mminloc1_16_i4 (gfc_array_i16 * retarray, gfc_array_i4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_16_i4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_INTEGER_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_INTEGER_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_16_i4 (gfc_array_i16 * retarray, gfc_array_i4 * array,
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_16_i8.c b/libgfortran/generated/minloc1_16_i8.c
index 20c17f2a9cb..d3f69950316 100644
--- a/libgfortran/generated/minloc1_16_i8.c
+++ b/libgfortran/generated/minloc1_16_i8.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minloc1_16_i8 (gfc_array_i16 *, gfc_array_i8 *, index_type *);
+extern void minloc1_16_i8 (gfc_array_i16 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict);
 export_proto(minloc1_16_i8);
 
 void
-minloc1_16_i8 (gfc_array_i16 *retarray, gfc_array_i8 *array, index_type *pdim)
+minloc1_16_i8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_INTEGER_8 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_16_i8 (gfc_array_i16 *retarray, gfc_array_i8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
+      const GFC_INTEGER_8 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_16_i8 (gfc_array_i16 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_16_i8 (gfc_array_i16 *, gfc_array_i8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_16_i8 (gfc_array_i16 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_16_i8);
 
 void
-mminloc1_16_i8 (gfc_array_i16 * retarray, gfc_array_i8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_16_i8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_INTEGER_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_INTEGER_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_16_i8 (gfc_array_i16 * retarray, gfc_array_i8 * array,
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_16_r10.c b/libgfortran/generated/minloc1_16_r10.c
index 48519c2697e..0e3d6053f8b 100644
--- a/libgfortran/generated/minloc1_16_r10.c
+++ b/libgfortran/generated/minloc1_16_r10.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minloc1_16_r10 (gfc_array_i16 *, gfc_array_r10 *, index_type *);
+extern void minloc1_16_r10 (gfc_array_i16 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict);
 export_proto(minloc1_16_r10);
 
 void
-minloc1_16_r10 (gfc_array_i16 *retarray, gfc_array_r10 *array, index_type *pdim)
+minloc1_16_r10 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_10 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_REAL_10 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_16_r10 (gfc_array_i16 *retarray, gfc_array_r10 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_10 *src;
+      const GFC_REAL_10 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_16_r10 (gfc_array_i16 *retarray, gfc_array_r10 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_16_r10 (gfc_array_i16 *, gfc_array_r10 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_16_r10 (gfc_array_i16 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_16_r10);
 
 void
-mminloc1_16_r10 (gfc_array_i16 * retarray, gfc_array_r10 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_16_r10 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_REAL_10 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_REAL_10 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_16_r10 (gfc_array_i16 * retarray, gfc_array_r10 * array,
 
   while (base)
     {
-      GFC_REAL_10 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_10 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_16_r16.c b/libgfortran/generated/minloc1_16_r16.c
index 41fed8a3067..29dfe1de0b9 100644
--- a/libgfortran/generated/minloc1_16_r16.c
+++ b/libgfortran/generated/minloc1_16_r16.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minloc1_16_r16 (gfc_array_i16 *, gfc_array_r16 *, index_type *);
+extern void minloc1_16_r16 (gfc_array_i16 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict);
 export_proto(minloc1_16_r16);
 
 void
-minloc1_16_r16 (gfc_array_i16 *retarray, gfc_array_r16 *array, index_type *pdim)
+minloc1_16_r16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_16 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_REAL_16 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_16_r16 (gfc_array_i16 *retarray, gfc_array_r16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_16 *src;
+      const GFC_REAL_16 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_16_r16 (gfc_array_i16 *retarray, gfc_array_r16 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_16_r16 (gfc_array_i16 *, gfc_array_r16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_16_r16 (gfc_array_i16 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_16_r16);
 
 void
-mminloc1_16_r16 (gfc_array_i16 * retarray, gfc_array_r16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_16_r16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_REAL_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_REAL_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_16_r16 (gfc_array_i16 * retarray, gfc_array_r16 * array,
 
   while (base)
     {
-      GFC_REAL_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_16_r4.c b/libgfortran/generated/minloc1_16_r4.c
index b3a4017a9f7..65ffe2cfbaf 100644
--- a/libgfortran/generated/minloc1_16_r4.c
+++ b/libgfortran/generated/minloc1_16_r4.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minloc1_16_r4 (gfc_array_i16 *, gfc_array_r4 *, index_type *);
+extern void minloc1_16_r4 (gfc_array_i16 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict);
 export_proto(minloc1_16_r4);
 
 void
-minloc1_16_r4 (gfc_array_i16 *retarray, gfc_array_r4 *array, index_type *pdim)
+minloc1_16_r4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_4 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_REAL_4 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_16_r4 (gfc_array_i16 *retarray, gfc_array_r4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_4 *src;
+      const GFC_REAL_4 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_16_r4 (gfc_array_i16 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_16_r4 (gfc_array_i16 *, gfc_array_r4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_16_r4 (gfc_array_i16 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_16_r4);
 
 void
-mminloc1_16_r4 (gfc_array_i16 * retarray, gfc_array_r4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_16_r4 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_REAL_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_REAL_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_16_r4 (gfc_array_i16 * retarray, gfc_array_r4 * array,
 
   while (base)
     {
-      GFC_REAL_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_16_r8.c b/libgfortran/generated/minloc1_16_r8.c
index a9a0267aa5a..379ca41166d 100644
--- a/libgfortran/generated/minloc1_16_r8.c
+++ b/libgfortran/generated/minloc1_16_r8.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minloc1_16_r8 (gfc_array_i16 *, gfc_array_r8 *, index_type *);
+extern void minloc1_16_r8 (gfc_array_i16 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict);
 export_proto(minloc1_16_r8);
 
 void
-minloc1_16_r8 (gfc_array_i16 *retarray, gfc_array_r8 *array, index_type *pdim)
+minloc1_16_r8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_8 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_REAL_8 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_16_r8 (gfc_array_i16 *retarray, gfc_array_r8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_8 *src;
+      const GFC_REAL_8 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_16_r8 (gfc_array_i16 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_16_r8 (gfc_array_i16 *, gfc_array_r8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_16_r8 (gfc_array_i16 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_16_r8);
 
 void
-mminloc1_16_r8 (gfc_array_i16 * retarray, gfc_array_r8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_16_r8 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_REAL_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_REAL_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_16_r8 (gfc_array_i16 * retarray, gfc_array_r8 * array,
 
   while (base)
     {
-      GFC_REAL_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_4_i16.c b/libgfortran/generated/minloc1_4_i16.c
index 3446a1a585c..13ac2d9768c 100644
--- a/libgfortran/generated/minloc1_4_i16.c
+++ b/libgfortran/generated/minloc1_4_i16.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minloc1_4_i16 (gfc_array_i4 *, gfc_array_i16 *, index_type *);
+extern void minloc1_4_i16 (gfc_array_i4 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict);
 export_proto(minloc1_4_i16);
 
 void
-minloc1_4_i16 (gfc_array_i4 *retarray, gfc_array_i16 *array, index_type *pdim)
+minloc1_4_i16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_INTEGER_16 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_4_i16 (gfc_array_i4 *retarray, gfc_array_i16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
+      const GFC_INTEGER_16 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_4_i16 (gfc_array_i4 *retarray, gfc_array_i16 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_4_i16 (gfc_array_i4 *, gfc_array_i16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_4_i16 (gfc_array_i4 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_4_i16);
 
 void
-mminloc1_4_i16 (gfc_array_i4 * retarray, gfc_array_i16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_4_i16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_INTEGER_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_INTEGER_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_4_i16 (gfc_array_i4 * retarray, gfc_array_i16 * array,
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_4_i4.c b/libgfortran/generated/minloc1_4_i4.c
index f7207192b1c..c9f5194bc3b 100644
--- a/libgfortran/generated/minloc1_4_i4.c
+++ b/libgfortran/generated/minloc1_4_i4.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minloc1_4_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
+extern void minloc1_4_i4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict);
 export_proto(minloc1_4_i4);
 
 void
-minloc1_4_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
+minloc1_4_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_INTEGER_4 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_4_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
+      const GFC_INTEGER_4 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_4_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_4_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_4_i4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_4_i4);
 
 void
-mminloc1_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_4_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_INTEGER_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_INTEGER_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array,
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_4_i8.c b/libgfortran/generated/minloc1_4_i8.c
index b049b19d755..57aee811d50 100644
--- a/libgfortran/generated/minloc1_4_i8.c
+++ b/libgfortran/generated/minloc1_4_i8.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minloc1_4_i8 (gfc_array_i4 *, gfc_array_i8 *, index_type *);
+extern void minloc1_4_i8 (gfc_array_i4 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict);
 export_proto(minloc1_4_i8);
 
 void
-minloc1_4_i8 (gfc_array_i4 *retarray, gfc_array_i8 *array, index_type *pdim)
+minloc1_4_i8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_INTEGER_8 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_4_i8 (gfc_array_i4 *retarray, gfc_array_i8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
+      const GFC_INTEGER_8 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_4_i8 (gfc_array_i4 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_4_i8 (gfc_array_i4 *, gfc_array_i8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_4_i8 (gfc_array_i4 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_4_i8);
 
 void
-mminloc1_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_4_i8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_INTEGER_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_INTEGER_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 * array,
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_4_r10.c b/libgfortran/generated/minloc1_4_r10.c
index 983db754f5f..d33be845030 100644
--- a/libgfortran/generated/minloc1_4_r10.c
+++ b/libgfortran/generated/minloc1_4_r10.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minloc1_4_r10 (gfc_array_i4 *, gfc_array_r10 *, index_type *);
+extern void minloc1_4_r10 (gfc_array_i4 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict);
 export_proto(minloc1_4_r10);
 
 void
-minloc1_4_r10 (gfc_array_i4 *retarray, gfc_array_r10 *array, index_type *pdim)
+minloc1_4_r10 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_10 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_REAL_10 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_4_r10 (gfc_array_i4 *retarray, gfc_array_r10 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_10 *src;
+      const GFC_REAL_10 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_4_r10 (gfc_array_i4 *retarray, gfc_array_r10 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_4_r10 (gfc_array_i4 *, gfc_array_r10 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_4_r10 (gfc_array_i4 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_4_r10);
 
 void
-mminloc1_4_r10 (gfc_array_i4 * retarray, gfc_array_r10 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_4_r10 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_REAL_10 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_REAL_10 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_4_r10 (gfc_array_i4 * retarray, gfc_array_r10 * array,
 
   while (base)
     {
-      GFC_REAL_10 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_10 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_4_r16.c b/libgfortran/generated/minloc1_4_r16.c
index 68f142125c9..fb602e20f30 100644
--- a/libgfortran/generated/minloc1_4_r16.c
+++ b/libgfortran/generated/minloc1_4_r16.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minloc1_4_r16 (gfc_array_i4 *, gfc_array_r16 *, index_type *);
+extern void minloc1_4_r16 (gfc_array_i4 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict);
 export_proto(minloc1_4_r16);
 
 void
-minloc1_4_r16 (gfc_array_i4 *retarray, gfc_array_r16 *array, index_type *pdim)
+minloc1_4_r16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_16 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_REAL_16 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_4_r16 (gfc_array_i4 *retarray, gfc_array_r16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_16 *src;
+      const GFC_REAL_16 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_4_r16 (gfc_array_i4 *retarray, gfc_array_r16 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_4_r16 (gfc_array_i4 *, gfc_array_r16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_4_r16 (gfc_array_i4 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_4_r16);
 
 void
-mminloc1_4_r16 (gfc_array_i4 * retarray, gfc_array_r16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_4_r16 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_REAL_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_REAL_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_4_r16 (gfc_array_i4 * retarray, gfc_array_r16 * array,
 
   while (base)
     {
-      GFC_REAL_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_4_r4.c b/libgfortran/generated/minloc1_4_r4.c
index e7191fd4de4..d8e7fbff078 100644
--- a/libgfortran/generated/minloc1_4_r4.c
+++ b/libgfortran/generated/minloc1_4_r4.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minloc1_4_r4 (gfc_array_i4 *, gfc_array_r4 *, index_type *);
+extern void minloc1_4_r4 (gfc_array_i4 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict);
 export_proto(minloc1_4_r4);
 
 void
-minloc1_4_r4 (gfc_array_i4 *retarray, gfc_array_r4 *array, index_type *pdim)
+minloc1_4_r4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_4 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_REAL_4 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_4_r4 (gfc_array_i4 *retarray, gfc_array_r4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_4 *src;
+      const GFC_REAL_4 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_4_r4 (gfc_array_i4 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_4_r4 (gfc_array_i4 *, gfc_array_r4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_4_r4 (gfc_array_i4 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_4_r4);
 
 void
-mminloc1_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_4_r4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_REAL_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_REAL_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 * array,
 
   while (base)
     {
-      GFC_REAL_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_4_r8.c b/libgfortran/generated/minloc1_4_r8.c
index 9d4c981cdc7..a0f018b15b3 100644
--- a/libgfortran/generated/minloc1_4_r8.c
+++ b/libgfortran/generated/minloc1_4_r8.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minloc1_4_r8 (gfc_array_i4 *, gfc_array_r8 *, index_type *);
+extern void minloc1_4_r8 (gfc_array_i4 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict);
 export_proto(minloc1_4_r8);
 
 void
-minloc1_4_r8 (gfc_array_i4 *retarray, gfc_array_r8 *array, index_type *pdim)
+minloc1_4_r8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_8 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_REAL_8 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_4_r8 (gfc_array_i4 *retarray, gfc_array_r8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_8 *src;
+      const GFC_REAL_8 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_4_r8 (gfc_array_i4 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_4_r8 (gfc_array_i4 *, gfc_array_r8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_4_r8 (gfc_array_i4 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_4_r8);
 
 void
-mminloc1_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_4_r8 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_REAL_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_REAL_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 * array,
 
   while (base)
     {
-      GFC_REAL_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_8_i16.c b/libgfortran/generated/minloc1_8_i16.c
index 13c2cb74a42..9e90549a6cd 100644
--- a/libgfortran/generated/minloc1_8_i16.c
+++ b/libgfortran/generated/minloc1_8_i16.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minloc1_8_i16 (gfc_array_i8 *, gfc_array_i16 *, index_type *);
+extern void minloc1_8_i16 (gfc_array_i8 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict);
 export_proto(minloc1_8_i16);
 
 void
-minloc1_8_i16 (gfc_array_i8 *retarray, gfc_array_i16 *array, index_type *pdim)
+minloc1_8_i16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_INTEGER_16 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_8_i16 (gfc_array_i8 *retarray, gfc_array_i16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
+      const GFC_INTEGER_16 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_8_i16 (gfc_array_i8 *retarray, gfc_array_i16 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_8_i16 (gfc_array_i8 *, gfc_array_i16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_8_i16 (gfc_array_i8 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_8_i16);
 
 void
-mminloc1_8_i16 (gfc_array_i8 * retarray, gfc_array_i16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_8_i16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_INTEGER_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_INTEGER_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_8_i16 (gfc_array_i8 * retarray, gfc_array_i16 * array,
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_8_i4.c b/libgfortran/generated/minloc1_8_i4.c
index f682c10936c..078ba6fcf85 100644
--- a/libgfortran/generated/minloc1_8_i4.c
+++ b/libgfortran/generated/minloc1_8_i4.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minloc1_8_i4 (gfc_array_i8 *, gfc_array_i4 *, index_type *);
+extern void minloc1_8_i4 (gfc_array_i8 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict);
 export_proto(minloc1_8_i4);
 
 void
-minloc1_8_i4 (gfc_array_i8 *retarray, gfc_array_i4 *array, index_type *pdim)
+minloc1_8_i4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_INTEGER_4 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_8_i4 (gfc_array_i8 *retarray, gfc_array_i4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
+      const GFC_INTEGER_4 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_8_i4 (gfc_array_i8 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_8_i4 (gfc_array_i8 *, gfc_array_i4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_8_i4 (gfc_array_i8 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_8_i4);
 
 void
-mminloc1_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_8_i4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_INTEGER_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_INTEGER_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 * array,
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_8_i8.c b/libgfortran/generated/minloc1_8_i8.c
index 9a2a5231b5a..6de37f1753e 100644
--- a/libgfortran/generated/minloc1_8_i8.c
+++ b/libgfortran/generated/minloc1_8_i8.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minloc1_8_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
+extern void minloc1_8_i8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict);
 export_proto(minloc1_8_i8);
 
 void
-minloc1_8_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
+minloc1_8_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_INTEGER_8 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_8_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
+      const GFC_INTEGER_8 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_8_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_8_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_8_i8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_8_i8);
 
 void
-mminloc1_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_8_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_INTEGER_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_INTEGER_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array,
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_8_r10.c b/libgfortran/generated/minloc1_8_r10.c
index 2058453584a..cb6d4d43a1e 100644
--- a/libgfortran/generated/minloc1_8_r10.c
+++ b/libgfortran/generated/minloc1_8_r10.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minloc1_8_r10 (gfc_array_i8 *, gfc_array_r10 *, index_type *);
+extern void minloc1_8_r10 (gfc_array_i8 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict);
 export_proto(minloc1_8_r10);
 
 void
-minloc1_8_r10 (gfc_array_i8 *retarray, gfc_array_r10 *array, index_type *pdim)
+minloc1_8_r10 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_10 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_REAL_10 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_8_r10 (gfc_array_i8 *retarray, gfc_array_r10 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_10 *src;
+      const GFC_REAL_10 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_8_r10 (gfc_array_i8 *retarray, gfc_array_r10 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_8_r10 (gfc_array_i8 *, gfc_array_r10 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_8_r10 (gfc_array_i8 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_8_r10);
 
 void
-mminloc1_8_r10 (gfc_array_i8 * retarray, gfc_array_r10 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_8_r10 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_REAL_10 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_REAL_10 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_8_r10 (gfc_array_i8 * retarray, gfc_array_r10 * array,
 
   while (base)
     {
-      GFC_REAL_10 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_10 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_8_r16.c b/libgfortran/generated/minloc1_8_r16.c
index e417f620ba6..d0a0445d330 100644
--- a/libgfortran/generated/minloc1_8_r16.c
+++ b/libgfortran/generated/minloc1_8_r16.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minloc1_8_r16 (gfc_array_i8 *, gfc_array_r16 *, index_type *);
+extern void minloc1_8_r16 (gfc_array_i8 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict);
 export_proto(minloc1_8_r16);
 
 void
-minloc1_8_r16 (gfc_array_i8 *retarray, gfc_array_r16 *array, index_type *pdim)
+minloc1_8_r16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_16 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_REAL_16 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_8_r16 (gfc_array_i8 *retarray, gfc_array_r16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_16 *src;
+      const GFC_REAL_16 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_8_r16 (gfc_array_i8 *retarray, gfc_array_r16 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_8_r16 (gfc_array_i8 *, gfc_array_r16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_8_r16 (gfc_array_i8 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_8_r16);
 
 void
-mminloc1_8_r16 (gfc_array_i8 * retarray, gfc_array_r16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_8_r16 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_REAL_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_REAL_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_8_r16 (gfc_array_i8 * retarray, gfc_array_r16 * array,
 
   while (base)
     {
-      GFC_REAL_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_8_r4.c b/libgfortran/generated/minloc1_8_r4.c
index 8f154dce275..ec8e6129d76 100644
--- a/libgfortran/generated/minloc1_8_r4.c
+++ b/libgfortran/generated/minloc1_8_r4.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minloc1_8_r4 (gfc_array_i8 *, gfc_array_r4 *, index_type *);
+extern void minloc1_8_r4 (gfc_array_i8 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict);
 export_proto(minloc1_8_r4);
 
 void
-minloc1_8_r4 (gfc_array_i8 *retarray, gfc_array_r4 *array, index_type *pdim)
+minloc1_8_r4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_4 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_REAL_4 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_8_r4 (gfc_array_i8 *retarray, gfc_array_r4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_4 *src;
+      const GFC_REAL_4 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_8_r4 (gfc_array_i8 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_8_r4 (gfc_array_i8 *, gfc_array_r4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_8_r4 (gfc_array_i8 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_8_r4);
 
 void
-mminloc1_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_8_r4 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_REAL_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_REAL_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 * array,
 
   while (base)
     {
-      GFC_REAL_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minloc1_8_r8.c b/libgfortran/generated/minloc1_8_r8.c
index 20a757a9217..ef2dd2b4af2 100644
--- a/libgfortran/generated/minloc1_8_r8.c
+++ b/libgfortran/generated/minloc1_8_r8.c
@@ -39,18 +39,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minloc1_8_r8 (gfc_array_i8 *, gfc_array_r8 *, index_type *);
+extern void minloc1_8_r8 (gfc_array_i8 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict);
 export_proto(minloc1_8_r8);
 
 void
-minloc1_8_r8 (gfc_array_i8 *retarray, gfc_array_r8 *array, index_type *pdim)
+minloc1_8_r8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_8 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_REAL_8 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -122,7 +125,7 @@ minloc1_8_r8 (gfc_array_i8 *retarray, gfc_array_r8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_8 *src;
+      const GFC_REAL_8 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -178,22 +181,25 @@ minloc1_8_r8 (gfc_array_i8 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void mminloc1_8_r8 (gfc_array_i8 *, gfc_array_r8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminloc1_8_r8 (gfc_array_i8 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminloc1_8_r8);
 
 void
-mminloc1_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminloc1_8_r8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_REAL_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_REAL_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -284,8 +290,8 @@ mminloc1_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 * array,
 
   while (base)
     {
-      GFC_REAL_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minval_i16.c b/libgfortran/generated/minval_i16.c
index 34963ae9725..5b34eafaaf7 100644
--- a/libgfortran/generated/minval_i16.c
+++ b/libgfortran/generated/minval_i16.c
@@ -38,18 +38,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void minval_i16 (gfc_array_i16 *, gfc_array_i16 *, index_type *);
+extern void minval_i16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict);
 export_proto(minval_i16);
 
 void
-minval_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
+minval_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_INTEGER_16 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -121,7 +124,7 @@ minval_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
+      const GFC_INTEGER_16 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -172,22 +175,25 @@ minval_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
 }
 
 
-extern void mminval_i16 (gfc_array_i16 *, gfc_array_i16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminval_i16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminval_i16);
 
 void
-mminval_i16 (gfc_array_i16 * retarray, gfc_array_i16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminval_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_INTEGER_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_INTEGER_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -278,8 +284,8 @@ mminval_i16 (gfc_array_i16 * retarray, gfc_array_i16 * array,
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minval_i4.c b/libgfortran/generated/minval_i4.c
index 826d2e902e2..bcdb55f3120 100644
--- a/libgfortran/generated/minval_i4.c
+++ b/libgfortran/generated/minval_i4.c
@@ -38,18 +38,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void minval_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
+extern void minval_i4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict);
 export_proto(minval_i4);
 
 void
-minval_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
+minval_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_INTEGER_4 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -121,7 +124,7 @@ minval_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
+      const GFC_INTEGER_4 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -172,22 +175,25 @@ minval_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void mminval_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminval_i4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminval_i4);
 
 void
-mminval_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminval_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_INTEGER_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_INTEGER_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -278,8 +284,8 @@ mminval_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array,
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minval_i8.c b/libgfortran/generated/minval_i8.c
index e58a97ba90d..eb37d4824b9 100644
--- a/libgfortran/generated/minval_i8.c
+++ b/libgfortran/generated/minval_i8.c
@@ -38,18 +38,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void minval_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
+extern void minval_i8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict);
 export_proto(minval_i8);
 
 void
-minval_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
+minval_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_INTEGER_8 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -121,7 +124,7 @@ minval_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
+      const GFC_INTEGER_8 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -172,22 +175,25 @@ minval_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void mminval_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminval_i8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminval_i8);
 
 void
-mminval_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminval_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_INTEGER_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_INTEGER_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -278,8 +284,8 @@ mminval_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array,
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minval_r10.c b/libgfortran/generated/minval_r10.c
index ec494fba168..a52e5a1b35a 100644
--- a/libgfortran/generated/minval_r10.c
+++ b/libgfortran/generated/minval_r10.c
@@ -38,18 +38,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_REAL_10)
 
 
-extern void minval_r10 (gfc_array_r10 *, gfc_array_r10 *, index_type *);
+extern void minval_r10 (gfc_array_r10 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict);
 export_proto(minval_r10);
 
 void
-minval_r10 (gfc_array_r10 *retarray, gfc_array_r10 *array, index_type *pdim)
+minval_r10 (gfc_array_r10 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_10 *base;
-  GFC_REAL_10 *dest;
+  const GFC_REAL_10 * restrict base;
+  GFC_REAL_10 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -121,7 +124,7 @@ minval_r10 (gfc_array_r10 *retarray, gfc_array_r10 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_10 *src;
+      const GFC_REAL_10 * restrict src;
       GFC_REAL_10 result;
       src = base;
       {
@@ -172,22 +175,25 @@ minval_r10 (gfc_array_r10 *retarray, gfc_array_r10 *array, index_type *pdim)
 }
 
 
-extern void mminval_r10 (gfc_array_r10 *, gfc_array_r10 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminval_r10 (gfc_array_r10 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminval_r10);
 
 void
-mminval_r10 (gfc_array_r10 * retarray, gfc_array_r10 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminval_r10 (gfc_array_r10 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_10 *dest;
-  GFC_REAL_10 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_10 * restrict dest;
+  const GFC_REAL_10 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -278,8 +284,8 @@ mminval_r10 (gfc_array_r10 * retarray, gfc_array_r10 * array,
 
   while (base)
     {
-      GFC_REAL_10 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_10 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_10 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minval_r16.c b/libgfortran/generated/minval_r16.c
index d71b00756de..61ecd81746f 100644
--- a/libgfortran/generated/minval_r16.c
+++ b/libgfortran/generated/minval_r16.c
@@ -38,18 +38,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_REAL_16)
 
 
-extern void minval_r16 (gfc_array_r16 *, gfc_array_r16 *, index_type *);
+extern void minval_r16 (gfc_array_r16 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict);
 export_proto(minval_r16);
 
 void
-minval_r16 (gfc_array_r16 *retarray, gfc_array_r16 *array, index_type *pdim)
+minval_r16 (gfc_array_r16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_16 *base;
-  GFC_REAL_16 *dest;
+  const GFC_REAL_16 * restrict base;
+  GFC_REAL_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -121,7 +124,7 @@ minval_r16 (gfc_array_r16 *retarray, gfc_array_r16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_16 *src;
+      const GFC_REAL_16 * restrict src;
       GFC_REAL_16 result;
       src = base;
       {
@@ -172,22 +175,25 @@ minval_r16 (gfc_array_r16 *retarray, gfc_array_r16 *array, index_type *pdim)
 }
 
 
-extern void mminval_r16 (gfc_array_r16 *, gfc_array_r16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminval_r16 (gfc_array_r16 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminval_r16);
 
 void
-mminval_r16 (gfc_array_r16 * retarray, gfc_array_r16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminval_r16 (gfc_array_r16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_16 *dest;
-  GFC_REAL_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_16 * restrict dest;
+  const GFC_REAL_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -278,8 +284,8 @@ mminval_r16 (gfc_array_r16 * retarray, gfc_array_r16 * array,
 
   while (base)
     {
-      GFC_REAL_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minval_r4.c b/libgfortran/generated/minval_r4.c
index 8228f991fcb..4eafed2eda1 100644
--- a/libgfortran/generated/minval_r4.c
+++ b/libgfortran/generated/minval_r4.c
@@ -38,18 +38,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_REAL_4)
 
 
-extern void minval_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *);
+extern void minval_r4 (gfc_array_r4 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict);
 export_proto(minval_r4);
 
 void
-minval_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
+minval_r4 (gfc_array_r4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_4 *base;
-  GFC_REAL_4 *dest;
+  const GFC_REAL_4 * restrict base;
+  GFC_REAL_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -121,7 +124,7 @@ minval_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_4 *src;
+      const GFC_REAL_4 * restrict src;
       GFC_REAL_4 result;
       src = base;
       {
@@ -172,22 +175,25 @@ minval_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void mminval_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminval_r4 (gfc_array_r4 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminval_r4);
 
 void
-mminval_r4 (gfc_array_r4 * retarray, gfc_array_r4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminval_r4 (gfc_array_r4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_4 *dest;
-  GFC_REAL_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_4 * restrict dest;
+  const GFC_REAL_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -278,8 +284,8 @@ mminval_r4 (gfc_array_r4 * retarray, gfc_array_r4 * array,
 
   while (base)
     {
-      GFC_REAL_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/minval_r8.c b/libgfortran/generated/minval_r8.c
index 81a8b2127e8..6b83f9b05d3 100644
--- a/libgfortran/generated/minval_r8.c
+++ b/libgfortran/generated/minval_r8.c
@@ -38,18 +38,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_REAL_8)
 
 
-extern void minval_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *);
+extern void minval_r8 (gfc_array_r8 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict);
 export_proto(minval_r8);
 
 void
-minval_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
+minval_r8 (gfc_array_r8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_8 *base;
-  GFC_REAL_8 *dest;
+  const GFC_REAL_8 * restrict base;
+  GFC_REAL_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -121,7 +124,7 @@ minval_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_8 *src;
+      const GFC_REAL_8 * restrict src;
       GFC_REAL_8 result;
       src = base;
       {
@@ -172,22 +175,25 @@ minval_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void mminval_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mminval_r8 (gfc_array_r8 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mminval_r8);
 
 void
-mminval_r8 (gfc_array_r8 * retarray, gfc_array_r8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mminval_r8 (gfc_array_r8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_8 *dest;
-  GFC_REAL_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_8 * restrict dest;
+  const GFC_REAL_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -278,8 +284,8 @@ mminval_r8 (gfc_array_r8 * retarray, gfc_array_r8 * array,
 
   while (base)
     {
-      GFC_REAL_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/product_c10.c b/libgfortran/generated/product_c10.c
index 0313c712626..bc1e9f0aef2 100644
--- a/libgfortran/generated/product_c10.c
+++ b/libgfortran/generated/product_c10.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_COMPLEX_10) && defined (HAVE_GFC_COMPLEX_10)
 
 
-extern void product_c10 (gfc_array_c10 *, gfc_array_c10 *, index_type *);
+extern void product_c10 (gfc_array_c10 * const restrict, 
+	gfc_array_c10 * const restrict, const index_type * const restrict);
 export_proto(product_c10);
 
 void
-product_c10 (gfc_array_c10 *retarray, gfc_array_c10 *array, index_type *pdim)
+product_c10 (gfc_array_c10 * const restrict retarray, 
+	gfc_array_c10 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_10 *base;
-  GFC_COMPLEX_10 *dest;
+  const GFC_COMPLEX_10 * restrict base;
+  GFC_COMPLEX_10 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ product_c10 (gfc_array_c10 *retarray, gfc_array_c10 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_COMPLEX_10 *src;
+      const GFC_COMPLEX_10 * restrict src;
       GFC_COMPLEX_10 result;
       src = base;
       {
@@ -170,22 +173,25 @@ product_c10 (gfc_array_c10 *retarray, gfc_array_c10 *array, index_type *pdim)
 }
 
 
-extern void mproduct_c10 (gfc_array_c10 *, gfc_array_c10 *, index_type *,
-					       gfc_array_l4 *);
+extern void mproduct_c10 (gfc_array_c10 * const restrict, 
+	gfc_array_c10 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mproduct_c10);
 
 void
-mproduct_c10 (gfc_array_c10 * retarray, gfc_array_c10 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mproduct_c10 (gfc_array_c10 * const restrict retarray, 
+	gfc_array_c10 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_10 *dest;
-  GFC_COMPLEX_10 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_COMPLEX_10 * restrict dest;
+  const GFC_COMPLEX_10 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ mproduct_c10 (gfc_array_c10 * retarray, gfc_array_c10 * array,
 
   while (base)
     {
-      GFC_COMPLEX_10 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_COMPLEX_10 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_COMPLEX_10 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/product_c16.c b/libgfortran/generated/product_c16.c
index 866ed451134..c5ac52fb834 100644
--- a/libgfortran/generated/product_c16.c
+++ b/libgfortran/generated/product_c16.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_COMPLEX_16) && defined (HAVE_GFC_COMPLEX_16)
 
 
-extern void product_c16 (gfc_array_c16 *, gfc_array_c16 *, index_type *);
+extern void product_c16 (gfc_array_c16 * const restrict, 
+	gfc_array_c16 * const restrict, const index_type * const restrict);
 export_proto(product_c16);
 
 void
-product_c16 (gfc_array_c16 *retarray, gfc_array_c16 *array, index_type *pdim)
+product_c16 (gfc_array_c16 * const restrict retarray, 
+	gfc_array_c16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_16 *base;
-  GFC_COMPLEX_16 *dest;
+  const GFC_COMPLEX_16 * restrict base;
+  GFC_COMPLEX_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ product_c16 (gfc_array_c16 *retarray, gfc_array_c16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_COMPLEX_16 *src;
+      const GFC_COMPLEX_16 * restrict src;
       GFC_COMPLEX_16 result;
       src = base;
       {
@@ -170,22 +173,25 @@ product_c16 (gfc_array_c16 *retarray, gfc_array_c16 *array, index_type *pdim)
 }
 
 
-extern void mproduct_c16 (gfc_array_c16 *, gfc_array_c16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mproduct_c16 (gfc_array_c16 * const restrict, 
+	gfc_array_c16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mproduct_c16);
 
 void
-mproduct_c16 (gfc_array_c16 * retarray, gfc_array_c16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mproduct_c16 (gfc_array_c16 * const restrict retarray, 
+	gfc_array_c16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_16 *dest;
-  GFC_COMPLEX_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_COMPLEX_16 * restrict dest;
+  const GFC_COMPLEX_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ mproduct_c16 (gfc_array_c16 * retarray, gfc_array_c16 * array,
 
   while (base)
     {
-      GFC_COMPLEX_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_COMPLEX_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_COMPLEX_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/product_c4.c b/libgfortran/generated/product_c4.c
index 42fb1ed2c6c..c8e932bdde2 100644
--- a/libgfortran/generated/product_c4.c
+++ b/libgfortran/generated/product_c4.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_COMPLEX_4) && defined (HAVE_GFC_COMPLEX_4)
 
 
-extern void product_c4 (gfc_array_c4 *, gfc_array_c4 *, index_type *);
+extern void product_c4 (gfc_array_c4 * const restrict, 
+	gfc_array_c4 * const restrict, const index_type * const restrict);
 export_proto(product_c4);
 
 void
-product_c4 (gfc_array_c4 *retarray, gfc_array_c4 *array, index_type *pdim)
+product_c4 (gfc_array_c4 * const restrict retarray, 
+	gfc_array_c4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_4 *base;
-  GFC_COMPLEX_4 *dest;
+  const GFC_COMPLEX_4 * restrict base;
+  GFC_COMPLEX_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ product_c4 (gfc_array_c4 *retarray, gfc_array_c4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_COMPLEX_4 *src;
+      const GFC_COMPLEX_4 * restrict src;
       GFC_COMPLEX_4 result;
       src = base;
       {
@@ -170,22 +173,25 @@ product_c4 (gfc_array_c4 *retarray, gfc_array_c4 *array, index_type *pdim)
 }
 
 
-extern void mproduct_c4 (gfc_array_c4 *, gfc_array_c4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mproduct_c4 (gfc_array_c4 * const restrict, 
+	gfc_array_c4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mproduct_c4);
 
 void
-mproduct_c4 (gfc_array_c4 * retarray, gfc_array_c4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mproduct_c4 (gfc_array_c4 * const restrict retarray, 
+	gfc_array_c4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_4 *dest;
-  GFC_COMPLEX_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_COMPLEX_4 * restrict dest;
+  const GFC_COMPLEX_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ mproduct_c4 (gfc_array_c4 * retarray, gfc_array_c4 * array,
 
   while (base)
     {
-      GFC_COMPLEX_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_COMPLEX_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_COMPLEX_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/product_c8.c b/libgfortran/generated/product_c8.c
index c554c513fb9..56485797edb 100644
--- a/libgfortran/generated/product_c8.c
+++ b/libgfortran/generated/product_c8.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_COMPLEX_8) && defined (HAVE_GFC_COMPLEX_8)
 
 
-extern void product_c8 (gfc_array_c8 *, gfc_array_c8 *, index_type *);
+extern void product_c8 (gfc_array_c8 * const restrict, 
+	gfc_array_c8 * const restrict, const index_type * const restrict);
 export_proto(product_c8);
 
 void
-product_c8 (gfc_array_c8 *retarray, gfc_array_c8 *array, index_type *pdim)
+product_c8 (gfc_array_c8 * const restrict retarray, 
+	gfc_array_c8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_8 *base;
-  GFC_COMPLEX_8 *dest;
+  const GFC_COMPLEX_8 * restrict base;
+  GFC_COMPLEX_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ product_c8 (gfc_array_c8 *retarray, gfc_array_c8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_COMPLEX_8 *src;
+      const GFC_COMPLEX_8 * restrict src;
       GFC_COMPLEX_8 result;
       src = base;
       {
@@ -170,22 +173,25 @@ product_c8 (gfc_array_c8 *retarray, gfc_array_c8 *array, index_type *pdim)
 }
 
 
-extern void mproduct_c8 (gfc_array_c8 *, gfc_array_c8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mproduct_c8 (gfc_array_c8 * const restrict, 
+	gfc_array_c8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mproduct_c8);
 
 void
-mproduct_c8 (gfc_array_c8 * retarray, gfc_array_c8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mproduct_c8 (gfc_array_c8 * const restrict retarray, 
+	gfc_array_c8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_8 *dest;
-  GFC_COMPLEX_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_COMPLEX_8 * restrict dest;
+  const GFC_COMPLEX_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ mproduct_c8 (gfc_array_c8 * retarray, gfc_array_c8 * array,
 
   while (base)
     {
-      GFC_COMPLEX_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_COMPLEX_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_COMPLEX_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/product_i16.c b/libgfortran/generated/product_i16.c
index 3c2aa9e4fba..2b2f314f5cc 100644
--- a/libgfortran/generated/product_i16.c
+++ b/libgfortran/generated/product_i16.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void product_i16 (gfc_array_i16 *, gfc_array_i16 *, index_type *);
+extern void product_i16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict);
 export_proto(product_i16);
 
 void
-product_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
+product_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_INTEGER_16 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ product_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
+      const GFC_INTEGER_16 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -170,22 +173,25 @@ product_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
 }
 
 
-extern void mproduct_i16 (gfc_array_i16 *, gfc_array_i16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mproduct_i16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mproduct_i16);
 
 void
-mproduct_i16 (gfc_array_i16 * retarray, gfc_array_i16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mproduct_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_INTEGER_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_INTEGER_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ mproduct_i16 (gfc_array_i16 * retarray, gfc_array_i16 * array,
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/product_i4.c b/libgfortran/generated/product_i4.c
index 3620d8da203..19a7858e414 100644
--- a/libgfortran/generated/product_i4.c
+++ b/libgfortran/generated/product_i4.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void product_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
+extern void product_i4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict);
 export_proto(product_i4);
 
 void
-product_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
+product_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_INTEGER_4 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ product_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
+      const GFC_INTEGER_4 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -170,22 +173,25 @@ product_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void mproduct_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mproduct_i4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mproduct_i4);
 
 void
-mproduct_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mproduct_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_INTEGER_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_INTEGER_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ mproduct_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array,
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/product_i8.c b/libgfortran/generated/product_i8.c
index 65b0bb0fc42..22b513530de 100644
--- a/libgfortran/generated/product_i8.c
+++ b/libgfortran/generated/product_i8.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void product_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
+extern void product_i8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict);
 export_proto(product_i8);
 
 void
-product_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
+product_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_INTEGER_8 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ product_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
+      const GFC_INTEGER_8 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -170,22 +173,25 @@ product_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void mproduct_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mproduct_i8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mproduct_i8);
 
 void
-mproduct_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mproduct_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_INTEGER_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_INTEGER_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ mproduct_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array,
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/product_r10.c b/libgfortran/generated/product_r10.c
index 292bbaa9726..9777df66a29 100644
--- a/libgfortran/generated/product_r10.c
+++ b/libgfortran/generated/product_r10.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_REAL_10)
 
 
-extern void product_r10 (gfc_array_r10 *, gfc_array_r10 *, index_type *);
+extern void product_r10 (gfc_array_r10 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict);
 export_proto(product_r10);
 
 void
-product_r10 (gfc_array_r10 *retarray, gfc_array_r10 *array, index_type *pdim)
+product_r10 (gfc_array_r10 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_10 *base;
-  GFC_REAL_10 *dest;
+  const GFC_REAL_10 * restrict base;
+  GFC_REAL_10 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ product_r10 (gfc_array_r10 *retarray, gfc_array_r10 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_10 *src;
+      const GFC_REAL_10 * restrict src;
       GFC_REAL_10 result;
       src = base;
       {
@@ -170,22 +173,25 @@ product_r10 (gfc_array_r10 *retarray, gfc_array_r10 *array, index_type *pdim)
 }
 
 
-extern void mproduct_r10 (gfc_array_r10 *, gfc_array_r10 *, index_type *,
-					       gfc_array_l4 *);
+extern void mproduct_r10 (gfc_array_r10 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mproduct_r10);
 
 void
-mproduct_r10 (gfc_array_r10 * retarray, gfc_array_r10 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mproduct_r10 (gfc_array_r10 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_10 *dest;
-  GFC_REAL_10 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_10 * restrict dest;
+  const GFC_REAL_10 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ mproduct_r10 (gfc_array_r10 * retarray, gfc_array_r10 * array,
 
   while (base)
     {
-      GFC_REAL_10 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_10 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_10 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/product_r16.c b/libgfortran/generated/product_r16.c
index f0a2c9818bb..e9d84eab314 100644
--- a/libgfortran/generated/product_r16.c
+++ b/libgfortran/generated/product_r16.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_REAL_16)
 
 
-extern void product_r16 (gfc_array_r16 *, gfc_array_r16 *, index_type *);
+extern void product_r16 (gfc_array_r16 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict);
 export_proto(product_r16);
 
 void
-product_r16 (gfc_array_r16 *retarray, gfc_array_r16 *array, index_type *pdim)
+product_r16 (gfc_array_r16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_16 *base;
-  GFC_REAL_16 *dest;
+  const GFC_REAL_16 * restrict base;
+  GFC_REAL_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ product_r16 (gfc_array_r16 *retarray, gfc_array_r16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_16 *src;
+      const GFC_REAL_16 * restrict src;
       GFC_REAL_16 result;
       src = base;
       {
@@ -170,22 +173,25 @@ product_r16 (gfc_array_r16 *retarray, gfc_array_r16 *array, index_type *pdim)
 }
 
 
-extern void mproduct_r16 (gfc_array_r16 *, gfc_array_r16 *, index_type *,
-					       gfc_array_l4 *);
+extern void mproduct_r16 (gfc_array_r16 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mproduct_r16);
 
 void
-mproduct_r16 (gfc_array_r16 * retarray, gfc_array_r16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mproduct_r16 (gfc_array_r16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_16 *dest;
-  GFC_REAL_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_16 * restrict dest;
+  const GFC_REAL_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ mproduct_r16 (gfc_array_r16 * retarray, gfc_array_r16 * array,
 
   while (base)
     {
-      GFC_REAL_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/product_r4.c b/libgfortran/generated/product_r4.c
index 6ca9ff84cf2..8b421d36539 100644
--- a/libgfortran/generated/product_r4.c
+++ b/libgfortran/generated/product_r4.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_REAL_4)
 
 
-extern void product_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *);
+extern void product_r4 (gfc_array_r4 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict);
 export_proto(product_r4);
 
 void
-product_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
+product_r4 (gfc_array_r4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_4 *base;
-  GFC_REAL_4 *dest;
+  const GFC_REAL_4 * restrict base;
+  GFC_REAL_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ product_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_4 *src;
+      const GFC_REAL_4 * restrict src;
       GFC_REAL_4 result;
       src = base;
       {
@@ -170,22 +173,25 @@ product_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void mproduct_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *,
-					       gfc_array_l4 *);
+extern void mproduct_r4 (gfc_array_r4 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mproduct_r4);
 
 void
-mproduct_r4 (gfc_array_r4 * retarray, gfc_array_r4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mproduct_r4 (gfc_array_r4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_4 *dest;
-  GFC_REAL_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_4 * restrict dest;
+  const GFC_REAL_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ mproduct_r4 (gfc_array_r4 * retarray, gfc_array_r4 * array,
 
   while (base)
     {
-      GFC_REAL_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/product_r8.c b/libgfortran/generated/product_r8.c
index d73ccc7b0e0..57094cf6f0a 100644
--- a/libgfortran/generated/product_r8.c
+++ b/libgfortran/generated/product_r8.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_REAL_8)
 
 
-extern void product_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *);
+extern void product_r8 (gfc_array_r8 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict);
 export_proto(product_r8);
 
 void
-product_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
+product_r8 (gfc_array_r8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_8 *base;
-  GFC_REAL_8 *dest;
+  const GFC_REAL_8 * restrict base;
+  GFC_REAL_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ product_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_8 *src;
+      const GFC_REAL_8 * restrict src;
       GFC_REAL_8 result;
       src = base;
       {
@@ -170,22 +173,25 @@ product_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void mproduct_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *,
-					       gfc_array_l4 *);
+extern void mproduct_r8 (gfc_array_r8 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(mproduct_r8);
 
 void
-mproduct_r8 (gfc_array_r8 * retarray, gfc_array_r8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+mproduct_r8 (gfc_array_r8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_8 *dest;
-  GFC_REAL_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_8 * restrict dest;
+  const GFC_REAL_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ mproduct_r8 (gfc_array_r8 * retarray, gfc_array_r8 * array,
 
   while (base)
     {
-      GFC_REAL_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/reshape_c10.c b/libgfortran/generated/reshape_c10.c
index 30988e87eff..21789f87fc6 100644
--- a/libgfortran/generated/reshape_c10.c
+++ b/libgfortran/generated/reshape_c10.c
@@ -40,13 +40,19 @@ typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
 /* The shape parameter is ignored. We can currently deduce the shape from the
    return array.  */
 
-extern void reshape_c10 (gfc_array_c10 *, gfc_array_c10 *, shape_type *,
-				    gfc_array_c10 *, shape_type *);
+extern void reshape_c10 (gfc_array_c10 * const restrict, 
+	gfc_array_c10 * const restrict, 
+	shape_type * const restrict,
+	gfc_array_c10 * const restrict, 
+	shape_type * const restrict);
 export_proto(reshape_c10);
 
 void
-reshape_c10 (gfc_array_c10 * ret, gfc_array_c10 * source, shape_type * shape,
-                      gfc_array_c10 * pad, shape_type * order)
+reshape_c10 (gfc_array_c10 * const restrict ret, 
+	gfc_array_c10 * const restrict source, 
+	shape_type * const restrict shape,
+	gfc_array_c10 * const restrict pad, 
+	shape_type * const restrict order)
 {
   /* r.* indicates the return array.  */
   index_type rcount[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/reshape_c16.c b/libgfortran/generated/reshape_c16.c
index 1c238de22eb..f3c4a901141 100644
--- a/libgfortran/generated/reshape_c16.c
+++ b/libgfortran/generated/reshape_c16.c
@@ -40,13 +40,19 @@ typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
 /* The shape parameter is ignored. We can currently deduce the shape from the
    return array.  */
 
-extern void reshape_c16 (gfc_array_c16 *, gfc_array_c16 *, shape_type *,
-				    gfc_array_c16 *, shape_type *);
+extern void reshape_c16 (gfc_array_c16 * const restrict, 
+	gfc_array_c16 * const restrict, 
+	shape_type * const restrict,
+	gfc_array_c16 * const restrict, 
+	shape_type * const restrict);
 export_proto(reshape_c16);
 
 void
-reshape_c16 (gfc_array_c16 * ret, gfc_array_c16 * source, shape_type * shape,
-                      gfc_array_c16 * pad, shape_type * order)
+reshape_c16 (gfc_array_c16 * const restrict ret, 
+	gfc_array_c16 * const restrict source, 
+	shape_type * const restrict shape,
+	gfc_array_c16 * const restrict pad, 
+	shape_type * const restrict order)
 {
   /* r.* indicates the return array.  */
   index_type rcount[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/reshape_c4.c b/libgfortran/generated/reshape_c4.c
index 4416b9060bc..384f36f2a5d 100644
--- a/libgfortran/generated/reshape_c4.c
+++ b/libgfortran/generated/reshape_c4.c
@@ -40,13 +40,19 @@ typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
 /* The shape parameter is ignored. We can currently deduce the shape from the
    return array.  */
 
-extern void reshape_c4 (gfc_array_c4 *, gfc_array_c4 *, shape_type *,
-				    gfc_array_c4 *, shape_type *);
+extern void reshape_c4 (gfc_array_c4 * const restrict, 
+	gfc_array_c4 * const restrict, 
+	shape_type * const restrict,
+	gfc_array_c4 * const restrict, 
+	shape_type * const restrict);
 export_proto(reshape_c4);
 
 void
-reshape_c4 (gfc_array_c4 * ret, gfc_array_c4 * source, shape_type * shape,
-                      gfc_array_c4 * pad, shape_type * order)
+reshape_c4 (gfc_array_c4 * const restrict ret, 
+	gfc_array_c4 * const restrict source, 
+	shape_type * const restrict shape,
+	gfc_array_c4 * const restrict pad, 
+	shape_type * const restrict order)
 {
   /* r.* indicates the return array.  */
   index_type rcount[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/reshape_c8.c b/libgfortran/generated/reshape_c8.c
index 425c6ebac0c..e2c7c399b43 100644
--- a/libgfortran/generated/reshape_c8.c
+++ b/libgfortran/generated/reshape_c8.c
@@ -40,13 +40,19 @@ typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
 /* The shape parameter is ignored. We can currently deduce the shape from the
    return array.  */
 
-extern void reshape_c8 (gfc_array_c8 *, gfc_array_c8 *, shape_type *,
-				    gfc_array_c8 *, shape_type *);
+extern void reshape_c8 (gfc_array_c8 * const restrict, 
+	gfc_array_c8 * const restrict, 
+	shape_type * const restrict,
+	gfc_array_c8 * const restrict, 
+	shape_type * const restrict);
 export_proto(reshape_c8);
 
 void
-reshape_c8 (gfc_array_c8 * ret, gfc_array_c8 * source, shape_type * shape,
-                      gfc_array_c8 * pad, shape_type * order)
+reshape_c8 (gfc_array_c8 * const restrict ret, 
+	gfc_array_c8 * const restrict source, 
+	shape_type * const restrict shape,
+	gfc_array_c8 * const restrict pad, 
+	shape_type * const restrict order)
 {
   /* r.* indicates the return array.  */
   index_type rcount[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/reshape_i16.c b/libgfortran/generated/reshape_i16.c
index 2d793e2929d..a8fece516fd 100644
--- a/libgfortran/generated/reshape_i16.c
+++ b/libgfortran/generated/reshape_i16.c
@@ -40,13 +40,19 @@ typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
 /* The shape parameter is ignored. We can currently deduce the shape from the
    return array.  */
 
-extern void reshape_16 (gfc_array_i16 *, gfc_array_i16 *, shape_type *,
-				    gfc_array_i16 *, shape_type *);
+extern void reshape_16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, 
+	shape_type * const restrict,
+	gfc_array_i16 * const restrict, 
+	shape_type * const restrict);
 export_proto(reshape_16);
 
 void
-reshape_16 (gfc_array_i16 * ret, gfc_array_i16 * source, shape_type * shape,
-                      gfc_array_i16 * pad, shape_type * order)
+reshape_16 (gfc_array_i16 * const restrict ret, 
+	gfc_array_i16 * const restrict source, 
+	shape_type * const restrict shape,
+	gfc_array_i16 * const restrict pad, 
+	shape_type * const restrict order)
 {
   /* r.* indicates the return array.  */
   index_type rcount[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/reshape_i4.c b/libgfortran/generated/reshape_i4.c
index 565d79c6222..2c8ee4b93a8 100644
--- a/libgfortran/generated/reshape_i4.c
+++ b/libgfortran/generated/reshape_i4.c
@@ -40,13 +40,19 @@ typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
 /* The shape parameter is ignored. We can currently deduce the shape from the
    return array.  */
 
-extern void reshape_4 (gfc_array_i4 *, gfc_array_i4 *, shape_type *,
-				    gfc_array_i4 *, shape_type *);
+extern void reshape_4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, 
+	shape_type * const restrict,
+	gfc_array_i4 * const restrict, 
+	shape_type * const restrict);
 export_proto(reshape_4);
 
 void
-reshape_4 (gfc_array_i4 * ret, gfc_array_i4 * source, shape_type * shape,
-                      gfc_array_i4 * pad, shape_type * order)
+reshape_4 (gfc_array_i4 * const restrict ret, 
+	gfc_array_i4 * const restrict source, 
+	shape_type * const restrict shape,
+	gfc_array_i4 * const restrict pad, 
+	shape_type * const restrict order)
 {
   /* r.* indicates the return array.  */
   index_type rcount[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/reshape_i8.c b/libgfortran/generated/reshape_i8.c
index 465d532ed8a..6ffb681700b 100644
--- a/libgfortran/generated/reshape_i8.c
+++ b/libgfortran/generated/reshape_i8.c
@@ -40,13 +40,19 @@ typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
 /* The shape parameter is ignored. We can currently deduce the shape from the
    return array.  */
 
-extern void reshape_8 (gfc_array_i8 *, gfc_array_i8 *, shape_type *,
-				    gfc_array_i8 *, shape_type *);
+extern void reshape_8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, 
+	shape_type * const restrict,
+	gfc_array_i8 * const restrict, 
+	shape_type * const restrict);
 export_proto(reshape_8);
 
 void
-reshape_8 (gfc_array_i8 * ret, gfc_array_i8 * source, shape_type * shape,
-                      gfc_array_i8 * pad, shape_type * order)
+reshape_8 (gfc_array_i8 * const restrict ret, 
+	gfc_array_i8 * const restrict source, 
+	shape_type * const restrict shape,
+	gfc_array_i8 * const restrict pad, 
+	shape_type * const restrict order)
 {
   /* r.* indicates the return array.  */
   index_type rcount[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/shape_i16.c b/libgfortran/generated/shape_i16.c
index 87a58ffe5a6..30209d5de9a 100644
--- a/libgfortran/generated/shape_i16.c
+++ b/libgfortran/generated/shape_i16.c
@@ -35,11 +35,13 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_INTEGER_16)
 
-extern void shape_16 (gfc_array_i16 * ret, const gfc_array_i16 * array);
+extern void shape_16 (gfc_array_i16 * const restrict ret, 
+	const gfc_array_i16 * const restrict array);
 export_proto(shape_16);
 
 void
-shape_16 (gfc_array_i16 * ret, const gfc_array_i16 * array)
+shape_16 (gfc_array_i16 * const restrict ret, 
+	const gfc_array_i16 * const restrict array)
 {
   int n;
   index_type stride;
diff --git a/libgfortran/generated/shape_i4.c b/libgfortran/generated/shape_i4.c
index 7a56eee5b5f..d4b323a3cb6 100644
--- a/libgfortran/generated/shape_i4.c
+++ b/libgfortran/generated/shape_i4.c
@@ -35,11 +35,13 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_INTEGER_4)
 
-extern void shape_4 (gfc_array_i4 * ret, const gfc_array_i4 * array);
+extern void shape_4 (gfc_array_i4 * const restrict ret, 
+	const gfc_array_i4 * const restrict array);
 export_proto(shape_4);
 
 void
-shape_4 (gfc_array_i4 * ret, const gfc_array_i4 * array)
+shape_4 (gfc_array_i4 * const restrict ret, 
+	const gfc_array_i4 * const restrict array)
 {
   int n;
   index_type stride;
diff --git a/libgfortran/generated/shape_i8.c b/libgfortran/generated/shape_i8.c
index 2e696c27b18..acf925fd8b9 100644
--- a/libgfortran/generated/shape_i8.c
+++ b/libgfortran/generated/shape_i8.c
@@ -35,11 +35,13 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_INTEGER_8)
 
-extern void shape_8 (gfc_array_i8 * ret, const gfc_array_i8 * array);
+extern void shape_8 (gfc_array_i8 * const restrict ret, 
+	const gfc_array_i8 * const restrict array);
 export_proto(shape_8);
 
 void
-shape_8 (gfc_array_i8 * ret, const gfc_array_i8 * array)
+shape_8 (gfc_array_i8 * const restrict ret, 
+	const gfc_array_i8 * const restrict array)
 {
   int n;
   index_type stride;
diff --git a/libgfortran/generated/sum_c10.c b/libgfortran/generated/sum_c10.c
index 655529a7fe9..393f04ece4c 100644
--- a/libgfortran/generated/sum_c10.c
+++ b/libgfortran/generated/sum_c10.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_COMPLEX_10) && defined (HAVE_GFC_COMPLEX_10)
 
 
-extern void sum_c10 (gfc_array_c10 *, gfc_array_c10 *, index_type *);
+extern void sum_c10 (gfc_array_c10 * const restrict, 
+	gfc_array_c10 * const restrict, const index_type * const restrict);
 export_proto(sum_c10);
 
 void
-sum_c10 (gfc_array_c10 *retarray, gfc_array_c10 *array, index_type *pdim)
+sum_c10 (gfc_array_c10 * const restrict retarray, 
+	gfc_array_c10 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_10 *base;
-  GFC_COMPLEX_10 *dest;
+  const GFC_COMPLEX_10 * restrict base;
+  GFC_COMPLEX_10 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ sum_c10 (gfc_array_c10 *retarray, gfc_array_c10 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_COMPLEX_10 *src;
+      const GFC_COMPLEX_10 * restrict src;
       GFC_COMPLEX_10 result;
       src = base;
       {
@@ -170,22 +173,25 @@ sum_c10 (gfc_array_c10 *retarray, gfc_array_c10 *array, index_type *pdim)
 }
 
 
-extern void msum_c10 (gfc_array_c10 *, gfc_array_c10 *, index_type *,
-					       gfc_array_l4 *);
+extern void msum_c10 (gfc_array_c10 * const restrict, 
+	gfc_array_c10 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(msum_c10);
 
 void
-msum_c10 (gfc_array_c10 * retarray, gfc_array_c10 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+msum_c10 (gfc_array_c10 * const restrict retarray, 
+	gfc_array_c10 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_10 *dest;
-  GFC_COMPLEX_10 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_COMPLEX_10 * restrict dest;
+  const GFC_COMPLEX_10 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ msum_c10 (gfc_array_c10 * retarray, gfc_array_c10 * array,
 
   while (base)
     {
-      GFC_COMPLEX_10 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_COMPLEX_10 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_COMPLEX_10 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/sum_c16.c b/libgfortran/generated/sum_c16.c
index ee40ba5149c..9e5c8edb138 100644
--- a/libgfortran/generated/sum_c16.c
+++ b/libgfortran/generated/sum_c16.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_COMPLEX_16) && defined (HAVE_GFC_COMPLEX_16)
 
 
-extern void sum_c16 (gfc_array_c16 *, gfc_array_c16 *, index_type *);
+extern void sum_c16 (gfc_array_c16 * const restrict, 
+	gfc_array_c16 * const restrict, const index_type * const restrict);
 export_proto(sum_c16);
 
 void
-sum_c16 (gfc_array_c16 *retarray, gfc_array_c16 *array, index_type *pdim)
+sum_c16 (gfc_array_c16 * const restrict retarray, 
+	gfc_array_c16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_16 *base;
-  GFC_COMPLEX_16 *dest;
+  const GFC_COMPLEX_16 * restrict base;
+  GFC_COMPLEX_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ sum_c16 (gfc_array_c16 *retarray, gfc_array_c16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_COMPLEX_16 *src;
+      const GFC_COMPLEX_16 * restrict src;
       GFC_COMPLEX_16 result;
       src = base;
       {
@@ -170,22 +173,25 @@ sum_c16 (gfc_array_c16 *retarray, gfc_array_c16 *array, index_type *pdim)
 }
 
 
-extern void msum_c16 (gfc_array_c16 *, gfc_array_c16 *, index_type *,
-					       gfc_array_l4 *);
+extern void msum_c16 (gfc_array_c16 * const restrict, 
+	gfc_array_c16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(msum_c16);
 
 void
-msum_c16 (gfc_array_c16 * retarray, gfc_array_c16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+msum_c16 (gfc_array_c16 * const restrict retarray, 
+	gfc_array_c16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_16 *dest;
-  GFC_COMPLEX_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_COMPLEX_16 * restrict dest;
+  const GFC_COMPLEX_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ msum_c16 (gfc_array_c16 * retarray, gfc_array_c16 * array,
 
   while (base)
     {
-      GFC_COMPLEX_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_COMPLEX_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_COMPLEX_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/sum_c4.c b/libgfortran/generated/sum_c4.c
index bb08a4b558d..72d28f8afa0 100644
--- a/libgfortran/generated/sum_c4.c
+++ b/libgfortran/generated/sum_c4.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_COMPLEX_4) && defined (HAVE_GFC_COMPLEX_4)
 
 
-extern void sum_c4 (gfc_array_c4 *, gfc_array_c4 *, index_type *);
+extern void sum_c4 (gfc_array_c4 * const restrict, 
+	gfc_array_c4 * const restrict, const index_type * const restrict);
 export_proto(sum_c4);
 
 void
-sum_c4 (gfc_array_c4 *retarray, gfc_array_c4 *array, index_type *pdim)
+sum_c4 (gfc_array_c4 * const restrict retarray, 
+	gfc_array_c4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_4 *base;
-  GFC_COMPLEX_4 *dest;
+  const GFC_COMPLEX_4 * restrict base;
+  GFC_COMPLEX_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ sum_c4 (gfc_array_c4 *retarray, gfc_array_c4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_COMPLEX_4 *src;
+      const GFC_COMPLEX_4 * restrict src;
       GFC_COMPLEX_4 result;
       src = base;
       {
@@ -170,22 +173,25 @@ sum_c4 (gfc_array_c4 *retarray, gfc_array_c4 *array, index_type *pdim)
 }
 
 
-extern void msum_c4 (gfc_array_c4 *, gfc_array_c4 *, index_type *,
-					       gfc_array_l4 *);
+extern void msum_c4 (gfc_array_c4 * const restrict, 
+	gfc_array_c4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(msum_c4);
 
 void
-msum_c4 (gfc_array_c4 * retarray, gfc_array_c4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+msum_c4 (gfc_array_c4 * const restrict retarray, 
+	gfc_array_c4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_4 *dest;
-  GFC_COMPLEX_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_COMPLEX_4 * restrict dest;
+  const GFC_COMPLEX_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ msum_c4 (gfc_array_c4 * retarray, gfc_array_c4 * array,
 
   while (base)
     {
-      GFC_COMPLEX_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_COMPLEX_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_COMPLEX_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/sum_c8.c b/libgfortran/generated/sum_c8.c
index fd8e3560aa3..485b46d75fb 100644
--- a/libgfortran/generated/sum_c8.c
+++ b/libgfortran/generated/sum_c8.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_COMPLEX_8) && defined (HAVE_GFC_COMPLEX_8)
 
 
-extern void sum_c8 (gfc_array_c8 *, gfc_array_c8 *, index_type *);
+extern void sum_c8 (gfc_array_c8 * const restrict, 
+	gfc_array_c8 * const restrict, const index_type * const restrict);
 export_proto(sum_c8);
 
 void
-sum_c8 (gfc_array_c8 *retarray, gfc_array_c8 *array, index_type *pdim)
+sum_c8 (gfc_array_c8 * const restrict retarray, 
+	gfc_array_c8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_8 *base;
-  GFC_COMPLEX_8 *dest;
+  const GFC_COMPLEX_8 * restrict base;
+  GFC_COMPLEX_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ sum_c8 (gfc_array_c8 *retarray, gfc_array_c8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_COMPLEX_8 *src;
+      const GFC_COMPLEX_8 * restrict src;
       GFC_COMPLEX_8 result;
       src = base;
       {
@@ -170,22 +173,25 @@ sum_c8 (gfc_array_c8 *retarray, gfc_array_c8 *array, index_type *pdim)
 }
 
 
-extern void msum_c8 (gfc_array_c8 *, gfc_array_c8 *, index_type *,
-					       gfc_array_l4 *);
+extern void msum_c8 (gfc_array_c8 * const restrict, 
+	gfc_array_c8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(msum_c8);
 
 void
-msum_c8 (gfc_array_c8 * retarray, gfc_array_c8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+msum_c8 (gfc_array_c8 * const restrict retarray, 
+	gfc_array_c8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_COMPLEX_8 *dest;
-  GFC_COMPLEX_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_COMPLEX_8 * restrict dest;
+  const GFC_COMPLEX_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ msum_c8 (gfc_array_c8 * retarray, gfc_array_c8 * array,
 
   while (base)
     {
-      GFC_COMPLEX_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_COMPLEX_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_COMPLEX_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/sum_i16.c b/libgfortran/generated/sum_i16.c
index b1ba2353fb9..00446895d0a 100644
--- a/libgfortran/generated/sum_i16.c
+++ b/libgfortran/generated/sum_i16.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_16) && defined (HAVE_GFC_INTEGER_16)
 
 
-extern void sum_i16 (gfc_array_i16 *, gfc_array_i16 *, index_type *);
+extern void sum_i16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict);
 export_proto(sum_i16);
 
 void
-sum_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
+sum_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *base;
-  GFC_INTEGER_16 *dest;
+  const GFC_INTEGER_16 * restrict base;
+  GFC_INTEGER_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ sum_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
+      const GFC_INTEGER_16 * restrict src;
       GFC_INTEGER_16 result;
       src = base;
       {
@@ -170,22 +173,25 @@ sum_i16 (gfc_array_i16 *retarray, gfc_array_i16 *array, index_type *pdim)
 }
 
 
-extern void msum_i16 (gfc_array_i16 *, gfc_array_i16 *, index_type *,
-					       gfc_array_l4 *);
+extern void msum_i16 (gfc_array_i16 * const restrict, 
+	gfc_array_i16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(msum_i16);
 
 void
-msum_i16 (gfc_array_i16 * retarray, gfc_array_i16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+msum_i16 (gfc_array_i16 * const restrict retarray, 
+	gfc_array_i16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_16 *dest;
-  GFC_INTEGER_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_16 * restrict dest;
+  const GFC_INTEGER_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ msum_i16 (gfc_array_i16 * retarray, gfc_array_i16 * array,
 
   while (base)
     {
-      GFC_INTEGER_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/sum_i4.c b/libgfortran/generated/sum_i4.c
index 1efb59e134e..f00c4ea3f15 100644
--- a/libgfortran/generated/sum_i4.c
+++ b/libgfortran/generated/sum_i4.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_4)
 
 
-extern void sum_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
+extern void sum_i4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict);
 export_proto(sum_i4);
 
 void
-sum_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
+sum_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *base;
-  GFC_INTEGER_4 *dest;
+  const GFC_INTEGER_4 * restrict base;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ sum_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
+      const GFC_INTEGER_4 * restrict src;
       GFC_INTEGER_4 result;
       src = base;
       {
@@ -170,22 +173,25 @@ sum_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void msum_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
-					       gfc_array_l4 *);
+extern void msum_i4 (gfc_array_i4 * const restrict, 
+	gfc_array_i4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(msum_i4);
 
 void
-msum_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+msum_i4 (gfc_array_i4 * const restrict retarray, 
+	gfc_array_i4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_4 *dest;
-  GFC_INTEGER_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_4 * restrict dest;
+  const GFC_INTEGER_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ msum_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array,
 
   while (base)
     {
-      GFC_INTEGER_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/sum_i8.c b/libgfortran/generated/sum_i8.c
index a7c3d2f6b83..78505da9865 100644
--- a/libgfortran/generated/sum_i8.c
+++ b/libgfortran/generated/sum_i8.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_8)
 
 
-extern void sum_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
+extern void sum_i8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict);
 export_proto(sum_i8);
 
 void
-sum_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
+sum_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *base;
-  GFC_INTEGER_8 *dest;
+  const GFC_INTEGER_8 * restrict base;
+  GFC_INTEGER_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ sum_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
+      const GFC_INTEGER_8 * restrict src;
       GFC_INTEGER_8 result;
       src = base;
       {
@@ -170,22 +173,25 @@ sum_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void msum_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
-					       gfc_array_l4 *);
+extern void msum_i8 (gfc_array_i8 * const restrict, 
+	gfc_array_i8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(msum_i8);
 
 void
-msum_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+msum_i8 (gfc_array_i8 * const restrict retarray, 
+	gfc_array_i8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_INTEGER_8 *dest;
-  GFC_INTEGER_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_INTEGER_8 * restrict dest;
+  const GFC_INTEGER_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ msum_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array,
 
   while (base)
     {
-      GFC_INTEGER_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_INTEGER_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_INTEGER_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/sum_r10.c b/libgfortran/generated/sum_r10.c
index e0231ca645b..49071021f0d 100644
--- a/libgfortran/generated/sum_r10.c
+++ b/libgfortran/generated/sum_r10.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_10) && defined (HAVE_GFC_REAL_10)
 
 
-extern void sum_r10 (gfc_array_r10 *, gfc_array_r10 *, index_type *);
+extern void sum_r10 (gfc_array_r10 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict);
 export_proto(sum_r10);
 
 void
-sum_r10 (gfc_array_r10 *retarray, gfc_array_r10 *array, index_type *pdim)
+sum_r10 (gfc_array_r10 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_10 *base;
-  GFC_REAL_10 *dest;
+  const GFC_REAL_10 * restrict base;
+  GFC_REAL_10 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ sum_r10 (gfc_array_r10 *retarray, gfc_array_r10 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_10 *src;
+      const GFC_REAL_10 * restrict src;
       GFC_REAL_10 result;
       src = base;
       {
@@ -170,22 +173,25 @@ sum_r10 (gfc_array_r10 *retarray, gfc_array_r10 *array, index_type *pdim)
 }
 
 
-extern void msum_r10 (gfc_array_r10 *, gfc_array_r10 *, index_type *,
-					       gfc_array_l4 *);
+extern void msum_r10 (gfc_array_r10 * const restrict, 
+	gfc_array_r10 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(msum_r10);
 
 void
-msum_r10 (gfc_array_r10 * retarray, gfc_array_r10 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+msum_r10 (gfc_array_r10 * const restrict retarray, 
+	gfc_array_r10 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_10 *dest;
-  GFC_REAL_10 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_10 * restrict dest;
+  const GFC_REAL_10 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ msum_r10 (gfc_array_r10 * retarray, gfc_array_r10 * array,
 
   while (base)
     {
-      GFC_REAL_10 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_10 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_10 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/sum_r16.c b/libgfortran/generated/sum_r16.c
index 4168f8c0669..eddd45b8646 100644
--- a/libgfortran/generated/sum_r16.c
+++ b/libgfortran/generated/sum_r16.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_16) && defined (HAVE_GFC_REAL_16)
 
 
-extern void sum_r16 (gfc_array_r16 *, gfc_array_r16 *, index_type *);
+extern void sum_r16 (gfc_array_r16 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict);
 export_proto(sum_r16);
 
 void
-sum_r16 (gfc_array_r16 *retarray, gfc_array_r16 *array, index_type *pdim)
+sum_r16 (gfc_array_r16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_16 *base;
-  GFC_REAL_16 *dest;
+  const GFC_REAL_16 * restrict base;
+  GFC_REAL_16 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ sum_r16 (gfc_array_r16 *retarray, gfc_array_r16 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_16 *src;
+      const GFC_REAL_16 * restrict src;
       GFC_REAL_16 result;
       src = base;
       {
@@ -170,22 +173,25 @@ sum_r16 (gfc_array_r16 *retarray, gfc_array_r16 *array, index_type *pdim)
 }
 
 
-extern void msum_r16 (gfc_array_r16 *, gfc_array_r16 *, index_type *,
-					       gfc_array_l4 *);
+extern void msum_r16 (gfc_array_r16 * const restrict, 
+	gfc_array_r16 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(msum_r16);
 
 void
-msum_r16 (gfc_array_r16 * retarray, gfc_array_r16 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+msum_r16 (gfc_array_r16 * const restrict retarray, 
+	gfc_array_r16 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_16 *dest;
-  GFC_REAL_16 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_16 * restrict dest;
+  const GFC_REAL_16 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ msum_r16 (gfc_array_r16 * retarray, gfc_array_r16 * array,
 
   while (base)
     {
-      GFC_REAL_16 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_16 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_16 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/sum_r4.c b/libgfortran/generated/sum_r4.c
index bf76631811a..97bf717ba5a 100644
--- a/libgfortran/generated/sum_r4.c
+++ b/libgfortran/generated/sum_r4.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_4) && defined (HAVE_GFC_REAL_4)
 
 
-extern void sum_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *);
+extern void sum_r4 (gfc_array_r4 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict);
 export_proto(sum_r4);
 
 void
-sum_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
+sum_r4 (gfc_array_r4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_4 *base;
-  GFC_REAL_4 *dest;
+  const GFC_REAL_4 * restrict base;
+  GFC_REAL_4 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ sum_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_4 *src;
+      const GFC_REAL_4 * restrict src;
       GFC_REAL_4 result;
       src = base;
       {
@@ -170,22 +173,25 @@ sum_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void msum_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *,
-					       gfc_array_l4 *);
+extern void msum_r4 (gfc_array_r4 * const restrict, 
+	gfc_array_r4 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(msum_r4);
 
 void
-msum_r4 (gfc_array_r4 * retarray, gfc_array_r4 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+msum_r4 (gfc_array_r4 * const restrict retarray, 
+	gfc_array_r4 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_4 *dest;
-  GFC_REAL_4 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_4 * restrict dest;
+  const GFC_REAL_4 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ msum_r4 (gfc_array_r4 * retarray, gfc_array_r4 * array,
 
   while (base)
     {
-      GFC_REAL_4 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_4 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_4 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/sum_r8.c b/libgfortran/generated/sum_r8.c
index c6d0546b2c3..0f3b49c278b 100644
--- a/libgfortran/generated/sum_r8.c
+++ b/libgfortran/generated/sum_r8.c
@@ -37,18 +37,21 @@ Boston, MA 02110-1301, USA.  */
 #if defined (HAVE_GFC_REAL_8) && defined (HAVE_GFC_REAL_8)
 
 
-extern void sum_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *);
+extern void sum_r8 (gfc_array_r8 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict);
 export_proto(sum_r8);
 
 void
-sum_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
+sum_r8 (gfc_array_r8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_8 *base;
-  GFC_REAL_8 *dest;
+  const GFC_REAL_8 * restrict base;
+  GFC_REAL_8 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
@@ -120,7 +123,7 @@ sum_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 
   while (base)
     {
-      GFC_REAL_8 *src;
+      const GFC_REAL_8 * restrict src;
       GFC_REAL_8 result;
       src = base;
       {
@@ -170,22 +173,25 @@ sum_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void msum_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *,
-					       gfc_array_l4 *);
+extern void msum_r8 (gfc_array_r8 * const restrict, 
+	gfc_array_r8 * const restrict, const index_type * const restrict,
+	gfc_array_l4 * const restrict);
 export_proto(msum_r8);
 
 void
-msum_r8 (gfc_array_r8 * retarray, gfc_array_r8 * array,
-				  index_type *pdim, gfc_array_l4 * mask)
+msum_r8 (gfc_array_r8 * const restrict retarray, 
+	gfc_array_r8 * const restrict array, 
+	const index_type * const restrict pdim, 
+	gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   index_type mstride[GFC_MAX_DIMENSIONS];
-  GFC_REAL_8 *dest;
-  GFC_REAL_8 *base;
-  GFC_LOGICAL_4 *mbase;
+  GFC_REAL_8 * restrict dest;
+  const GFC_REAL_8 * restrict base;
+  const GFC_LOGICAL_4 * restrict mbase;
   int rank;
   int dim;
   index_type n;
@@ -276,8 +282,8 @@ msum_r8 (gfc_array_r8 * retarray, gfc_array_r8 * array,
 
   while (base)
     {
-      GFC_REAL_8 *src;
-      GFC_LOGICAL_4 *msrc;
+      const GFC_REAL_8 * restrict src;
+      const GFC_LOGICAL_4 * restrict msrc;
       GFC_REAL_8 result;
       src = base;
       msrc = mbase;
diff --git a/libgfortran/generated/transpose_c10.c b/libgfortran/generated/transpose_c10.c
index cb2f992e6f8..9400c82fc18 100644
--- a/libgfortran/generated/transpose_c10.c
+++ b/libgfortran/generated/transpose_c10.c
@@ -34,11 +34,13 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_COMPLEX_10)
 
-extern void transpose_c10 (gfc_array_c10 * ret, gfc_array_c10 * source);
+extern void transpose_c10 (gfc_array_c10 * const restrict ret, 
+	gfc_array_c10 * const restrict source);
 export_proto(transpose_c10);
 
 void
-transpose_c10 (gfc_array_c10 * ret, gfc_array_c10 * source)
+transpose_c10 (gfc_array_c10 * const restrict ret, 
+	gfc_array_c10 * const restrict source)
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;
diff --git a/libgfortran/generated/transpose_c16.c b/libgfortran/generated/transpose_c16.c
index 4c39c58ba30..a572be3859d 100644
--- a/libgfortran/generated/transpose_c16.c
+++ b/libgfortran/generated/transpose_c16.c
@@ -34,11 +34,13 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_COMPLEX_16)
 
-extern void transpose_c16 (gfc_array_c16 * ret, gfc_array_c16 * source);
+extern void transpose_c16 (gfc_array_c16 * const restrict ret, 
+	gfc_array_c16 * const restrict source);
 export_proto(transpose_c16);
 
 void
-transpose_c16 (gfc_array_c16 * ret, gfc_array_c16 * source)
+transpose_c16 (gfc_array_c16 * const restrict ret, 
+	gfc_array_c16 * const restrict source)
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;
diff --git a/libgfortran/generated/transpose_c4.c b/libgfortran/generated/transpose_c4.c
index a8e22c9f659..3dc14756dbb 100644
--- a/libgfortran/generated/transpose_c4.c
+++ b/libgfortran/generated/transpose_c4.c
@@ -34,11 +34,13 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_COMPLEX_4)
 
-extern void transpose_c4 (gfc_array_c4 * ret, gfc_array_c4 * source);
+extern void transpose_c4 (gfc_array_c4 * const restrict ret, 
+	gfc_array_c4 * const restrict source);
 export_proto(transpose_c4);
 
 void
-transpose_c4 (gfc_array_c4 * ret, gfc_array_c4 * source)
+transpose_c4 (gfc_array_c4 * const restrict ret, 
+	gfc_array_c4 * const restrict source)
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;
diff --git a/libgfortran/generated/transpose_c8.c b/libgfortran/generated/transpose_c8.c
index a61ecc4d2c2..c127d947f56 100644
--- a/libgfortran/generated/transpose_c8.c
+++ b/libgfortran/generated/transpose_c8.c
@@ -34,11 +34,13 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_COMPLEX_8)
 
-extern void transpose_c8 (gfc_array_c8 * ret, gfc_array_c8 * source);
+extern void transpose_c8 (gfc_array_c8 * const restrict ret, 
+	gfc_array_c8 * const restrict source);
 export_proto(transpose_c8);
 
 void
-transpose_c8 (gfc_array_c8 * ret, gfc_array_c8 * source)
+transpose_c8 (gfc_array_c8 * const restrict ret, 
+	gfc_array_c8 * const restrict source)
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;
diff --git a/libgfortran/generated/transpose_i16.c b/libgfortran/generated/transpose_i16.c
index fcebdf3c9d8..d780fb12c4f 100644
--- a/libgfortran/generated/transpose_i16.c
+++ b/libgfortran/generated/transpose_i16.c
@@ -34,11 +34,13 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_INTEGER_16)
 
-extern void transpose_i16 (gfc_array_i16 * ret, gfc_array_i16 * source);
+extern void transpose_i16 (gfc_array_i16 * const restrict ret, 
+	gfc_array_i16 * const restrict source);
 export_proto(transpose_i16);
 
 void
-transpose_i16 (gfc_array_i16 * ret, gfc_array_i16 * source)
+transpose_i16 (gfc_array_i16 * const restrict ret, 
+	gfc_array_i16 * const restrict source)
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;
diff --git a/libgfortran/generated/transpose_i4.c b/libgfortran/generated/transpose_i4.c
index b3979a87d4c..cf2bfc7ee87 100644
--- a/libgfortran/generated/transpose_i4.c
+++ b/libgfortran/generated/transpose_i4.c
@@ -34,11 +34,13 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_INTEGER_4)
 
-extern void transpose_i4 (gfc_array_i4 * ret, gfc_array_i4 * source);
+extern void transpose_i4 (gfc_array_i4 * const restrict ret, 
+	gfc_array_i4 * const restrict source);
 export_proto(transpose_i4);
 
 void
-transpose_i4 (gfc_array_i4 * ret, gfc_array_i4 * source)
+transpose_i4 (gfc_array_i4 * const restrict ret, 
+	gfc_array_i4 * const restrict source)
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;
diff --git a/libgfortran/generated/transpose_i8.c b/libgfortran/generated/transpose_i8.c
index e195d592841..4fd16648729 100644
--- a/libgfortran/generated/transpose_i8.c
+++ b/libgfortran/generated/transpose_i8.c
@@ -34,11 +34,13 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_INTEGER_8)
 
-extern void transpose_i8 (gfc_array_i8 * ret, gfc_array_i8 * source);
+extern void transpose_i8 (gfc_array_i8 * const restrict ret, 
+	gfc_array_i8 * const restrict source);
 export_proto(transpose_i8);
 
 void
-transpose_i8 (gfc_array_i8 * ret, gfc_array_i8 * source)
+transpose_i8 (gfc_array_i8 * const restrict ret, 
+	gfc_array_i8 * const restrict source)
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;