Backport a fix to the 2.95 branch

From-SVN: r38049

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e736e0e4b85103354b5694578c226fa93cfced69..debfacf0e4239e07b40773ceeee3d984c477f77d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -10,6 +10,11 @@
        arm_fast_multiply, arm_arch4, arm_arch5, arm_ld_sched,
        arm_is_strong, and arm_is_6_or_7.
 
+       Thu Jul 29 19:01:58 1999  Bernd Schmidt  <bernds@cygnus.co.uk>
+       * arm.h (Hint): Delete macro.
+       Substitute HOST_WIDE_INT for Hint in some prototypes.
+       * arm.c: Substitute HOST_WIDE_INT for Hint in one prototype.
+
 2000-11-30  Bernd Schmidt  <bernds@redhat.co.uk>
 
        * version.c: Bump.

diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 5c884837e1ac2b6e2efd73a22a4073b068b9a95a..70ccc3951a7db0d94c69ef61490b1f3a647bb35f 100644 (file)
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -68,7 +68,7 @@ static int function_really_clobbers_lr PROTO ((rtx));
 static void emit_multi_reg_push PROTO ((int));
 static void emit_sfm PROTO ((int, int));
 static enum arm_cond_code get_arm_condition_code PROTO ((rtx));
-static int const_ok_for_op RTX_CODE_PROTO ((Hint, Rcode));
+static int const_ok_for_op RTX_CODE_PROTO ((HOST_WIDE_INT, Rcode));
 
 /* True if we are currently building a constant table. */
 int making_const_table;

diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 3c133a01b0e4cac9e6db53cd264f4c5e3806bbef..8bc200a1cebe02acfddafaf90c01ecad18f5e867 100644 (file)
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -2148,7 +2148,6 @@ struct rtx_def;
 #ifndef HOST_WIDE_INT
 #include "hwint.h"
 #endif
-#define Hint HOST_WIDE_INT
 
 #ifndef HAVE_MACHINE_MODES
 #include "machmode.h"
@@ -2164,8 +2163,8 @@ struct rtx_def;
 
 void   arm_override_options PROTO ((void));
 int    use_return_insn PROTO ((int));
-int    const_ok_for_arm PROTO ((Hint));
-int    arm_split_constant RTX_CODE_PROTO ((Rcode, Mmode, Hint, Rtx, Rtx, int));
+int    const_ok_for_arm PROTO ((HOST_WIDE_INT));
+int    arm_split_constant RTX_CODE_PROTO ((Rcode, Mmode, HOST_WIDE_INT, Rtx, Rtx, int));
 Rcode  arm_canonicalize_comparison RTX_CODE_PROTO ((Rcode,  Rtx *));
 int    arm_return_in_memory PROTO ((Tree));
 int    legitimate_pic_operand_p PROTO ((Rtx));
@@ -2206,9 +2205,9 @@ Rcode  minmax_code PROTO ((Rtx));
 int    adjacent_mem_locations PROTO ((Rtx, Rtx));
 int    load_multiple_operation PROTO ((Rtx, Mmode));
 int    store_multiple_operation PROTO ((Rtx, Mmode));
-int    load_multiple_sequence PROTO ((Rtx *, int, int *, int *, Hint *));
+int    load_multiple_sequence PROTO ((Rtx *, int, int *, int *, HOST_WIDE_INT *));
 char * emit_ldm_seq PROTO ((Rtx *, int));
-int    store_multiple_sequence PROTO ((Rtx *, int, int *, int *, Hint *));
+int    store_multiple_sequence PROTO ((Rtx *, int, int *, int *, HOST_WIDE_INT *));
 char * emit_stm_seq PROTO ((Rtx *, int));
 int    arm_valid_machine_decl_attribute PROTO ((Tree, Tree, Tree));
 Rtx    arm_gen_load_multiple PROTO ((int, int, Rtx, int, int, int, int, int));