common/autoconf/toolchain_windows.m4

rev 1119 : 8022177: Windows/MSYS builds broken

*** 242,257 ****
      AC_MSG_NOTICE([Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD])
      
      # Need to check if the found msvcr is correct architecture
      AC_MSG_CHECKING([found msvcr100.dll architecture])
      MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
      if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
        CORRECT_MSVCR_ARCH=386
      else
        CORRECT_MSVCR_ARCH=x86-64
      fi
!     if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
        AC_MSG_RESULT([ok])
        MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
        AC_MSG_CHECKING([for msvcr100.dll])
        AC_MSG_RESULT([$MSVCR_DLL])
      else
--- 242,267 ----
      AC_MSG_NOTICE([Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD])
      
      # Need to check if the found msvcr is correct architecture
      AC_MSG_CHECKING([found msvcr100.dll architecture])
      MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
+     if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+       # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
+       # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
+       if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+         CORRECT_MSVCR_ARCH="PE32 executable"
+       else
+         CORRECT_MSVCR_ARCH="PE32+ executable"
+       fi
+     else
        if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
          CORRECT_MSVCR_ARCH=386
        else
          CORRECT_MSVCR_ARCH=x86-64
        fi
!     fi
!     if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
        AC_MSG_RESULT([ok])
        MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
        AC_MSG_CHECKING([for msvcr100.dll])
        AC_MSG_RESULT([$MSVCR_DLL])
      else