diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e20d3db2d0c..f10bef21200 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12982
+	* elflink.c (bfd_elf_size_dynamic_sections): Also skip BFD_PLUGIN
+	when setting stack_flags.
+
 2011-07-11  Catherine Moore  <clm@codesourcery.com>
 
 	* aout-adobe.c (aout_32_bfd_lookup_section_flags): New definition.
diff --git a/bfd/elflink.c b/bfd/elflink.c
index e2cb28cc8e2..dc3840e33db 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -5525,7 +5525,8 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
 	{
 	  asection *s;
 
-	  if (inputobj->flags & (DYNAMIC | EXEC_P | BFD_LINKER_CREATED))
+	  if (inputobj->flags
+	      & (DYNAMIC | EXEC_P | BFD_PLUGIN | BFD_LINKER_CREATED))
 	    continue;
 	  s = bfd_get_section_by_name (inputobj, ".note.GNU-stack");
 	  if (s)