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

Add processor architecture specific flags to BASE_FLAGS again. (#4605)

This commit is contained in:
Max Neunhöffer 2018-02-20 10:50:17 +01:00 committed by Jan
parent cd97787adf
commit 152f60b80a
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdParty/jemalloc/CMakeLists.txt vendored
View File

@ -40,8 +40,8 @@ if (LINUX OR DARWIN)
set(JEMALLOC_CONFIG "background_thread:true") set(JEMALLOC_CONFIG "background_thread:true")
endif () endif ()
set(JEMALLOC_CFLAGS_TMP "-DARANGODB_MMAP_JEMALLOC=1") set(JEMALLOC_CFLAGS_TMP "-DARANGODB_MMAP_JEMALLOC=1 ${CMAKE_C_FLAGS}")
set(JEMALLOC_CXXFLAGS_TMP "-DARANGODB_MMAP_JEMALLOC=1") set(JEMALLOC_CXXFLAGS_TMP "-DARANGODB_MMAP_JEMALLOC=1 ${CMAKE_CXX_FLAGS}")
ExternalProject_Add( ExternalProject_Add(
jemalloc jemalloc

2
CHANGELOG
View File

@ -125,6 +125,8 @@ devel
Health did not function for multiple servers at the same time, as Health did not function for multiple servers at the same time, as
agency transaction was malformed. agency transaction was malformed.
* fixed compiler optimization flag usage, adding the used flags to the
console version print
v3.3.4 (XXXX-XX-XX) v3.3.4 (XXXX-XX-XX)
------------------- -------------------

7
CMakeLists.txt
View File

@ -363,7 +363,7 @@ if (CMAKE_COMPILER_IS_GNUCC)
elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "7.9.9") elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "7.9.9")
message(FATAL_ERROR "ArangoDB doesn't support g++ 8.0 yet.") message(FATAL_ERROR "ArangoDB doesn't support g++ 8.0 yet.")
endif() endif()
set(BASE_C_FLAGS "${BASE_C_FLAGS} -std=gnu89") set(BASE_C_FLAGS "${BASE_C_FLAGS}")
endif () endif ()
if (CMAKE_COMPILER_IS_GNUCC OR APPLE) if (CMAKE_COMPILER_IS_GNUCC OR APPLE)
@ -490,9 +490,12 @@ else ()
set(ARANGODB_SSE42_FLAGS "-msse4.2") set(ARANGODB_SSE42_FLAGS "-msse4.2")
endif () endif ()
set(BASE_FLAGS "${Vc_COMPILE_FLAGS} ${BASE_FLAGS}") set(BASE_FLAGS "${Vc_ARCHITECTURE_FLAGS} ${BASE_FLAGS}")
endif () endif ()
set(ARCHITECTURE_OPTIMIZATIONS "\"${Vc_ARCHITECTURE_FLAGS}\"")
################################################################################ ################################################################################
## BACKTRACE ## BACKTRACE
################################################################################ ################################################################################

2
cmake/OptimizeForArchitecture.cmake
View File

@ -557,7 +557,7 @@ Other supported values are: \"none\", \"generic\", \"core\", \"merom\" (65nm Cor
endif() endif()
endif() endif()
if(NOT _header OR ${_resultVar}) if(NOT _header OR ${_resultVar})
list(APPEND Vc_ARCHITECTURE_FLAGS "-m${_flag}") AddCompilerFlag("-m${_flag}" CXX_FLAGS Vc_ARCHITECTURE_FLAGS)
endif() endif()
endif() endif()
endforeach(_flag) endforeach(_flag)

4
lib/CMakeLists.txt
View File

@ -81,7 +81,9 @@ set(LIB_ARANGO_VPACK
${PROJECT_SOURCE_DIR}/3rdParty/velocypack/src/fpconv.cpp ${PROJECT_SOURCE_DIR}/3rdParty/velocypack/src/fpconv.cpp
${PROJECT_SOURCE_DIR}/3rdParty/velocypack/src/velocypack-common.cpp ${PROJECT_SOURCE_DIR}/3rdParty/velocypack/src/velocypack-common.cpp
${PROJECT_SOURCE_DIR}/lib/Basics/xxhash.cpp ${PROJECT_SOURCE_DIR}/lib/Basics/xxhash.cpp
) )
add_definitions ("-DARCHITECTURE_OPTIMIZATIONS=${ARCHITECTURE_OPTIMIZATIONS}")
if (ASM_OPTIMIZATIONS AND CMAKE_TARGET_ARCHITECTURE_CODE MATCHES "x86_64") if (ASM_OPTIMIZATIONS AND CMAKE_TARGET_ARCHITECTURE_CODE MATCHES "x86_64")
if (DARWIN) if (DARWIN)

3
lib/Rest/Version.cpp
View File

@ -104,6 +104,9 @@ void Version::initialize() {
Values["debug"] = "true"; Values["debug"] = "true";
#else #else
Values["debug"] = "false"; Values["debug"] = "false";
#endif
#if defined(ARCHITECTURE_OPTIMIZATIONS)
Values["optimization-flags"] = std::string(ARCHITECTURE_OPTIMIZATIONS);
#endif #endif
Values["endianness"] = getEndianness(); Values["endianness"] = getEndianness();
Values["fd-setsize"] = arangodb::basics::StringUtils::itoa(FD_SETSIZE); Values["fd-setsize"] = arangodb::basics::StringUtils::itoa(FD_SETSIZE);