diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 01a13ffe63..7570b23c47 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-19  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* elflink.h (NAME(bfd_elf,record_link_assignment)): Don't set
+	STT_NOTYPE symbols to STT_OBJECT.
+
 Mon Mar 18 17:38:03 CET 2002  Jan Hubicka  <jh@suse.cz>
 
 	* cpu-i386.c (bfd_x86_64_arch): Rename to "i386:x86-64"
diff --git a/bfd/elflink.h b/bfd/elflink.h
index 90c7f527de..d84f2a5f08 100644
--- a/bfd/elflink.h
+++ b/bfd/elflink.h
@@ -2795,10 +2795,6 @@ NAME(bfd_elf,record_link_assignment) (output_bfd, info, name, provide)
 
   h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
 
-  /* When possible, keep the original type of the symbol.  */
-  if (h->type == STT_NOTYPE)
-    h->type = STT_OBJECT;
-
   if (((h->elf_link_hash_flags & (ELF_LINK_HASH_DEF_DYNAMIC
 				  | ELF_LINK_HASH_REF_DYNAMIC)) != 0
        || info->shared)