This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Fix unused but set warnings in libgfortran


Hi!

This patch fixes the -Wunused-but-set-* warnings in libgfortran.
Bootstrapped/regtested on x86_64-linux.  Ok for trunk?

2009-11-28  Jakub Jelinek  <jakub@redhat.com>

	* intrinsics/pack_generic.c (pack_internal): Remove unused
	zero_sized variable.
	* intrinsics/unpack_generic.c (unpack0): Remove unused size
	variable.
	* io/write.c (namelist_write_newline): Remove unused length
	variable.
	* io/unix.c (find_file): Remove unused id variable.
	* m4/ifunction.m4 (SCALAR_ARRAY_FUNCTION): Remove unused sstride
	variable.
	* generated/maxloc1_16_i1.c: Regenerated.
	* generated/maxloc1_16_i16.c: Regenerated.
	* generated/maxloc1_16_i2.c: Regenerated.
	* generated/maxloc1_16_i4.c: Regenerated.
	* generated/maxloc1_16_i8.c: Regenerated.
	* generated/maxloc1_16_r10.c: Regenerated.
	* generated/maxloc1_16_r16.c: Regenerated.
	* generated/maxloc1_16_r4.c: Regenerated.
	* generated/maxloc1_16_r8.c: Regenerated.
	* generated/maxloc1_4_i1.c: Regenerated.
	* generated/maxloc1_4_i16.c: Regenerated.
	* generated/maxloc1_4_i2.c: Regenerated.
	* generated/maxloc1_4_i4.c: Regenerated.
	* generated/maxloc1_4_i8.c: Regenerated.
	* generated/maxloc1_4_r10.c: Regenerated.
	* generated/maxloc1_4_r16.c: Regenerated.
	* generated/maxloc1_4_r4.c: Regenerated.
	* generated/maxloc1_4_r8.c: Regenerated.
	* generated/maxloc1_8_i1.c: Regenerated.
	* generated/maxloc1_8_i16.c: Regenerated.
	* generated/maxloc1_8_i2.c: Regenerated.
	* generated/maxloc1_8_i4.c: Regenerated.
	* generated/maxloc1_8_i8.c: Regenerated.
	* generated/maxloc1_8_r10.c: Regenerated.
	* generated/maxloc1_8_r16.c: Regenerated.
	* generated/maxloc1_8_r4.c: Regenerated.
	* generated/maxloc1_8_r8.c: Regenerated.
	* generated/maxval_i1.c: Regenerated.
	* generated/maxval_i16.c: Regenerated.
	* generated/maxval_i2.c: Regenerated.
	* generated/maxval_i4.c: Regenerated.
	* generated/maxval_i8.c: Regenerated.
	* generated/maxval_r10.c: Regenerated.
	* generated/maxval_r16.c: Regenerated.
	* generated/maxval_r4.c: Regenerated.
	* generated/maxval_r8.c: Regenerated.
	* generated/minloc1_16_i1.c: Regenerated.
	* generated/minloc1_16_i16.c: Regenerated.
	* generated/minloc1_16_i2.c: Regenerated.
	* generated/minloc1_16_i4.c: Regenerated.
	* generated/minloc1_16_i8.c: Regenerated.
	* generated/minloc1_16_r10.c: Regenerated.
	* generated/minloc1_16_r16.c: Regenerated.
	* generated/minloc1_16_r4.c: Regenerated.
	* generated/minloc1_16_r8.c: Regenerated.
	* generated/minloc1_4_i1.c: Regenerated.
	* generated/minloc1_4_i16.c: Regenerated.
	* generated/minloc1_4_i2.c: Regenerated.
	* generated/minloc1_4_i4.c: Regenerated.
	* generated/minloc1_4_i8.c: Regenerated.
	* generated/minloc1_4_r10.c: Regenerated.
	* generated/minloc1_4_r16.c: Regenerated.
	* generated/minloc1_4_r4.c: Regenerated.
	* generated/minloc1_4_r8.c: Regenerated.
	* generated/minloc1_8_i1.c: Regenerated.
	* generated/minloc1_8_i16.c: Regenerated.
	* generated/minloc1_8_i2.c: Regenerated.
	* generated/minloc1_8_i4.c: Regenerated.
	* generated/minloc1_8_i8.c: Regenerated.
	* generated/minloc1_8_r10.c: Regenerated.
	* generated/minloc1_8_r16.c: Regenerated.
	* generated/minloc1_8_r4.c: Regenerated.
	* generated/minloc1_8_r8.c: Regenerated.
	* generated/minval_i1.c: Regenerated.
	* generated/minval_i16.c: Regenerated.
	* generated/minval_i2.c: Regenerated.
	* generated/minval_i4.c: Regenerated.
	* generated/minval_i8.c: Regenerated.
	* generated/minval_r10.c: Regenerated.
	* generated/minval_r16.c: Regenerated.
	* generated/minval_r4.c: Regenerated.
	* generated/minval_r8.c: Regenerated.
	* generated/product_c10.c: Regenerated.
	* generated/product_c16.c: Regenerated.
	* generated/product_c4.c: Regenerated.
	* generated/product_c8.c: Regenerated.
	* generated/product_i1.c: Regenerated.
	* generated/product_i16.c: Regenerated.
	* generated/product_i2.c: Regenerated.
	* generated/product_i4.c: Regenerated.
	* generated/product_i8.c: Regenerated.
	* generated/product_r10.c: Regenerated.
	* generated/product_r16.c: Regenerated.
	* generated/product_r4.c: Regenerated.
	* generated/product_r8.c: Regenerated.
	* generated/sum_c10.c: Regenerated.
	* generated/sum_c16.c: Regenerated.
	* generated/sum_c4.c: Regenerated.
	* generated/sum_c8.c: Regenerated.
	* generated/sum_i1.c: Regenerated.
	* generated/sum_i16.c: Regenerated.
	* generated/sum_i2.c: Regenerated.
	* generated/sum_i4.c: Regenerated.
	* generated/sum_i8.c: Regenerated.
	* generated/sum_r10.c: Regenerated.
	* generated/sum_r16.c: Regenerated.
	* generated/sum_r4.c: Regenerated.
	* generated/sum_r8.c: Regenerated.

--- libgfortran/intrinsics/pack_generic.c.jj	2009-09-01 11:05:04.000000000 +0200
+++ libgfortran/intrinsics/pack_generic.c	2009-11-27 17:22:04.000000000 +0100
@@ -87,7 +87,6 @@ pack_internal (gfc_array_char *ret, cons
 
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
-  int zero_sized;
   index_type n;
   index_type dim;
   index_type nelem;
@@ -117,13 +116,10 @@ pack_internal (gfc_array_char *ret, cons
   else
     runtime_error ("Funny sized logical array");
 
-  zero_sized = 0;
   for (n = 0; n < dim; n++)
     {
       count[n] = 0;
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
-      if (extent[n] <= 0)
-       zero_sized = 1;
       sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(array,n);
       mstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(mask,n);
     }
--- libgfortran/intrinsics/unpack_generic.c.jj	2009-11-04 08:16:07.000000000 +0100
+++ libgfortran/intrinsics/unpack_generic.c	2009-11-27 17:22:31.000000000 +0100
@@ -403,15 +403,13 @@ unpack0 (gfc_array_char *ret, const gfc_
   gfc_array_char tmp;
 
   index_type type_size;
-  index_type size;
 
   if (unlikely(compile_options.bounds_check))
     unpack_bounds (ret, vector, mask, NULL);
 
   type_size = GFC_DTYPE_TYPE_SIZE (vector);
-  size = GFC_DESCRIPTOR_SIZE (vector);
 
-  switch(type_size)
+  switch (type_size)
     {
     case GFC_DTYPE_LOGICAL_1:
     case GFC_DTYPE_INTEGER_1:
--- libgfortran/io/write.c.jj	2009-11-04 08:16:10.000000000 +0100
+++ libgfortran/io/write.c	2009-11-27 17:24:57.000000000 +0100
@@ -1427,10 +1427,8 @@ namelist_write_newline (st_parameter_dt 
   if (is_array_io (dtp))
     {
       gfc_offset record;
-      int finished, length;
+      int finished;
 
-      length = (int) dtp->u.p.current_unit->bytes_left;
-	      
       /* Now that the current record has been padded out,
 	 determine where the next record in the array is. */
       record = next_array_record (dtp, dtp->u.p.current_unit->ls,
--- libgfortran/io/unix.c.jj	2009-11-04 08:16:10.000000000 +0100
+++ libgfortran/io/unix.c	2009-11-27 17:24:33.000000000 +0100
@@ -1287,7 +1287,6 @@ find_file (const char *file, gfc_charlen
   char path[PATH_MAX + 1];
   struct stat st[2];
   gfc_unit *u;
-  uint64_t id;
 
   if (unpack_filename (path, file, file_len))
     return NULL;
@@ -1296,9 +1295,7 @@ find_file (const char *file, gfc_charlen
     return NULL;
 
 #if defined(__MINGW32__) && !HAVE_WORKING_STAT
-  id = id_from_path (path);
-#else
-  id = 0;
+  id_from_path (path);
 #endif
 
   __gthread_mutex_lock (&unit_lock);
--- libgfortran/m4/ifunction.m4.jj	2009-07-24 11:05:19.000000000 +0200
+++ libgfortran/m4/ifunction.m4	2009-11-27 17:01:42.000000000 +0100
@@ -371,7 +371,6 @@ void
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
-  index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   rtype_name * restrict dest;
   index_type rank;
@@ -390,7 +389,6 @@ void
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -399,7 +397,6 @@ void
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_4_r8.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/minloc1_4_r8.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_4_r8 (gfc_array_i4 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_4_r8 (gfc_array_i4 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_4_r8 (gfc_array_i4 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_4_i4.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_4_i4.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_4_i4 (gfc_array_i4 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_4_i4 (gfc_array_i4 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_4_i4 (gfc_array_i4 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_8_i1.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_8_i1.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_8_i1 (gfc_array_i8 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_8_i1 (gfc_array_i8 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_8_i1 (gfc_array_i8 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/product_r10.c.jj	2009-11-27 17:12:09.000000000 +0100
+++ libgfortran/generated/product_r10.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ sproduct_r10 (gfc_array_r10 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ sproduct_r10 (gfc_array_r10 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ sproduct_r10 (gfc_array_r10 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/product_i4.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/product_i4.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ sproduct_i4 (gfc_array_i4 * const restri
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ sproduct_i4 (gfc_array_i4 * const restri
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ sproduct_i4 (gfc_array_i4 * const restri
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_16_r10.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/minloc1_16_r10.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_16_r10 (gfc_array_i16 * const r
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_16_r10 (gfc_array_i16 * const r
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_16_r10 (gfc_array_i16 * const r
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_8_r8.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/minloc1_8_r8.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_8_r8 (gfc_array_i8 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_8_r8 (gfc_array_i8 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_8_r8 (gfc_array_i8 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_16_i16.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_16_i16.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_16_i16 (gfc_array_i16 * const r
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_16_i16 (gfc_array_i16 * const r
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_16_i16 (gfc_array_i16 * const r
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxval_r4.c.jj	2009-11-27 17:12:09.000000000 +0100
+++ libgfortran/generated/maxval_r4.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ smaxval_r4 (gfc_array_r4 * const restric
 {
   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 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ smaxval_r4 (gfc_array_r4 * const restric
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ smaxval_r4 (gfc_array_r4 * const restric
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_4_r8.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxloc1_4_r8.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_4_r8 (gfc_array_i4 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_4_r8 (gfc_array_i4 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_4_r8 (gfc_array_i4 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_8_i8.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_8_i8.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_8_i8 (gfc_array_i8 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_8_i8 (gfc_array_i8 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_8_i8 (gfc_array_i8 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_8_r8.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxloc1_8_r8.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_8_r8 (gfc_array_i8 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_8_r8 (gfc_array_i8 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_8_r8 (gfc_array_i8 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minval_i2.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minval_i2.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ sminval_i2 (gfc_array_i2 * const restric
 {
   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_2 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ sminval_i2 (gfc_array_i2 * const restric
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ sminval_i2 (gfc_array_i2 * const restric
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minval_i1.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minval_i1.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ sminval_i1 (gfc_array_i1 * const restric
 {
   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_1 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ sminval_i1 (gfc_array_i1 * const restric
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ sminval_i1 (gfc_array_i1 * const restric
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/product_c10.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/product_c10.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ sproduct_c10 (gfc_array_c10 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ sproduct_c10 (gfc_array_c10 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ sproduct_c10 (gfc_array_c10 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxval_i4.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxval_i4.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ smaxval_i4 (gfc_array_i4 * const restric
 {
   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 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ smaxval_i4 (gfc_array_i4 * const restric
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ smaxval_i4 (gfc_array_i4 * const restric
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_16_r4.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_16_r4.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_16_r4 (gfc_array_i16 * const re
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_16_r4 (gfc_array_i16 * const re
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_16_r4 (gfc_array_i16 * const re
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/sum_i1.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/sum_i1.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ ssum_i1 (gfc_array_i1 * const restrict r
 {
   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_1 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ ssum_i1 (gfc_array_i1 * const restrict r
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ ssum_i1 (gfc_array_i1 * const restrict r
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_8_i2.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_8_i2.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_8_i2 (gfc_array_i8 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_8_i2 (gfc_array_i8 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_8_i2 (gfc_array_i8 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/product_i16.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/product_i16.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ sproduct_i16 (gfc_array_i16 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ sproduct_i16 (gfc_array_i16 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ sproduct_i16 (gfc_array_i16 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/product_r8.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/product_r8.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ sproduct_r8 (gfc_array_r8 * const restri
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ sproduct_r8 (gfc_array_r8 * const restri
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ sproduct_r8 (gfc_array_r8 * const restri
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_4_i16.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/minloc1_4_i16.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_4_i16 (gfc_array_i4 * const res
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_4_i16 (gfc_array_i4 * const res
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_4_i16 (gfc_array_i4 * const res
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/sum_i4.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/sum_i4.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ ssum_i4 (gfc_array_i4 * const restrict r
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ ssum_i4 (gfc_array_i4 * const restrict r
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ ssum_i4 (gfc_array_i4 * const restrict r
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_8_r10.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxloc1_8_r10.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_8_r10 (gfc_array_i8 * const res
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_8_r10 (gfc_array_i8 * const res
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_8_r10 (gfc_array_i8 * const res
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_16_i1.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_16_i1.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_16_i1 (gfc_array_i16 * const re
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_16_i1 (gfc_array_i16 * const re
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_16_i1 (gfc_array_i16 * const re
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_8_i4.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxloc1_8_i4.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_8_i4 (gfc_array_i8 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_8_i4 (gfc_array_i8 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_8_i4 (gfc_array_i8 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxval_i2.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxval_i2.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ smaxval_i2 (gfc_array_i2 * const restric
 {
   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_2 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ smaxval_i2 (gfc_array_i2 * const restric
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ smaxval_i2 (gfc_array_i2 * const restric
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minval_i4.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minval_i4.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ sminval_i4 (gfc_array_i4 * const restric
 {
   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 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ sminval_i4 (gfc_array_i4 * const restric
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ sminval_i4 (gfc_array_i4 * const restric
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_8_i8.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_8_i8.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_8_i8 (gfc_array_i8 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_8_i8 (gfc_array_i8 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_8_i8 (gfc_array_i8 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_16_r4.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_16_r4.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_16_r4 (gfc_array_i16 * const re
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_16_r4 (gfc_array_i16 * const re
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_16_r4 (gfc_array_i16 * const re
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_16_i16.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_16_i16.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_16_i16 (gfc_array_i16 * const r
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_16_i16 (gfc_array_i16 * const r
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_16_i16 (gfc_array_i16 * const r
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_4_i16.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxloc1_4_i16.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_4_i16 (gfc_array_i4 * const res
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_4_i16 (gfc_array_i4 * const res
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_4_i16 (gfc_array_i4 * const res
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_4_i2.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_4_i2.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_4_i2 (gfc_array_i4 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_4_i2 (gfc_array_i4 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_4_i2 (gfc_array_i4 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/product_r16.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/product_r16.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ sproduct_r16 (gfc_array_r16 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ sproduct_r16 (gfc_array_r16 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ sproduct_r16 (gfc_array_r16 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minval_r10.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minval_r10.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ sminval_r10 (gfc_array_r10 * const restr
 {
   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 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ sminval_r10 (gfc_array_r10 * const restr
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ sminval_r10 (gfc_array_r10 * const restr
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_4_r16.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_4_r16.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_4_r16 (gfc_array_i4 * const res
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_4_r16 (gfc_array_i4 * const res
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_4_r16 (gfc_array_i4 * const res
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/sum_c16.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/sum_c16.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ ssum_c16 (gfc_array_c16 * const restrict
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ ssum_c16 (gfc_array_c16 * const restrict
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ ssum_c16 (gfc_array_c16 * const restrict
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_8_r16.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxloc1_8_r16.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_8_r16 (gfc_array_i8 * const res
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_8_r16 (gfc_array_i8 * const res
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_8_r16 (gfc_array_i8 * const res
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_4_r4.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_4_r4.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_4_r4 (gfc_array_i4 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_4_r4 (gfc_array_i4 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_4_r4 (gfc_array_i4 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minval_r16.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minval_r16.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ sminval_r16 (gfc_array_r16 * const restr
 {
   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 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ sminval_r16 (gfc_array_r16 * const restr
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ sminval_r16 (gfc_array_r16 * const restr
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxval_r8.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxval_r8.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ smaxval_r8 (gfc_array_r8 * const restric
 {
   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 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ smaxval_r8 (gfc_array_r8 * const restric
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ smaxval_r8 (gfc_array_r8 * const restric
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_16_i2.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_16_i2.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_16_i2 (gfc_array_i16 * const re
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_16_i2 (gfc_array_i16 * const re
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_16_i2 (gfc_array_i16 * const re
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minval_i8.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/minval_i8.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ sminval_i8 (gfc_array_i8 * const restric
 {
   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 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ sminval_i8 (gfc_array_i8 * const restric
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ sminval_i8 (gfc_array_i8 * const restric
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_8_i16.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_8_i16.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_8_i16 (gfc_array_i8 * const res
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_8_i16 (gfc_array_i8 * const res
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_8_i16 (gfc_array_i8 * const res
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_16_i2.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_16_i2.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_16_i2 (gfc_array_i16 * const re
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_16_i2 (gfc_array_i16 * const re
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_16_i2 (gfc_array_i16 * const re
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_8_i4.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/minloc1_8_i4.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_8_i4 (gfc_array_i8 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_8_i4 (gfc_array_i8 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_8_i4 (gfc_array_i8 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/sum_i16.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/sum_i16.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ ssum_i16 (gfc_array_i16 * const restrict
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ ssum_i16 (gfc_array_i16 * const restrict
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ ssum_i16 (gfc_array_i16 * const restrict
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxval_i16.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxval_i16.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ smaxval_i16 (gfc_array_i16 * const restr
 {
   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 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ smaxval_i16 (gfc_array_i16 * const restr
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ smaxval_i16 (gfc_array_i16 * const restr
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_8_r4.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_8_r4.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_8_r4 (gfc_array_i8 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_8_r4 (gfc_array_i8 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_8_r4 (gfc_array_i8 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_4_i8.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_4_i8.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_4_i8 (gfc_array_i4 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_4_i8 (gfc_array_i4 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_4_i8 (gfc_array_i4 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_8_r4.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_8_r4.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_8_r4 (gfc_array_i8 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_8_r4 (gfc_array_i8 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_8_r4 (gfc_array_i8 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/product_c16.c.jj	2009-11-27 17:12:09.000000000 +0100
+++ libgfortran/generated/product_c16.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ sproduct_c16 (gfc_array_c16 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ sproduct_c16 (gfc_array_c16 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ sproduct_c16 (gfc_array_c16 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_16_i4.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxloc1_16_i4.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_16_i4 (gfc_array_i16 * const re
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_16_i4 (gfc_array_i16 * const re
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_16_i4 (gfc_array_i16 * const re
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_16_i8.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_16_i8.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_16_i8 (gfc_array_i16 * const re
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_16_i8 (gfc_array_i16 * const re
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_16_i8 (gfc_array_i16 * const re
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_16_r8.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxloc1_16_r8.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_16_r8 (gfc_array_i16 * const re
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_16_r8 (gfc_array_i16 * const re
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_16_r8 (gfc_array_i16 * const re
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxval_r10.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxval_r10.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ smaxval_r10 (gfc_array_r10 * const restr
 {
   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 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ smaxval_r10 (gfc_array_r10 * const restr
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ smaxval_r10 (gfc_array_r10 * const restr
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_4_r10.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_4_r10.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_4_r10 (gfc_array_i4 * const res
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_4_r10 (gfc_array_i4 * const res
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_4_r10 (gfc_array_i4 * const res
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/sum_r4.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/sum_r4.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ ssum_r4 (gfc_array_r4 * const restrict r
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ ssum_r4 (gfc_array_r4 * const restrict r
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ ssum_r4 (gfc_array_r4 * const restrict r
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minval_i16.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/minval_i16.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ sminval_i16 (gfc_array_i16 * const restr
 {
   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 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ sminval_i16 (gfc_array_i16 * const restr
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ sminval_i16 (gfc_array_i16 * const restr
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/product_c4.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/product_c4.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ sproduct_c4 (gfc_array_c4 * const restri
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ sproduct_c4 (gfc_array_c4 * const restri
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ sproduct_c4 (gfc_array_c4 * const restri
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_8_r16.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/minloc1_8_r16.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_8_r16 (gfc_array_i8 * const res
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_8_r16 (gfc_array_i8 * const res
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_8_r16 (gfc_array_i8 * const res
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/product_c8.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/product_c8.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ sproduct_c8 (gfc_array_c8 * const restri
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ sproduct_c8 (gfc_array_c8 * const restri
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ sproduct_c8 (gfc_array_c8 * const restri
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/product_i1.c.jj	2009-11-27 17:12:09.000000000 +0100
+++ libgfortran/generated/product_i1.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ sproduct_i1 (gfc_array_i1 * const restri
 {
   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_1 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ sproduct_i1 (gfc_array_i1 * const restri
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ sproduct_i1 (gfc_array_i1 * const restri
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_16_i4.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/minloc1_16_i4.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_16_i4 (gfc_array_i16 * const re
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_16_i4 (gfc_array_i16 * const re
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_16_i4 (gfc_array_i16 * const re
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_16_i8.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_16_i8.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_16_i8 (gfc_array_i16 * const re
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_16_i8 (gfc_array_i16 * const re
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_16_i8 (gfc_array_i16 * const re
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_8_i1.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_8_i1.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_8_i1 (gfc_array_i8 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_8_i1 (gfc_array_i8 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_8_i1 (gfc_array_i8 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxval_r16.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxval_r16.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ smaxval_r16 (gfc_array_r16 * const restr
 {
   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 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ smaxval_r16 (gfc_array_r16 * const restr
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ smaxval_r16 (gfc_array_r16 * const restr
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/product_r4.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/product_r4.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ sproduct_r4 (gfc_array_r4 * const restri
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ sproduct_r4 (gfc_array_r4 * const restri
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ sproduct_r4 (gfc_array_r4 * const restri
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/sum_c8.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/sum_c8.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ ssum_c8 (gfc_array_c8 * const restrict r
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ ssum_c8 (gfc_array_c8 * const restrict r
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ ssum_c8 (gfc_array_c8 * const restrict r
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/product_i8.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/product_i8.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ sproduct_i8 (gfc_array_i8 * const restri
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ sproduct_i8 (gfc_array_i8 * const restri
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ sproduct_i8 (gfc_array_i8 * const restri
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_16_i1.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_16_i1.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_16_i1 (gfc_array_i16 * const re
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_16_i1 (gfc_array_i16 * const re
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_16_i1 (gfc_array_i16 * const re
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/sum_r8.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/sum_r8.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ ssum_r8 (gfc_array_r8 * const restrict r
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ ssum_r8 (gfc_array_r8 * const restrict r
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ ssum_r8 (gfc_array_r8 * const restrict r
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_4_r4.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_4_r4.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_4_r4 (gfc_array_i4 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_4_r4 (gfc_array_i4 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_4_r4 (gfc_array_i4 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_16_r8.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/minloc1_16_r8.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_16_r8 (gfc_array_i16 * const re
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_16_r8 (gfc_array_i16 * const re
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_16_r8 (gfc_array_i16 * const re
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_4_i2.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_4_i2.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_4_i2 (gfc_array_i4 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_4_i2 (gfc_array_i4 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_4_i2 (gfc_array_i4 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_8_r10.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/minloc1_8_r10.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_8_r10 (gfc_array_i8 * const res
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_8_r10 (gfc_array_i8 * const res
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_8_r10 (gfc_array_i8 * const res
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_4_i1.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_4_i1.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_4_i1 (gfc_array_i4 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_4_i1 (gfc_array_i4 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_4_i1 (gfc_array_i4 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minval_r4.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minval_r4.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ sminval_r4 (gfc_array_r4 * const restric
 {
   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 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ sminval_r4 (gfc_array_r4 * const restric
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ sminval_r4 (gfc_array_r4 * const restric
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_16_r16.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/minloc1_16_r16.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_16_r16 (gfc_array_i16 * const r
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_16_r16 (gfc_array_i16 * const r
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_16_r16 (gfc_array_i16 * const r
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_4_i8.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxloc1_4_i8.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_4_i8 (gfc_array_i4 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_4_i8 (gfc_array_i4 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_4_i8 (gfc_array_i4 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minval_r8.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/minval_r8.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ sminval_r8 (gfc_array_r8 * const restric
 {
   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 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ sminval_r8 (gfc_array_r8 * const restric
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ sminval_r8 (gfc_array_r8 * const restric
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_8_i16.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_8_i16.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_8_i16 (gfc_array_i8 * const res
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_8_i16 (gfc_array_i8 * const res
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_8_i16 (gfc_array_i8 * const res
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/sum_r10.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/sum_r10.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ ssum_r10 (gfc_array_r10 * const restrict
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ ssum_r10 (gfc_array_r10 * const restrict
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ ssum_r10 (gfc_array_r10 * const restrict
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/sum_c4.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/sum_c4.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ ssum_c4 (gfc_array_c4 * const restrict r
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ ssum_c4 (gfc_array_c4 * const restrict r
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ ssum_c4 (gfc_array_c4 * const restrict r
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/sum_i8.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/sum_i8.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ ssum_i8 (gfc_array_i8 * const restrict r
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ ssum_i8 (gfc_array_i8 * const restrict r
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ ssum_i8 (gfc_array_i8 * const restrict r
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_16_r10.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxloc1_16_r10.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_16_r10 (gfc_array_i16 * const r
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_16_r10 (gfc_array_i16 * const r
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_16_r10 (gfc_array_i16 * const r
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/product_i2.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/product_i2.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ sproduct_i2 (gfc_array_i2 * const restri
 {
   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_2 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ sproduct_i2 (gfc_array_i2 * const restri
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ sproduct_i2 (gfc_array_i2 * const restri
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxval_i1.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxval_i1.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ smaxval_i1 (gfc_array_i1 * const restric
 {
   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_1 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ smaxval_i1 (gfc_array_i1 * const restric
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ smaxval_i1 (gfc_array_i1 * const restric
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_4_i1.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_4_i1.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_4_i1 (gfc_array_i4 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_4_i1 (gfc_array_i4 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_4_i1 (gfc_array_i4 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_4_r16.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_4_r16.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_4_r16 (gfc_array_i4 * const res
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_4_r16 (gfc_array_i4 * const res
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_4_r16 (gfc_array_i4 * const res
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxval_i8.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxval_i8.c	2009-11-27 17:13:00.000000000 +0100
@@ -426,7 +426,6 @@ smaxval_i8 (gfc_array_i8 * const restric
 {
   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 * restrict dest;
   index_type rank;
@@ -445,7 +444,6 @@ smaxval_i8 (gfc_array_i8 * const restric
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -454,7 +452,6 @@ smaxval_i8 (gfc_array_i8 * const restric
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/sum_i2.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/sum_i2.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ ssum_i2 (gfc_array_i2 * const restrict r
 {
   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_2 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ ssum_i2 (gfc_array_i2 * const restrict r
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ ssum_i2 (gfc_array_i2 * const restrict r
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_4_r10.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/maxloc1_4_r10.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_4_r10 (gfc_array_i4 * const res
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_4_r10 (gfc_array_i4 * const res
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_4_r10 (gfc_array_i4 * const res
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_8_i2.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_8_i2.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_8_i2 (gfc_array_i8 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_8_i2 (gfc_array_i8 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_8_i2 (gfc_array_i8 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/sum_r16.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/sum_r16.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ ssum_r16 (gfc_array_r16 * const restrict
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ ssum_r16 (gfc_array_r16 * const restrict
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ ssum_r16 (gfc_array_r16 * const restrict
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/sum_c10.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/sum_c10.c	2009-11-27 17:13:00.000000000 +0100
@@ -384,7 +384,6 @@ ssum_c10 (gfc_array_c10 * const restrict
 {
   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 * restrict dest;
   index_type rank;
@@ -403,7 +402,6 @@ ssum_c10 (gfc_array_c10 * const restrict
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -412,7 +410,6 @@ ssum_c10 (gfc_array_c10 * const restrict
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/minloc1_4_i4.c.jj	2009-11-27 17:12:08.000000000 +0100
+++ libgfortran/generated/minloc1_4_i4.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ sminloc1_4_i4 (gfc_array_i4 * const rest
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ sminloc1_4_i4 (gfc_array_i4 * const rest
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ sminloc1_4_i4 (gfc_array_i4 * const rest
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
--- libgfortran/generated/maxloc1_16_r16.c.jj	2009-11-27 17:12:07.000000000 +0100
+++ libgfortran/generated/maxloc1_16_r16.c	2009-11-27 17:13:00.000000000 +0100
@@ -439,7 +439,6 @@ smaxloc1_16_r16 (gfc_array_i16 * const r
 {
   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 * restrict dest;
   index_type rank;
@@ -458,7 +457,6 @@ smaxloc1_16_r16 (gfc_array_i16 * const r
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
@@ -467,7 +465,6 @@ smaxloc1_16_r16 (gfc_array_i16 * const r
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
       extent[n] =
 	GFC_DESCRIPTOR_EXTENT(array,n + 1);
 

	Jakub


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]