diff --git a/configure b/configure
index 2e59ac8da57..d5181f06939 100755
--- a/configure
+++ b/configure
@@ -5069,9 +5069,16 @@ MULTIARCH=$($CC --print-multiarch 2>/dev/null)
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the platform triplet based on compiler characteristics" >&5
 $as_echo_n "checking for the platform triplet based on compiler characteristics... " >&6; }
 cat >> conftest.c <<EOF
+#undef bfin
+#undef cris
+#undef fr30
 #undef linux
+#undef hppa
+#undef hpux
 #undef i386
+#undef mips
 #undef powerpc
+#undef sparc
 #undef unix
 #if defined(__linux__)
 # if defined(__x86_64__) && defined(__LP64__)
diff --git a/configure.ac b/configure.ac
index 73a0a2f2aee..9b12dbfd1a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -728,9 +728,16 @@ AC_SUBST(MULTIARCH)
 
 AC_MSG_CHECKING([for the platform triplet based on compiler characteristics])
 cat >> conftest.c <<EOF
+#undef bfin
+#undef cris
+#undef fr30
 #undef linux
+#undef hppa
+#undef hpux
 #undef i386
+#undef mips
 #undef powerpc
+#undef sparc
 #undef unix
 #if defined(__linux__)
 # if defined(__x86_64__) && defined(__LP64__)