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

3rdParty/jemalloc/CMakeLists.txt

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

CHANGELOG

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

CMakeLists.txt

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

cmake/OptimizeForArchitecture.cmake

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

lib/CMakeLists.txt

@@ -81,7 +81,9 @@ set(LIB_ARANGO_VPACK
   ${PROJECT_SOURCE_DIR}/3rdParty/velocypack/src/fpconv.cpp
   ${PROJECT_SOURCE_DIR}/3rdParty/velocypack/src/velocypack-common.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 (DARWIN)

lib/Rest/Version.cpp

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