1 files changed, 12 insertions, 12 deletions

diff --git a/libgfortran/generated/any_l16.c b/libgfortran/generated/any_l16.c
index 5c70eba1e9c..747a4221ca7 100644
--- a/libgfortran/generated/any_l16.c
+++ b/libgfortran/generated/any_l16.c
@@ -58,17 +58,17 @@ any_l16 (gfc_array_l16 * const restrict retarray,
   dim = (*pdim) - 1;
   rank = GFC_DESCRIPTOR_RANK (array) - 1;
 
-  src_kind = GFC_DESCRIPTOR_SIZE (array);
+  src_kind = GFC_DESCRIPTOR_ELEM_LEN (array);
 
   len = GFC_DESCRIPTOR_EXTENT(array,dim);
   if (len < 0)
     len = 0;
 
-  delta = GFC_DESCRIPTOR_STRIDE_BYTES(array,dim);
+  delta = GFC_DESCRIPTOR_SM(array,dim);
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(array,n);
+      sstride[n] = GFC_DESCRIPTOR_SM(array,n);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] < 0)
@@ -76,7 +76,7 @@ any_l16 (gfc_array_l16 * const restrict retarray,
     }
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(array,n + 1);
+      sstride[n] = GFC_DESCRIPTOR_SM(array,n + 1);
       extent[n] = GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
       if (extent[n] < 0)
@@ -85,23 +85,23 @@ any_l16 (gfc_array_l16 * const restrict retarray,
 
   if (retarray->base_addr == NULL)
     {
-      size_t alloc_size, str;
+      size_t alloc_size, sm;
 
       for (n = 0; n < rank; n++)
         {
           if (n == 0)
-            str = 1;
+            sm = sizeof (GFC_LOGICAL_16);
           else
-            str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1];
-
-	  GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str);
+            sm = GFC_DESCRIPTOR_SM (retarray,n-1) * extent[n-1];
 
+	  GFC_DIMENSION_SET (retarray->dim[n], 0, extent[n], sm);
         }
 
+      retarray->elem_len = array->elem_len;
+      retarray->type = array->type;
       retarray->offset = 0;
-      retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank;
 
-      alloc_size = GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1];
+      alloc_size = GFC_DESCRIPTOR_SM (retarray, rank-1) * extent[rank-1];
 
       if (alloc_size == 0)
 	{
@@ -139,7 +139,7 @@ any_l16 (gfc_array_l16 * const restrict retarray,
   for (n = 0; n < rank; n++)
     {
       count[n] = 0;
-      dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n);
+      dstride[n] = GFC_DESCRIPTOR_STRIDE_TYPEKNOWN(retarray,n);
       if (extent[n] <= 0)
 	return;
     }