merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index b3dc41708b4a54459c5bea48547658fa0ce88c27..c36413bbbfbd28eaaef767313507e770dbe1c5b8 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-15  Tristan Gingold  <gingold@adacore.com>
+
+       * config.h-vms (intptr_t): Define to compile hashtab.c
+
 2009-09-04  Ozkan Sezer  <sezeroz@gmail.com>
 
        PR target/39065

diff --git a/libiberty/config.h-vms b/libiberty/config.h-vms
index d84453101e817a15642849b24ba45e6d7ca88b0e..d923ecb3cf262cabd20ba86d3019b0a3417c3a94 100644 (file)
--- a/libiberty/config.h-vms
+++ b/libiberty/config.h-vms
@@ -5,6 +5,9 @@
 #define HAVE_SYS_STAT_H 1
 #define HAVE_SYS_TIME_H 1
 
+/* intptr_t is defined in inttypes.h!  */
+#define intptr_t __int64
+
 /* Cheat: use vms builtin alloca.  */
 #ifdef __DECC
 #define C_alloca(x) __ALLOCA(x)