diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9a9152609d..e12c559c13 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2021-03-31  Alan Modra  <amodra@gmail.com>
+
+	PR 27671
+	* bfd-in.h: Don't poison FALSE or TRUE.
+	* bfd-in2.h: Regenerate.
+
 2021-03-31  Alan Modra  <amodra@gmail.com>
 
 	* sysdep.h: POISON_BFD_BOOLEAN: Define.
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 6f72cc4539..1fbccca416 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -120,7 +120,7 @@ typedef struct bfd bfd;
    success and FALSE on failure (unless they're a predicate).  */
 
 #ifdef POISON_BFD_BOOLEAN
-# pragma GCC poison bfd_boolean FALSE TRUE
+# pragma GCC poison bfd_boolean
 #else
 # define bfd_boolean bool
 # undef FALSE
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 40d35a1a43..2b431dacec 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -127,7 +127,7 @@ typedef struct bfd bfd;
    success and FALSE on failure (unless they're a predicate).  */
 
 #ifdef POISON_BFD_BOOLEAN
-# pragma GCC poison bfd_boolean FALSE TRUE
+# pragma GCC poison bfd_boolean
 #else
 # define bfd_boolean bool
 # undef FALSE