diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 73206a1f11..1ac3321489 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-20  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.c (elf_fixup_link_order): Rewrite conversion of
+	s->alignment_power into an offset mask in order to avoid a gcc
+	error message.
+
 2007-08-17  Jakub Jelinek  <jakub@redhat.com>
 
 	* config.bfd: Handle sparcv*-*-linux-* the same as sparc-*-linux-*.
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 6cfb8b9609..6059ab1140 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -9965,7 +9965,7 @@ elf_fixup_link_order (bfd *abfd, asection *o)
   for (n = 0; n < seen_linkorder; n++)
     {
       s = sections[n]->u.indirect.section;
-      offset &= ~(bfd_vma)((1 << s->alignment_power) - 1);
+      offset &= (bfd_vma)~((1L << s->alignment_power) - 1L);
       s->output_offset = offset;
       sections[n]->offset = offset;
       offset += sections[n]->size;