Fix architecture error for Windows.

Author: fniephaus

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java

@@ -159,8 +159,12 @@ protected CompilerInfo createCompilerInfo(Path compilerPath, Scanner scanner) {
                 scanner.nextLine(); // skip blank separator line
                 skipLineIfHasNext(scanner, "detect-cl-version-info.c");
                 scanner.nextLine(); // skip blank separator line
-                skipLineIfHasNext(scanner, "M_X64=100"); // _M_X64 is defined
-                skipLineIfHasNext(scanner, "M_ARM64EC=_M_ARM64EC"); // _M_ARM64EC is not defined
+                try {
+                    skipLineIfHasNext(scanner, "M_X64=100"); // _M_X64 is defined
+                    skipLineIfHasNext(scanner, "M_ARM64EC=_M_ARM64EC"); // _M_ARM64EC is not defined
+                } catch (NoSuchElementException e) {
+                    throw UserError.abort("Native Image on Windows currently only supports target architecture: %s", AMD64.class.getSimpleName());
+                }
                 if (scanner.findInLine("MSC_FULL_VER=") == null) {
                     return null;
                 }
@@ -195,11 +199,6 @@ protected void verify() {
                 UserError.abort("On Windows, GraalVM Native Image for JDK %s requires %s or later (C/C++ Optimizing Compiler Version %s.%s or later).%nCompiler info detected: %s",
                                 JavaVersionUtil.JAVA_SPEC, VISUAL_STUDIO_MINIMUM_REQUIRED_VERSION, minimumMajorVersion, minimumMinorVersion, compilerInfo.getShortDescription());
             }
-            if (guessArchitecture(compilerInfo.targetArch) != AMD64.class) {
-                String targetPrefix = compilerInfo.targetArch.matches("(.*x|i\\d)86$") ? "32-bit architecture " : "";
-                UserError.abort("Native-image building on Windows currently only supports target architecture: %s (%s%s unsupported)",
-                                AMD64.class.getSimpleName(), targetPrefix, compilerInfo.targetArch);
-            }
         }
 
         @Override