Merge pull request #367 from hjyamauchi/mimallocv3.0.1

Adapt to mimalloc v3.0.1

Author: hjyamauchi

platforms/Windows/bld/bld.wixproj

@@ -6,6 +6,7 @@
       TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
       TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;
       ENABLE_MIMALLOC=$(ENABLE_MIMALLOC);
+      WORKAROUND_MIMALLOC_ISSUE_997=$(WORKAROUND_MIMALLOC_ISSUE_997);
     </DefineConstants>
   </PropertyGroup>
 

platforms/Windows/bld/bld.wxs

@@ -484,11 +484,27 @@
 
     <ComponentGroup Id="mimalloc" Directory="_usr_bin">
       <?if $(ENABLE_MIMALLOC) == true ?>
+        <?if $(ProductArchitecture) = "amd64" ?>
+          <Component>
+            <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect.dll" />
+          </Component>
+          <?if $(WORKAROUND_MIMALLOC_ISSUE_997) ?>
+            <Component>
+              <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect-arm64.dll" />
+            </Component>
+          <?endif?>
+        <?elseif $(ProductArchitecture) = "arm64" ?>
+          <Component>
+            <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect-arm64.dll" />
+          </Component>
+          <?if $(WORKAROUND_MIMALLOC_ISSUE_997) ?>
+            <Component>
+              <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect.dll" />
+            </Component>
+          <?endif?>
+        <?endif?>
         <Component>
-          <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect.dll" />
-        </Component>
-        <Component>
-          <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-override.dll" />
+          <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc.dll" />
         </Component>
       <?endif?>
     </ComponentGroup>