Add better support to dynamically setup content of config.h in Windows MSVC builds.

When running tests on CI the runtime is configured from autogen.sh script.
When running fullaot there are a couple of features not supported so they are
disabled. The problem is that the MSVC Windows builds have its own winconfig.h
template, losing all the disabled features from configures config.h.

This commit adds support to detect the disable defines from configures config.h
if one exists. Since the complexity of this step increases the work previously
done in winsetup.bat has been moved into a msbuild target that is used from
both within VS build as well as winsetup.bat (there are a couple of other builds
using that bat file, so won't remove it).

The winconfig.h template we had is quite outdated compared to what’s generated
by configure. This commit also updates the winconfig.h to closer match what generated
for corresponding mingw build but keep all the Windows specific configurations
included in current version.

msvc/build-init.vcxproj

@@ -150,19 +150,21 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="mono.external.targets" />
+  <Import Project="mono.winconfig.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 
   <Target Name="AfterBuildWinSetup">
     <PropertyGroup>
-      <_OptionalDefines Condition="'$(MONO_ENABLE_BTLS)' == 'true'">$(_OptionalDefines);HAVE_BTLS</_OptionalDefines>
-      <_OptionalDefines Condition="'$(MONO_ENABLE_LLVM)' == 'true'">$(_OptionalDefines);ENABLE_LLVM;ENABLE_LLVM_RUNTIME</_OptionalDefines>
-      <_OptionalDefines>$(_OptionalDefines.Trim(';'))</_OptionalDefines>
+      <_EnableDefines Condition="'$(MONO_ENABLE_LLVM)' == 'true'">$(_EnableDefines);ENABLE_LLVM;ENABLE_LLVM_RUNTIME</_EnableDefines>
+      <_HaveDefines Condition="'$(MONO_ENABLE_BTLS)' == 'true'">$(_HaveDefines);HAVE_BTLS</_HaveDefines>
+      <_EnableDefines>$(_EnableDefines.Trim(';'))</_EnableDefines>
+      <_HaveDefines>$(_HaveDefines.Trim(';'))</_HaveDefines>
     </PropertyGroup>
-    <Exec Command="winsetup.bat &quot;$(_OptionalDefines)&quot;">
-      <Output TaskParameter="ExitCode" PropertyName="WinSetupExitCode" />
-    </Exec>
-    <Error Text="Failed running winsetup.bat" Condition="$(WinSetupExitCode) != 0" />
+    <WinConfigSetup ConfigFileRoot="$(MSBuildThisFileDirectory)..\"
+                    DisableDefines=""
+                    EnableDefines="$(_EnableDefines)"
+                    HaveDefines="$(_HaveDefines)"/>
   </Target>
 
   <Target Name="AfterBuild" DependsOnTargets="AfterBuildWinSetup" />

msvc/mono.external.targets

@@ -23,7 +23,7 @@
                 if (File.Exists (ConfFile))
                 {
                     var regex = new Regex (ConfRegEx);
-                    using (StreamReader reader = new StreamReader(ConfFile))
+                    using (StreamReader reader = new StreamReader (ConfFile))
                     {
                         string line;
                         while ((line = reader.ReadLine ()) != null)

msvc/mono.winconfig.targets

@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <UsingTask TaskName="WinConfigSetup" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+      <ParameterGroup>
+        <ConfigFileRoot ParameterType="System.String" Required="true" />
+        <DisableDefines ParameterType="System.String" Required="false" />
+        <EnableDefines ParameterType="System.String" Required="false" />
+        <HaveDefines ParameterType="System.String" Required="false" />
+      </ParameterGroup>
+        <Task>
+            <Code Type="Class" Language="cs">
+            <![CDATA[
+                using System;
+                using System.IO;
+                using System.Text;
+                using System.Linq;
+                using Microsoft.Build.Framework;
+                using Microsoft.Build.Utilities;
+                using System.Collections.Generic;
+                using System.Text.RegularExpressions;
+
+                public class _WinConfigSetup : Task
+                {
+                  void GetVersionsFromConfigureAC (string configureACFile, out string monoVersion, out string monoCorlibVersion)
+                  {
+                      monoVersion = null;
+                      monoCorlibVersion = null;
+                      if (File.Exists (configureACFile))
+                      {
+                          var monoVersionRegEx = new Regex (@"(.*AC_INIT\(mono, \[)(\d+\.\d+\.\d+)");
+                          var monoCorlibVersionRegEx = new Regex (@"(MONO_CORLIB_VERSION=)([A-F0-9]{8}(?:-[A-F0-9]{4}){3}-[A-F0-9]{12})");
+                          using (StreamReader reader = new StreamReader (configureACFile))
+                          {
+                              string line;
+                              while ((line = reader.ReadLine ()) != null && (monoVersion == null || monoCorlibVersion == null))
+                              {
+                                  var monoVersionMatch = monoVersionRegEx.Match (line);
+                                  if (monoVersionMatch != null && monoVersionMatch.Success && monoVersionMatch.Groups.Count == 3)
+                                  {
+                                      monoVersion = monoVersionMatch.Groups[2].Value;
+                                      continue;
+                                  }
+
+                                  var monoCorlibVersionMatch = monoCorlibVersionRegEx.Match (line);
+                                  if (monoCorlibVersionMatch != null && monoCorlibVersionMatch.Success && monoCorlibVersionMatch.Groups.Count == 3)
+                                  {
+                                      monoCorlibVersion = monoCorlibVersionMatch.Groups[2].Value;
+                                      continue;
+                                  }
+                              }
+                          }
+                      }
+                  }
+
+                  string [] GetDisabledConfigFeatures (string path)
+                  {
+                      var disabledFeatures = new List<string> ();
+                      if (File.Exists (path))
+                      {
+                          var regex = new Regex (".*#define.*DISABLE_.*1");
+                          using (StreamReader reader = new StreamReader (path))
+                          {
+                              string line;
+                              while ((line = reader.ReadLine ()) != null)
+                              {
+                                  var match = regex.Match (line);
+                                  if (match != null && match.Success)
+                                  {
+                                      if (match.Groups != null && match.Groups.Count == 1)
+                                      {
+                                          var configLine = match.Groups[0].ToString ();
+                                          if (!String.IsNullOrEmpty (configLine))
+                                          {
+                                              var configItems = configLine.Trim ().Split (' ');
+                                              if (configItems != null && configItems.Length == 3)
+                                              {
+                                                  // Second item should be the define.
+                                                  disabledFeatures.Add (configItems[1]);
+                                              }
+                                          }
+                                      }
+                                  }
+                              }
+                          }
+                      }
+                      return disabledFeatures.ToArray ();
+                  }
+
+                  void CreateConfigUsingTemplate (string templatePath, string targetPath, string [] disabledDefines, string [] enabledDefines, string [] haveDefines, string monoVersion, string monoCorlibVersion)
+                  {
+                      string tempFilePath = "";
+
+                      try
+                      {
+                          if (File.Exists (templatePath))
+                          {
+                              var disabledDefinesRegex = new Regex (".*@DISABLE_DEFINES@.*");
+                              var enabledDefinesRegex = new Regex (".*@ENABLE_DEFINES@.*");
+                              var haveDefinesRegex = new Regex (".*@HAVE_DEFINES.*");
+
+                              var definesList = new List<Tuple<Regex, string []>>
+                              {
+                                  new Tuple<Regex, string []>(disabledDefinesRegex, disabledDefines),
+                                  new Tuple<Regex, string []>(enabledDefinesRegex, enabledDefines),
+                                  new Tuple<Regex, string []>(haveDefinesRegex, haveDefines)
+                              };
+
+                              var monoCorlibVersions = new string [] {
+                                  ".*#MONO_CORLIB_VERSION#.*",
+                                  "#MONO_CORLIB_VERSION#",
+                                  monoCorlibVersion
+                              };
+                              var monoCorlibVersionRegex = new Regex (monoCorlibVersions[0]);
+
+                              var monoVersions = new string [] {
+                                  ".*#MONO_VERSION#.*",
+                                  "#MONO_VERSION#",
+                                  monoVersion
+                              };
+                              var monoVersionRegex = new Regex (monoVersions[0]);
+
+                              var versionList = new List<Tuple<Regex, string []>>
+                              {
+                                  new Tuple<Regex, string []>(monoCorlibVersionRegex, monoCorlibVersions),
+                                  new Tuple<Regex, string []>(monoVersionRegex, monoVersions)
+                              };
+
+                              tempFilePath = Path.GetTempFileName ();
+
+                              using (StreamReader reader = new StreamReader (templatePath))
+                              using (StreamWriter writer = new StreamWriter (tempFilePath))
+                              {
+                                  string line;
+                                  Match match;
+                                  while ((line = reader.ReadLine ()) != null)
+                                  {
+                                      var replaced = false;
+                                      foreach (var defines in definesList)
+                                      {
+                                          match = defines.Item1.Match (line);
+                                          if (match != null && match.Success && defines.Item2 != null)
+                                          {
+                                              // Replace with disabled defines.
+                                              foreach (var define in defines.Item2)
+                                              {
+                                                  writer.WriteLine ("#ifndef {0}", define);
+                                                  writer.WriteLine ("#define {0} 1", define);
+                                                  writer.WriteLine ("#endif");
+                                              }
+                                              replaced = true;
+                                              break;
+                                          }
+                                      }
+
+                                      if (!replaced)
+                                      {
+                                          foreach (var version in versionList)
+                                          {
+                                              match = version.Item1.Match (line);
+                                              if (match != null && match.Success)
+                                              {
+                                                  writer.WriteLine (line.Replace(version.Item2[1], version.Item2[2]));
+                                                  replaced = true;
+                                                  break;
+                                              }
+                                          }
+                                      }
+
+                                      if (!replaced)
+                                          writer.WriteLine (line);
+                                  }
+                              }
+
+                              bool overwrite = true;
+                              if (File.Exists (targetPath))
+                              {
+                                  if (File.ReadAllBytes (tempFilePath).SequenceEqual (File.ReadAllBytes (targetPath)))
+                                      overwrite = false;
+                              }
+
+                              if (overwrite)
+                                  File.Copy (tempFilePath, targetPath, true);
+                          }
+                      }
+                      finally
+                      {
+                          if (!String.IsNullOrEmpty (tempFilePath))
+                              File.Delete (tempFilePath);
+                      }
+                  }
+
+                  void CreateVersionFile (string targetFile)
+                  {
+                      string tempFile = "";
+
+                      try
+                      {
+                          tempFile = Path.GetTempFileName ();
+
+                          using (StreamWriter writer = new StreamWriter (tempFile))
+                          {
+                              writer.WriteLine ("#define FULL_VERSION \"Visual Studio built mono\"");
+                          }
+
+                          bool overwrite = true;
+                          if (File.Exists (targetFile))
+                          {
+                              if (File.ReadAllBytes (tempFile).SequenceEqual (File.ReadAllBytes (targetFile)))
+                                  overwrite = false;
+                          }
+
+                          if (overwrite)
+                              File.Copy (tempFile, targetFile, true);
+                      }
+                      finally
+                      {
+                          if (!String.IsNullOrEmpty (tempFile))
+                              File.Delete (tempFile);
+                      }
+                  }
+
+                  bool BackupConfigFile (string sourceConfigFile, string targetConfigFile)
+                  {
+                      bool result = false;
+                      if (File.Exists (sourceConfigFile))
+                      {
+                          var includesCygconfig = new Regex (".*#include \"cygconfig.h\".*");
+
+                          var allText = File.ReadAllText (sourceConfigFile);
+                          var match = includesCygconfig.Match (allText);
+                          if (match == null || !match.Success)
+                          {
+                              File.Copy (sourceConfigFile, targetConfigFile, true);
+                              result = true;
+                          }
+                      }
+
+                      return result;
+                  }
+
+                  public string ConfigFileRoot { get; set; }
+                  public string DisableDefines { get; set; }
+                  public string EnableDefines { get; set; }
+                  public string HaveDefines { get; set; }
+
+                  public override bool Execute ()
+                  {
+                    string configureACFile = Path.Combine (ConfigFileRoot, @"configure.ac");
+                    string configFile = Path.Combine (ConfigFileRoot, @"config.h");
+                    string cygConfigFile = Path.Combine (ConfigFileRoot, @"cygconfig.h");
+                    string winConfigFile = Path.Combine (ConfigFileRoot, @"winconfig.h");
+                    string versionFile = Path.Combine (ConfigFileRoot, @"mono\mini\version.h");
+
+                    Log.LogMessage (MessageImportance.High, "Setting up Mono configuration headers...");
+
+                    BackupConfigFile (configFile, cygConfigFile);
+
+                    string monoVersion = null;
+                    string monoCorlibVersion = null;
+                    GetVersionsFromConfigureAC (configureACFile, out monoVersion, out monoCorlibVersion);
+
+                    var disableDefines = GetDisabledConfigFeatures (cygConfigFile);
+                    var enableDefines = (EnableDefines != null) ? EnableDefines.Split (';') : null;
+                    var haveDefines = (HaveDefines != null) ? HaveDefines.Split (';') : null;
+                    CreateConfigUsingTemplate (winConfigFile, configFile, disableDefines, enableDefines, haveDefines, monoVersion, monoCorlibVersion);
+
+                    CreateVersionFile (versionFile);
+
+                    Log.LogMessage (MessageImportance.High, "Successfully setup Mono configuration headers.");
+
+                    return true;
+                  }
+                }
+            ]]>
+            </Code>
+        </Task>
+    </UsingTask>
+
+    <Target Name="RunWinConfigSetup">
+      <WinConfigSetup ConfigFileRoot="$(MSBuildThisFileDirectory)..\"
+                       DisableDefines=""
+                       EnableDefines=""
+                       HaveDefines=""/>
+    </Target>
+
+</Project>

msvc/msvc-disabled-warnings.h

@@ -0,0 +1,34 @@
+#pragma once
+
+#ifdef _MSC_VER
+
+// FIXME This is all questionable but the logs are flooded and nothing else is fixing them.
+#define _CRT_SECURE_NO_WARNINGS 1
+#pragma warning(disable:4013) // function undefined; assuming extern returning int
+#pragma warning(disable:4018) // signed/unsigned mismatch
+#pragma warning(disable:4022) // call and prototype disagree
+#pragma warning(disable:4047) // call and prototype disagree
+#pragma warning(disable:4090) // const problem
+#pragma warning(disable:4098) // void return returns a value
+#pragma warning(disable:4101) // unreferenced local variable
+#pragma warning(disable:4113) // call and prototype disagree
+#pragma warning(disable:4146) // unary minus operator applied to unsigned type, result still unsigned
+#pragma warning(disable:4172) // returning address of local variable or temporary
+#pragma warning(disable:4189) // local variable is initialized but not referenced
+#pragma warning(disable:4197) // top-level volatile in cast is ignored
+#pragma warning(disable:4244) // integer conversion, possible loss of data
+#pragma warning(disable:4245) // signed/unsigned mismatch
+#pragma warning(disable:4267) // integer conversion, possible loss of data
+#pragma warning(disable:4273) // inconsistent dll linkage
+#pragma warning(disable:4293) // shift count negative or too big, undefined behavior
+#pragma warning(disable:4305) // truncation from 'double' to 'float'
+#pragma warning(disable:4312) // 'type cast': conversion from 'MonoNativeThreadId' to 'gpointer' of greater size
+#pragma warning(disable:4389) // signed/unsigned mismatch
+#pragma warning(disable:4456) // declaration of 'j' hides previous local declaration
+#pragma warning(disable:4457) // declaration of 'text' hides function parameter
+#pragma warning(disable:4702) // unreachable code
+#pragma warning(disable:4706) // assignment within conditional expression
+#pragma warning(disable:4715) // 'keyword' not all control paths return a value
+#pragma warning(disable:4996) // deprecated function GetVersion GetVersionExW fopen inet_addr mktemp sprintf strcat strcpy strtok unlink etc.
+
+#endif

msvc/msvc-win32-support.h

@@ -0,0 +1,41 @@
+#pragma once
+
+#ifdef _MSC_VER
+
+#ifndef WINVER
+#define WINVER 0x0A00
+#endif
+
+#include <SDKDDKVer.h>
+
+#if _WIN32_WINNT < 0x0601
+#error "Mono requires Windows 7 or later."
+#endif /* _WIN32_WINNT < 0x0601 */
+
+#ifndef HAVE_WINAPI_FAMILY_SUPPORT
+
+#define HAVE_WINAPI_FAMILY_SUPPORT
+
+/* WIN API Family support */
+#include <winapifamily.h>
+
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+	#define HAVE_CLASSIC_WINAPI_SUPPORT 1
+	#define HAVE_UWP_WINAPI_SUPPORT 0
+#elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
+	#define HAVE_CLASSIC_WINAPI_SUPPORT 0
+	#define HAVE_UWP_WINAPI_SUPPORT 1
+#ifndef HAVE_EXTERN_DEFINED_WINAPI_SUPPORT
+	#error Unsupported WINAPI family
+#endif
+#else
+	#define HAVE_CLASSIC_WINAPI_SUPPORT 0
+	#define HAVE_UWP_WINAPI_SUPPORT 0
+#ifndef HAVE_EXTERN_DEFINED_WINAPI_SUPPORT
+	#error Unsupported WINAPI family
+#endif
+#endif
+
+#endif
+
+#endif

msvc/winsetup.bat

@@ -1,94 +1,6 @@
-@ECHO off
-SetLocal
+@echo off
+setlocal
 
-SET CONFIG_H="%~dp0..\config.h"
-SET CYG_CONFIG_H="%~dp0..\cygconfig.h"
-SET WIN_CONFIG_H="%~dp0..\winconfig.h"
-SET CONFIGURE_AC="%~dp0..\configure.ac"
-SET VERSION_H="%~dp0..\mono\mini\version.h"
-SET OPTIONAL_DEFINES=%~1
+call "msbuild.exe" /t:RunWinConfigSetup mono.winconfig.targets
 
-ECHO Setting up Mono configuration headers...
-
-:: generate unique temp file path
-uuidgen > nul 2>&1 || goto no_uuidgen
-for /f %%a in ('uuidgen') do set CONFIG_H_TEMP=%%a
-goto :got_temp
-
-:no_uuidgen
-:: Random isn't very random or unique. %time% and %date% is not random but fairly unique.
-set CONFIG_H_TEMP=%~n0%random%%time%%date%
-
-:got_temp
-:: Remove special characters.
-set CONFIG_H_TEMP=%CONFIG_H_TEMP:-=%
-set CONFIG_H_TEMP=%CONFIG_H_TEMP:\=%
-set CONFIG_H_TEMP=%CONFIG_H_TEMP:/=%
-set CONFIG_H_TEMP=%CONFIG_H_TEMP::=%
-set CONFIG_H_TEMP=%CONFIG_H_TEMP: =%
-set CONFIG_H_TEMP=%CONFIG_H_TEMP:.=%
-set CONFIG_H_TEMP=%temp%\CONFIG_H_TEMP%CONFIG_H_TEMP%
-mkdir "%CONFIG_H_TEMP%\.." 2>nul
-set CONFIG_H_TEMP="%CONFIG_H_TEMP%"
-
-REM Backup existing config.h into cygconfig.h if its not already replaced.
-if exist %CONFIG_H% (
-	findstr /i /r /c:"#include *\"cygconfig.h\"" %CONFIG_H% >nul || copy /y %CONFIG_h% %CYG_CONFIG_H%
-)
-
-:: Extract MONO_VERSION from configure.ac.
-for /f "delims=[] tokens=2" %%a in ('findstr /b /c:"AC_INIT(mono, [" %CONFIGURE_AC%') do (
-	set MONO_VERSION=%%a
-)
-
-:: Split MONO_VERSION into three parts.
-for /f "delims=. tokens=1-3" %%a in ('echo %MONO_VERSION%') do (
-	set MONO_VERSION_MAJOR=%%a
-	set MONO_VERSION_MINOR=%%b
-	set MONO_VERSION_PATCH=%%c
-)
-:: configure.ac hardcodes this.
-set MONO_VERSION_PATCH=00
-
-:: Extract MONO_CORLIB_VERSION from configure.ac.
-for /f "tokens=*" %%a in ('findstr /b /c:MONO_CORLIB_VERSION= %CONFIGURE_AC%') do set %%a
-
-:: Pad out version pieces to 2 characters with zeros on left.
-if "%MONO_VERSION_MAJOR:~1%" == "" set MONO_VERSION_MAJOR=0%MONO_VERSION_MAJOR%
-if "%MONO_VERSION_MINOR:~1%" == "" set MONO_VERSION_MINOR=0%MONO_VERSION_MINOR%
-
-:: Remove every define VERSION from winconfig.h and add what we want.
-findstr /v /b /i /c:"#define PACKAGE_VERSION " /c:"#define VERSION " /c:"#define MONO_CORLIB_VERSION " %WIN_CONFIG_H% > %CONFIG_H_TEMP%
-
-: Setup dynamic section of config.h
-echo #ifdef _MSC_VER >> %CONFIG_H_TEMP%
-echo #define PACKAGE_VERSION "%MONO_VERSION%" >> %CONFIG_H_TEMP%
-echo #define VERSION "%MONO_VERSION%" >> %CONFIG_H_TEMP%
-echo #define MONO_CORLIB_VERSION "%MONO_CORLIB_VERSION%" >> %CONFIG_H_TEMP%
-
-:: Add dynamic configuration parameters affecting msvc build.
-for %%a in (%OPTIONAL_DEFINES%) do (
-	echo #ifndef %%a >> %CONFIG_H_TEMP%
-	echo #define %%a 1 >> %CONFIG_H_TEMP%
-	echo #endif >> %CONFIG_H_TEMP%
-)
-
-echo #endif >> %CONFIG_H_TEMP%
-
-echo #if defined(ENABLE_LLVM) ^&^& defined(HOST_WIN32) ^&^& defined(TARGET_WIN32) ^&^& (!defined(TARGET_AMD64) ^|^| !defined(_MSC_VER)) >> %CONFIG_H_TEMP%
-echo #error LLVM for host=Windows and target=Windows is only supported on x64 MSVC build. >> %CONFIG_H_TEMP%
-echo #endif >> %CONFIG_H_TEMP%
-
-:: If the file is different, replace it.
-fc %CONFIG_H_TEMP% %CONFIG_H% >nul 2>&1 || move /y %CONFIG_H_TEMP% %CONFIG_H%
-del %CONFIG_H_TEMP% 2>nul
-
-echo #define FULL_VERSION "Visual Studio built mono" > %CONFIG_H_TEMP%
-fc %CONFIG_H_TEMP% %VERSION_H% >nul 2>&1 || move /y %CONFIG_H_TEMP% %VERSION_H%
-del %CONFIG_H_TEMP% 2>nul
-
-:: Log environment variables that start "mono".
-set MONO
-
-ECHO Successfully setup Mono configuration headers.
-EXIT /b 0
+exit /b 0

winconfig.h

@@ -1,145 +1,59 @@
 #pragma once
 
-#ifndef _MSC_VER
-#include "cygconfig.h"
-#else
-
-/* The architecture this is running on */
-#if defined(_M_IA64)
-#define MONO_ARCHITECTURE "ia64"
-#elif defined(_M_AMD64)
-#define MONO_ARCHITECTURE "amd64"
-#elif defined(_M_IX86)
-#define MONO_ARCHITECTURE "x86"
-#else
-#error Unknown architecture
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0A00
-#endif
-
-#include <SDKDDKVer.h>
-
-#if _WIN32_WINNT < 0x0601
-#error "Mono requires Windows 7 or later."
-#endif /* _WIN32_WINNT < 0x0601 */
-
-#ifndef HAVE_WINAPI_FAMILY_SUPPORT
-
-#define HAVE_WINAPI_FAMILY_SUPPORT
-
-/* WIN API Family support */
-#include <winapifamily.h>
+#ifdef _MSC_VER
 
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-	#define HAVE_CLASSIC_WINAPI_SUPPORT 1
-	#define HAVE_UWP_WINAPI_SUPPORT 0
-#elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
-	#define HAVE_CLASSIC_WINAPI_SUPPORT 0
-	#define HAVE_UWP_WINAPI_SUPPORT 1
-#ifndef HAVE_EXTERN_DEFINED_WINAPI_SUPPORT
-	#error Unsupported WINAPI family
-#endif
-#else
-	#define HAVE_CLASSIC_WINAPI_SUPPORT 0
-	#define HAVE_UWP_WINAPI_SUPPORT 0
-#ifndef HAVE_EXTERN_DEFINED_WINAPI_SUPPORT
-	#error Unsupported WINAPI family
-#endif
-#endif
+/* Building Mono runtime under MSVC uses this template for it's config.h since autogen.sh can't */
+/* generate a config.h that is suitable for MSVC builds. The below template will still get */
+/* some dynamic configuration from autogen.sh config.h, if one exists. */
+#include <msvc/msvc-win32-support.h>
+#include <msvc/msvc-disabled-warnings.h>
 
+#ifdef HAVE_BOEHM_GC
+/* Only used when building using Boehm GC and only supported on x86 builds */
+#define DEFAULT_GC_NAME "Included Boehm (with typed GC)"
 #endif
 
-/*
- * Features that are not required in the Windows port
- */
-#define DISABLE_PORTABILITY 1
-
-/* Windows does not have symlinks */
-#define HOST_NO_SYMLINKS 1
-
-/* String of disabled features */
-#define DISABLED_FEATURES "none"
-
-/* Disable AOT support */
-/* #undef DISABLE_AOT */
-
-/* Disable COM support */
-/* #undef DISABLE_COM */
-
-/* Disable runtime debugging support */
-/* #undef DISABLE_DEBUG */
-
-/* Disable System.Decimal support */
-/* #undef DISABLE_DECIMAL */
-
-/* Disable generics support */
-/* #undef DISABLE_GENERICS */
-
-/* Disable support for huge assemblies */
-/* #undef DISABLE_LARGE_CODE */
-
-/* Disable support debug logging */
-/* #undef DISABLE_LOGGING */
-
 /* Disable runtime state dumping */
 #define DISABLE_CRASH_REPORTING 1
 
-/* Disable P/Invoke support */
-/* #undef DISABLE_PINVOKE */
-
-/* Disable default profiler support */
-/* #undef DISABLE_PROFILER */
+/* String of disabled features */
+#define DISABLED_FEATURES "none"
 
-/* Disable reflection emit support */
-/* #undef DISABLE_REFLECTION_EMIT */
+/* Disables the IO portability layer */
+#define DISABLE_PORTABILITY 1
 
-/* Disable advanced SSA JIT optimizations */
-/* #undef DISABLE_SSA */
+/* DISABLE_DEFINES picked up from cygconfig.h, if available */
+/* @DISABLE_DEFINES@ */
 
-/* Disable interpreter */
-/* #undef DISABLE_INTERPRETER */
+/* No DISABLE_DEFINES below this point */
 
 /* Some VES is available at runtime */
 #define ENABLE_ILGEN 1
 
-/* Enable DTrace probes */
-/* #undef ENABLE_DTRACE */
-
-/* Define to 1 if you have the <attr/xattr.h> header file. */
-/* #undef HAVE_ATTR_XATTR_H */
-
-/* Define to 1 if you have the `backtrace_symbols' function. */
-/* #undef HAVE_BACKTRACE_SYMBOLS */
-
-/* Define to 1 if the system has the type `blkcnt_t'. */
-/* #undef HAVE_BLKCNT_T */
+/* Optional ENABLE_DEFINES */
+/* @ENABLE_DEFINES@ */
 
-/* Define to 1 if the system has the type `blksize_t'. */
-/* #undef HAVE_BLKSIZE_T */
+/* No ENABLE_DEFINES below this point */
 
-/* Have Boehm GC */
-/* #define HAVE_BOEHM_GC 1 */
-
-/* Define to 1 if you have the <checklist.h> header file. */
-/* #undef HAVE_CHECKLIST_H */
-
-/* Define to 1 if you have the <complex.h> header file. */
-#define HAVE_COMPLEX_H 1
+/* Have access */
+#define HAVE_ACCESS 1
 
 /* Define to 1 if you have the `system' function. */
 #if HAVE_WINAPI_FAMILY_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT)
 #define HAVE_SYSTEM 1
 #endif
 
+/* Define to 1 if you have the <complex.h> header file. */
+#define HAVE_COMPLEX_H 1
+
+#if defined(HAVE_SGEN_GC) && !defined(HAVE_CONC_GC_AS_DEFAULT)
+/* Defaults to concurrent GC */
+#define HAVE_CONC_GC_AS_DEFAULT 1
+#endif
 
 /* Have /dev/random */
 #define HAVE_CRYPT_RNG 1
 
-/* Define to 1 if you have the <curses.h> header file. */
-/* #undef HAVE_CURSES_H */
-
 /* Define to 1 if you have the declaration of `InterlockedAdd',
    and to 0 if you don't. */
 #define HAVE_DECL_INTERLOCKEDADD 1
@@ -168,42 +82,6 @@
    and to 0 if you don't. */
 #define HAVE_DECL___READFSDWORD 1
 
-/* Define to 1 if you have the <dirent.h> header file. */
-/* #define HAVE_DIRENT_H 1 */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* dlopen-based dynamic loader available */
-/* #undef HAVE_DL_LOADER */
-
-/* Define to 1 if you have the <elf.h> header file. */
-/* #undef HAVE_ELF_H */
-
-/* epoll supported */
-/* #undef HAVE_EPOLL */
-
-/* Define to 1 if you have the `epoll_ctl' function. */
-/* #undef HAVE_EPOLL_CTL */
-
-/* Define to 1 if you have the <execinfo.h> header file. */
-/* #undef HAVE_EXECINFO_H */
-
-/* Define to 1 if you have the `fgetgrent' function. */
-/* #undef HAVE_FGETGRENT */
-
-/* Define to 1 if you have the `fgetpwent' function. */
-/* #undef HAVE_FGETPWENT */
-
-/* Define to 1 if you have the <fstab.h> header file. */
-/* #undef HAVE_FSTAB_H */
-
-/* Define to 1 if you have the `fstatfs' function. */
-/* #undef HAVE_FSTATFS */
-
-/* Define to 1 if you have the `fstatvfs' function. */
-/* #undef HAVE_FSTATVFS */
-
 /* Define to 1 if you have the `getaddrinfo' function. */
 #define HAVE_GETADDRINFO 1
 
@@ -213,44 +91,11 @@
 /* Define to 1 if you have the `getprotobyname' function. */
 #define HAVE_GETPROTOBYNAME 1
 
-/* Define to 1 if you have the `getdomainname' function. */
-/* #undef HAVE_GETDOMAINNAME */
-
-/* Define to 1 if you have the `getfsstat' function. */
-/* #undef HAVE_GETFSSTAT */
-
-/* Define to 1 if you have the `getgrgid_r' function. */
-/* #undef HAVE_GETGRGID_R */
-
-/* Define to 1 if you have the `getgrnam_r' function. */
-/* #undef HAVE_GETGRNAM_R */
-
-/* Have gethostbyname2_r */
-/* #undef HAVE_GETHOSTBYNAME2_R */
-
-/* Define to 1 if you have the `getpriority' function. */
-/* #undef HAVE_GETPRIORITY */
-
 /* Define to 1 if you have the `GetProcessId' function. */
 #define HAVE_GETPROCESSID 1
 
-/* Define to 1 if you have the `getpwnam_r' function. */
-/* #undef HAVE_GETPWNAM_R */
-
-/* Define to 1 if you have the `getpwuid_r' function. */
-/* #undef HAVE_GETPWUID_R */
-
-/* Define to 1 if you have the `getresuid' function. */
-/* #undef HAVE_GETRESUID */
-
-/* Define to 1 if you have the `getrusage' function. */
-/* #undef HAVE_GETRUSAGE */
-
-/* Define to 1 if you have the <grp.h> header file. */
-/* #undef HAVE_GRP_H */
-
-/* Define to 1 if you have the `inet_aton' function. */
-/* #undef HAVE_INET_ATON */
+/* Have inet_ntop */
+#define HAVE_INET_NTOP 1
 
 /* Define to 1 if you have the `inet_pton' function. */
 #define HAVE_INET_PTON 1
@@ -258,349 +103,87 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
-/* Have IPV6_PKTINFO */
-/* #undef HAVE_IPV6_PKTINFO */
-
-/* Have IP_DONTFRAGMENT */
-/* #undef HAVE_IP_DONTFRAGMENT */
-
-/* Have IP_MTU_DISCOVER */
-/* #undef HAVE_IP_MTU_DISCOVER */
-
-/* Have IP_PKTINFO */
-/* #undef HAVE_IP_PKTINFO */
-
-/* Define to 1 if you have the `kqueue' function. */
-/* #undef HAVE_KQUEUE */
-
-/* Have __thread keyword */
-#ifdef _MSC_VER
-#define MONO_KEYWORD_THREAD __declspec (thread)
-#else
-// Cygwin/gcc emulates __thread.
-#undef MONO_KEYWORD_THREAD
-#endif
-
-/* Have large file support */
-/* #undef HAVE_LARGE_FILE_SUPPORT */
-
-/* Define to 1 if you have the `unwind' library (-lunwind). */
-/* #undef HAVE_LIBUNWIND */
-
-/* Define to 1 if you have the <linux/rtc.h> header file. */
-/* #undef HAVE_LINUX_RTC_H */
-
-/* Define to 1 if you have the `lutimes' function. */
-/* #undef HAVE_LUTIMES */
-
-/* Define to 1 if you have the `madvise' function. */
-/* #undef HAVE_MADVISE */
-
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
-/* Define to 1 if you have the `mkstemp' function. */
-/* #undef HAVE_MKSTEMP */
-
-/* Define to 1 if you have the `mmap' function. */
-/* #undef HAVE_MMAP */
-
-/* The GC can move objects. */
-/* #undef HAVE_MOVING_COLLECTOR */
-
-/* Define to 1 if you have the `mremap' function. */
-/* #undef HAVE_MREMAP */
-
-/* Have MSG_NOSIGNAL */
-/* #undef HAVE_MSG_NOSIGNAL */
-
-/* Define to 1 if you have the <netdb.h> header file. */
-/* #undef HAVE_NETDB_H */
-
-/* Define to 1 if you have the <net/if.h> header file. */
-/* #undef HAVE_NET_IF_H */
-
-/* No GC support. */
-/* #undef HAVE_NULL_GC */
-
-/* Define to 1 if you have the `poll' function. */
-/* #undef HAVE_POLL */
-
-/* Define to 1 if you have the <poll.h> header file. */
-/* #undef HAVE_POLL_H */
-
-/* Define to 1 if you have the `posix_fadvise' function. */
-/* #undef HAVE_POSIX_FADVISE */
-
-/* Define to 1 if you have the `posix_fallocate' function. */
-/* #undef HAVE_POSIX_FALLOCATE */
-
-/* Define to 1 if you have the `posix_madvise' function. */
-/* #undef HAVE_POSIX_MADVISE */
-
-/* Define to 1 if you have the `pthread_attr_getstack' function. */
-/* #undef HAVE_PTHREAD_ATTR_GETSTACK */
-
-/* Define to 1 if you have the `pthread_attr_get_np' function. */
-/* #undef HAVE_PTHREAD_ATTR_GET_NP */
-
-/* Define to 1 if you have the `pthread_attr_setstacksize' function. */
-/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */
-
-/* Define to 1 if you have the `pthread_getattr_np' function. */
-/* #undef HAVE_PTHREAD_GETATTR_NP */
-
-/* Define to 1 if you have the `pthread_get_stackaddr_np' function. */
-/* #undef HAVE_PTHREAD_GET_STACKADDR_NP */
-
-/* Define to 1 if you have the `pthread_get_stacksize_np' function. */
-/* #undef HAVE_PTHREAD_GET_STACKSIZE_NP */
-
-/* Define to 1 if you have the <pthread.h> header file. */
-/* #undef HAVE_PTHREAD_H */
-
-/* Define to 1 if you have the `pthread_mutex_timedlock' function. */
-/* #undef HAVE_PTHREAD_MUTEX_TIMEDLOCK */
-
-/* Define to 1 if you have the `remap_file_pages' function. */
-/* #undef HAVE_REMAP_FILE_PAGES */
-
-/* Define to 1 if you have the `sched_setaffinity' function. */
-/* #undef HAVE_SCHED_SETAFFINITY */
-
-/* Define to 1 if you have the <semaphore.h> header file. */
-/* #undef HAVE_SEMAPHORE_H */
-
-/* Define to 1 if you have the `sendfile' function. */
-/* #undef HAVE_SENDFILE */
-
-/* Define to 1 if you have the `setdomainname' function. */
-/* #undef HAVE_SETDOMAINNAME */
-
-/* Define to 1 if you have the `sethostid' function. */
-/* #undef HAVE_SETHOSTID */
-
-/* Define to 1 if you have the `setpriority' function. */
-/* #undef HAVE_SETPRIORITY */
-
-/* Define to 1 if you have the `setresuid' function. */
-/* #undef HAVE_SETRESUID */
-
-/* Using the simple generational GC. */
-/* #undef HAVE_SGEN_GC */
+#if defined(HAVE_SGEN_GC) && !defined(HAVE_MOVING_COLLECTOR)
+/* Moving collector */
+#define HAVE_MOVING_COLLECTOR 1
+#endif
 
- /* Have signal */
+/* Define to 1 if you have the `signal' function. */
 #define HAVE_SIGNAL 1
 
  /* Define to 1 if you have the <signal.h> header file. */
 #define HAVE_SIGNAL_H 1
 
-/* Can get interface list */
-/* #undef HAVE_SIOCGIFCONF */
-
-/* sockaddr_in6 has sin6_len */
-/* #undef HAVE_SOCKADDR_IN6_SIN_LEN */
-
-/* sockaddr_in has sin_len */
-/* #undef HAVE_SOCKADDR_IN_SIN_LEN */
-
-/* Have socklen_t */
-/* #undef HAVE_SOCKLEN_T */
-
-/* Have SOL_IP */
-/* #undef HAVE_SOL_IP */
-
-/* Have SOL_IPV6 */
-/* #undef HAVE_SOL_IPV6 */
-
-/* Have SOL_TCP */
-/* #undef HAVE_SOL_TCP */
-
-/* Define to 1 if you have the `statfs' function. */
-/* #undef HAVE_STATFS */
-
-/* Define to 1 if you have the `statvfs' function. */
-/* #undef HAVE_STATVFS */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-/* #define HAVE_STDINT_H 1 */
+ /* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
-/* Define to 1 if you have the `stime' function. */
-/* #undef HAVE_STIME */
-
-/* Define to 1 if you have the `strerror_r' function. */
-/* #undef HAVE_STRERROR_R */
-
 /* Define to 1 if you have the <strings.h> header file. */
 #define HAVE_STRINGS_H 1
 
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
-/* Define to 1 if `d_off' is member of `struct dirent'. */
-/* #undef HAVE_STRUCT_DIRENT_D_OFF */
-
-/* Define to 1 if `d_reclen' is member of `struct dirent'. */
-/* #undef HAVE_STRUCT_DIRENT_D_RECLEN */
-
-/* Define to 1 if `d_type' is member of `struct dirent'. */
-/* #undef HAVE_STRUCT_DIRENT_D_TYPE */
+/* Define to 1 if you have the `strtok_r' function. */
+#define HAVE_STRTOK_R 1
 
 /* Have struct ip_mreq */
 #define HAVE_STRUCT_IP_MREQ 1
 
-/* Have struct ip_mreqn */
-/* #undef HAVE_STRUCT_IP_MREQN */
-
-/* Define to 1 if the system has the type `struct pollfd'. */
-/* #undef HAVE_STRUCT_POLLFD */
-
-/* Define to 1 if the system has the type `struct stat'. */
-/* #undef HAVE_STRUCT_STAT */
-
-/* Define to 1 if the system has the type `struct timeval'. */
-/* #undef HAVE_STRUCT_TIMEVAL */
-
-/* Define to 1 if the system has the type `struct timezone'. */
-/* #undef HAVE_STRUCT_TIMEZONE */
-
-/* Define to 1 if the system has the type `struct utimbuf'. */
-/* #undef HAVE_STRUCT_UTIMBUF */
-
-/* Define to 1 if the system has the type `suseconds_t'. */
-/* #undef HAVE_SUSECONDS_T */
-
-/* Define to 1 if you have the <syslog.h> header file. */
-/* #undef HAVE_SYSLOG_H */
-
-/* Define to 1 if you have the <sys/epoll.h> header file. */
-/* #undef HAVE_SYS_EPOLL_H */
-
-/* Define to 1 if you have the <sys/extattr.h> header file. */
-/* #undef HAVE_SYS_EXTATTR_H */
-
-/* Define to 1 if you have the <sys/filio.h> header file. */
-/* #undef HAVE_SYS_FILIO_H */
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-/* #undef HAVE_SYS_IOCTL_H */
-
-/* Define to 1 if you have the <sys/mkdev.h> header file. */
-/* #undef HAVE_SYS_MKDEV_H */
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-/* #undef HAVE_SYS_MMAN_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_H */
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-/* #undef HAVE_SYS_POLL_H */
-
-/* Define to 1 if you have the <sys/sdt.h> header file. */
-/* #undef HAVE_SYS_SDT_H */
-
-/* Define to 1 if you have the <sys/sendfile.h> header file. */
-/* #undef HAVE_SYS_SENDFILE_H */
-
-/* Define to 1 if you have the <sys/sockio.h> header file. */
-/* #undef HAVE_SYS_SOCKIO_H */
-
-/* Define to 1 if you have the <sys/statvfs.h> header file. */
-/* #undef HAVE_SYS_STATVFS_H */
+/* Define to 1 if the system has the type `struct sockaddr_in6'. */
+#define HAVE_STRUCT_SOCKADDR_IN6 1
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
-/* Define to 1 if you have the <sys/syscall.h> header file. */
-/* #undef HAVE_SYS_SYSCALL_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-/* #undef HAVE_SYS_TIME_H */
-
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
-/* Define to 1 if you have the <sys/un.h> header file. */
-/* #undef HAVE_SYS_UN_H */
-
 /* Define to 1 if you have the <sys/utime.h> header file. */
 #define HAVE_SYS_UTIME_H 1
 
-/* Define to 1 if you have the <sys/vfstab.h> header file. */
-/* #undef HAVE_SYS_VFSTAB_H */
-
-/* Define to 1 if you have the <sys/wait.h> header file. */
-/* #undef HAVE_SYS_WAIT_H */
-
-/* Define to 1 if you have the <sys/xattr.h> header file. */
-/* #undef HAVE_SYS_XATTR_H */
-
-/* Define to 1 if you have the <termios.h> header file. */
-/* #undef HAVE_TERMIOS_H */
-
-/* Define to 1 if you have the <term.h> header file. */
-/* #undef HAVE_TERM_H */
-
-/* Have timezone variable */
-/* #undef HAVE_TIMEZONE */
-
-/* tld_model available */
-/* #undef HAVE_TLS_MODEL_ATTR */
-
-/* Have tm_gmtoff */
-/* #undef HAVE_TM_GMTOFF */
-
-/* Define to 1 if you have the `ttyname_r' function. */
-/* #undef HAVE_TTYNAME_R */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #define HAVE_UNISTD_H 1 */
-
-/* Define to 1 if you have the <utime.h> header file. */
-/* #define HAVE_UTIME_H 1 */
-
-/* Define to 1 if you have the <valgrind/memcheck.h> header file. */
-/* #undef HAVE_VALGRIND_MEMCHECK_H */
-
-/* Support for the visibility ("hidden") attribute */
-/* #define HAVE_VISIBILITY_HIDDEN 1 */
-
-/* Define to 1 if you have the `vsnprintf' function. */
-/* #undef HAVE_VSNPRINTF */
-
 /* Define to 1 if you have the <wchar.h> header file. */
 #define HAVE_WCHAR_H 1
 
-/* Define to 1 if you have IPv6 support. */
-#define HAVE_STRUCT_SOCKADDR_IN6 1
+/* Define to 1 if you have the <winternl.h> header file. */
+#define HAVE_WINTERNL_H 1
 
-/* Defined as strtok_s in eglib-config.hw */
-#define HAVE_STRTOK_R 1
+#if defined(HAVE_SGEN_GC) && !defined(HAVE_WRITE_BARRIERS)
+#define HAVE_WRITE_BARRIERS
+#endif
 
-/* Define to 1 if you have the `access' function. */
-#define HAVE_ACCESS 1
+/* Optional HAVE_DEFINES */
+/* @HAVE_DEFINES@ */
 
-/* Have a working sigaltstack */
-/* #undef HAVE_WORKING_SIGALTSTACK */
+/* No HAVE_DEFINES below this point */
 
-/* The GC needs write barriers. */
-/* #undef HAVE_WRITE_BARRIERS */
+/* This platform does not support symlinks */
+#define HOST_NO_SYMLINKS 1
 
-/* Have system zlib */
-/* #define HAVE_ZLIB 1 */
+/* Host Platform is Win32 */
+#define HOST_WIN32 1
 
-/* Architecture uses registers for Parameters */
-/* #undef MONO_ARCH_REGPARMS */
+/* The architecture this is running on */
+#if defined(_M_IA64)
+#define MONO_ARCHITECTURE "ia64"
+#elif defined(_M_AMD64)
+#define MONO_ARCHITECTURE "amd64"
+#elif defined(_M_IX86)
+#define MONO_ARCHITECTURE "x86"
+#else
+#error Unknown architecture
+#endif
 
-/* Enable the allocation and indexing of arrays greater than Int32.MaxValue */
-/* #undef MONO_BIG_ARRAYS */
+/* Version of the corlib-runtime interface */
+#define MONO_CORLIB_VERSION "#MONO_CORLIB_VERSION#"
 
-/* Xen-specific behaviour */
-/* #define MONO_XEN_OPT 1 */
+/* Have __thread keyword */
+#define MONO_KEYWORD_THREAD __declspec (thread)
 
 /* Length of zero length arrays */
 #define MONO_ZERO_LEN_ARRAY 1
@@ -608,106 +191,78 @@
 /* Name of /dev/random */
 #define NAME_DEV_RANDOM ""
 
-/* Define if Unix sockets cannot be created in an anonymous namespace */
-/* #undef NEED_LINK_UNLINK */
-
 /* Name of package */
 #define PACKAGE "mono"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "Hans_Boehm@hp.com"
+#define PACKAGE_BUGREPORT "https://github.com/mono/mono/issues/new"
 
 /* Define to the full name of this package. */
-#define PACKAGE_NAME "libgc-mono"
+#define PACKAGE_NAME "mono"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libgc-mono 6.6"
+#define PACKAGE_STRING "mono #MONO_VERSION#"
 
 /* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libgc-mono"
+#define PACKAGE_TARNAME "mono"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "6.6"
+#define PACKAGE_VERSION "#MONO_VERSION#"
 
-/* Platform is Win32 */
-#define HOST_WIN32 1
-#define TARGET_WIN32 1
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
 
+/* The size of `long long', as computed by sizeof. */
+#define SIZEOF_LONG_LONG 8
+
+/* size of target machine integer registers */
 #ifdef _WIN64
-#define TARGET_AMD64 1
+#define SIZEOF_REGISTER 8
 #else
-#define TARGET_X86 1
+#define SIZEOF_REGISTER 4
 #endif
 
-/* pthread_t is a pointer */
-/* #undef PTHREAD_POINTER_ID */
-
-/* The size of `size_t', as computed by sizeof. */
-/* #undef SIZEOF_SIZE_T */
-
-/* The size of a `void *', as computed by sizeof. */
+/* The size of `void *', as computed by sizeof. */
 #ifdef _WIN64
 #define SIZEOF_VOID_P 8
-#define TARGET_SIZEOF_VOID_P 8
 #else
 #define SIZEOF_VOID_P 4
-#define TARGET_SIZEOF_VOID_P 4
 #endif
 
-#define SIZEOF_REGISTER SIZEOF_VOID_P
-
-/* byte order of target */
-#define TARGET_BYTE_ORDER G_BYTE_ORDER
-
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
-/* Use included libgc */
-/* #define USE_INCLUDED_LIBGC 1 */
+#ifdef _WIN64
+#define TARGET_AMD64 1
+#else
+#define TARGET_X86 1
+#endif
 
-#define DEFAULT_GC_NAME "Included Boehm (with typed GC)"
+/* byte order of target */
+#define TARGET_BYTE_ORDER G_BYTE_ORDER
 
-/* ... */
-/* #undef USE_MACH_SEMA */
+/* wordsize of target */
+#define TARGET_SIZEOF_VOID_P SIZEOF_VOID_P
 
-/* Use mono_mutex_t */
-/* #undef USE_MONO_MUTEX */
+/* Platform is Win32 */
+#define TARGET_WIN32 1
 
 /* Version number of package */
 #define VERSION "#MONO_VERSION#"
 
-/* Version of the corlib-runtime interface */
-#define MONO_CORLIB_VERSION #MONO_CORLIB_VERSION#
+#else
+
+/* Not building under MSVC, use autogen.sh generated config.h */
+#include "cygconfig.h"
 
 #endif
 
-#ifdef _MSC_VER
-// FIXME This is all questionable but the logs are flooded and nothing else is fixing them.
-#define _CRT_SECURE_NO_WARNINGS 1
-#pragma warning(disable:4013) // function undefined; assuming extern returning int
-#pragma warning(disable:4018) // signed/unsigned mismatch
-#pragma warning(disable:4022) // call and prototype disagree
-#pragma warning(disable:4047) // call and prototype disagree
-#pragma warning(disable:4090) // const problem
-#pragma warning(disable:4098) // void return returns a value
-#pragma warning(disable:4101) // unreferenced local variable
-#pragma warning(disable:4113) // call and prototype disagree
-#pragma warning(disable:4146) // unary minus operator applied to unsigned type, result still unsigned
-#pragma warning(disable:4172) // returning address of local variable or temporary
-#pragma warning(disable:4189) // local variable is initialized but not referenced
-#pragma warning(disable:4197) // top-level volatile in cast is ignored
-#pragma warning(disable:4244) // integer conversion, possible loss of data
-#pragma warning(disable:4245) // signed/unsigned mismatch
-#pragma warning(disable:4267) // integer conversion, possible loss of data
-#pragma warning(disable:4273) // inconsistent dll linkage
-#pragma warning(disable:4293) // shift count negative or too big, undefined behavior
-#pragma warning(disable:4305) // truncation from 'double' to 'float'
-#pragma warning(disable:4312) // 'type cast': conversion from 'MonoNativeThreadId' to 'gpointer' of greater size
-#pragma warning(disable:4389) // signed/unsigned mismatch
-#pragma warning(disable:4456) // declaration of 'j' hides previous local declaration
-#pragma warning(disable:4457) // declaration of 'text' hides function parameter
-#pragma warning(disable:4702) // unreachable code
-#pragma warning(disable:4706) // assignment within conditional expression
-#pragma warning(disable:4715) // 'keyword' not all control paths return a value
-#pragma warning(disable:4996) // deprecated function GetVersion GetVersionExW fopen inet_addr mktemp sprintf strcat strcpy strtok unlink etc.
+#if defined(ENABLE_LLVM) && defined(HOST_WIN32) && defined(TARGET_WIN32) && (!defined(TARGET_AMD64) || !defined(_MSC_VER))
+#error LLVM for host=Windows and target=Windows is only supported on x64 MSVC build.
 #endif