diff --git a/bin/mimalloc-redirect-arm64.dll b/bin/mimalloc-redirect-arm64.dll
index 2b1d3e35..98268796 100644
Binary files a/bin/mimalloc-redirect-arm64.dll and b/bin/mimalloc-redirect-arm64.dll differ
diff --git a/bin/mimalloc-redirect-arm64ec.dll b/bin/mimalloc-redirect-arm64ec.dll
new file mode 100644
index 00000000..fba5f68a
Binary files /dev/null and b/bin/mimalloc-redirect-arm64ec.dll differ
diff --git a/bin/mimalloc-redirect-arm64ec.lib b/bin/mimalloc-redirect-arm64ec.lib
new file mode 100644
index 00000000..1c7c368f
Binary files /dev/null and b/bin/mimalloc-redirect-arm64ec.lib differ
diff --git a/bin/mimalloc-redirect.dll b/bin/mimalloc-redirect.dll
index 4702fec0..5dee3713 100644
Binary files a/bin/mimalloc-redirect.dll and b/bin/mimalloc-redirect.dll differ
diff --git a/bin/mimalloc-redirect.lib b/bin/mimalloc-redirect.lib
index 7d5f19ce..851455a5 100644
Binary files a/bin/mimalloc-redirect.lib and b/bin/mimalloc-redirect.lib differ
diff --git a/bin/mimalloc-redirect32.dll b/bin/mimalloc-redirect32.dll
index 17c05550..1bb909e1 100644
Binary files a/bin/mimalloc-redirect32.dll and b/bin/mimalloc-redirect32.dll differ
diff --git a/bin/mimalloc-redirect32.lib b/bin/mimalloc-redirect32.lib
index a7100afc..45d7297d 100644
Binary files a/bin/mimalloc-redirect32.lib and b/bin/mimalloc-redirect32.lib differ
diff --git a/ide/vs2022/mimalloc-override-test.vcxproj b/ide/vs2022/mimalloc-override-test.vcxproj
index ff5d53d0..97803b9c 100644
--- a/ide/vs2022/mimalloc-override-test.vcxproj
+++ b/ide/vs2022/mimalloc-override-test.vcxproj
@@ -5,6 +5,10 @@
Debug
ARM64
+
+ Debug
+ ARM64EC
+
Debug
Win32
@@ -13,6 +17,10 @@
Release
ARM64
+
+ Release
+ ARM64EC
+
Release
Win32
@@ -55,6 +63,11 @@
true
v143
+
+ Application
+ true
+ v143
+
Application
false
@@ -67,6 +80,12 @@
v143
true
+
+ Application
+ false
+ v143
+ true
+
@@ -84,12 +103,18 @@
+
+
+
+
+
+
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
@@ -107,6 +132,10 @@
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
@@ -115,6 +144,10 @@
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
Level3
@@ -185,6 +218,30 @@
+
+
+ Level3
+ Disabled
+ true
+ true
+ ..\..\include
+ MultiThreadedDebugDLL
+ Sync
+ Default
+ false
+
+
+ Console
+
+
+ kernel32.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
Level3
@@ -258,6 +315,31 @@
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ true
+ ..\..\include
+ _MBCS;%(PreprocessorDefinitions);NDEBUG
+ MultiThreadedDLL
+
+
+ true
+ true
+ Console
+
+
+ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+
+
+
+
+
+
diff --git a/ide/vs2022/mimalloc-override.vcxproj b/ide/vs2022/mimalloc-override.vcxproj
index 16a48740..9de18895 100644
--- a/ide/vs2022/mimalloc-override.vcxproj
+++ b/ide/vs2022/mimalloc-override.vcxproj
@@ -5,6 +5,10 @@
Debug
ARM64
+
+ Debug
+ ARM64EC
+
Debug
Win32
@@ -13,6 +17,10 @@
Release
ARM64
+
+ Release
+ ARM64EC
+
Release
Win32
@@ -54,6 +62,11 @@
true
v143
+
+ DynamicLibrary
+ true
+ v143
+
DynamicLibrary
false
@@ -64,6 +77,11 @@
false
v143
+
+ DynamicLibrary
+ false
+ v143
+
@@ -81,12 +99,18 @@
+
+
+
+
+
+
$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\
@@ -112,6 +136,12 @@
.dll
mimalloc-override
+
+ $(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\
+ $(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+ .dll
+ mimalloc-override
+
$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\
$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
@@ -124,6 +154,12 @@
.dll
mimalloc-override
+
+ $(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\
+ $(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+ .dll
+ mimalloc-override
+
Level3
@@ -208,6 +244,34 @@
copy mimalloc-redirect-arm64.dll to the output directory
+
+
+ Level3
+ Disabled
+ true
+ true
+ ../../include
+ MI_DEBUG=4;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);
+ MultiThreadedDebugDLL
+ false
+ CompileAsCpp
+
+
+ $(ProjectDir)\..\..\bin\mimalloc-redirect-arm64ec.lib;%(AdditionalDependencies)
+
+
+
+
+ Default
+ false
+
+
+ COPY /Y "$(ProjectDir)..\..\bin\mimalloc-redirect-arm64ec.dll" "$(OutputPath)"
+
+
+ copy mimalloc-redirect-arm64ec.dll to the output directory
+
+
Level3
@@ -305,6 +369,39 @@
copy mimalloc-redirect-arm64.dll to the output directory
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ../../include
+ MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG
+ AssemblyAndSourceCode
+ $(IntDir)
+ false
+ MultiThreadedDLL
+ CompileAsCpp
+ false
+ CPUExtensionRequirementsARMv81
+
+
+ true
+ true
+ $(ProjectDir)\..\..\bin\mimalloc-redirect-arm64ec.lib;%(AdditionalDependencies)
+
+
+ Default
+ false
+
+
+ COPY /Y "$(ProjectDir)..\..\bin\mimalloc-redirect-arm64ec.dll" "$(OutputPath)"
+
+
+ copy mimalloc-redirect-arm64ec.dll to the output directory
+
+
@@ -324,16 +421,20 @@
false
false
false
+ false
false
false
+ false
true
true
true
true
+ true
true
true
+ true
@@ -342,8 +443,10 @@
true
true
true
+ true
true
true
+ true
@@ -356,8 +459,10 @@
true
true
true
+ true
true
true
+ true
@@ -366,8 +471,10 @@
true
true
true
+ true
true
true
+ true
diff --git a/ide/vs2022/mimalloc-test-api.vcxproj b/ide/vs2022/mimalloc-test-api.vcxproj
index babe7f96..27247569 100644
--- a/ide/vs2022/mimalloc-test-api.vcxproj
+++ b/ide/vs2022/mimalloc-test-api.vcxproj
@@ -5,6 +5,10 @@
Debug
ARM64
+
+ Debug
+ ARM64EC
+
Debug
Win32
@@ -13,6 +17,10 @@
Release
ARM64
+
+ Release
+ ARM64EC
+
Release
Win32
@@ -55,6 +63,11 @@
true
v143
+
+ Application
+ true
+ v143
+
Application
false
@@ -67,6 +80,12 @@
v143
true
+
+ Application
+ false
+ v143
+ true
+
@@ -84,12 +103,18 @@
+
+
+
+
+
+
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
@@ -107,6 +132,10 @@
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
@@ -115,6 +144,10 @@
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
Level3
@@ -151,6 +184,18 @@
Console
+
+
+ Level3
+ Disabled
+ true
+ true
+ ..\..\include
+
+
+ Console
+
+
Level3
@@ -202,18 +247,38 @@
Console
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ true
+ ..\..\include
+ %(PreprocessorDefinitions);NDEBUG
+
+
+ true
+ true
+ Console
+
+
true
true
true
true
+ true
true
true
+ true
false
false
+ false
diff --git a/ide/vs2022/mimalloc-test-stress.vcxproj b/ide/vs2022/mimalloc-test-stress.vcxproj
index c033aaeb..fd88cd8e 100644
--- a/ide/vs2022/mimalloc-test-stress.vcxproj
+++ b/ide/vs2022/mimalloc-test-stress.vcxproj
@@ -5,6 +5,10 @@
Debug
ARM64
+
+ Debug
+ ARM64EC
+
Debug
Win32
@@ -13,6 +17,10 @@
Release
ARM64
+
+ Release
+ ARM64EC
+
Release
Win32
@@ -55,6 +63,11 @@
true
v143
+
+ Application
+ true
+ v143
+
Application
false
@@ -67,6 +80,12 @@
v143
true
+
+ Application
+ false
+ v143
+ true
+
@@ -84,12 +103,18 @@
+
+
+
+
+
+
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
@@ -107,6 +132,10 @@
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
@@ -115,6 +144,10 @@
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
Level3
@@ -151,6 +184,18 @@
Console
+
+
+ Level3
+ Disabled
+ true
+ true
+ ..\..\include
+
+
+ Console
+
+
Level3
@@ -203,14 +248,34 @@
Console
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ true
+ ..\..\include
+ %(PreprocessorDefinitions);NDEBUG
+ CPUExtensionRequirementsARMv81
+
+
+ true
+ true
+ Console
+
+
false
false
false
+ false
false
false
false
+ false
diff --git a/ide/vs2022/mimalloc-test.vcxproj b/ide/vs2022/mimalloc-test.vcxproj
index bfd72287..fc9e9102 100644
--- a/ide/vs2022/mimalloc-test.vcxproj
+++ b/ide/vs2022/mimalloc-test.vcxproj
@@ -5,6 +5,10 @@
Debug
ARM64
+
+ Debug
+ ARM64EC
+
Debug
Win32
@@ -13,6 +17,10 @@
Release
ARM64
+
+ Release
+ ARM64EC
+
Release
Win32
@@ -55,6 +63,11 @@
true
v143
+
+ Application
+ true
+ v143
+
Application
false
@@ -67,6 +80,12 @@
v143
true
+
+ Application
+ false
+ v143
+ true
+
@@ -84,12 +103,18 @@
+
+
+
+
+
+
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
@@ -107,6 +132,10 @@
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
@@ -115,6 +144,10 @@
$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\
+ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+
Level3
@@ -154,6 +187,19 @@
Console
+
+
+ Level3
+ Disabled
+ true
+ true
+ ..\..\include
+ stdcpp17
+
+
+ Console
+
+
Level3
@@ -208,6 +254,24 @@
Console
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ true
+ ..\..\include
+ _MBCS;%(PreprocessorDefinitions);NDEBUG
+ stdcpp17
+
+
+ true
+ true
+ Console
+
+
{abb5eae7-b3e6-432e-b636-333449892ea6}
diff --git a/ide/vs2022/mimalloc.sln b/ide/vs2022/mimalloc.sln
index e4a6538b..5a55c98b 100644
--- a/ide/vs2022/mimalloc.sln
+++ b/ide/vs2022/mimalloc.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
-VisualStudioVersion = 17.12.35527.113 d17.12
+VisualStudioVersion = 17.12.35527.113
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc", "mimalloc.vcxproj", "{ABB5EAE7-B3E6-432E-B636-333449892EA6}"
EndProject
@@ -18,81 +18,107 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM64 = Debug|ARM64
+ Debug|ARM64EC = Debug|ARM64EC
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM64 = Release|ARM64
+ Release|ARM64EC = Release|ARM64EC
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|ARM64.ActiveCfg = Debug|ARM64
{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|ARM64.Build.0 = Debug|ARM64
+ {ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+ {ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x64.ActiveCfg = Debug|x64
{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x64.Build.0 = Debug|x64
{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x86.ActiveCfg = Debug|Win32
{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x86.Build.0 = Debug|Win32
{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|ARM64.ActiveCfg = Release|ARM64
{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|ARM64.Build.0 = Release|ARM64
+ {ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+ {ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|ARM64EC.Build.0 = Release|ARM64EC
{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x64.ActiveCfg = Release|x64
{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x64.Build.0 = Release|x64
{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x86.ActiveCfg = Release|Win32
{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x86.Build.0 = Release|Win32
{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|ARM64.ActiveCfg = Debug|ARM64
{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|ARM64.Build.0 = Debug|ARM64
+ {FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+ {FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x64.ActiveCfg = Debug|x64
{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x64.Build.0 = Debug|x64
{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x86.ActiveCfg = Debug|Win32
{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x86.Build.0 = Debug|Win32
{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|ARM64.ActiveCfg = Release|ARM64
{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|ARM64.Build.0 = Release|ARM64
+ {FEF7858F-750E-4C21-A04D-22707CC66878}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+ {FEF7858F-750E-4C21-A04D-22707CC66878}.Release|ARM64EC.Build.0 = Release|ARM64EC
{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x64.ActiveCfg = Release|x64
{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x64.Build.0 = Release|x64
{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x86.ActiveCfg = Release|Win32
{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x86.Build.0 = Release|Win32
{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|ARM64.ActiveCfg = Debug|ARM64
{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|ARM64.Build.0 = Debug|ARM64
+ {ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+ {ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x64.ActiveCfg = Debug|x64
{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x64.Build.0 = Debug|x64
{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x86.ActiveCfg = Debug|Win32
{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x86.Build.0 = Debug|Win32
{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|ARM64.ActiveCfg = Release|ARM64
{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|ARM64.Build.0 = Release|ARM64
+ {ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+ {ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|ARM64EC.Build.0 = Release|ARM64EC
{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x64.ActiveCfg = Release|x64
{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x64.Build.0 = Release|x64
{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x86.ActiveCfg = Release|Win32
{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x86.Build.0 = Release|Win32
{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|ARM64.ActiveCfg = Debug|ARM64
{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|ARM64.Build.0 = Debug|ARM64
+ {FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+ {FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x64.ActiveCfg = Debug|x64
{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x64.Build.0 = Debug|x64
{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x86.ActiveCfg = Debug|Win32
{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x86.Build.0 = Debug|Win32
{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|ARM64.ActiveCfg = Release|ARM64
{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|ARM64.Build.0 = Release|ARM64
+ {FEF7868F-750E-4C21-A04D-22707CC66879}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+ {FEF7868F-750E-4C21-A04D-22707CC66879}.Release|ARM64EC.Build.0 = Release|ARM64EC
{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x64.ActiveCfg = Release|x64
{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x64.Build.0 = Release|x64
{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x86.ActiveCfg = Release|Win32
{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x86.Build.0 = Release|Win32
{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64.ActiveCfg = Debug|ARM64
{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64.Build.0 = Debug|ARM64
+ {FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+ {FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x64.ActiveCfg = Debug|x64
{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x64.Build.0 = Debug|x64
{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x86.ActiveCfg = Debug|Win32
{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x86.Build.0 = Debug|Win32
{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64.ActiveCfg = Release|ARM64
{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64.Build.0 = Release|ARM64
+ {FEF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+ {FEF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64EC.Build.0 = Release|ARM64EC
{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x64.ActiveCfg = Release|x64
{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x64.Build.0 = Release|x64
{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x86.ActiveCfg = Release|Win32
{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x86.Build.0 = Release|Win32
{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64.ActiveCfg = Debug|ARM64
{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64.Build.0 = Debug|ARM64
+ {FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+ {FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|x64.ActiveCfg = Debug|x64
{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|x64.Build.0 = Debug|x64
{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|x86.ActiveCfg = Debug|Win32
{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|x86.Build.0 = Debug|Win32
{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64.ActiveCfg = Release|ARM64
{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64.Build.0 = Release|ARM64
+ {FFF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+ {FFF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64EC.Build.0 = Release|ARM64EC
{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|x64.ActiveCfg = Release|x64
{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|x64.Build.0 = Release|x64
{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|x86.ActiveCfg = Release|Win32
diff --git a/ide/vs2022/mimalloc.vcxproj b/ide/vs2022/mimalloc.vcxproj
index fb13cd1f..34a9317a 100644
--- a/ide/vs2022/mimalloc.vcxproj
+++ b/ide/vs2022/mimalloc.vcxproj
@@ -5,6 +5,10 @@
Debug
ARM64
+
+ Debug
+ ARM64EC
+
Debug
Win32
@@ -13,6 +17,10 @@
Release
ARM64
+
+ Release
+ ARM64EC
+
Release
Win32
@@ -55,6 +63,11 @@
true
v143
+
+ StaticLibrary
+ true
+ v143
+
StaticLibrary
false
@@ -67,6 +80,12 @@
v143
true
+
+ StaticLibrary
+ false
+ v143
+ true
+
@@ -84,12 +103,18 @@
+
+
+
+
+
+
$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\
@@ -115,6 +140,12 @@
.lib
mimalloc-static
+
+ $(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\
+ $(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+ .lib
+ mimalloc-static
+
$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\
$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
@@ -127,6 +158,12 @@
.lib
mimalloc-static
+
+ $(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\
+ $(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\
+ .lib
+ mimalloc-static
+
Level4
@@ -200,6 +237,33 @@
+
+
+ Level4
+ Disabled
+ true
+ Default
+ ../../include
+ MI_DEBUG=3;MI_GUARDED=0;%(PreprocessorDefinitions);
+ CompileAsCpp
+ false
+ stdcpp20
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Level4
@@ -298,22 +362,62 @@
+
+
+ Level4
+ MaxSpeed
+ true
+ Default
+ ../../include
+ %(PreprocessorDefinitions);NDEBUG
+ AssemblyAndSourceCode
+ $(IntDir)
+ false
+ false
+ Default
+ CompileAsCpp
+ true
+ stdcpp20
+ CPUExtensionRequirementsARMv81
+ Sync
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
false
false
false
+ false
false
false
false
+ false
true
true
true
true
+ true
true
true
+ true
@@ -322,21 +426,26 @@
true
true
true
+ true
true
true
+ true
false
false
+ false
true
true
+ true
true
true
true
true
+ true
@@ -347,8 +456,10 @@
true
true
true
+ true
true
true
+ true
@@ -356,8 +467,10 @@
true
true
true
+ true
true
true
+ true
diff --git a/test/main-override.cpp b/test/main-override.cpp
index 3d56ae42..e7499f2a 100644
--- a/test/main-override.cpp
+++ b/test/main-override.cpp
@@ -47,6 +47,9 @@ int main() {
mi_stats_reset(); // ignore earlier allocations
various_tests();
test_mixed1();
+ const char* ptr = ::_Getdays();
+ free((void*)ptr);
+
//test_std_string();
//test_thread_local();
// heap_thread_free_huge();