diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2c5a4c77c4..39dc9e7687 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-01  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* emultempl/elf32.em (gld${EMULATION_NAME}_before_allocation):
+	Use is_elf_hash_table rather than a handcoded condition.
+
 2013-04-30  Nick Clifton  <nickc@redhat.com>
 
 	* ld.texinfo (SORT_BY_ALIGNMENT): Fix and clarify typo - sections
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 83a554fa74..dae86052ad 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1483,7 +1483,7 @@ gld${EMULATION_NAME}_before_allocation (void)
   asection *sinterp;
   bfd *abfd;
 
-  if (link_info.hash->type == bfd_link_elf_hash_table)
+  if (is_elf_hash_table (link_info.hash))
     _bfd_elf_tls_setup (link_info.output_bfd, &link_info);
 
   /* If we are going to make any variable assignments, we need to let