diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 24c74a18d7..fa33a4312b 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* dwarf.c (debug_displays_assert): New static assertion.
+
 2017-03-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* dwarf.h (enum dwarf_section_display_enum): Add loclists and rnglists.
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index ad0bfcfa4f..fdfbc16e88 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -8591,3 +8591,6 @@ struct dwarf_section_display debug_displays[] =
   { { ".debug_tu_index",    "",			NULL, NULL, 0, 0, 0, NULL, 0, NULL },
     display_cu_index,       &do_debug_cu_index,	FALSE },
 };
+
+/* A static assertion.  */
+extern int debug_displays_assert[ARRAY_SIZE (debug_displays) == max ? 1 : -1];