Merge branch 'dev41' into unicode

starg2 · Mar 10, 2021 · 03b0142 · 03b0142
2 parents 2ba616f + 3e84a5f
commit 03b0142
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.9)
 
 project(timidity41)
 
-set(TIM41_X86_SIMD_LEVEL SSE42 CACHE BOOL "x86 SIMD instruction set extension to use")
+set(TIM41_X86_SIMD_LEVEL SSE42 CACHE STRING "x86 SIMD instruction set extension to use")
 set_property(CACHE TIM41_X86_SIMD_LEVEL PROPERTY STRINGS SSE2 SSE42 AVX AVX2 AVX512)
 
 set(TIM41_SPECTRE_MITIGATION FALSE CACHE BOOL "Enable Spectre mitigation")
@@ -266,7 +266,7 @@ else()
  string(APPEND CMAKE_CXX_FLAGS " -std=c++17")
  string(APPEND CMAKE_C_FLAGS_RELEASE " -flto")
  string(APPEND CMAKE_CXX_FLAGS_RELEASE " -flto")
- string(APPEND CMAKE_EXE_LINKER_FLAGS " --stack 16777216")
+ string(APPEND CMAKE_EXE_LINKER_FLAGS " -Wl,--stack,16777216")
  string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " -s")
  string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " -s")
  string(APPEND CMAKE_RC_FLAGS " -O coff")

diff --git a/libunimod/unimod_priv.h b/libunimod/unimod_priv.h
@@ -56,6 +56,7 @@ extern "C"
 /*========== Error handling */
 
 #define _mm_errno ML_errno
+#define _mm_malloc ML_malloc
 
 /*========== Memory allocation */