diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index c2c93879058e2..94c5c672c7234 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,22 @@ +2008-02-25 Francois-Xavier Coudert + + * m4/ifunction_logical.m4: Add casts to get rid of warnings. + * generated/all_l1.c: Regenerate. + * generated/all_l2.c: Regenerate. + * generated/all_l4.c: Regenerate. + * generated/all_l8.c: Regenerate. + * generated/all_l16.c: Regenerate. + * generated/any_l1.c: Regenerate. + * generated/any_l2.c: Regenerate. + * generated/any_l4.c: Regenerate. + * generated/any_l8.c: Regenerate. + * generated/any_l16.c: Regenerate. + * generated/count_1_l.c: Regenerate. + * generated/count_2_l.c: Regenerate. + * generated/count_4_l.c: Regenerate. + * generated/count_8_l.c: Regenerate. + * generated/count_16_l.c: Regenerate. + 2008-02-24 Francois-Xavier Coudert PR libfortran/32841 diff --git a/libgfortran/generated/all_l1.c b/libgfortran/generated/all_l1.c index 47cf2220d339c..385726af3994c 100644 --- a/libgfortran/generated/all_l1.c +++ b/libgfortran/generated/all_l1.c @@ -119,8 +119,9 @@ all_l1 (gfc_array_l1 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " ALL intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " ALL intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/generated/all_l16.c b/libgfortran/generated/all_l16.c index ca147e7d39fcc..fd6a9f0b7156e 100644 --- a/libgfortran/generated/all_l16.c +++ b/libgfortran/generated/all_l16.c @@ -119,8 +119,9 @@ all_l16 (gfc_array_l16 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " ALL intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " ALL intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/generated/all_l2.c b/libgfortran/generated/all_l2.c index 9e4ab72b30cdf..16b4ec94ea1da 100644 --- a/libgfortran/generated/all_l2.c +++ b/libgfortran/generated/all_l2.c @@ -119,8 +119,9 @@ all_l2 (gfc_array_l2 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " ALL intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " ALL intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/generated/all_l4.c b/libgfortran/generated/all_l4.c index 255881b911280..ef8bdcdddbae4 100644 --- a/libgfortran/generated/all_l4.c +++ b/libgfortran/generated/all_l4.c @@ -119,8 +119,9 @@ all_l4 (gfc_array_l4 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " ALL intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " ALL intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/generated/all_l8.c b/libgfortran/generated/all_l8.c index 00ba59f10341b..8e7a659a2832b 100644 --- a/libgfortran/generated/all_l8.c +++ b/libgfortran/generated/all_l8.c @@ -119,8 +119,9 @@ all_l8 (gfc_array_l8 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " ALL intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " ALL intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/generated/any_l1.c b/libgfortran/generated/any_l1.c index 9781a43c2cbd4..8975438ae59b6 100644 --- a/libgfortran/generated/any_l1.c +++ b/libgfortran/generated/any_l1.c @@ -119,8 +119,9 @@ any_l1 (gfc_array_l1 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " ANY intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " ANY intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/generated/any_l16.c b/libgfortran/generated/any_l16.c index b0e95a6dad6e1..060a4b8212772 100644 --- a/libgfortran/generated/any_l16.c +++ b/libgfortran/generated/any_l16.c @@ -119,8 +119,9 @@ any_l16 (gfc_array_l16 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " ANY intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " ANY intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/generated/any_l2.c b/libgfortran/generated/any_l2.c index 6a42be0fcbcf1..73db5aea082de 100644 --- a/libgfortran/generated/any_l2.c +++ b/libgfortran/generated/any_l2.c @@ -119,8 +119,9 @@ any_l2 (gfc_array_l2 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " ANY intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " ANY intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/generated/any_l4.c b/libgfortran/generated/any_l4.c index eb37296903053..3e239cab10680 100644 --- a/libgfortran/generated/any_l4.c +++ b/libgfortran/generated/any_l4.c @@ -119,8 +119,9 @@ any_l4 (gfc_array_l4 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " ANY intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " ANY intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/generated/any_l8.c b/libgfortran/generated/any_l8.c index b5b52a0b81b59..3ea80dd3e3155 100644 --- a/libgfortran/generated/any_l8.c +++ b/libgfortran/generated/any_l8.c @@ -119,8 +119,9 @@ any_l8 (gfc_array_l8 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " ANY intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " ANY intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/generated/count_16_l.c b/libgfortran/generated/count_16_l.c index d3f15d7119d0c..654c5495dec4f 100644 --- a/libgfortran/generated/count_16_l.c +++ b/libgfortran/generated/count_16_l.c @@ -119,8 +119,9 @@ count_16_l (gfc_array_i16 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " COUNT intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " COUNT intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/generated/count_1_l.c b/libgfortran/generated/count_1_l.c index 78d82c0ea36fe..ab2d0eac21adb 100644 --- a/libgfortran/generated/count_1_l.c +++ b/libgfortran/generated/count_1_l.c @@ -119,8 +119,9 @@ count_1_l (gfc_array_i1 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " COUNT intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " COUNT intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/generated/count_2_l.c b/libgfortran/generated/count_2_l.c index eb03c2d5c5fc3..bb29d4f3c4f56 100644 --- a/libgfortran/generated/count_2_l.c +++ b/libgfortran/generated/count_2_l.c @@ -119,8 +119,9 @@ count_2_l (gfc_array_i2 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " COUNT intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " COUNT intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/generated/count_4_l.c b/libgfortran/generated/count_4_l.c index 58dcd77c731b5..82926bd522eab 100644 --- a/libgfortran/generated/count_4_l.c +++ b/libgfortran/generated/count_4_l.c @@ -119,8 +119,9 @@ count_4_l (gfc_array_i4 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " COUNT intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " COUNT intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/generated/count_8_l.c b/libgfortran/generated/count_8_l.c index b7db60e00b09e..9cb094f81cd04 100644 --- a/libgfortran/generated/count_8_l.c +++ b/libgfortran/generated/count_8_l.c @@ -119,8 +119,9 @@ count_8_l (gfc_array_i8 * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " COUNT intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " COUNT intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) { diff --git a/libgfortran/m4/ifunction_logical.m4 b/libgfortran/m4/ifunction_logical.m4 index b2acb32f11517..8666870c88e0c 100644 --- a/libgfortran/m4/ifunction_logical.m4 +++ b/libgfortran/m4/ifunction_logical.m4 @@ -102,8 +102,9 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray, { if (rank != GFC_DESCRIPTOR_RANK (retarray)) runtime_error ("rank of return array incorrect in" - " u_name intrinsic: is %d, should be %d", - GFC_DESCRIPTOR_RANK (retarray), rank); + " u_name intrinsic: is %ld, should be %ld", + (long int) GFC_DESCRIPTOR_RANK (retarray), + (long int) rank); if (compile_options.bounds_check) {