diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9a124bd3b49..5f3fb8c14ce 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/21384
+	* elf32-cris.c (elf_cris_discard_excess_program_dynamics): Don't
+	hide symbol which was forced to be dynamic.
+
 2017-10-14  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/22269
diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 4c80d002cc8..387c7c7475b 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -3988,6 +3988,7 @@ elf_cris_discard_excess_program_dynamics (struct elf_cris_link_hash_entry *h,
       if (! (info->export_dynamic
 	     || (h->root.type != STT_FUNC && info->dynamic_data))
 	  && h->root.dynindx != -1
+	  && !h->root.dynamic
 	  && !h->root.def_dynamic
 	  && !h->root.ref_dynamic)
 	{