diff --git a/ld/ChangeLog b/ld/ChangeLog
index c7a20f1ed3..dacdf8ee02 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2016-10-31  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+	* ldmain.c (add_archive_element): Initialize input->header.type.
+	* plugin.c (plugin_maybe_claim): Assert the statement is an input
+	statement.
+
 2016-10-15  Alan Modra  <amodra@gmail.com>
 
 	* emultempl/spu_ovl.o_c: Regenerate.
diff --git a/ld/ldmain.c b/ld/ldmain.c
index 29ef77f4f0..2f15ba72a9 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -800,6 +800,7 @@ add_archive_element (struct bfd_link_info *info,
 
   input = (lang_input_statement_type *)
       xcalloc (1, sizeof (lang_input_statement_type));
+  input->header.type = lang_input_statement_enum;
   input->filename = abfd->filename;
   input->local_sym_name = abfd->filename;
   input->the_bfd = abfd;
diff --git a/ld/plugin.c b/ld/plugin.c
index 80d22e222d..804294049a 100644
--- a/ld/plugin.c
+++ b/ld/plugin.c
@@ -1195,6 +1195,7 @@ plugin_object_p (bfd *ibfd)
 void
 plugin_maybe_claim (lang_input_statement_type *entry)
 {
+  ASSERT (entry->header.type == lang_input_statement_enum);
   if (plugin_object_p (entry->the_bfd))
     {
       bfd *abfd = entry->the_bfd->plugin_dummy_bfd;