diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f39dd090871..7cbd7611b7f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-15  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/21582
+	* ieee.c (ieee_object_p): Use a static buffer to avoid compiler
+	bugs.
+
 2017-06-15  Nick Clifton  <nickc@redhat.com>
 
 	PR binutils/21579
diff --git a/bfd/ieee.c b/bfd/ieee.c
index 763c2b81822..0884d87a7b5 100644
--- a/bfd/ieee.c
+++ b/bfd/ieee.c
@@ -1873,7 +1873,7 @@ ieee_object_p (bfd *abfd)
   char *processor;
   unsigned int part;
   ieee_data_type *ieee;
-  unsigned char buffer[300];
+  static unsigned char buffer[300];
   ieee_data_type *save = IEEE_DATA (abfd);
   bfd_size_type amt;