diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0fe87c96f3f..5fb4b61233b 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-30  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* bfd-in.h (align_power): Cast constants to bfd_vma type.
+	* bfd-in2.h (align_power): Likewise.
+
 2002-08-30  Alan Modra  <amodra@bigpond.net.au>
 
 	* Makefile.am: Run "make dep-am".
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 9017440c2a1..3941906979e 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -331,7 +331,7 @@ alent;
 /* Object and core file sections.  */
 
 #define	align_power(addr, align)	\
-	( ((addr) + ((1<<(align))-1)) & (-1 << (align)))
+  (((addr) + ((bfd_vma) 1 << (align)) - 1) & ((bfd_vma) -1 << (align)))
 
 typedef struct sec *sec_ptr;
 
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 0ab42452029..abb6405f579 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -337,7 +337,7 @@ alent;
 /* Object and core file sections.  */
 
 #define	align_power(addr, align)	\
-	( ((addr) + ((1<<(align))-1)) & (-1 << (align)))
+  (((addr) + ((bfd_vma) 1 << (align)) - 1) & ((bfd_vma) -1 << (align)))
 
 typedef struct sec *sec_ptr;