diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id
index 24465e84e5..63b50edb6e 100644
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@@ -1 +1 @@
-7552f94c31b6c3bfc3f105917d070d37e49ba83d
\ No newline at end of file
+0ce11501124227087f971ccc176d0f620c2b3afc
\ No newline at end of file
diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id
index 72161185fa..a47e87e3df 100644
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@@ -1 +1 @@
-6e456112b3a4d9b08a90e185130eeefdbf02858e
\ No newline at end of file
+e5a5ec7e6126a46c206b043b53c87299e9751280
\ No newline at end of file
diff --git a/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_networking.o.REMOVED.git-id b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_networking.o.REMOVED.git-id
index ce4a3a11c7..f9153db0bb 100644
--- a/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_networking.o.REMOVED.git-id
+++ b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_networking.o.REMOVED.git-id
@@ -1 +1 @@
-43e79bb02715ef88b41fd6dc800e96b3f58ff973
\ No newline at end of file
+2e6aca36b1f1bc468d57c112a6812fecd62982b0
\ No newline at end of file
diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networking.o.REMOVED.git-id b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networking.o.REMOVED.git-id
index 20204d5de3..c04727fab3 100644
--- a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networking.o.REMOVED.git-id
+++ b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networking.o.REMOVED.git-id
@@ -1 +1 @@
-9b782c31cf1cda31f6ee1a3b9e12cf3bd723fb30
\ No newline at end of file
+9d073102395241a169f95cfba5a149ed33df2f5c
\ No newline at end of file
diff --git a/external/corefx/src/Native/Unix/System.Native/pal_networking.c b/external/corefx/src/Native/Unix/System.Native/pal_networking.c
index 74864b371b..e6e06106e9 100644
--- a/external/corefx/src/Native/Unix/System.Native/pal_networking.c
+++ b/external/corefx/src/Native/Unix/System.Native/pal_networking.c
@@ -1711,6 +1711,7 @@ int32_t SystemNative_GetSockOpt(
                 return Error_EINVAL;
             }
 
+#ifdef SO_REUSEPORT
             socklen_t optLen = (socklen_t)*optionLen;
             // On Unix, SO_REUSEPORT controls the ability to bind multiple sockets to the same address.
             int err = getsockopt(fd, SOL_SOCKET, SO_REUSEPORT, optionValue, &optLen);
@@ -1731,7 +1732,9 @@ int32_t SystemNative_GetSockOpt(
                 value = value == 0 ? 1 : 0;
             }
             *(int32_t*)optionValue = value;
-
+#else
+            *optionValue = 0;
+#endif
             return Error_SUCCESS;
         }
     }
@@ -1790,6 +1793,7 @@ SystemNative_SetSockOpt(intptr_t socket, int32_t socketOptionLevel, int32_t sock
         // We make both SocketOptionName_SO_REUSEADDR and SocketOptionName_SO_EXCLUSIVEADDRUSE control SO_REUSEPORT.
         if (socketOptionName == SocketOptionName_SO_EXCLUSIVEADDRUSE || socketOptionName == SocketOptionName_SO_REUSEADDR)
         {
+#ifdef SO_REUSEPORT
             if (optionLen != sizeof(int32_t))
             {
                 return Error_EINVAL;
@@ -1812,6 +1816,9 @@ SystemNative_SetSockOpt(intptr_t socket, int32_t socketOptionLevel, int32_t sock
 
             int err = setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &value, (socklen_t)optionLen);
             return err == 0 ? Error_SUCCESS : SystemNative_ConvertErrorPlatformToPal(errno);
+#else
+            return Error_SUCCESS;
+#endif
         }
     }
 #ifdef IP_MTU_DISCOVER
diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs
index 10f8e02f14..6d1c8bd257 100644
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@@ -34,7 +34,7 @@ static class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//
 
-	public const string MonoVersion = "5.16.0.147";
+	public const string MonoVersion = "5.16.0.149";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";
diff --git a/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id
index 211a2b22ce..bf52c062b6 100644
--- a/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-3bef811522cfefd473c3a19057733bc3bb933841
\ No newline at end of file
+977f587aa6001f1c2f62d7fa0e222b013c9a14be
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id
index c021cd7682..6662795d0c 100644
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-ea0566efb289eadaf4380ed461e880412421d2b5
\ No newline at end of file
+7b9c5fd1c0b674f8fa1a62d4a0af485f5b7a8686
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll b/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll
index 6e760e24b9..adcab5c0bc 100644
Binary files a/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll and b/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll differ
diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id
index 187c33ec61..17e4ccc45d 100644
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-9daf5b25db435c76eb1ac03188d8f197da765331
\ No newline at end of file
+3c18ef9382bd55d045696e1ce0352e62182bbad1
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id
index aca512c2c7..717badd2af 100644
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-03bd3ffc76a6b0250bacf9eaed5a01885f51e28b
\ No newline at end of file
+1deb3b48f9f17958091e66443b9ee8edf4128532
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id
index 850b7417f9..f55c137d68 100644
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-f339075882428e73eeb05b6fecd0add018de02b7
\ No newline at end of file
+42f5c77c39919687b66b96f6acde71daeca87492
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id
index ae2cd15804..66d40b78df 100644
--- a/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-c8fbfe870e9a1807acf4794a30f178bb96f93c64
\ No newline at end of file
+0bef82188692ed7b1d07b578b9e16d7dd4427d74
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id
index d79dc16aad..d538e50480 100644
--- a/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-a16e10b83b7d8ff21a6b6bc05cb778c105aa06f2
\ No newline at end of file
+507dc2d482157fa3e043ee642930c367154e2a20
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id
index 211a2b22ce..bf52c062b6 100644
--- a/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-3bef811522cfefd473c3a19057733bc3bb933841
\ No newline at end of file
+977f587aa6001f1c2f62d7fa0e222b013c9a14be
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id
index c021cd7682..6662795d0c 100644
--- a/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-ea0566efb289eadaf4380ed461e880412421d2b5
\ No newline at end of file
+7b9c5fd1c0b674f8fa1a62d4a0af485f5b7a8686
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll
index 6e760e24b9..adcab5c0bc 100644
Binary files a/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll and b/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll differ
diff --git a/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id
index 187c33ec61..17e4ccc45d 100644
--- a/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-9daf5b25db435c76eb1ac03188d8f197da765331
\ No newline at end of file
+3c18ef9382bd55d045696e1ce0352e62182bbad1
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id
index aca512c2c7..717badd2af 100644
--- a/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-03bd3ffc76a6b0250bacf9eaed5a01885f51e28b
\ No newline at end of file
+1deb3b48f9f17958091e66443b9ee8edf4128532
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id
index 850b7417f9..f55c137d68 100644
--- a/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-f339075882428e73eeb05b6fecd0add018de02b7
\ No newline at end of file
+42f5c77c39919687b66b96f6acde71daeca87492
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id
index ae2cd15804..66d40b78df 100644
--- a/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-c8fbfe870e9a1807acf4794a30f178bb96f93c64
\ No newline at end of file
+0bef82188692ed7b1d07b578b9e16d7dd4427d74
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id
index d79dc16aad..d538e50480 100644
--- a/mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-a16e10b83b7d8ff21a6b6bc05cb778c105aa06f2
\ No newline at end of file
+507dc2d482157fa3e043ee642930c367154e2a20
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-win32/1051600011/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/Mono.Security.dll.REMOVED.git-id
index 211a2b22ce..bf52c062b6 100644
--- a/mcs/class/lib/monolite-win32/1051600011/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051600011/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-3bef811522cfefd473c3a19057733bc3bb933841
\ No newline at end of file
+977f587aa6001f1c2f62d7fa0e222b013c9a14be
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-win32/1051600011/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/System.Configuration.dll.REMOVED.git-id
index c021cd7682..6662795d0c 100644
--- a/mcs/class/lib/monolite-win32/1051600011/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051600011/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-ea0566efb289eadaf4380ed461e880412421d2b5
\ No newline at end of file
+7b9c5fd1c0b674f8fa1a62d4a0af485f5b7a8686
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-win32/1051600011/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/1051600011/System.IO.Compression.dll
index 6e760e24b9..adcab5c0bc 100644
Binary files a/mcs/class/lib/monolite-win32/1051600011/System.IO.Compression.dll and b/mcs/class/lib/monolite-win32/1051600011/System.IO.Compression.dll differ
diff --git a/mcs/class/lib/monolite-win32/1051600011/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/System.Numerics.dll.REMOVED.git-id
index 187c33ec61..17e4ccc45d 100644
--- a/mcs/class/lib/monolite-win32/1051600011/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051600011/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-9daf5b25db435c76eb1ac03188d8f197da765331
\ No newline at end of file
+3c18ef9382bd55d045696e1ce0352e62182bbad1
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-win32/1051600011/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/System.Security.dll.REMOVED.git-id
index aca512c2c7..717badd2af 100644
--- a/mcs/class/lib/monolite-win32/1051600011/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051600011/System.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-03bd3ffc76a6b0250bacf9eaed5a01885f51e28b
\ No newline at end of file
+1deb3b48f9f17958091e66443b9ee8edf4128532
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-win32/1051600011/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/System.Xml.dll.REMOVED.git-id
index 850b7417f9..f55c137d68 100644
--- a/mcs/class/lib/monolite-win32/1051600011/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051600011/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-f339075882428e73eeb05b6fecd0add018de02b7
\ No newline at end of file
+42f5c77c39919687b66b96f6acde71daeca87492
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-win32/1051600011/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/mcs.exe.REMOVED.git-id
index ae2cd15804..66d40b78df 100644
--- a/mcs/class/lib/monolite-win32/1051600011/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051600011/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-c8fbfe870e9a1807acf4794a30f178bb96f93c64
\ No newline at end of file
+0bef82188692ed7b1d07b578b9e16d7dd4427d74
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-win32/1051600011/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/mscorlib.dll.REMOVED.git-id
index d79dc16aad..d538e50480 100644
--- a/mcs/class/lib/monolite-win32/1051600011/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051600011/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-a16e10b83b7d8ff21a6b6bc05cb778c105aa06f2
\ No newline at end of file
+507dc2d482157fa3e043ee642930c367154e2a20
\ No newline at end of file
diff --git a/mono/metadata/icall.c.REMOVED.git-id b/mono/metadata/icall.c.REMOVED.git-id
index 4830962a65..261453f90a 100644
--- a/mono/metadata/icall.c.REMOVED.git-id
+++ b/mono/metadata/icall.c.REMOVED.git-id
@@ -1 +1 @@
-ba09dfa7f38c0d32081101e05cb28f8575de20ef
\ No newline at end of file
+62f329a4dd84568e6c3b81b0d561ea7b0ab2bffc
\ No newline at end of file
diff --git a/mono/mini/aot-compiler.c.REMOVED.git-id b/mono/mini/aot-compiler.c.REMOVED.git-id
index 5a9f1e328b..6d30d1f222 100644
--- a/mono/mini/aot-compiler.c.REMOVED.git-id
+++ b/mono/mini/aot-compiler.c.REMOVED.git-id
@@ -1 +1 @@
-f99bfabb6d6335971022389c34c52b9beb9e59a1
\ No newline at end of file
+72adcbab7c990d56f40f314018622875e3336a7d
\ No newline at end of file
diff --git a/mono/mini/llvm-jit.h b/mono/mini/llvm-jit.h
index b1775b7e6a..2dff9d6a74 100644
--- a/mono/mini/llvm-jit.h
+++ b/mono/mini/llvm-jit.h
@@ -16,7 +16,9 @@
 #include "llvm-c/Core.h"
 #include "llvm-c/ExecutionEngine.h"
 
+#ifdef HAVE_UNWIND_H
 #include <unwind.h>
+#endif
 
 /* These can't go into mini-<ARCH>.h since thats not included into llvm-jit.cpp */
 #if defined(TARGET_AMD64) && defined(TARGET_OSX)
diff --git a/mono/mini/mini-exceptions.c.REMOVED.git-id b/mono/mini/mini-exceptions.c.REMOVED.git-id
index 9220d8d6be..252f86dcb1 100644
--- a/mono/mini/mini-exceptions.c.REMOVED.git-id
+++ b/mono/mini/mini-exceptions.c.REMOVED.git-id
@@ -1 +1 @@
-9aaca6b472e5626585f9d689edd52a4109db5b46
\ No newline at end of file
+f84002197cdbad51ac8632232856e0d8a144b380
\ No newline at end of file
diff --git a/mono/mini/mini-llvm-cpp.h b/mono/mini/mini-llvm-cpp.h
index 2a72e96477..c6b9024547 100644
--- a/mono/mini/mini-llvm-cpp.h
+++ b/mono/mini/mini-llvm-cpp.h
@@ -16,7 +16,9 @@
 #include "llvm-c/Core.h"
 #include "llvm-c/ExecutionEngine.h"
 
+#ifdef HAVE_UNWIND_H
 #include <unwind.h>
+#endif
 
 G_BEGIN_DECLS
 
@@ -113,9 +115,11 @@ mono_llvm_add_param_attr (LLVMValueRef param, AttrKind kind);
 void
 mono_llvm_add_instr_attr (LLVMValueRef val, int index, AttrKind kind);
 
+#if defined(ENABLE_LLVM) && defined(HAVE_UNWIND_H)
 _Unwind_Reason_Code 
 mono_debug_personality (int a, _Unwind_Action b,
 	uint64_t c, struct _Unwind_Exception *d, struct _Unwind_Context *e);
+#endif
 
 void
 default_mono_llvm_unhandled_exception (void);
diff --git a/mono/mini/mini-llvm.c.REMOVED.git-id b/mono/mini/mini-llvm.c.REMOVED.git-id
index d6d56061c5..f94f41138d 100644
--- a/mono/mini/mini-llvm.c.REMOVED.git-id
+++ b/mono/mini/mini-llvm.c.REMOVED.git-id
@@ -1 +1 @@
-82c015035f331d30e7c5f01bf4eebe843b1479e0
\ No newline at end of file
+9de9f3fa41740e56973928c320307aa2ea64d9e5
\ No newline at end of file
diff --git a/mono/mini/mini-runtime.c.REMOVED.git-id b/mono/mini/mini-runtime.c.REMOVED.git-id
index 156dafad53..5d6d6aceac 100644
--- a/mono/mini/mini-runtime.c.REMOVED.git-id
+++ b/mono/mini/mini-runtime.c.REMOVED.git-id
@@ -1 +1 @@
-70a3493001858c82e80c63350fd9688008da662d
\ No newline at end of file
+286f3ba4893b8a62595f5ed58752f7f9cc70d892
\ No newline at end of file
diff --git a/mono/mini/version.h b/mono/mini/version.h
index e93d2fa4e0..842d9f94f6 100644
--- a/mono/mini/version.h
+++ b/mono/mini/version.h
@@ -1 +1 @@
-#define FULL_VERSION "explicit/9439ee6"
+#define FULL_VERSION "explicit/b34a4d9"
diff --git a/msvc/build-init.vcxproj b/msvc/build-init.vcxproj
index e4bd714670..46b4b18a96 100644
--- a/msvc/build-init.vcxproj
+++ b/msvc/build-init.vcxproj
@@ -20,7 +20,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h" />
-    <ClInclude Include="..\eglib\config.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{92AE7622-5F58-4234-9A26-9EC71876B3F4}</ProjectGuid>
@@ -99,7 +98,8 @@
       <SDLCheck>true</SDLCheck>
     </ClCompile>
     <PostBuildEvent>
-      <Command>winsetup.bat</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -109,7 +109,8 @@
       <SDLCheck>true</SDLCheck>
     </ClCompile>
     <PostBuildEvent>
-      <Command>winsetup.bat</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -125,7 +126,8 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PostBuildEvent>
-      <Command>winsetup.bat</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -141,10 +143,36 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PostBuildEvent>
-      <Command>winsetup.bat</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <PropertyGroup Label="LLVMProperties" Condition="$(MONO_ENABLE_LLVM)=='true'">
+    <LLVMConfig>$(MONO_LLVM_BIN_DIR)/llvm-config.exe</LLVMConfig>
+  </PropertyGroup>
+  <Target Name="AfterBuildWinSetup">
+    <Exec Command="winsetup.bat">
+      <Output TaskParameter="ExitCode" PropertyName="WinSetupExitCode" />
+    </Exec>
+    <Error Text="Failed running winsetup.bat" Condition="$(WinSetupExitCode) != 0" />
+  </Target>
+  <Target Name="AfterBuildLLVMSetup" Condition="$(MONO_ENABLE_LLVM)=='true'">
+    <Message Importance="high" Text="Validating LLVM configuration..." />
+    <Error Text="LLVM executable $(LLVMConfig) not found." Condition="!Exists($(LLVMConfig))" />
+    <Message Importance="high" Text="LLVM Version:" />
+    <Exec Command="$(MONO_LLVM_BIN_DIR)/llvm-config.exe --version" ConsoleToMSBuild="true">
+      <Output TaskParameter="ConsoleOutput" PropertyName="MonoLLVMVersion" />
+    </Exec>
+    <Message Importance="high" Text="LLVM API Version:" />
+    <Exec Command="$(MONO_LLVM_BIN_DIR)/llvm-config.exe --mono-api-version" ConsoleToMSBuild="true" EchoOff="true">
+      <Output TaskParameter="ConsoleOutput" PropertyName="MonoLLVMAPIVersion" />
+    </Exec>
+    <Error Text="Compiling with stock LLVM is not supported, please use the Mono LLVM repo at https://github.com/mono/llvm." Condition="!$(MonoLLVMVersion.Contains('mono'))" />
+    <Error Text="Expected llvm version 4, but llvm-config --version returned $(MonoLLVMAPIVersion)." Condition="$(MonoLLVMAPIVersion) != '4'" />
+    <Message Importance="high" Text="Successfully validated LLVM configuration." />
+  </Target>
+  <Target Name="AfterBuild" DependsOnTargets="AfterBuildWinSetup;AfterBuildLLVMSetup" />
 </Project>
\ No newline at end of file
diff --git a/msvc/libmini.vcxproj b/msvc/libmini.vcxproj
index 63f573ac73..62e9def9d7 100644
--- a/msvc/libmini.vcxproj
+++ b/msvc/libmini.vcxproj
@@ -100,7 +100,7 @@
     <ClCompile>
       <AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -125,7 +125,7 @@
     <ClCompile>
       <AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;WIN64;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -150,7 +150,7 @@
     <ClCompile>
       <AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -176,7 +176,7 @@
     <ClCompile>
       <AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;WIN64;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
diff --git a/msvc/libmono-dynamic.vcxproj b/msvc/libmono-dynamic.vcxproj
index 186bd7ffc3..21e64c3495 100644
--- a/msvc/libmono-dynamic.vcxproj
+++ b/msvc/libmono-dynamic.vcxproj
@@ -97,7 +97,7 @@
     <ClCompile>
       <AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -114,12 +114,13 @@
     </ProjectReference>
     <Link>
       <AdditionalDependencies Condition="'$(MONO_TARGET_GC)'=='boehm'">$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
+      <AdditionalDependencies>$(MONO_LLVM_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>.\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q</Command>
@@ -136,7 +137,7 @@
     <ClCompile>
       <AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;WIN64;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -153,10 +154,11 @@
     </ProjectReference>
     <Link>
       <AdditionalDependencies Condition="'$(MONO_TARGET_GC)'=='boehm'">$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
       <ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
+      <AdditionalDependencies>$(MONO_LLVM_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>.\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q</Command>
@@ -170,7 +172,7 @@
     <ClCompile>
       <AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <PrecompiledHeader>
@@ -184,12 +186,13 @@
     <ProjectReference />
     <Link>
       <AdditionalDependencies Condition="'$(MONO_TARGET_GC)'=='boehm'">$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
+      <AdditionalDependencies>$(MONO_LLVM_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>.\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q</Command>
@@ -209,7 +212,7 @@
     <ClCompile>
       <AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;WIN64;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <PrecompiledHeader>
@@ -223,10 +226,11 @@
     <ProjectReference />
     <Link>
       <AdditionalDependencies Condition="'$(MONO_TARGET_GC)'=='boehm'">$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
       <ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
+      <AdditionalDependencies>$(MONO_LLVM_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>.\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q</Command>
diff --git a/msvc/mono.props b/msvc/mono.props
index c9bd97e59e..4c93b8dc47 100644
--- a/msvc/mono.props
+++ b/msvc/mono.props
@@ -5,6 +5,8 @@
     <MONO_BUILD_DIR_PREFIX>$(MSBuildProjectDirectory)/./build/</MONO_BUILD_DIR_PREFIX>
     <!-- Change this to custom distribution tree location to enable out of source tree distribution, example c:/mono-dist/ -->
     <MONO_INSTALL_DIR_PREFIX>$(MSBuildProjectDirectory)/./dist/</MONO_INSTALL_DIR_PREFIX>
+    <!-- Change this to custom install tree location to enable out of source tree builds, example c:/mono-llvm/ -->
+    <MONO_LLVM_INSTALL_DIR_PREFIX>$(MONO_INSTALL_DIR_PREFIX)llvm/</MONO_LLVM_INSTALL_DIR_PREFIX>
     <!-- GC in use, sgen or boehm, default is sgen. -->
     <MONO_TARGET_GC>sgen</MONO_TARGET_GC>
     <!-- When true, build targets will get a suffix based on used GC. Makes it possible to have builds using different GC's in same build folders, sharing common targets. -->
@@ -15,6 +17,8 @@
     <MONO_USE_STATIC_C_RUNTIME>false</MONO_USE_STATIC_C_RUNTIME>
     <!-- When true, mono binaries will link using static libmono. When false, mono binaries will link using dynamic libmono.  -->
     <MONO_USE_STATIC_LIBMONO>false</MONO_USE_STATIC_LIBMONO>
+    <!-- When true, mono binaries will link and include llvm. When false, mono binaries will not link and include llvm.  -->
+    <MONO_ENABLE_LLVM>false</MONO_ENABLE_LLVM>
   </PropertyGroup>
   <PropertyGroup Label="MonoDirectories">
     <MonoSourceLocation Condition="'$(MonoSourceLocation)' == '' ">..</MonoSourceLocation>
@@ -30,6 +34,11 @@
     <LIBGC_CPPFLAGS_INCLUDE>$(MONO_LIBGC_INCLUDE_DIR)</LIBGC_CPPFLAGS_INCLUDE>
     <GLIB_CFLAGS_INCLUDE>$(MONO_EGLIB_SOURCE_DIR)</GLIB_CFLAGS_INCLUDE>
   </PropertyGroup>
+  <PropertyGroup Label="MonoLLVMDirectories">
+    <MONO_LLVM_INCLUDE_DIR>$(MONO_LLVM_INSTALL_DIR_PREFIX)include</MONO_LLVM_INCLUDE_DIR>
+    <MONO_LLVM_LIB_DIR>$(MONO_LLVM_INSTALL_DIR_PREFIX)lib</MONO_LLVM_LIB_DIR>
+    <MONO_LLVM_BIN_DIR>$(MONO_LLVM_INSTALL_DIR_PREFIX)bin</MONO_LLVM_BIN_DIR>
+  </PropertyGroup>
   <PropertyGroup Label="Static-C-Runtime" Condition="$(MONO_USE_STATIC_C_RUNTIME)=='true'">
     <MONO_C_RUNTIME Condition="'$(Configuration)'=='Debug'">MultiThreadedDebug</MONO_C_RUNTIME>
     <MONO_C_RUNTIME Condition="'$(Configuration)'!='Debug'">MultiThreaded</MONO_C_RUNTIME>
@@ -66,6 +75,12 @@
   <PropertyGroup Label="MonoProfiler">
     <VTUNE_INCLUDE_DIR>$(ProgramFiles)/Intel/VTune Amplifier XE 2013/include</VTUNE_INCLUDE_DIR>
   </PropertyGroup>
+  <PropertyGroup Label="MONO_ENABLE_LLVM" Condition="$(MONO_ENABLE_LLVM)=='true'">
+    <MONO_LLVM_CODEGEN_LIBS>LLVMX86CodeGen.lib;LLVMX86Desc.lib;LLVMX86Info.lib;LLVMObject.lib;LLVMBitReader.lib;LLVMMCDisassembler.lib;LLVMX86AsmPrinter.lib;LLVMX86Utils.lib;LLVMSelectionDAG.lib;LLVMAsmPrinter.lib;LLVMMCParser.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib;LLVMipa.lib</MONO_LLVM_CODEGEN_LIBS>
+    <MONO_LLVM_JIT_LIBS>LLVMMCJIT.lib;LLVMRuntimeDyld.lib;LLVMObject.lib;LLVMMCParser.lib;LLVMBitReader.lib;LLVMJIT.lib;LLVMExecutionEngine.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib</MONO_LLVM_JIT_LIBS>
+    <MONO_LLVM_LIBS>$(MONO_LLVM_CODEGEN_LIBS);$(MONO_LLVM_JIT_LIBS);LLVMBitWriter.lib;LLVMAnalysis.lib;LLVMTarget.lib;LLVMMC.lib;LLVMCore.lib;LLVMSupport.lib</MONO_LLVM_LIBS>
+    <MONO_ADDITIONAL_PREPROCESSOR_DEFINITIONS>ENABLE_LLVM=1;$(MONO_ADDITIONAL_PREPROCESSOR_DEFINITIONS)</MONO_ADDITIONAL_PREPROCESSOR_DEFINITIONS>
+  </PropertyGroup>
   <ItemGroup>
     <BuildMacro Include="MONO_BUILD_DIR_PREFIX">
       <Value>$(MONO_BUILD_DIR_PREFIX)</Value>
@@ -73,6 +88,9 @@
     <BuildMacro Include="MONO_INSTALL_DIR_PREFIX">
       <Value>$(MONO_INSTALL_DIR_PREFIX)</Value>
     </BuildMacro>
+    <BuildMacro Include="MONO_LLVM_INSTALL_DIR_PREFIX">
+      <Value>$(MONO_LLVM_INSTALL_DIR_PREFIX)</Value>
+    </BuildMacro>
     <BuildMacro Include="MONO_TARGET_GC">
       <Value>$(MONO_TARGET_GC)</Value>
     </BuildMacro>
@@ -88,12 +106,18 @@
     <BuildMacro Include="MONO_USE_STATIC_LIBMONO">
       <Value>$(MONO_USE_STATIC_LIBMONO)</Value>
     </BuildMacro>
+    <BuildMacro Include="MONO_ENABLE_LLVM">
+      <Value>$(MONO_ENABLE_LLVM)</Value>
+    </BuildMacro>
   </ItemGroup>
+  <PropertyGroup Label="MonoDefaultPreprocessorDefinitions">
+    <MONO_PREPROCESSOR_DEFINITIONS>__default_codegen__;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;GC_NOT_DLL;WIN32_THREADS;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;_UNICODE;UNICODE;FD_SETSIZE=1024;NVALGRIND;$(MONO_ADDITIONAL_PREPROCESSOR_DEFINITIONS)</MONO_PREPROCESSOR_DEFINITIONS>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <DllExportPreprocessorDefinitions>MONO_DLL_EXPORT</DllExportPreprocessorDefinitions>
       <DllImportPreprocessorDefinitions>MONO_DLL_IMPORT</DllImportPreprocessorDefinitions>
-      <PreprocessorDefinitions>__default_codegen__;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;GC_NOT_DLL;WIN32_THREADS;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;_UNICODE;UNICODE;FD_SETSIZE=1024;NVALGRIND;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(MONO_PREPROCESSOR_DEFINITIONS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4273;4005;4152;4221;4214;4204;4201</DisableSpecificWarnings>
       <RuntimeLibrary>$(MONO_C_RUNTIME)</RuntimeLibrary>
     </ClCompile>
diff --git a/msvc/mono.vcxproj b/msvc/mono.vcxproj
index 0c3eba152b..7567c5e3b9 100644
--- a/msvc/mono.vcxproj
+++ b/msvc/mono.vcxproj
@@ -103,8 +103,8 @@
     </ClCompile>
     <ProjectReference />
     <Link>
-      <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(MONO_LIBMONO_LIB);$(MONO_LLVM_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -131,8 +131,8 @@
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <Link>
-      <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(MONO_LIBMONO_LIB);$(MONO_LLVM_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <ShowProgress>
       </ShowProgress>
@@ -152,8 +152,8 @@
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <Link>
-      <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(MONO_LIBMONO_LIB);$(MONO_LLVM_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -176,8 +176,8 @@
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <Link>
-      <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(MONO_LIBMONO_LIB);$(MONO_LLVM_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo
index 7b1f8fc3d3..1f82128610 100644
Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ
diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id
index a09c79f6aa..5f51f26c71 100644
--- a/po/mcs/de.po.REMOVED.git-id
+++ b/po/mcs/de.po.REMOVED.git-id
@@ -1 +1 @@
-af4e44c7c957c50f9dc2fc191a4ce62513b362b2
\ No newline at end of file
+4efc13a5ca7865150dc4f0341b6111bad5f593b7
\ No newline at end of file
diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo
index fe18f3ff1c..28cbf02ad4 100644
Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ
diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id
index 9a38a12f08..133256b237 100644
--- a/po/mcs/es.po.REMOVED.git-id
+++ b/po/mcs/es.po.REMOVED.git-id
@@ -1 +1 @@
-fe199afd6607471eb01e175befc011d7456493d1
\ No newline at end of file
+204525d4c5951b04e51f558bc87a0a1348e14b11
\ No newline at end of file
diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo
index 52aa4a6936..0757028423 100644
Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ
diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id
index 043417dd80..12ba59a2ab 100644
--- a/po/mcs/ja.po.REMOVED.git-id
+++ b/po/mcs/ja.po.REMOVED.git-id
@@ -1 +1 @@
-8bb51ec00f4a3f64cb24c9bbd83a63f92ce88cf8
\ No newline at end of file
+2f6131c48354b8dc281e9d4ecee933e0d609325b
\ No newline at end of file
diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot
index 8559bfad34..93705b2688 100644
--- a/po/mcs/mcs.pot
+++ b/po/mcs/mcs.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mono 5.16.0.147\n"
+"Project-Id-Version: mono 5.16.0.149\n"
 "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
-"POT-Creation-Date: 2018-09-06 08:02+0000\n"
+"POT-Creation-Date: 2018-09-07 08:12+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo
index f04abd0a8d..445b65ec9e 100644
Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ
diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id
index 4c3a88b083..944d4efd0b 100644
--- a/po/mcs/pt_BR.po.REMOVED.git-id
+++ b/po/mcs/pt_BR.po.REMOVED.git-id
@@ -1 +1 @@
-2aa18bf16e405b0ba9ffc1cfc42d5285a7e0a974
\ No newline at end of file
+01cebefa99b4d1d20d19feae48d1baf3d0652f87
\ No newline at end of file
diff --git a/winconfig.h b/winconfig.h
index 145b0c13c3..51444d567b 100644
--- a/winconfig.h
+++ b/winconfig.h
@@ -682,6 +682,13 @@
 /* Use mono_mutex_t */
 /* #undef USE_MONO_MUTEX */
 
+#ifdef ENABLE_LLVM
+	#define ENABLE_LLVM 1
+	#define ENABLE_LLVM_RUNTIME 1
+	#define LLVM_VERSION "3.6.0svn-mono-"
+	#define LLVM_API_VERSION 4
+#endif
+
 /* Version number of package */
 #define VERSION "#MONO_VERSION#"