diff --git a/gnu/dist/binutils/bfd/ChangeLog b/gnu/dist/binutils/bfd/ChangeLog
index 0ba609c47869..4e85fd2af7b5 100644
--- a/gnu/dist/binutils/bfd/ChangeLog
+++ b/gnu/dist/binutils/bfd/ChangeLog
@@ -1,4 +1,13 @@
-2005-05-02  Daniel Jacobowitz  <dan@codesourcery.com>
+2005-07-16  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	PR ld/1021
+	PR ld/1031
+	* elflink.c (elf_link_add_object_symbols): Also append the version
+	name to non-hidden absolute symbols that are functions.
+
+ 2005-06-12  Daniel Jacobowitz  <dan@codesourcery.com>
+ 
+ 	* Makefile.am: Clear RELEASE.
 
 	* Makefile.am: Set RELEASE.
 	* configure.in: Bump version to 2.16.1.
diff --git a/gnu/dist/binutils/bfd/elflink.c b/gnu/dist/binutils/bfd/elflink.c
index e1d81af278c2..4dba8f6faacf 100644
--- a/gnu/dist/binutils/bfd/elflink.c
+++ b/gnu/dist/binutils/bfd/elflink.c
@@ -3683,11 +3683,12 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
 
 	  /* If this is a hidden symbol, or if it is not version
 	     1, we append the version name to the symbol name.
-	     However, we do not modify a non-hidden absolute
-	     symbol, because it might be the version symbol
-	     itself.  FIXME: What if it isn't?  */
+	     However, we do not modify a non-hidden absolute symbol
+	     if it is not a function, because it might be the version
+	     symbol itself.  FIXME: What if it isn't?  */
 	  if ((iver.vs_vers & VERSYM_HIDDEN) != 0
-	      || (vernum > 1 && ! bfd_is_abs_section (sec)))
+	      || (vernum > 1 && (! bfd_is_abs_section (sec)
+				 || ELF_ST_TYPE (isym->st_info) == STT_FUNC)))
 	    {
 	      const char *verstr;
 	      size_t namelen, verlen, newlen;