mirror of git://gcc.gnu.org/git/gcc.git
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
This commit is contained in:
parent
96281645bd
commit
97e1c8786b
|
|
@ -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>
|
2017-11-23 Thomas Koenig <tkoenig@gcc.gnu.org>
|
||||||
|
|
||||||
PR fortran/36313
|
PR fortran/36313
|
||||||
|
|
|
||||||
|
|
@ -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,
|
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);
|
export_proto(smaxloc2_16_s1);
|
||||||
|
|
||||||
GFC_INTEGER_16
|
GFC_INTEGER_16
|
||||||
|
|
|
||||||
|
|
@ -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,
|
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);
|
export_proto(smaxloc2_16_s4);
|
||||||
|
|
||||||
GFC_INTEGER_16
|
GFC_INTEGER_16
|
||||||
|
|
|
||||||
|
|
@ -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,
|
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);
|
export_proto(smaxloc2_4_s1);
|
||||||
|
|
||||||
GFC_INTEGER_4
|
GFC_INTEGER_4
|
||||||
|
|
|
||||||
|
|
@ -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,
|
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);
|
export_proto(smaxloc2_4_s4);
|
||||||
|
|
||||||
GFC_INTEGER_4
|
GFC_INTEGER_4
|
||||||
|
|
|
||||||
|
|
@ -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,
|
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);
|
export_proto(smaxloc2_8_s1);
|
||||||
|
|
||||||
GFC_INTEGER_8
|
GFC_INTEGER_8
|
||||||
|
|
|
||||||
|
|
@ -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,
|
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);
|
export_proto(smaxloc2_8_s4);
|
||||||
|
|
||||||
GFC_INTEGER_8
|
GFC_INTEGER_8
|
||||||
|
|
|
||||||
|
|
@ -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,
|
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);
|
export_proto(mminloc2_16_s1);
|
||||||
|
|
||||||
GFC_INTEGER_16
|
GFC_INTEGER_16
|
||||||
|
|
|
||||||
|
|
@ -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,
|
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);
|
export_proto(mminloc2_16_s4);
|
||||||
|
|
||||||
GFC_INTEGER_16
|
GFC_INTEGER_16
|
||||||
|
|
|
||||||
|
|
@ -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,
|
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);
|
export_proto(mminloc2_4_s1);
|
||||||
|
|
||||||
GFC_INTEGER_4
|
GFC_INTEGER_4
|
||||||
|
|
|
||||||
|
|
@ -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,
|
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);
|
export_proto(mminloc2_4_s4);
|
||||||
|
|
||||||
GFC_INTEGER_4
|
GFC_INTEGER_4
|
||||||
|
|
|
||||||
|
|
@ -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,
|
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);
|
export_proto(mminloc2_8_s1);
|
||||||
|
|
||||||
GFC_INTEGER_8
|
GFC_INTEGER_8
|
||||||
|
|
|
||||||
|
|
@ -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,
|
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);
|
export_proto(mminloc2_8_s4);
|
||||||
|
|
||||||
GFC_INTEGER_8
|
GFC_INTEGER_8
|
||||||
|
|
|
||||||
|
|
@ -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,
|
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`);
|
export_proto(s'name`'rtype_qual`_'atype_code`);
|
||||||
|
|
||||||
'rtype_name`
|
'rtype_name`
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ export_proto('name`'rtype_qual`_'atype_code`);
|
||||||
}
|
}
|
||||||
|
|
||||||
extern 'rtype_name` m'name`'rtype_qual`_'atype_code` ('atype` * const restrict,
|
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`);
|
export_proto(m'name`'rtype_qual`_'atype_code`);
|
||||||
|
|
||||||
'rtype_name`
|
'rtype_name`
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue