2012-03-11 Tobias Burnus <burnus@net-b.de>

        * trans-array.c (UBOUND_SUBFIELD, STRIDE_SUBFIELD): Remove.
        (LBOUND_SUBFIELD, EXTENT_SUBFIELD, SM_SUBFIELD): Change value.
        (gfc_conv_descriptor_stride): Remove.
        (gfc_conv_descriptor_stride_set): Only set "sm".
        (gfc_conv_descriptor_ubound): Remove.
        (gfc_conv_descriptor_ubound_set): Only set "extent"
        (gfc_conv_shift_descriptor_lbound): Remove ubound-setting call.
        (gfc_conv_array_sm, gfc_conv_array_extent): New functions.
        * trans-array.h (gfc_conv_array_sm, gfc_conv_array_extent): New
        prototypes.
        * trans-types.c (gfc_get_desc_dim_type): Remove stride/ubound,
        rename and reorder according to TS29113.
        * trans-io.h (transfer_namelist_element): Pass extent/sm instead
        of ubound/stride.

2012-03-11  Tobias Burnus  <burnus@net-b.de>

        * ISO_Fortran_binding.h (CFI_dim_t): Remove stride/ubound,
        reorder according to TS29113.
        * intrinsics/spread_generic.c (spread_internal,
        spread_internal_scalar): Update GFC_DIMENSION_SET call, rename
        GFC_DESCRIPTOR_STRIDE_BYTES to GFC_DESCRIPTOR_SM.
        * intrinsics/eoshift0.c (eoshift0): Ditto.
        * intrinsics/iso_c_binding.c (c_f_pointer_u0): Ditto.
        * intrinsics/cshift0.c (cshift0): Ditto.
        * intrinsics/unpack_generic.c (unpack_internal): Ditto.
        * intrinsics/date_and_time.c (secnds): Ditto.
        * intrinsics/eoshift2.c (eoshift2): Ditto.
        * intrinsics/reshape_generic.c (reshape_internal): Ditto.
        * intrinsics/pack_generic.c (pack_internal, pack_s_internal):
        Ditto.
        * intrinsics/transpose_generic.c (transpose_internal): Ditto.
        * intrinsics/move_alloc.c (move_alloc): Ditto.
        * io/transfer.c (transfer_array, init_loop_spec): Ditto.
        (st_set_nml_var_dim): Use sm/extent rather than ubound/stride
        as arguments.
        * io/list_read.c (nml_read_obj): Update descriptor_dimension
        initialization.
        * libgfortran.h (GFC_DIMENSION_SET): Take sm/extent instead of
        stride/ubound.
        (GFC_DESCRIPTOR_EXTENT, GFC_DESCRIPTOR_UBOUND,
        GFC_DESCRIPTOR_STRIDE): Update macros.
        (GFC_DESCRIPTOR_SM): Renamed from GFC_DESCRIPTOR_STRIDE_BYTES.
        * libtool-version: Bump version number.
        * m4/shape.m4 (shape_'rtype_kind`): Update GFC_DIMENSION_SET
        * call,
        rename GFC_DESCRIPTOR_STRIDE_BYTES to GFC_DESCRIPTOR_SM.
        * m4/cshift1.m4 (cshift1): Ditto.
        * m4/matmull.m4 (matmul_'rtype_code`): Ditto.
        * m4/eoshift1.m4 (eoshift1): Ditto.
        * m4/ifunction.m4 (name`'rtype_qual`_'atype_code): Ditto.
        * m4/bessel.m4 (bessel_jn_r'rtype_kind`,
        * bessel_yn_r'rtype_kind`):
        Ditto.
        * m4/transpose.m4 (transpose_'rtype_code`): Ditto.
        * m4/unpack.m4 (unpack0_'rtype_code`, unpack1_'rtype_code`):
        * Ditto.
        * m4/matmul.m4 (matmul_'rtype_code`): Ditto.
        * m4/spread.m4 (spread_'rtype_code`): Ditto.
        * m4/pack.m4 (pack_'rtype_code`): Ditto.
        * m4/iforeach.m4 (name`'rtype_qual`_'atype_code): Ditto
        * m4/eoshift3.m4 (eoshift3): Ditto.
        * m4/reshape.m4 (reshape_'rtype_ccode`): Ditto.
        * m4/ifunction_logical.m4 (name`'rtype_qual`_'atype_code):
        * Ditto.
        * runtime/bounds.c (count_0): Ditto.
        * generated/maxval_i8.c: Regenerated.
        * generated/product_c16.c: Regenerated.
        * generated/maxval_r10.c: Regenerated.
        * generated/maxloc0_4_r16.c: Regenerated.
        * generated/minloc0_16_r10.c: Regenerated.
        * generated/reshape_r8.c: Regenerated.
        * generated/transpose_r10.c: Regenerated.
        * generated/all_l2.c: Regenerated.
        * generated/pack_c8.c: Regenerated.
        * generated/spread_c8.c: Regenerated.
        * generated/maxloc0_8_i4.c: Regenerated.
        * generated/unpack_c16.c: Regenerated.
        * generated/minloc1_4_r4.c: Regenerated.
        * generated/minval_r16.c: Regenerated.
        * generated/minloc1_4_i2.c: Regenerated.
        * generated/maxloc1_8_i1.c: Regenerated.
        * generated/parity_l2.c: Regenerated.
        * generated/bessel_r4.c: Regenerated.
        * generated/maxloc1_16_i16.c: Regenerated.
        * generated/iany_i8.c: Regenerated.
        * generated/norm2_r8.c: Regenerated.
        * generated/minloc1_8_r10.c: Regenerated.
        * generated/minloc0_16_r4.c: Regenerated.
        * generated/transpose_c10.c: Regenerated.
        * generated/minloc0_16_i2.c: Regenerated.
        * generated/maxloc0_8_r8.c: Regenerated.
        * generated/all_l4.c: Regenerated.
        * generated/reshape_r10.c: Regenerated.
        * generated/iparity_i1.c: Regenerated.
        * generated/reshape_i8.c: Regenerated.
        * generated/unpack_c8.c: Regenerated.
        * generated/minloc1_4_i4.c: Regenerated.
        * generated/pack_r4.c: Regenerated.
        * generated/spread_r4.c: Regenerated.
        * generated/parity_l4.c: Regenerated.
        * generated/spread_i2.c: Regenerated.
        * generated/pack_i2.c: Regenerated.
        * generated/maxloc0_4_i1.c: Regenerated.
        * generated/iall_i1.c: Regenerated.
        * generated/matmul_i16.c: Regenerated.
        * generated/maxloc1_4_r16.c: Regenerated.
        * generated/minloc0_8_r16.c: Regenerated.
        * generated/cshift1_4.c: Regenerated.
        * generated/reshape_c10.c: Regenerated.
        * generated/count_8_l.c: Regenerated.
        * generated/minloc0_16_i4.c: Regenerated.
        * generated/product_i1.c: Regenerated.
        * generated/minval_i1.c: Regenerated.
        * generated/maxloc0_8_i8.c: Regenerated.
        * generated/minloc1_16_r10.c: Regenerated.
        * generated/minloc1_4_r8.c: Regenerated.
        * generated/spread_r10.c: Regenerated.
        * generated/pack_r10.c: Regenerated.
        * generated/sum_r10.c: Regenerated.
        * generated/matmul_i1.c: Regenerated.
        * generated/pack_i4.c: Regenerated.
        * generated/spread_i4.c: Regenerated.
        * generated/unpack_r4.c: Regenerated.
        * generated/bessel_r8.c: Regenerated.
        * generated/minloc0_4_i16.c: Regenerated.
        * generated/unpack_i2.c: Regenerated.
        * generated/maxloc0_8_r10.c: Regenerated.
        * generated/minloc1_16_r4.c: Regenerated.
        * generated/maxval_r16.c: Regenerated.
        * generated/minloc0_16_r8.c: Regenerated.
        * generated/minloc0_16_r16.c: Regenerated.
        * generated/minloc1_16_i2.c: Regenerated.
        * generated/transpose_r16.c: Regenerated.
        * generated/all_l8.c: Regenerated.
        * generated/minloc0_8_i1.c: Regenerated.
        * generated/pack_c10.c: Regenerated.
        * generated/spread_c10.c: Regenerated.
        * generated/sum_c10.c: Regenerated.
        * generated/any_l2.c: Regenerated.
        * generated/minloc1_4_i8.c: Regenerated.
        * generated/pack_r8.c: Regenerated.
        * generated/spread_r8.c: Regenerated.
        * generated/parity_l8.c: Regenerated.
        * generated/maxloc1_4_r4.c: Regenerated.
        * generated/sum_i1.c: Regenerated.
        * generated/transpose_c4.c: Regenerated.
        * generated/unpack_i4.c: Regenerated.
        * generated/minloc1_8_r16.c: Regenerated.
        * generated/maxloc1_4_i2.c: Regenerated.
        * generated/transpose_c16.c: Regenerated.
        * generated/cshift1_8.c: Regenerated.
        * generated/shape_i4.c: Regenerated.
        * generated/minloc1_16_i4.c: Regenerated.
        * generated/minloc0_16_i8.c: Regenerated.
        * generated/reshape_r16.c: Regenerated.
        * generated/maxval_i1.c: Regenerated.
        * generated/any_l4.c: Regenerated.
        * generated/maxloc0_16_r10.c: Regenerated.
        * generated/spread_i8.c: Regenerated.
        * generated/pack_i8.c: Regenerated.
        * generated/unpack_r8.c: Regenerated.
        * generated/minloc1_4_i16.c: Regenerated.
        * generated/maxloc1_8_r10.c: Regenerated.
        * generated/maxloc0_16_r4.c: Regenerated.
        * generated/minloc1_16_r8.c: Regenerated.
        * generated/matmul_l16.c: Regenerated.
        * generated/maxloc1_4_i4.c: Regenerated.
        * generated/reshape_c16.c: Regenerated.
        * generated/iparity_i16.c: Regenerated.
        * generated/maxloc0_16_i2.c: Regenerated.
        * generated/iany_i1.c: Regenerated.
        * generated/minloc1_8_r4.c: Regenerated.
        * generated/minloc1_16_r16.c: Regenerated.
        * generated/pack_r16.c: Regenerated.
        * generated/spread_r16.c: Regenerated.
        * generated/minloc1_8_i2.c: Regenerated.
        * generated/sum_r16.c: Regenerated.
        * generated/product_i16.c: Regenerated.
        * generated/maxloc1_4_r8.c: Regenerated.
        * generated/transpose_c8.c: Regenerated.
        * generated/unpack_i8.c: Regenerated.
        * generated/maxloc0_8_r16.c: Regenerated.
        * generated/shape_i8.c: Regenerated.
        * generated/maxloc0_16_i4.c: Regenerated.
        * generated/cshift1_16.c: Regenerated.
        * generated/minloc1_16_i8.c: Regenerated.
        * generated/pack_c16.c: Regenerated.
        * generated/spread_c16.c: Regenerated.
        * generated/matmul_l4.c: Regenerated.
        * generated/unpack_i16.c: Regenerated.
        * generated/sum_c16.c: Regenerated.
        * generated/minloc1_8_i4.c: Regenerated.
        * generated/minloc0_4_r4.c: Regenerated.
        * generated/any_l8.c: Regenerated.
        * generated/minloc0_4_i2.c: Regenerated.
        * generated/maxloc0_8_i1.c: Regenerated.
        * generated/maxloc1_16_r10.c: Regenerated.
        * generated/maxloc0_4_i16.c: Regenerated.
        * generated/maxloc1_16_r4.c: Regenerated.
        * generated/maxloc0_16_r8.c: Regenerated.
        * generated/maxloc1_4_i8.c: Regenerated.
        * generated/maxloc1_16_i2.c: Regenerated.
        * generated/product_c4.c: Regenerated.
        * generated/transpose_r4.c: Regenerated.
        * generated/minloc1_8_r8.c: Regenerated.
        * generated/minval_i16.c: Regenerated.
        * generated/matmul_c4.c: Regenerated.
        * generated/maxloc0_16_r16.c: Regenerated.
        * generated/all_l1.c: Regenerated.
        * generated/minloc0_4_i4.c: Regenerated.
        * generated/minloc1_4_i1.c: Regenerated.
        * generated/matmul_r10.c: Regenerated.
        * generated/maxloc1_8_r16.c: Regenerated.
        * generated/parity_l1.c: Regenerated.
        * generated/maxloc1_16_i4.c: Regenerated.
        * generated/maxloc0_16_i8.c: Regenerated.
        * generated/matmul_l8.c: Regenerated.
        * generated/eoshift1_4.c: Regenerated.
        * generated/transpose_i4.c: Regenerated.
        * generated/minloc1_8_i8.c: Regenerated.
        * generated/minloc0_4_r8.c: Regenerated.
        * generated/minloc0_16_i1.c: Regenerated.
        * generated/eoshift1_16.c: Regenerated.
        * generated/sum_c4.c: Regenerated.
        * generated/maxloc1_8_r4.c: Regenerated.
        * generated/matmul_c10.c: Regenerated.
        * generated/maxloc1_4_i16.c: Regenerated.
        * generated/minloc0_4_r10.c: Regenerated.
        * generated/minloc0_8_i16.c: Regenerated.
        * generated/maxloc1_16_r8.c: Regenerated.
        * generated/maxloc1_8_i2.c: Regenerated.
        * generated/pack_i1.c: Regenerated.
        * generated/spread_i1.c: Regenerated.
        * generated/any_l16.c: Regenerated.
        * generated/product_c8.c: Regenerated.
        * generated/transpose_r8.c: Regenerated.
        * generated/bessel_r10.c: Regenerated.
        * generated/count_16_l.c: Regenerated.
        * generated/matmul_c8.c: Regenerated.
        * generated/iparity_i2.c: Regenerated.
        * generated/minloc0_4_i8.c: Regenerated.
        * generated/maxloc1_16_r16.c: Regenerated.
        * generated/maxval_i16.c: Regenerated.
        * generated/minloc0_16_i16.c: Regenerated.
        * generated/maxloc1_8_i4.c: Regenerated.
        * generated/all_l16.c: Regenerated.
        * generated/maxloc0_4_r4.c: Regenerated.
        * generated/transpose_i16.c: Regenerated.
        * generated/maxloc1_16_i8.c: Regenerated.
        * generated/shape_i16.c: Regenerated.
        * generated/maxloc0_4_i2.c: Regenerated.
        * generated/eoshift3_4.c: Regenerated.
        * generated/eoshift1_8.c: Regenerated.
        * generated/unpack_i1.c: Regenerated.
        * generated/iall_i2.c: Regenerated.
        * generated/transpose_i8.c: Regenerated.
        * generated/product_r4.c: Regenerated.
        * generated/parity_l16.c: Regenerated.
        * generated/minval_r4.c: Regenerated.
        * generated/minloc1_16_i1.c: Regenerated.
        * generated/product_i2.c: Regenerated.
        * generated/reshape_c4.c: Regenerated.
        * generated/iparity_i4.c: Regenerated.
        * generated/minval_i2.c: Regenerated.
        * generated/sum_c8.c: Regenerated.
        * generated/maxloc1_8_r8.c: Regenerated.
        * generated/matmul_r4.c: Regenerated.
        * generated/minloc1_4_r10.c: Regenerated.
        * generated/minloc1_8_i16.c: Regenerated.
        * generated/count_1_l.c: Regenerated.
        * generated/any_l1.c: Regenerated.
        * generated/matmul_r16.c: Regenerated.
        * generated/matmul_i2.c: Regenerated.
        * generated/reshape_i16.c: Regenerated.
        * generated/maxloc0_4_i4.c: Regenerated.
        * generated/eoshift3_16.c: Regenerated.
        * generated/iall_i4.c: Regenerated.
        * generated/norm2_r10.c: Regenerated.
        * generated/maxloc1_4_i1.c: Regenerated.
        * generated/minloc0_8_r4.c: Regenerated.
        * generated/product_i4.c: Regenerated.
        * generated/minloc0_8_i2.c: Regenerated.
        * generated/minval_i4.c: Regenerated.
        * generated/product_r10.c: Regenerated.
        * generated/matmul_c16.c: Regenerated.
        * generated/minloc0_4_r16.c: Regenerated.
        * generated/count_2_l.c: Regenerated.
        * generated/maxloc1_8_i8.c: Regenerated.
        * generated/matmul_i4.c: Regenerated.
        * generated/maxloc0_4_r8.c: Regenerated.
        * generated/sum_r4.c: Regenerated.
        * generated/minloc1_16_i16.c: Regenerated.
        * generated/spread_i16.c: Regenerated.
        * generated/pack_i16.c: Regenerated.
        * generated/sum_i2.c: Regenerated.
        * generated/unpack_r10.c: Regenerated.
        * generated/bessel_r16.c: Regenerated.
        * generated/eoshift3_8.c: Regenerated.
        * generated/sum_i16.c: Regenerated.
        * generated/product_r8.c: Regenerated.
        * generated/maxval_r4.c: Regenerated.
        * generated/minval_r8.c: Regenerated.
        * generated/maxloc0_16_i1.c: Regenerated.
        * generated/reshape_c8.c: Regenerated.
        * generated/iparity_i8.c: Regenerated.
        * generated/maxval_i2.c: Regenerated.
        * generated/product_c10.c: Regenerated.
        * generated/minloc0_8_i4.c: Regenerated.
        * generated/maxloc0_4_r10.c: Regenerated.
        * generated/matmul_r8.c: Regenerated.
        * generated/maxloc0_8_i16.c: Regenerated.
        * generated/iany_i16.c: Regenerated.
        * generated/minloc1_8_i1.c: Regenerated.
        * generated/unpack_c10.c: Regenerated.
        * generated/maxloc0_4_i8.c: Regenerated.
        * generated/sum_i4.c: Regenerated.
        * generated/minval_r10.c: Regenerated.
        * generated/iall_i8.c: Regenerated.
        * generated/minloc0_8_r8.c: Regenerated.
        * generated/product_i8.c: Regenerated.
        * generated/maxval_i4.c: Regenerated.
        * generated/minval_i8.c: Regenerated.
        * generated/iany_i2.c: Regenerated.
        * generated/iall_i16.c: Regenerated.
        * generated/minloc1_4_r16.c: Regenerated.
        * generated/count_4_l.c: Regenerated.
        * generated/reshape_r4.c: Regenerated.
        * generated/matmul_i8.c: Regenerated.
        * generated/spread_c4.c: Regenerated.
        * generated/pack_c4.c: Regenerated.
        * generated/minloc0_4_i1.c: Regenerated.
        * generated/sum_r8.c: Regenerated.
        * generated/norm2_r16.c: Regenerated.
        * generated/maxloc0_16_i16.c: Regenerated.
        * generated/maxval_r8.c: Regenerated.
        * generated/maxloc1_16_i1.c: Regenerated.
        * generated/minloc0_8_i8.c: Regenerated.
        * generated/iany_i4.c: Regenerated.
        * generated/norm2_r4.c: Regenerated.
        * generated/product_r16.c: Regenerated.
        * generated/maxloc1_4_r10.c: Regenerated.
        * generated/maxloc1_8_i16.c: Regenerated.
        * generated/minloc0_8_r10.c: Regenerated.
        * generated/maxloc0_8_r4.c: Regenerated.
        * generated/reshape_i4.c: Regenerated.
        * generated/maxloc0_8_i2.c: Regenerated.
        * generated/sum_i8.c: Regenerated.
        * generated/unpack_c4.c: Regenerated.
        * generated/unpack_r16.c: Regenerated.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/fortran-dev@185199 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 2 insertions, 2 deletions

diff --git a/libgfortran/generated/pack_i4.c b/libgfortran/generated/pack_i4.c
index 36d1eb149e1..a6186cec32b 100644
--- a/libgfortran/generated/pack_i4.c
+++ b/libgfortran/generated/pack_i4.c
@@ -127,7 +127,7 @@ pack_i4 (gfc_array_i4 *ret, const gfc_array_i4 *array,
       if (extent[n] <= 0)
        zero_sized = 1;
       sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
-      mstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(mask,n);
+      mstride[n] = GFC_DESCRIPTOR_SM(mask,n);
     }
   if (sstride[0] == 0)
     sstride[0] = 1;
@@ -164,7 +164,7 @@ pack_i4 (gfc_array_i4 *ret, const gfc_array_i4 *array,
       if (ret->base_addr == NULL)
 	{
 	  /* Setup the array descriptor.  */
-	  GFC_DIMENSION_SET(ret->dim[0], 0, total-1, 1);
+	  GFC_DIMENSION_SET(ret->dim[0], 0, total, sizeof (GFC_INTEGER_4));
 
 	  ret->offset = 0;