diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bd584628f51..3f913c6a83f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-16  Richard Guenther  <rguenther@suse.de>
+
+	* lto-symtab.c (lto_symtab_entry_hash): Use IDENTIFIER_HASH_VALUE.
+	* optabs.c (libfunc_decl_hash): Likewise.
+	* varasm.c (emutls_decl): Likewise.
+
 2010-05-16  Steven Bosscher  <steven@gcc.gnu.org>
 
 	* c-decl.c: Don't include gimple.h.
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a8879acb460..386c90f3882 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-16  Richard Guenther  <rguenther@suse.de>
+
+	* trans-decl.c (module_htab_decls_hash): Use IDENTIFIER_HASH_VALUE.
+
 2010-05-16  Manuel López-Ibáñez  <manu@gcc.gnu.org>
 
 	* options.c (set_Wall): Remove special logic for Wuninitialized
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 56c88bc69f8..3216f68b59d 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -3374,7 +3374,7 @@ module_htab_decls_hash (const void *x)
   const_tree n = DECL_NAME (t);
   if (n == NULL_TREE)
     n = TYPE_NAME (TREE_TYPE (t));
-  return htab_hash_string (IDENTIFIER_POINTER (n));
+  return IDENTIFIER_HASH_VALUE (n);
 }
 
 static int
diff --git a/gcc/lto-symtab.c b/gcc/lto-symtab.c
index f8a244cbeec..28e9aa3eebd 100644
--- a/gcc/lto-symtab.c
+++ b/gcc/lto-symtab.c
@@ -81,7 +81,7 @@ lto_symtab_entry_hash (const void *p)
 {
   const struct lto_symtab_entry_def *base =
     (const struct lto_symtab_entry_def *) p;
-  return htab_hash_string (IDENTIFIER_POINTER (base->id));
+  return IDENTIFIER_HASH_VALUE (base->id);
 }
 
 /* Return non-zero if P1 and P2 points to lto_symtab_entry_def structs
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 5a3e61092b9..cf5873b1b33 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -6032,7 +6032,7 @@ static GTY ((param_is (union tree_node))) htab_t libfunc_decls;
 static hashval_t
 libfunc_decl_hash (const void *entry)
 {
-  return htab_hash_string (IDENTIFIER_POINTER (DECL_NAME ((const_tree) entry)));
+  return IDENTIFIER_HASH_VALUE (DECL_NAME ((const_tree) entry));
 }
 
 static int
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 15ff1b3c212..5fb57dcdda7 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -365,7 +365,7 @@ emutls_decl (tree decl)
   /* Note that we use the hash of the decl's name, rather than a hash
      of the decl's pointer.  In emutls_finish we iterate through the
      hash table, and we want this traversal to be predictable.  */
-  in.hash = htab_hash_string (IDENTIFIER_POINTER (name));
+  in.hash = IDENTIFIER_HASH_VALUE (name);
   in.base.from = decl;
   loc = htab_find_slot_with_hash (emutls_htab, &in, in.hash, INSERT);
   h = (struct tree_map *) *loc;