From 7afb510abc4331739304b47563b3d072bdbe6fc1 Mon Sep 17 00:00:00 2001 From: Starg Date: Wed, 10 Mar 2021 18:56:28 +0900 Subject: [PATCH 1/3] [cmake] Fix variable type --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9aadb7f8..7c624ca4 100644 --- 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") From 899e6be80e631ea3065b1d17e0bc7ca8077760c7 Mon Sep 17 00:00:00 2001 From: Starg Date: Wed, 10 Mar 2021 19:58:43 +0900 Subject: [PATCH 2/3] [libunimod] Workaround for conflicting _mm_malloc() --- libunimod/unimod_priv.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libunimod/unimod_priv.h b/libunimod/unimod_priv.h index 778aaba3..d9c964c3 100644 --- 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 */ From 3e84a5f80ed3866e5b55ee9b39638b4a65672775 Mon Sep 17 00:00:00 2001 From: Starg Date: Wed, 10 Mar 2021 20:01:56 +0900 Subject: [PATCH 3/3] Fix linker options for GCC --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c624ca4..1dd6aee6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,7 +262,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")