From: Orit Wasserman Date: Thu, 7 May 2015 09:16:31 +0000 (+0200) Subject: cmake: add crc assembley files X-Git-Tag: v9.0.2~209^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=31b9dc4f998679cdb7efe057a954bf7ec74bb96e;p=ceph.git cmake: add crc assembley files Signed-off-by: Orit Wasserman --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 94b08e95bfaf..2fae8fa5ba53 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,6 @@ include(GetGitRevisionDescription) +enable_language(C ASM) set(bindir ${CMAKE_INSTALL_PREFIX}/bin) set(sbindir ${CMAKE_INSTALL_PREFIX}/sbin) set(libdir ${CMAKE_INSTALL_PREFIX}/lib) @@ -11,6 +12,10 @@ add_definitions("-DCEPH_LIBDIR=\"${libdir}\"") add_definitions("-DCEPH_PKGLIBDIR=\"${libdir}\"") add_definitions("-DHAVE_CONFIG_H -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -D__STDC_FORMAT_MACROS -D_GNU_SOURCE") +set(CMAKE_ASM_COMPILER ${PROJECT_SOURCE_DIR}/src/yasm-wrapper) +message(status " ams compiler ${CMAKE_ASM_COMPILER}") +set(CMAKE_ASM_FLAGS "-f elf64") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -rdynamic -Wall -Wtype-limits -Wignored-qualifiers -Winit-self -Wpointer-arith -Werror=format-security -fno-strict-aliasing -fsigned-char -fPIC") set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -ftemplate-depth-1024 -Wno-invalid-offsetof -Wnon-virtual-dtor -Wno-invalid-offsetof -Wstrict-null-sentinel -Woverloaded-virtual") @@ -166,6 +171,8 @@ set(libcommon_files common/crc32c.cc common/crc32c_intel_baseline.c common/crc32c_intel_fast.c + common/crc32c_intel_fast_asm.S + common/crc32c_intel_fast_zero_asm.S common/assert.cc common/run_cmd.cc common/WorkQueue.cc