diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1bca5b852d5..f4b9c698370 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Allow R_386_GOTOFF
+	against protected function when building executable.
+
 2005-05-12  Alan Modra  <amodra@bigpond.net.au>
 
 	* elf32-ppc.c (LWZU_0_X_11): Delete.
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index fe2ebc85c44..491fd9b1dd6 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -2368,6 +2368,7 @@ elf_i386_relocate_section (bfd *output_bfd,
 	     for shared library since it may not be local when used
 	     as function address.  */
 	  if (info->shared
+	      && !info->executable
 	      && h
 	      && h->def_regular
 	      && h->type == STT_FUNC