diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 787dfe000965b..b336f2b68077e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - a811ac5e4b91afb162a547bf1932e473411388e1 + f8281bcfcee30bbb26f44961ac883692ae2fa6fb https://github.com/dotnet/msquic @@ -12,37 +12,37 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 https://github.com/dotnet/command-line-api @@ -64,14 +64,14 @@ 9c9443396f8deacceb8edb169890e52aac25f311 - + https://github.com/dotnet/emsdk - 8e660ff41e91879977e3a9d837e068bd72234c26 + 2275bbda5e4d11dec74f13583a3e6044aa713191 - + https://github.com/dotnet/emsdk - 8e660ff41e91879977e3a9d837e068bd72234c26 + 2275bbda5e4d11dec74f13583a3e6044aa713191 @@ -222,61 +222,61 @@ https://github.com/dotnet/runtime-assets e98370e661a19bdfed31eefb8740ecfad255f9ed - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 - + https://github.com/dotnet/llvm-project - b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1 + 65b04a49bfa71421af9062d3b446cc2ec99cf483 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 177eb032e0257..46eeb6be14811 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,44 +216,44 @@ 9.0.0-rtm.24503.8 - 9.0.0-rc.2.24467.2 + 9.0.0-rtm.24502.3 9.0.0-rtm.24466.4 2.4.3 9.0.0-alpha.1.24167.3 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 - 9.0.0-rtm.24469.1 + 9.0.0-rtm.24513.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 - 19.0.0-alpha.1.24401.1 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 + 19.1.0-alpha.1.24510.5 3.1.7 1.0.406601 diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 1db86b961f1da..bcab359dde579 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -869,7 +869,6 @@ extends: platforms: - browser_wasm - browser_wasm_win - - wasi_wasm nameSuffix: _Smoke_AOT runAOT: true shouldRunSmokeOnly: true diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index 9ac88a7bc26e9..16c8f16d419ce 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -582,12 +582,6 @@ - - - - - - diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt index 7078eb1230631..fabeafa41e3e7 100644 --- a/src/mono/CMakeLists.txt +++ b/src/mono/CMakeLists.txt @@ -650,6 +650,9 @@ if(LLVM_PREFIX) elseif(HOST_OSX) # llvm-config --system-libs list(APPEND llvm_system_libs "-lm") + elseif(HOST_WIN32) + # llvm-config --system-libs + list(APPEND llvm_system_libs "psapi.lib" "shell32.lib" "ole32.lib" "uuid.lib" "advapi32.lib" "ws2_32.lib" "ntdll.lib") endif() if (CLR_CMAKE_USE_SYSTEM_ZLIB AND (HOST_LINUX OR HOST_OSX)) diff --git a/src/mono/mono/mini/llvm-intrinsics.h b/src/mono/mono/mini/llvm-intrinsics.h index d4c7deea9ee8a..d1cb974e41e11 100644 --- a/src/mono/mono/mini/llvm-intrinsics.h +++ b/src/mono/mono/mini/llvm-intrinsics.h @@ -108,7 +108,7 @@ INTRINS_OVR_TAG(SIMD_CEIL, ceil, Generic, Scalar | V64 | V128 | R4 | R8) INTRINS_OVR_TAG(SIMD_TRUNC, trunc, Generic, Scalar | V64 | V128 | R4 | R8) INTRINS_OVR_TAG(SIMD_ROUND, round, Generic, Scalar | V64 | V128 | R4 | R8) INTRINS_OVR_TAG(SIMD_NEAREST, nearbyint, Generic, V64 | V128 | R4 | R8) -INTRINS(EH_TYPEID_FOR, eh_typeid_for, Generic) +INTRINS_OVR(EH_TYPEID_FOR, eh_typeid_for, Generic, LLVMPointerType (i1_t, 0)) INTRINS_OVR_TAG(ROUNDEVEN, roundeven, Generic, Scalar | V64 | V128 | R4 | R8) #if defined(TARGET_AMD64) || defined(TARGET_X86) diff --git a/src/mono/mono/mini/mini-llvm-cpp.cpp b/src/mono/mono/mini/mini-llvm-cpp.cpp index e15619703e511..5a6a150960559 100644 --- a/src/mono/mono/mini/mini-llvm-cpp.cpp +++ b/src/mono/mono/mini/mini-llvm-cpp.cpp @@ -643,19 +643,17 @@ int mono_llvm_check_cpu_features (const CpuFeatureAliasFlag *features, int length) { int flags = 0; - llvm::StringMap HostFeatures; - if (llvm::sys::getHostCPUFeatures (HostFeatures)) { - for (int i=0; i HostFeatures = llvm::sys::getHostCPUFeatures (); + for (int i=0; i