Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Switch off assembler CRC32 on Windows by default.

This commit is contained in:
Max Neunhoeffer 2016-02-19 10:59:13 +01:00
parent f95860c143
commit ac7a3e6d6a
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -227,14 +227,22 @@ else()
endif() endif()
# Allow to prohibit assembler optimization code explicitly # Allow to prohibit assembler optimization code explicitly
if(MSVC)
SET(ASM_OPTIMIZATIONS_DEFAULT OFF)
else(MSVC)
SET(ASM_OPTIMIZATIONS_DEFAULT ON)
endif(MSVC)
option(ASM_OPTIMIZATIONS "whether hand-optimized assembler code should be used" option(ASM_OPTIMIZATIONS "whether hand-optimized assembler code should be used"
ON) ${ASM_OPTIMIZATIONS_DEFAULT})
if (ASM_OPTIMIZATIONS) if (ASM_OPTIMIZATIONS)
add_definitions("-DASM_OPTIMIZATIONS=1") add_definitions("-DASM_OPTIMIZATIONS=1")
else (ASM_OPTIMIZATIONS) else (ASM_OPTIMIZATIONS)
add_definitions("-DASM_OPTIMIZATIONS=0") add_definitions("-DASM_OPTIMIZATIONS=0")
endif(ASM_OPTIMIZATIONS) endif(ASM_OPTIMIZATIONS)
# Maintainer mode (Assertions) ------------------------------------------------- # Maintainer mode (Assertions) -------------------------------------------------
option(USE_MAINTAINER_MODE option(USE_MAINTAINER_MODE
"whether we want to have assertions and other development features" OFF) "whether we want to have assertions and other development features" OFF)

4
lib/Basics/hashes.cpp
View File

@ -463,6 +463,10 @@ static bool HasSSE42() {
} }
} }
// The following is currently not used, it is a fallback for the case
// that the pure assembler source cannot be assembled or linked for
// some reason.
extern "C" uint32_t TRI_BlockCrc32_intrinsics(uint32_t value, extern "C" uint32_t TRI_BlockCrc32_intrinsics(uint32_t value,
char const* data, char const* data,
size_t length) { size_t length) {