From e1c3985148869c55b3725e208ec3bc5acf5fceae Mon Sep 17 00:00:00 2001 From: Bassam Tabbara Date: Wed, 17 May 2017 17:41:16 -0700 Subject: [PATCH] cmake: workaound ccache issue with .S assembly files when building with -DWITH_CCACHE=ON recent versions of ccache (for example 3.3.3) seem to mangle object files from the cache for source files that have a .S extension. This seems similar but unrelated to PR #14633. The workaround here is to rename .S files to .s (lower case). Signed-off-by: Bassam Tabbara --- src/CMakeLists.txt | 8 ++++---- .../{crc32c_intel_fast_asm.S => crc32c_intel_fast_asm.s} | 0 ...intel_fast_zero_asm.S => crc32c_intel_fast_zero_asm.s} | 0 src/common/{crc32c_ppc_asm.S => crc32c_ppc_asm.s} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename src/common/{crc32c_intel_fast_asm.S => crc32c_intel_fast_asm.s} (100%) rename src/common/{crc32c_intel_fast_zero_asm.S => crc32c_intel_fast_zero_asm.s} (100%) rename src/common/{crc32c_ppc_asm.S => crc32c_ppc_asm.s} (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 387a7d30731bc..6c5375bfdbd80 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -90,7 +90,7 @@ if(HAVE_INTEL) endif() execute_process( - COMMAND yasm -f elf64 ${CMAKE_SOURCE_DIR}/src/common/crc32c_intel_fast_asm.S -o /dev/null + COMMAND yasm -f elf64 ${CMAKE_SOURCE_DIR}/src/common/crc32c_intel_fast_asm.s -o /dev/null RESULT_VARIABLE no_yasm OUTPUT_QUIET) if(no_yasm) @@ -536,13 +536,13 @@ if(HAVE_INTEL) 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) + 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) + common/crc32c_ppc_asm.s) endif(HAVE_INTEL) if(LINUX) diff --git a/src/common/crc32c_intel_fast_asm.S b/src/common/crc32c_intel_fast_asm.s similarity index 100% rename from src/common/crc32c_intel_fast_asm.S rename to src/common/crc32c_intel_fast_asm.s diff --git a/src/common/crc32c_intel_fast_zero_asm.S b/src/common/crc32c_intel_fast_zero_asm.s similarity index 100% rename from src/common/crc32c_intel_fast_zero_asm.S rename to src/common/crc32c_intel_fast_zero_asm.s diff --git a/src/common/crc32c_ppc_asm.S b/src/common/crc32c_ppc_asm.s similarity index 100% rename from src/common/crc32c_ppc_asm.S rename to src/common/crc32c_ppc_asm.s -- 2.39.5