diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure
index 411475784..f5c8a7d4b 100755
--- a/winsup/cygwin/configure
+++ b/winsup/cygwin/configure
@@ -1965,7 +1965,7 @@ esac
 
 
 case "$target_cpu" in
-   i386|i486|i586|i686) DLL_ENTRY="_dll_entry@12"
+   i?86) DLL_ENTRY="_dll_entry@12"
 		DEF_DLL_ENTRY="dll_entry@12"
 		ALLOCA="_alloca"
 		CONFIG_DIR="i386"  ;;
diff --git a/winsup/cygwin/configure.in b/winsup/cygwin/configure.in
index 0712b821f..6a762e071 100644
--- a/winsup/cygwin/configure.in
+++ b/winsup/cygwin/configure.in
@@ -205,7 +205,7 @@ dnl   fi
 dnl fi
 
 case "$target_cpu" in
-   i386|i486|i586|i686) DLL_ENTRY="_dll_entry@12"
+   i?86) DLL_ENTRY="_dll_entry@12"
 		DEF_DLL_ENTRY="dll_entry@12"
 		ALLOCA="_alloca"
 		CONFIG_DIR="i386"  ;;