Revert r244448

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244454 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 4 insertions, 17 deletions

diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index 137914aa5d6..f01a290e28f 100644
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -2064,14 +2064,6 @@ gfc_intrinsic_sym;
 
 typedef splay_tree gfc_constructor_base;
 
-
-/* This should be an unsigned variable of type size_t.  But to handle
-   compiling to a 64-bit target from a 32-bit host, we need to use a
-   HOST_WIDE_INT.  Also, occasionally the string length field is used
-   as a flag with values -1 and -2, see e.g. gfc_add_assign_aux_vars.
-   So it needs to be signed.  */
-typedef HOST_WIDE_INT gfc_charlen_t;
-
 typedef struct gfc_expr
 {
   expr_t expr_type;
@@ -2117,7 +2109,7 @@ typedef struct gfc_expr
      the value.  */
   struct
   {
-    gfc_charlen_t length;
+    int length;
     char *string;
   }
   representation;
@@ -2173,7 +2165,7 @@ typedef struct gfc_expr
 
     struct
     {
-      gfc_charlen_t length;
+      int length;
       gfc_char_t *string;
     }
     character;
@@ -2767,9 +2759,6 @@ void gfc_done_2 (void);
 
 int get_c_kind (const char *, CInteropKind_t *);
 
-HOST_WIDE_INT gfc_mpz_get_hwi (mpz_t);
-void gfc_mpz_set_hwi (mpz_t, const HOST_WIDE_INT);
-
 /* options.c */
 unsigned int gfc_option_lang_mask (void);
 void gfc_init_options_struct (struct gcc_options *);
@@ -2861,7 +2850,6 @@ extern int gfc_atomic_int_kind;
 extern int gfc_atomic_logical_kind;
 extern int gfc_intio_kind;
 extern int gfc_charlen_int_kind;
-extern int gfc_size_kind;
 extern int gfc_numeric_storage_size;
 extern int gfc_character_storage_size;
 
@@ -3093,7 +3081,6 @@ void gfc_resolve_oacc_blocks (gfc_code *, gfc_namespace *);
 void gfc_free_actual_arglist (gfc_actual_arglist *);
 gfc_actual_arglist *gfc_copy_actual_arglist (gfc_actual_arglist *);
 const char *gfc_extract_int (gfc_expr *, int *);
-const char *gfc_extract_hwi (gfc_expr *, HOST_WIDE_INT *);
 bool is_subref_array (gfc_expr *);
 bool gfc_is_simply_contiguous (gfc_expr *, bool, bool);
 bool gfc_check_init_expr (gfc_expr *);
@@ -3111,8 +3098,8 @@ gfc_expr *gfc_get_null_expr (locus *);
 gfc_expr *gfc_get_operator_expr (locus *, gfc_intrinsic_op,gfc_expr *, gfc_expr *);
 gfc_expr *gfc_get_structure_constructor_expr (bt, int, locus *);
 gfc_expr *gfc_get_constant_expr (bt, int, locus *);
-gfc_expr *gfc_get_character_expr (int, locus *, const char *, gfc_charlen_t len);
-gfc_expr *gfc_get_int_expr (int, locus *, HOST_WIDE_INT);
+gfc_expr *gfc_get_character_expr (int, locus *, const char *, int len);
+gfc_expr *gfc_get_int_expr (int, locus *, int);
 gfc_expr *gfc_get_logical_expr (int, locus *, bool);
 gfc_expr *gfc_get_iokind_expr (locus *, io_kind);