Merge branch 'master' of https://github.com/azerothcore/azerothcore-wotlk into dir-restructure

deps/jemalloc/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -8,14 +8,24 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# We need to generate the jemalloc_def.h header based on platform-specific settings
-if (PLATFORM EQUAL 32)
-  set(JEM_SIZEDEF 2)
-  set(JEM_TLSMODEL)
-else()
-  set(JEM_SIZEDEF 3)
-  set(JEM_TLSMODEL "__attribute__\(\(tls_model\(\"initial-exec\"\)\)\)")
-endif()
+  # We need to generate the jemalloc_def.h header based on platform-specific settings
+  CHECK_SYMBOL_EXISTS(MADV_FREE "sys/mman.h" HAVE_MADV_FREE)
+  
+  if (PLATFORM EQUAL 32)
+    set(JEM_SIZEDEF 2)
+    set(JEM_TLSMODEL)
+	set(JEM_VADDRBITS 32)
+  else()
+    set(JEM_SIZEDEF 3)
+    set(JEM_TLSMODEL "__attribute__\(\(tls_model\(\"initial-exec\"\)\)\)")
+	set(JEM_VADDRBITS 48)
+  endif()
+  
+  if (HAVE_MADV_FREE)
+    set(JEM_MADFREE_DEF "#define")
+  else()
+    set(JEM_MADFREE_DEF "#undef")
+  endif()
 
 # Create the header, so we can use it
 configure_file(
@@ -24,31 +34,38 @@ configure_file(
   @ONLY
 )
 
-# Done, let's continue
-set(jemalloc_STAT_SRC
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/arena.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/atomic.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/base.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/bitmap.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/chunk.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/chunk_dss.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/chunk_mmap.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/ckh.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/ctl.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/extent.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/hash.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/huge.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/jemalloc.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/mb.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/mutex.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/prof.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/quarantine.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/rtree.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/stats.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/tcache.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/tsd.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/util.c
-)
+  # Done, let's continue
+  set(jemalloc_STAT_SRC
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/arena.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/background_thread.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/base.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/bitmap.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/ckh.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/ctl.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/extent.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/extent_dss.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/extent_mmap.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/hash.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/hooks.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/jemalloc.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/jemalloc_cpp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/large.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/malloc_io.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/mutex.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/mutex_pool.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/nstime.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/pages.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/prng.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/prof.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/rtree.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/spin.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/stats.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/sz.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/tcache.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/ticker.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/tsd.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/witness.c
+  )
 
 include_directories(
   ${BUILDDIR}/
@@ -58,3 +75,12 @@ include_directories(
 add_definitions(-D_GNU_SOURCE -D_REENTRANT)
 
 add_library(jemalloc STATIC ${jemalloc_STAT_SRC})
+
+target_link_libraries(jemalloc
+    PUBLIC
+	  ${CMAKE_DL_LIBS})
+      
+set_target_properties(jemalloc
+    PROPERTIES
+      FOLDER
+        "deps")