diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 94f3e223d1..225a3fb40a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_finish_dynamic_symbol): Return false
+	on dynamic symbol error.
+	* elf64-x86-64.c (elf_x86_64_finish_dynamic_symbol): Likewise.
+
 2011-04-20  Tristan Gingold  <gingold@adacore.com>
 
 	* config.bfd (alpha*-*-*vms*, ia64*-*-*vms*): Define targ_selvecs.
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 8934d27786..1bdc05e9ae 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -4189,7 +4189,7 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
 	  || plt == NULL
 	  || gotplt == NULL
 	  || relplt == NULL)
-	abort ();
+	return FALSE;
 
       /* Get the index in the procedure linkage table which
 	 corresponds to this symbol.  This is the index of this symbol
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 84ee101783..6190a98847 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -3961,7 +3961,7 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
 	  || plt == NULL
 	  || gotplt == NULL
 	  || relplt == NULL)
-	abort ();
+	return FALSE;
 
       /* Get the index in the procedure linkage table which
 	 corresponds to this symbol.  This is the index of this symbol