diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1d2e135af3..4eb0feee9c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-04  Alan Modra  <alan@linuxcare.com.au>
+
+	* libhppa.h (HPPA_R_CONSTANT): Cast argument to bfd_signed_vma.
+
 2000-05-03  Martin v. Löwis  <loewis@informatik.hu-berlin.de>
 
 	* elflink.h (elf_link_add_object_symbols): Reset dynindx for
diff --git a/bfd/libhppa.h b/bfd/libhppa.h
index 121398d2b2..ddb6efa2e1 100644
--- a/bfd/libhppa.h
+++ b/bfd/libhppa.h
@@ -156,7 +156,7 @@ enum hppa_reloc_expr_type_alt
 #define HPPA_R_ARG_RELOC(a)	\
   (((a) >> 22) & 0x3ff)
 #define HPPA_R_CONSTANT(a)	\
-  ((((int)(a)) << (BFD_ARCH_SIZE-22)) >> (BFD_ARCH_SIZE-22))
+  ((((bfd_signed_vma)(a)) << (BFD_ARCH_SIZE-22)) >> (BFD_ARCH_SIZE-22))
 #define HPPA_R_ADDEND(r, c)	\
   (((r) << 22) + ((c) & 0x3fffff))
 #define HPPA_WIDE	       (0) /* PSW W-bit, need to check! FIXME */