diff --git a/ld/ChangeLog b/ld/ChangeLog
index b9bfc2b1f7..2d748f1a64 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-09  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	* emultempl/armelf.em (gld${EMULATION_NAME}_finish): Use the right
+	symbol name in case of warning.
+
 2018-07-05  Jim Wilson  <jimw@sifive.com>
 
 	* configure.tgt (riscv-*-*): Add as an alias for riscv32*-*-*.
diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
index 2d98064ed3..8cecedae15 100644
--- a/ld/emultempl/armelf.em
+++ b/ld/emultempl/armelf.em
@@ -499,7 +499,7 @@ gld${EMULATION_NAME}_finish (void)
     }
   else
     einfo (_("%P: warning: cannot find thumb start symbol %s\n"),
-	   params.thumb_entry_symbol);
+	   h->root.string);
 }
 
 /* This is a convenient point to tell BFD about target specific flags.