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

15 files changed, 31 insertions, 14 deletions

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index b69ad715dbb..c5f50200c47 100644
--- 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 6b7eeb82fb0..ac1da8613f5 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 650abf9afea..cfda242a538 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 bcd89c504e1..d7c1cf7d59b 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 e4765c89fdc..6a5317979ff 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 7ee1f6a081f..c244aa784c9 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 61ad61c00ad..abdefeff096 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 4c804e386d0..b0ae953fe9e 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 103db0601c2..bd02ae1f97d 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 fc2c1dd079b..48620861d8c 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 b7b8876b1ca..ae53dc99485 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 dfcbde0eed6..6948b368a0f 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 6a40731c5a8..4d9a61afee2 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 8cfca6aab67..f2a061c8c03 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 8e99ed3cb5c..b9a7fb65fcd 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`