diff --git a/directory/c-sdk/configure b/directory/c-sdk/configure
index 35739f672ca8..f0621a46b558 100755
--- a/directory/c-sdk/configure
+++ b/directory/c-sdk/configure
@@ -3082,7 +3082,7 @@ EOF
     PR_MD_ARCH_DIR=beos
     RESOLVE_LINK_SYMBOLS=1
     case "${target_cpu}" in
-    i?86)
+    i*86)
         _OPTIMIZE_FLAGS=-O2
         _DEBUG_FLAGS='-gdwarf-2 -O0'
         MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@'
@@ -3757,7 +3757,7 @@ EOF
         CFLAGS="$CFLAGS -mieee"
         CXXFLAGS="$CXXFLAGS -mieee"
         ;;
-    i?86)
+    i*86)
         cat >> confdefs.h <<\EOF
 #define i386 1
 EOF
@@ -3920,7 +3920,7 @@ EOF
     esac
 
     case "$target_cpu" in
-    i?86)
+    i*86)
 	    cat >> confdefs.h <<\EOF
 #define _X86_ 1
 EOF
@@ -4721,8 +4721,8 @@ EOF
         LD='-ilink'
         MKSHLIB='$(LD) $(DSO_LDOPTS)'
         IMPLIB='implib -nologo -noignorecase'
-        FILTER='cppfilt -q -B -P'
-        _OPTIMIZE_FLAGS='/O+ /Gl+ /Gx+ /qtune=pentium /qarch=pentium'
+        FILTER='cppfilt -q -B -P -o'
+        _OPTIMIZE_FLAGS='/O+ /Gl+ /G5 /qarch=pentium'
         _DEBUG_FLAGS='/Ti+ '
         LDFLAGS='/NOL /M /L'
         DLLFLAGS='/O:$@ /DLL /INC:_dllentry /MAP:$(@:.dll=.map) /L /NOL'
@@ -5458,14 +5458,6 @@ fi
 
 RELEASE_OBJDIR_NAME="${OS_CONFIG}${CPU_ARCH_TAG}${COMPILER_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}.${OBJDIR_SUFFIX}"
 
-case "$target_os" in
-mingw*|cygwin*|msvc*|mksnt*)
-    CC="\$(CYGWIN_WRAPPER) $CC"
-    CXX="\$(CYGWIN_WRAPPER) $CXX"
-    RC="\$(CYGWIN_WRAPPER) $RC"
-    ;;
-esac
-
 
 
 
diff --git a/directory/c-sdk/configure.in b/directory/c-sdk/configure.in
index 2ce931fad667..ad0545bfd3f1 100644
--- a/directory/c-sdk/configure.in
+++ b/directory/c-sdk/configure.in
@@ -768,7 +768,7 @@ case "$target" in
     PR_MD_ARCH_DIR=beos
     RESOLVE_LINK_SYMBOLS=1
     case "${target_cpu}" in
-    i?86)
+    i*86)
         _OPTIMIZE_FLAGS=-O2
         _DEBUG_FLAGS='-gdwarf-2 -O0'
         MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@'
@@ -1165,7 +1165,7 @@ case "$target" in
         CFLAGS="$CFLAGS -mieee"
         CXXFLAGS="$CXXFLAGS -mieee"
         ;;
-    i?86)
+    i*86)
         AC_DEFINE(i386)
         PR_MD_ASFILES=os_Linux_x86.s
         ;;
@@ -1301,7 +1301,7 @@ case "$target" in
     esac
 
     case "$target_cpu" in
-    i?86)
+    i*86)
 	    AC_DEFINE(_X86_)
         ;;
     alpha)