diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7cbd7611b7f..550738531bc 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -3,6 +3,8 @@
 	PR binutils/21582
 	* ieee.c (ieee_object_p): Use a static buffer to avoid compiler
 	bugs.
+	PR binutils/21581
+	(ieee_archive_p): Likewise.
 
 2017-06-15  Nick Clifton  <nickc@redhat.com>
 
diff --git a/bfd/ieee.c b/bfd/ieee.c
index 0884d87a7b5..f7ea4bd3e2b 100644
--- a/bfd/ieee.c
+++ b/bfd/ieee.c
@@ -1355,7 +1355,7 @@ ieee_archive_p (bfd *abfd)
 {
   char *library;
   unsigned int i;
-  unsigned char buffer[512];
+  static unsigned char buffer[512];
   file_ptr buffer_offset = 0;
   ieee_ar_data_type *save = abfd->tdata.ieee_ar_data;
   ieee_ar_data_type *ieee;