summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Ignatov <sergign60@mail.ru>2018-06-08 16:50:47 (GMT)
committerGleb Balykov <g.balykov@samsung.com>2018-09-18 12:49:14 (GMT)
commiteaae668fc97b56946e4a01a3ad0c89c11f8259d7 (patch)
tree985564e0fac8fb2f9983c4e26a5034196a238b0c
parent6536c5ed30307bb5ef0410d741901addbcba4c31 (diff)
downloadcoreclr-eaae668fc97b56946e4a01a3ad0c89c11f8259d7.zip
coreclr-eaae668fc97b56946e4a01a3ad0c89c11f8259d7.tar.gz
coreclr-eaae668fc97b56946e4a01a3ad0c89c11f8259d7.tar.bz2
Launching the Memory Profiler on x86 emulator may lead to crash in coreclr (xmm bug)
-rw-r--r--src/pal/src/CMakeLists.txt2
-rw-r--r--src/utilcode/CMakeLists.txt5
2 files changed, 7 insertions, 0 deletions
diff --git a/src/pal/src/CMakeLists.txt b/src/pal/src/CMakeLists.txt
index dbff63d..8670972 100644
--- a/src/pal/src/CMakeLists.txt
+++ b/src/pal/src/CMakeLists.txt
@@ -107,6 +107,8 @@ elseif(PAL_CMAKE_PLATFORM_ARCH_ARM64)
elseif(PAL_CMAKE_PLATFORM_ARCH_I386)
add_definitions(-DBIT32=1)
set(PAL_ARCH_SOURCES_DIR i386)
+ # Workaround to avoid generating sse insts for profiler
+ add_compile_options(-mno-sse -mno-avx)
endif()
if(PAL_CMAKE_PLATFORM_ARCH_AMD64 AND CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CLR_CMAKE_PLATFORM_ALPINE_LINUX)
diff --git a/src/utilcode/CMakeLists.txt b/src/utilcode/CMakeLists.txt
index 9629e51..a7f2156 100644
--- a/src/utilcode/CMakeLists.txt
+++ b/src/utilcode/CMakeLists.txt
@@ -110,6 +110,11 @@ if(CLR_CMAKE_PLATFORM_UNIX)
add_compile_options(-fPIC)
endif(CLR_CMAKE_PLATFORM_UNIX)
+if(CLR_CMAKE_PLATFORM_ARCH_I386)
+ # Workaround to avoid generating sse insts for profiler
+ add_compile_options(-mno-sse -mno-avx)
+endif(CLR_CMAKE_PLATFORM_ARCH_I386)
+
add_subdirectory(dac)
add_subdirectory(dyncrt)
add_subdirectory(staticnohost)