summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/fortran/ChangeLog7
-rw-r--r--gcc/fortran/intrinsic.c3
-rw-r--r--gcc/fortran/intrinsic.h2
-rw-r--r--gcc/fortran/simplify.c12
4 files changed, 8 insertions, 16 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 82f816d30c0..36ab4716312 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2015-09-04 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
+
+ * intrinsic.h (gfc_simplify_mvbits): Remove.
+ * simplify.c (gfc_simplify_mvbits): Remove.
+ * intrinsic.c (add_subroutines): Remove reference to
+ gfc_simplify_mvbits.
+
2015-09-04 Manuel López-Ibáñez <manu@gcc.gnu.org>
PR fortran/67429
diff --git a/gcc/fortran/intrinsic.c b/gcc/fortran/intrinsic.c
index b46a5b21b79..17410925245 100644
--- a/gcc/fortran/intrinsic.c
+++ b/gcc/fortran/intrinsic.c
@@ -3290,8 +3290,7 @@ add_subroutines (void)
t, BT_UNKNOWN, 0, REQUIRED, INTENT_OUT);
add_sym_5s ("mvbits", GFC_ISYM_MVBITS, CLASS_ELEMENTAL, BT_UNKNOWN, 0,
- GFC_STD_F95, gfc_check_mvbits, gfc_simplify_mvbits,
- gfc_resolve_mvbits,
+ GFC_STD_F95, gfc_check_mvbits, NULL, gfc_resolve_mvbits,
f, BT_INTEGER, di, REQUIRED, INTENT_IN,
fp, BT_INTEGER, di, REQUIRED, INTENT_IN,
ln, BT_INTEGER, di, REQUIRED, INTENT_IN,
diff --git a/gcc/fortran/intrinsic.h b/gcc/fortran/intrinsic.h
index 4e91b822b22..971cf7c9feb 100644
--- a/gcc/fortran/intrinsic.h
+++ b/gcc/fortran/intrinsic.h
@@ -345,8 +345,6 @@ gfc_expr *gfc_simplify_maxexponent (gfc_expr *);
gfc_expr *gfc_simplify_minexponent (gfc_expr *);
gfc_expr *gfc_simplify_mod (gfc_expr *, gfc_expr *);
gfc_expr *gfc_simplify_modulo (gfc_expr *, gfc_expr *);
-gfc_expr *gfc_simplify_mvbits (gfc_expr *, gfc_expr *, gfc_expr *, gfc_expr *,
- gfc_expr *);
gfc_expr *gfc_simplify_nearest (gfc_expr *, gfc_expr *);
gfc_expr *gfc_simplify_new_line (gfc_expr *);
gfc_expr *gfc_simplify_nint (gfc_expr *, gfc_expr *);
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 124558efa5d..6a81dc32eca 100644
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -4443,18 +4443,6 @@ gfc_simplify_modulo (gfc_expr *a, gfc_expr *p)
}
-/* Exists for the sole purpose of consistency with other intrinsics. */
-gfc_expr *
-gfc_simplify_mvbits (gfc_expr *f ATTRIBUTE_UNUSED,
- gfc_expr *fp ATTRIBUTE_UNUSED,
- gfc_expr *l ATTRIBUTE_UNUSED,
- gfc_expr *to ATTRIBUTE_UNUSED,
- gfc_expr *tp ATTRIBUTE_UNUSED)
-{
- return NULL;
-}
-
-
gfc_expr *
gfc_simplify_nearest (gfc_expr *x, gfc_expr *s)
{