diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index b69ad715dbbe..c5f50200c478 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,20 @@ +2017-11-24 Janne Blomqvist + PR fortran/36313 + * m4/maxloc2s.m4: Replace int with gfc_charlen_type, take 3. + * m4/minloc2s.m4: Likewise. + * generated/maxloc2_16_s1.c: Regenerated. + * generated/maxloc2_16_s4.c: Regenerated. + * generated/maxloc2_4_s1.c: Regenerated. + * generated/maxloc2_4_s4.c: Regenerated. + * generated/maxloc2_8_s1.c: Regenerated. + * generated/maxloc2_8_s4.c: Regenerated. + * generated/minloc2_16_s1.c: Regenerated. + * generated/minloc2_16_s4.c: Regenerated. + * generated/minloc2_4_s1.c: Regenerated. + * generated/minloc2_4_s4.c: Regenerated. + * generated/minloc2_8_s1.c: Regenerated. + * generated/minloc2_8_s4.c: Regenerated. + 2017-11-23 Thomas Koenig PR fortran/36313 diff --git a/libgfortran/generated/maxloc2_16_s1.c b/libgfortran/generated/maxloc2_16_s1.c index 6b7eeb82fb09..ac1da8613f52 100644 --- a/libgfortran/generated/maxloc2_16_s1.c +++ b/libgfortran/generated/maxloc2_16_s1.c @@ -141,7 +141,7 @@ mmaxloc2_16_s1 (gfc_array_s1 * const restrict array, } extern GFC_INTEGER_16 smaxloc2_16_s1 (gfc_array_s1 * const restrict, - GFC_LOGICAL_4 *mask, int); + GFC_LOGICAL_4 *mask, gfc_charlen_type); export_proto(smaxloc2_16_s1); GFC_INTEGER_16 diff --git a/libgfortran/generated/maxloc2_16_s4.c b/libgfortran/generated/maxloc2_16_s4.c index 650abf9afeab..cfda242a5387 100644 --- a/libgfortran/generated/maxloc2_16_s4.c +++ b/libgfortran/generated/maxloc2_16_s4.c @@ -141,7 +141,7 @@ mmaxloc2_16_s4 (gfc_array_s4 * const restrict array, } extern GFC_INTEGER_16 smaxloc2_16_s4 (gfc_array_s4 * const restrict, - GFC_LOGICAL_4 *mask, int); + GFC_LOGICAL_4 *mask, gfc_charlen_type); export_proto(smaxloc2_16_s4); GFC_INTEGER_16 diff --git a/libgfortran/generated/maxloc2_4_s1.c b/libgfortran/generated/maxloc2_4_s1.c index bcd89c504e1e..d7c1cf7d59bd 100644 --- a/libgfortran/generated/maxloc2_4_s1.c +++ b/libgfortran/generated/maxloc2_4_s1.c @@ -141,7 +141,7 @@ mmaxloc2_4_s1 (gfc_array_s1 * const restrict array, } extern GFC_INTEGER_4 smaxloc2_4_s1 (gfc_array_s1 * const restrict, - GFC_LOGICAL_4 *mask, int); + GFC_LOGICAL_4 *mask, gfc_charlen_type); export_proto(smaxloc2_4_s1); GFC_INTEGER_4 diff --git a/libgfortran/generated/maxloc2_4_s4.c b/libgfortran/generated/maxloc2_4_s4.c index e4765c89fdc9..6a5317979ffe 100644 --- a/libgfortran/generated/maxloc2_4_s4.c +++ b/libgfortran/generated/maxloc2_4_s4.c @@ -141,7 +141,7 @@ mmaxloc2_4_s4 (gfc_array_s4 * const restrict array, } extern GFC_INTEGER_4 smaxloc2_4_s4 (gfc_array_s4 * const restrict, - GFC_LOGICAL_4 *mask, int); + GFC_LOGICAL_4 *mask, gfc_charlen_type); export_proto(smaxloc2_4_s4); GFC_INTEGER_4 diff --git a/libgfortran/generated/maxloc2_8_s1.c b/libgfortran/generated/maxloc2_8_s1.c index 7ee1f6a081f6..c244aa784c98 100644 --- a/libgfortran/generated/maxloc2_8_s1.c +++ b/libgfortran/generated/maxloc2_8_s1.c @@ -141,7 +141,7 @@ mmaxloc2_8_s1 (gfc_array_s1 * const restrict array, } extern GFC_INTEGER_8 smaxloc2_8_s1 (gfc_array_s1 * const restrict, - GFC_LOGICAL_4 *mask, int); + GFC_LOGICAL_4 *mask, gfc_charlen_type); export_proto(smaxloc2_8_s1); GFC_INTEGER_8 diff --git a/libgfortran/generated/maxloc2_8_s4.c b/libgfortran/generated/maxloc2_8_s4.c index 61ad61c00adc..abdefeff096f 100644 --- a/libgfortran/generated/maxloc2_8_s4.c +++ b/libgfortran/generated/maxloc2_8_s4.c @@ -141,7 +141,7 @@ mmaxloc2_8_s4 (gfc_array_s4 * const restrict array, } extern GFC_INTEGER_8 smaxloc2_8_s4 (gfc_array_s4 * const restrict, - GFC_LOGICAL_4 *mask, int); + GFC_LOGICAL_4 *mask, gfc_charlen_type); export_proto(smaxloc2_8_s4); GFC_INTEGER_8 diff --git a/libgfortran/generated/minloc2_16_s1.c b/libgfortran/generated/minloc2_16_s1.c index 4c804e386d0a..b0ae953fe9ee 100644 --- a/libgfortran/generated/minloc2_16_s1.c +++ b/libgfortran/generated/minloc2_16_s1.c @@ -73,7 +73,7 @@ minloc2_16_s1 (gfc_array_s1 * const restrict array, gfc_charlen_type len) } extern GFC_INTEGER_16 mminloc2_16_s1 (gfc_array_s1 * const restrict, - gfc_array_l1 *const restrict mask, int); + gfc_array_l1 *const restrict mask, gfc_charlen_type); export_proto(mminloc2_16_s1); GFC_INTEGER_16 diff --git a/libgfortran/generated/minloc2_16_s4.c b/libgfortran/generated/minloc2_16_s4.c index 103db0601c20..bd02ae1f97de 100644 --- a/libgfortran/generated/minloc2_16_s4.c +++ b/libgfortran/generated/minloc2_16_s4.c @@ -73,7 +73,7 @@ minloc2_16_s4 (gfc_array_s4 * const restrict array, gfc_charlen_type len) } extern GFC_INTEGER_16 mminloc2_16_s4 (gfc_array_s4 * const restrict, - gfc_array_l1 *const restrict mask, int); + gfc_array_l1 *const restrict mask, gfc_charlen_type); export_proto(mminloc2_16_s4); GFC_INTEGER_16 diff --git a/libgfortran/generated/minloc2_4_s1.c b/libgfortran/generated/minloc2_4_s1.c index fc2c1dd079ba..48620861d8ce 100644 --- a/libgfortran/generated/minloc2_4_s1.c +++ b/libgfortran/generated/minloc2_4_s1.c @@ -73,7 +73,7 @@ minloc2_4_s1 (gfc_array_s1 * const restrict array, gfc_charlen_type len) } extern GFC_INTEGER_4 mminloc2_4_s1 (gfc_array_s1 * const restrict, - gfc_array_l1 *const restrict mask, int); + gfc_array_l1 *const restrict mask, gfc_charlen_type); export_proto(mminloc2_4_s1); GFC_INTEGER_4 diff --git a/libgfortran/generated/minloc2_4_s4.c b/libgfortran/generated/minloc2_4_s4.c index b7b8876b1ca2..ae53dc99485e 100644 --- a/libgfortran/generated/minloc2_4_s4.c +++ b/libgfortran/generated/minloc2_4_s4.c @@ -73,7 +73,7 @@ minloc2_4_s4 (gfc_array_s4 * const restrict array, gfc_charlen_type len) } extern GFC_INTEGER_4 mminloc2_4_s4 (gfc_array_s4 * const restrict, - gfc_array_l1 *const restrict mask, int); + gfc_array_l1 *const restrict mask, gfc_charlen_type); export_proto(mminloc2_4_s4); GFC_INTEGER_4 diff --git a/libgfortran/generated/minloc2_8_s1.c b/libgfortran/generated/minloc2_8_s1.c index dfcbde0eed64..6948b368a0f9 100644 --- a/libgfortran/generated/minloc2_8_s1.c +++ b/libgfortran/generated/minloc2_8_s1.c @@ -73,7 +73,7 @@ minloc2_8_s1 (gfc_array_s1 * const restrict array, gfc_charlen_type len) } extern GFC_INTEGER_8 mminloc2_8_s1 (gfc_array_s1 * const restrict, - gfc_array_l1 *const restrict mask, int); + gfc_array_l1 *const restrict mask, gfc_charlen_type); export_proto(mminloc2_8_s1); GFC_INTEGER_8 diff --git a/libgfortran/generated/minloc2_8_s4.c b/libgfortran/generated/minloc2_8_s4.c index 6a40731c5a8c..4d9a61afee27 100644 --- a/libgfortran/generated/minloc2_8_s4.c +++ b/libgfortran/generated/minloc2_8_s4.c @@ -73,7 +73,7 @@ minloc2_8_s4 (gfc_array_s4 * const restrict array, gfc_charlen_type len) } extern GFC_INTEGER_8 mminloc2_8_s4 (gfc_array_s4 * const restrict, - gfc_array_l1 *const restrict mask, int); + gfc_array_l1 *const restrict mask, gfc_charlen_type); export_proto(mminloc2_8_s4); GFC_INTEGER_8 diff --git a/libgfortran/m4/maxloc2s.m4 b/libgfortran/m4/maxloc2s.m4 index 8cfca6aab67d..f2a061c8c034 100644 --- a/libgfortran/m4/maxloc2s.m4 +++ b/libgfortran/m4/maxloc2s.m4 @@ -142,7 +142,7 @@ m'name`'rtype_qual`_'atype_code` ('atype` * const restrict array, } extern 'rtype_name` s'name`'rtype_qual`_'atype_code` ('atype` * const restrict, - GFC_LOGICAL_4 *mask, int); + GFC_LOGICAL_4 *mask, gfc_charlen_type); export_proto(s'name`'rtype_qual`_'atype_code`); 'rtype_name` diff --git a/libgfortran/m4/minloc2s.m4 b/libgfortran/m4/minloc2s.m4 index 8e99ed3cb5c6..b9a7fb65fcd3 100644 --- a/libgfortran/m4/minloc2s.m4 +++ b/libgfortran/m4/minloc2s.m4 @@ -74,7 +74,7 @@ export_proto('name`'rtype_qual`_'atype_code`); } extern 'rtype_name` m'name`'rtype_qual`_'atype_code` ('atype` * const restrict, - gfc_array_l1 *const restrict mask, int); + gfc_array_l1 *const restrict mask, gfc_charlen_type); export_proto(m'name`'rtype_qual`_'atype_code`); 'rtype_name`