diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 13d7ba7d35a..33b331bc48d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-20  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* pa-protos.h (pa_asm_output_mi_thunk): Change third argument to
+	HOST_WIDE_INT.
+	* pa.c (pa_asm_output_mi_thunk): Likewise.
+	(n_deferred_plabels): Change type to size_t.
+	(output_deferred_plabels, output_call): Use size_t instead of int.
+
 2002-06-20  Richard Henderson  <rth@redhat.com>
 
 	PR target/4041
diff --git a/gcc/config/pa/pa-protos.h b/gcc/config/pa/pa-protos.h
index b26b7b8fa7a..a21a383a47b 100644
--- a/gcc/config/pa/pa-protos.h
+++ b/gcc/config/pa/pa-protos.h
@@ -163,5 +163,5 @@ extern int function_arg_partial_nregs PARAMS ((CUMULATIVE_ARGS *,
 					       enum machine_mode,
 					       tree, int));
 
-extern void pa_asm_output_mi_thunk PARAMS ((FILE *, tree, int, tree));
+extern void pa_asm_output_mi_thunk PARAMS ((FILE *, tree, HOST_WIDE_INT, tree));
 #endif /* TREE_CODE */
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index bfa1c1d45c6..7661f596e93 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -156,7 +156,7 @@ struct deferred_plabel GTY(())
 };
 static GTY((length ("n_deferred_plabels"))) struct deferred_plabel *
   deferred_plabels;
-static int n_deferred_plabels = 0;
+static size_t n_deferred_plabels = 0;
 
 /* Initialize the GCC target structure.  */
 
@@ -4703,7 +4703,7 @@ void
 output_deferred_plabels (file)
      FILE *file;
 {
-  int i;
+  size_t i;
   /* If we have deferred plabels, then we need to switch into the data
      section and align it to a 4 byte boundary before we output the
      deferred plabels.  */
@@ -6255,7 +6255,7 @@ output_call (insn, call_dest, sibcall)
       /* Don't have to worry about TARGET_PORTABLE_RUNTIME here since
 	 we don't have any direct calls in that case.  */
 	{
-	  int i;
+	  size_t i;
 	  const char *name = XSTR (call_dest, 0);
 
 	  /* See if we have already put this function on the list
@@ -6506,7 +6506,7 @@ void
 pa_asm_output_mi_thunk (file, thunk_fndecl, delta, function)
      FILE *file;
      tree thunk_fndecl;
-     int delta;
+     HOST_WIDE_INT delta;
      tree function;
 {
   const char *target_name = XSTR (XEXP (DECL_RTL (function), 0), 0);