From c92293d6a6aefc7cc055cc32605b60d814c66625 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Fri, 7 Sep 2018 08:27:29 +0000 Subject: [PATCH] Imported Upstream version 5.16.0.149 Former-commit-id: 14c55149475ede19ed48b6a8018dc6d18549c21b --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- ..._native_la-pal_networking.o.REMOVED.git-id | 2 +- ..._native_la-pal_networking.o.REMOVED.git-id | 2 +- .../Unix/System.Native/pal_networking.c | 9 ++++- mcs/build/common/Consts.cs | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../1051600011/System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051600011/System.Xml.dll.REMOVED.git-id | 2 +- .../1051600011/mcs.exe.REMOVED.git-id | 2 +- .../1051600011/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../1051600011/System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051600011/System.Xml.dll.REMOVED.git-id | 2 +- .../1051600011/mcs.exe.REMOVED.git-id | 2 +- .../1051600011/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../1051600011/System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051600011/System.Xml.dll.REMOVED.git-id | 2 +- .../1051600011/mcs.exe.REMOVED.git-id | 2 +- .../1051600011/mscorlib.dll.REMOVED.git-id | 2 +- mono/metadata/icall.c.REMOVED.git-id | 2 +- mono/mini/aot-compiler.c.REMOVED.git-id | 2 +- mono/mini/llvm-jit.h | 2 + mono/mini/mini-exceptions.c.REMOVED.git-id | 2 +- mono/mini/mini-llvm-cpp.h | 4 ++ mono/mini/mini-llvm.c.REMOVED.git-id | 2 +- mono/mini/mini-runtime.c.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- msvc/build-init.vcxproj | 38 +++++++++++++++--- msvc/libmini.vcxproj | 8 ++-- msvc/libmono-dynamic.vcxproj | 20 +++++---- msvc/mono.props | 26 +++++++++++- msvc/mono.vcxproj | 16 ++++---- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 +- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- winconfig.h | 7 ++++ 53 files changed, 141 insertions(+), 65 deletions(-) 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 6e760e24b952ac31c125fd408bd8258a4b48ed7e..adcab5c0bcf23a83a3daaa2836331f2498bc8586 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ_#|qWfsD0`0W=H{YyJ9_P;WCrnIsB0&9| +#endif /* These can't go into mini-.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 +#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 @@ - {92AE7622-5F58-4234-9A26-9EC71876B3F4} @@ -99,7 +98,8 @@ true - winsetup.bat + + @@ -109,7 +109,8 @@ true - winsetup.bat + + @@ -125,7 +126,8 @@ true - winsetup.bat + + @@ -141,10 +143,36 @@ true - winsetup.bat + + + + $(MONO_LLVM_BIN_DIR)/llvm-config.exe + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) Disabled - $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;%(PreprocessorDefinitions) @@ -125,7 +125,7 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) Disabled - $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;WIN64;_DEBUG;%(PreprocessorDefinitions) @@ -150,7 +150,7 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) true - $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;%(PreprocessorDefinitions) @@ -176,7 +176,7 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) true - $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;WIN64;NDEBUG;%(PreprocessorDefinitions) 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 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) Disabled - $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;_DEBUG;%(PreprocessorDefinitions) @@ -114,12 +114,13 @@ $(GC_LIB);%(AdditionalDependencies) - %(AdditionalLibraryDirectories) + $(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories) $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib + $(MONO_LLVM_LIBS);%(AdditionalDependencies) .\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q @@ -136,7 +137,7 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) Disabled - $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;WIN64;_DEBUG;%(PreprocessorDefinitions) @@ -153,10 +154,11 @@ $(GC_LIB);%(AdditionalDependencies) - %(AdditionalLibraryDirectories) + $(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories) $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib + $(MONO_LLVM_LIBS);%(AdditionalDependencies) .\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q @@ -170,7 +172,7 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) true - $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;NDEBUG;%(PreprocessorDefinitions) true @@ -184,12 +186,13 @@ $(GC_LIB);%(AdditionalDependencies) - %(AdditionalLibraryDirectories) + $(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories) $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib + $(MONO_LLVM_LIBS);%(AdditionalDependencies) .\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q @@ -209,7 +212,7 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) true - $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;WIN64;NDEBUG;%(PreprocessorDefinitions) true @@ -223,10 +226,11 @@ $(GC_LIB);%(AdditionalDependencies) - %(AdditionalLibraryDirectories) + $(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories) $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib + $(MONO_LLVM_LIBS);%(AdditionalDependencies) .\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q 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 @@ $(MSBuildProjectDirectory)/./build/ $(MSBuildProjectDirectory)/./dist/ + + $(MONO_INSTALL_DIR_PREFIX)llvm/ sgen @@ -15,6 +17,8 @@ false false + + false .. @@ -30,6 +34,11 @@ $(MONO_LIBGC_INCLUDE_DIR) $(MONO_EGLIB_SOURCE_DIR) + + $(MONO_LLVM_INSTALL_DIR_PREFIX)include + $(MONO_LLVM_INSTALL_DIR_PREFIX)lib + $(MONO_LLVM_INSTALL_DIR_PREFIX)bin + MultiThreadedDebug MultiThreaded @@ -66,6 +75,12 @@ $(ProgramFiles)/Intel/VTune Amplifier XE 2013/include + + 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 + LLVMMCJIT.lib;LLVMRuntimeDyld.lib;LLVMObject.lib;LLVMMCParser.lib;LLVMBitReader.lib;LLVMJIT.lib;LLVMExecutionEngine.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib + $(MONO_LLVM_CODEGEN_LIBS);$(MONO_LLVM_JIT_LIBS);LLVMBitWriter.lib;LLVMAnalysis.lib;LLVMTarget.lib;LLVMMC.lib;LLVMCore.lib;LLVMSupport.lib + ENABLE_LLVM=1;$(MONO_ADDITIONAL_PREPROCESSOR_DEFINITIONS) + $(MONO_BUILD_DIR_PREFIX) @@ -73,6 +88,9 @@ $(MONO_INSTALL_DIR_PREFIX) + + $(MONO_LLVM_INSTALL_DIR_PREFIX) + $(MONO_TARGET_GC) @@ -88,12 +106,18 @@ $(MONO_USE_STATIC_LIBMONO) + + $(MONO_ENABLE_LLVM) + + + __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_DLL_EXPORT MONO_DLL_IMPORT - __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); + $(MONO_PREPROCESSOR_DEFINITIONS);%(PreprocessorDefinitions) 4273;4005;4152;4221;4214;4204;4201 $(MONO_C_RUNTIME) 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 @@ - $(MONO_LIBMONO_LIB);%(AdditionalDependencies) - %(AdditionalLibraryDirectories) + $(MONO_LIBMONO_LIB);$(MONO_LLVM_LIBS);%(AdditionalDependencies) + $(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories) Console @@ -131,8 +131,8 @@ false - $(MONO_LIBMONO_LIB);%(AdditionalDependencies) - %(AdditionalLibraryDirectories) + $(MONO_LIBMONO_LIB);$(MONO_LLVM_LIBS);%(AdditionalDependencies) + $(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories) Console @@ -152,8 +152,8 @@ false - $(MONO_LIBMONO_LIB);%(AdditionalDependencies) - %(AdditionalLibraryDirectories) + $(MONO_LIBMONO_LIB);$(MONO_LLVM_LIBS);%(AdditionalDependencies) + $(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories) Console @@ -176,8 +176,8 @@ false - $(MONO_LIBMONO_LIB);%(AdditionalDependencies) - %(AdditionalLibraryDirectories) + $(MONO_LIBMONO_LIB);$(MONO_LLVM_LIBS);%(AdditionalDependencies) + $(MONO_LLVM_LIB_DIR);%(AdditionalLibraryDirectories) Console diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 7b1f8fc3d3c24677dff3115a4074b9d421a02602..1f82128610f0746fa304f295ccdf984cbf2889d1 100644 GIT binary patch delta 19 acmbQIHBW29Q!X}h1p^B!!_BX`jJW_s0R}|? delta 19 acmbQIHBW29Q!X|$1p^B!gUzqGjJW_r@CHKw 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 fe18f3ff1cff39e944cf9383b72de841d5936c74..28cbf02ad4c76a4e7150ad47591a23fdc1fffeba 100644 GIT binary patch delta 19 acmX?Ef3kjqo+6vMf`NsV;bs%Xsd4~I!3KK( delta 19 acmX?Ef3kjqo+6u>f`NsV!DbW1sd4~Ium*Vm 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 52aa4a69368ba44dc8483783ae1702d993289421..075702842359f00398caaf88dac84843033d56b1 100644 GIT binary patch delta 21 ccmeyri1Gg-#tj_mY~~6E7FLFv`P2)w09t\n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index f04abd0a8d0915f98fd736f73b9193b7cd941106..445b65ec9ee23f2fb4e134fa563e9da7f37bd3c4 100644 GIT binary patch delta 21 dcmaF1gXP%{mJM-J*~}FTEUXMSr%YvP2LNWW2u%P0 delta 21 dcmaF1gXP%{mJM-J*~}CSEUXMRr%YvP2LNWF2ulC} 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#"