This is an automated email from the ASF dual-hosted git repository. tarmstrong pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/impala.git
commit dc993daa34defadc57434ffe57331818c2c143f7 Author: zhaorenhai <[email protected]> AuthorDate: Wed Apr 1 02:23:51 2020 +0000 IMPALA-9590 Resolve error when build tsan and ubsan on arm64 Tsan build will fail on atomicops-internals-x86.cc build, so if on arm64, just don't build it. And Ubsan build should link to libclang_rt.ubsan_standalone's aarch 64 version, not x86 version. Change-Id: I1b5b63e5e52bc818ea4591292ac36da941b2cf2d Reviewed-on: http://gerrit.cloudera.org:8080/15630 Reviewed-by: Impala Public Jenkins <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> --- be/src/gutil/CMakeLists.txt | 7 ++++++- be/src/service/CMakeLists.txt | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/be/src/gutil/CMakeLists.txt b/be/src/gutil/CMakeLists.txt index 444ef80..78ba14b 100644 --- a/be/src/gutil/CMakeLists.txt +++ b/be/src/gutil/CMakeLists.txt @@ -18,7 +18,6 @@ INCLUDE_DIRECTORIES(${GLOG_INCLUDE_DIR}) set(GUTIL_SRCS - atomicops-internals-x86.cc bits.cc callback_internal.cc cpu.cc @@ -54,6 +53,12 @@ set(GUTIL_SRCS utf/rune.c walltime.cc) +if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") +set(GUTIL_SRCS + atomicops-internals-x86.cc + ${GUTIL_SRCS}) +endif() + set(GUTIL_LIBS glog protobuf) diff --git a/be/src/service/CMakeLists.txt b/be/src/service/CMakeLists.txt index 939df22..ff0a6ce 100644 --- a/be/src/service/CMakeLists.txt +++ b/be/src/service/CMakeLists.txt @@ -63,8 +63,8 @@ add_dependencies(fesupport gen-deps) if ("${CMAKE_BUILD_TYPE}" STREQUAL "UBSAN" OR "${CMAKE_BUILD_TYPE}" STREQUAL "UBSAN_FULL") target_link_libraries(fesupport "-Wl,--whole-archive \ - $ENV{IMPALA_TOOLCHAIN}/llvm-$ENV{IMPALA_LLVM_DEBUG_VERSION}/lib/clang/$ENV{IMPALA_LLVM_UBSAN_BASE_VERSION}/lib/linux/libclang_rt.ubsan_standalone_cxx-x86_64.a \ - $ENV{IMPALA_TOOLCHAIN}/llvm-$ENV{IMPALA_LLVM_DEBUG_VERSION}/lib/clang/$ENV{IMPALA_LLVM_UBSAN_BASE_VERSION}/lib/linux/libclang_rt.ubsan_standalone-x86_64.a \ + $ENV{IMPALA_TOOLCHAIN}/llvm-$ENV{IMPALA_LLVM_DEBUG_VERSION}/lib/clang/$ENV{IMPALA_LLVM_UBSAN_BASE_VERSION}/lib/linux/libclang_rt.ubsan_standalone_cxx-${CMAKE_SYSTEM_PROCESSOR}.a \ + $ENV{IMPALA_TOOLCHAIN}/llvm-$ENV{IMPALA_LLVM_DEBUG_VERSION}/lib/clang/$ENV{IMPALA_LLVM_UBSAN_BASE_VERSION}/lib/linux/libclang_rt.ubsan_standalone-${CMAKE_SYSTEM_PROCESSOR}.a \ -Wl,--no-whole-archive") endif()
