diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index be981b8389ad0029075326ea86b66ffc3db9bfdb..17fb033c6f99ca52125a5c0e2d491acd94ad9c35 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-03  Ozkan Sezer  <sezeroz@gmail.com>
+
+	PR target/39065
+	* configure.ac: Also check for intptr_t.
+	* config.h.in: Regenerated.
+	* configure: Regenerated.
+	* hashtab.c (hash_pointer): Cast the pointer argument to intptr_t
+	instead of of long.
+
 2009-09-02  Tristan Gingold  <gingold@adacore.com>
 
 	* vmsbuild.com: Removed as unused and superceeded by makefile.vms.
diff --git a/libiberty/config.in b/libiberty/config.in
index 514e73c2732bcf4bf1417015df372160676cdb18..e962769e6a950922fb8a9496c105b4aaae3d7d07 100644
--- a/libiberty/config.in
+++ b/libiberty/config.in
@@ -457,6 +457,9 @@
 #undef inline
 #endif
 
+/* Define to `long' if <sys/types.h> does not define. */
+#undef intptr_t
+
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
diff --git a/libiberty/configure b/libiberty/configure
index 4a04e1f0794e423bf28b0ec9bb937174956e4d8d..9463f8f506f54aa1a66977ff2f25f08eb724e6bc 100755
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -5046,6 +5046,17 @@ _ACEOF
 
 
 
+ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_intptr_t" = x""yes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define intptr_t long
+_ACEOF
+
+fi
+
 ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
 if test "x$ac_cv_type_uintptr_t" = x""yes; then :
 
diff --git a/libiberty/configure.ac b/libiberty/configure.ac
index f01d518e5e4739bbfb2b77295c8c26dc0eec30a6..c34fc10b81bf5b2959701fc3d2e7545fa28c7ad7 100644
--- a/libiberty/configure.ac
+++ b/libiberty/configure.ac
@@ -254,6 +254,7 @@ libiberty_AC_DECLARE_ERRNO
 # Determine the size of an int for struct fibnode.
 AC_CHECK_SIZEOF([int])
 
+AC_CHECK_TYPE(intptr_t, long)
 AC_CHECK_TYPE(uintptr_t, unsigned long)
 
 # Look for a 64-bit type.
diff --git a/libiberty/hashtab.c b/libiberty/hashtab.c
index 3e649215f4205b860bdd6e52e6c971d71fd433d6..8c8bd3110ade2a1d509321a46341baa52a3f8131 100644
--- a/libiberty/hashtab.c
+++ b/libiberty/hashtab.c
@@ -196,7 +196,7 @@ higher_prime_index (unsigned long n)
 static hashval_t
 hash_pointer (const PTR p)
 {
-  return (hashval_t) ((long)p >> 3);
+  return (hashval_t) ((intptr_t)p >> 3);
 }
 
 /* Returns non-zero if P1 and P2 are equal.  */