diff --git a/config/ChangeLog b/config/ChangeLog
index 104b1fbaf..55ea2e292 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-25  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR build/26188
+        * stdint.m4: Test for uintptr_t even on systems with uint64_t or uint32_t.
+
+	Sync from GCC
+	2006-07-21  Steve Ellcey  <sje@cup.hp.com>
+
+        PR target/26792
+        * unwind_ipinfo.m4: New.
+
 2006-07-18  Paolo Bonzini  <bonzini@gnu.org>
 
         * acx.m4: Support --with-build-libsubdir and AC_SUBST
diff --git a/config/stdint.m4 b/config/stdint.m4
index 21ef2ec43..07923826c 100644
--- a/config/stdint.m4
+++ b/config/stdint.m4
@@ -61,14 +61,17 @@ for i in stdint.h $inttype_headers; do
   break
 done
 if test "$acx_cv_header_stdint" = stddef.h; then
-  acx_cv_header_stdint_kind="(lacks uintptr_t)"
+  acx_cv_header_stdint_kind="(lacks uintmax_t)"
   for i in stdint.h $inttype_headers; do
+    unset ac_cv_type_uintptr_t
     unset ac_cv_type_uint32_t
     unset ac_cv_type_uint64_t
     _AS_ECHO_N([looking for an incomplete stdint.h in $i, ])
     AC_CHECK_TYPE(uint32_t,[acx_cv_header_stdint=$i],continue,[#include <sys/types.h>
 #include <$i>])
-    AC_CHECK_TYPE(uint64_t,,[acx_cv_header_stdint_kind="(lacks uintptr_t and uint64_t)"], [#include <sys/types.h>
+    AC_CHECK_TYPE(uint64_t,,,[#include <sys/types.h>
+#include <$i>])
+    AC_CHECK_TYPE(uintptr_t,,,[#include <sys/types.h>
 #include <$i>])
     break
   done
@@ -81,7 +84,7 @@ if test "$acx_cv_header_stdint" = stddef.h; then
     _AS_ECHO_N([looking for u_intXX_t types in $i, ])
     AC_CHECK_TYPE(u_int32_t,[acx_cv_header_stdint=$i],continue,[#include <sys/types.h>
 #include <$i>])
-    AC_CHECK_TYPE(u_int64_t,,[acx_cv_header_stdint_kind="(u_intXX_t style, lacks u_int64_t)"], [#include <sys/types.h>
+    AC_CHECK_TYPE(u_int64_t,,,[#include <sys/types.h>
 #include <$i>])
     break
   done
diff --git a/config/unwind_ipinfo.m4 b/config/unwind_ipinfo.m4
new file mode 100644
index 000000000..5587d9c3f
--- /dev/null
+++ b/config/unwind_ipinfo.m4
@@ -0,0 +1,22 @@
+dnl
+dnl Check whether _Unwind_GetIPInfo is available.
+dnl
+AC_DEFUN([GCC_CHECK_UNWIND_GETIPINFO], [
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  ac_save_CXXFLAGS="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS -fno-exceptions"
+  AC_MSG_CHECKING([for _Unwind_GetIPInfo])
+  AC_CACHE_VAL(gcc_cv_getipinfo, [
+  AC_TRY_LINK([extern "C" { extern void _Unwind_GetIPInfo(); }],
+      [_Unwind_GetIPInfo();],
+      [gcc_cv_getipinfo=yes],
+      [gcc_cv_getipinfo=no])
+  ])
+  if test $gcc_cv_getipinfo = yes; then
+    AC_DEFINE(HAVE_GETIPINFO, 1, [Define if _Unwind_GetIPInfo is available.])
+  fi
+  AC_MSG_RESULT($gcc_cv_getipinfo)
+  CXXFLAGS="$ac_save_CXXFLAGS"
+  AC_LANG_RESTORE
+])