From: Kefu Chai <kchai@redhat.com>
Date: Mon, 10 Apr 2017 07:53:43 +0000 (+0800)
Subject: cmake: should not compile crc32c_ppc.c on intel arch.
X-Git-Tag: v12.0.3~323^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e883876a5646886e41a9a4c25906cc13dc889edb;p=ceph.git

cmake: should not compile crc32c_ppc.c on intel arch.

and should not compile crc32c_intel_fast.c on ARM.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 60b3187c4536..bb63eb2a8d22 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -371,12 +371,6 @@ if(HAVE_DPDK)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${DPDK_INCLUDE_DIR}")
 endif(HAVE_DPDK)
 
-if(HAVE_GOOD_YASM_ELF64)
-  set(yasm_srcs
-    common/crc32c_intel_fast_asm.S
-    common/crc32c_intel_fast_zero_asm.S)
-endif(HAVE_GOOD_YASM_ELF64)
-
 add_library(common_buffer_obj OBJECT
   common/buffer.cc)
 
@@ -415,9 +409,6 @@ set(libcommon_files
   common/sctp_crc32.c
   common/crc32c.cc
   common/crc32c_intel_baseline.c
-  common/crc32c_intel_fast.c
-  common/crc32c_ppc.c
-  ${yasm_srcs}
   xxHash/xxhash.c
   common/assert.cc
   common/run_cmd.cc
@@ -513,6 +504,7 @@ set(libcommon_files
   arch/probe.cc
   ${auth_files}
   ${mds_files})
+
 if(HAVE_ARM)
   list(APPEND libcommon_files arch/arm.c)
 elseif(HAVE_INTEL)
@@ -520,6 +512,21 @@ elseif(HAVE_INTEL)
 elseif(HAVE_POWER8)
   list(APPEND libcommon_files arch/ppc.c)
 endif()
+
+if(HAVE_INTEL)
+  list(APPEND libcommon_files
+    common/crc32c_intel_fast.c)
+  if(HAVE_GOOD_YASM_ELF64)
+    list(APPEND libcommon_files
+      common/crc32c_intel_fast_asm.S
+      common/crc32c_intel_fast_zero_asm.S)
+  endif(HAVE_GOOD_YASM_ELF64)
+elseif(HAVE_POWER8)
+  list(APPEND libcommon_files
+    common/crc32c_ppc.c
+    common/crc32c_ppc_asm.S)
+endif(HAVE_INTEL)
+
 if(LINUX)
   list(APPEND libcommon_files msg/async/EventEpoll.cc)
   message(STATUS " Using EventEpoll for events.")
@@ -528,10 +535,6 @@ elseif(FREEBSD OR APPLE)
   message(STATUS " Using EventKqueue for events.")
 endif(LINUX)
 
-if(HAVE_POWER8)
-  list(APPEND libcommon_files common/crc32c_ppc_asm.S)
-endif(HAVE_POWER8)
-
 if(WITH_LTTNG AND WITH_EVENTTRACE)
   message(STATUS " Using EventTrace class.")
   add_definitions("-DWITH_EVENTTRACE")