diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 6f2c4374048ee0db25ef7f17a7d05ff8206fca6c..4adf23a771d10dd7af0a3884bea2bfbac6b2405a 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -5202,7 +5202,7 @@ AC_DEFUN([GLIBCXX_ZONEINFO_DIR], [
 	;;
     esac
 
-    AC_COMPUTE_INT(glibcxx_cv_at_least_32bit, [sizeof(void*) >= 4])
+    AC_COMPUTE_INT(glibcxx_cv_at_least_32bit, [__INTPTR_WIDTH__ >= 32])
     if test "$glibcxx_cv_at_least_32bit" -ne 0; then
       # Also embed a copy of the tzdata.zi file as a static string.
       embed_zoneinfo=yes
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 95b8a8de649576ac4dde943583e7c7c94a633011..02a931cd0964d6f7fae48c43e66850fca5764628 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -71558,7 +71558,7 @@ fi
 	;;
     esac
 
-    if ac_fn_c_compute_int "$LINENO" "sizeof(void*) >= 4" "glibcxx_cv_at_least_32bit"        ""; then :
+    if ac_fn_c_compute_int "$LINENO" "__INTPTR_WIDTH__ >= 32" "glibcxx_cv_at_least_32bit"        ""; then :
 
 fi