PR 36313 Replace int with gfc_charlen_type, take 3

Still some prototypes that didn't match the implementation.

2017-11-24  Janne Blomqvist  <jb@gcc.gnu.org>
        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.

From-SVN: r255135

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index b69ad715dbbea589369093fdeeee80d1b883e7c4..c5f50200c478bcec4f4a39e86b8d1615ba7668a2 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,20 @@
+2017-11-24  Janne Blomqvist  <jb@gcc.gnu.org>
+       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  <tkoenig@gcc.gnu.org>
 
        PR fortran/36313

diff --git a/libgfortran/generated/maxloc2_16_s1.c b/libgfortran/generated/maxloc2_16_s1.c
index 6b7eeb82fb090fdb5118faf7cfa9586b8bedb6b4..ac1da8613f52bf9a76ff9fb86e83c24effac2209 100644 (file)
--- 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 650abf9afeabeedb72816751152b542559ec776f..cfda242a5387e6ef6f9c770a7a5a7debcb91e0c5 100644 (file)
--- 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 bcd89c504e1e9da649c8d5d48c7695ee45873575..d7c1cf7d59bde0e81c571f6a56419e44ef0bc468 100644 (file)
--- 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 e4765c89fdc976854c7403ec076642ebabe30f93..6a5317979ffe5e0ac9f2e33d5a27758b688b96e6 100644 (file)
--- 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 7ee1f6a081f65b8ad32d23544289ade5a0f4d776..c244aa784c98031855d8283dbc677d79bdecc415 100644 (file)
--- 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 61ad61c00adca72cf3522de1189071e627920d2b..abdefeff096f01d34aed9889b4d534b012371423 100644 (file)
--- 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 4c804e386d0aa674587ed4e9187fbae07dcd1f26..b0ae953fe9eea24715aeda10f432292f24de5ee8 100644 (file)
--- 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 103db0601c20916894ef60143a9cf4f9423eae1d..bd02ae1f97de2406bc26d174011540a0df1c8d90 100644 (file)
--- 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 fc2c1dd079ba53b7615ea2c5fe74aef4a010e9c8..48620861d8cef87589f37da40b987944b3df92d5 100644 (file)
--- 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 b7b8876b1ca27561ef3c0f3822d94be90038bc09..ae53dc99485e0d42830ae993cff56cfdd71b787b 100644 (file)
--- 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 dfcbde0eed649753d68d46dee3993dad00d2b0fc..6948b368a0f9028c1dc8aa8c7f99a1f6ddfb1f8c 100644 (file)
--- 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 6a40731c5a8c40a9ac3aa8a32ba8678879160604..4d9a61afee27eb2b52435aa7702f17efb444a577 100644 (file)
--- 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 8cfca6aab67dc7629eca3a725f70a5ba9101c6c2..f2a061c8c0343534def494f060899055c1810350 100644 (file)
--- 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 8e99ed3cb5c6fd4167e49f69f9dcb47730c9c5ac..b9a7fb65fcd3743fabff99c6c70a9cf843d5d5c4 100644 (file)
--- 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`