thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-18 04:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix of ppc64le definitions

Browse Source
This commit is contained in:
Danila Kutenin 2019-01-23 18:24:14 +03:00
parent f6e6f99737
commit 784c3e5fda
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/arch.cmake
View File

@ -26,7 +26,7 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
endif () endif ()
if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(ppc64le.*|PPC64LE.*)") if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(ppc64le.*|PPC64LE.*)")
set (PPC64LE 1) set (ARCH_PPC64LE 1)
if (COMPILER_CLANG OR (COMPILER_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8)) if (COMPILER_CLANG OR (COMPILER_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8))
message(FATAL_ERROR "Only gcc-8 is supported for powerpc architecture") message(FATAL_ERROR "Only gcc-8 is supported for powerpc architecture")
endif () endif ()

2
cmake/test_cpu.cmake
View File

@ -27,7 +27,7 @@ if (HAVE_SSE41)
set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}") set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
endif () endif ()
if (PPC64LE) if (ARCH_PPC64LE)
set (COMPILER_FLAGS "${COMPILER_FLAGS} -maltivec -D__SSE2__=1 -DNO_WARN_X86_INTRINSICS") set (COMPILER_FLAGS "${COMPILER_FLAGS} -maltivec -D__SSE2__=1 -DNO_WARN_X86_INTRINSICS")
endif () endif ()

2
contrib/libdivide/libdivide.h
View File

@ -342,7 +342,7 @@ static inline __m128i libdivide_get_0000FFFF(void) {
#endif #endif
/// This is a bug in gcc-8, _MM_SHUFFLE was forgotten, though in trunk it is ok https://github.com/gcc-mirror/gcc/blob/master/gcc/config/rs6000/xmmintrin.h#L61 /// This is a bug in gcc-8, _MM_SHUFFLE was forgotten, though in trunk it is ok https://github.com/gcc-mirror/gcc/blob/master/gcc/config/rs6000/xmmintrin.h#L61
#if __PPC__ #if defined(__PPC__)
#ifndef _MM_SHUFFLE #ifndef _MM_SHUFFLE
#define _MM_SHUFFLE(w,x,y,z) (((w) << 6) | ((x) << 4) | ((y) << 2) | (z)) #define _MM_SHUFFLE(w,x,y,z) (((w) << 6) | ((x) << 4) | ((y) << 2) | (z))
#endif #endif

4
contrib/libhdfs3-cmake/CMake/Options.cmake
View File

@ -7,9 +7,9 @@ CHECK_FUNCTION_EXISTS(nanosleep HAVE_NANOSLEEP)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing")
IF(ENABLE_SSE STREQUAL ON AND NOT PPC64LE AND NOT ARCH_AARCH64 AND NOT ARCH_ARM) IF(ENABLE_SSE STREQUAL ON AND NOT ARCH_PPC64LE AND NOT ARCH_AARCH64 AND NOT ARCH_ARM)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2")
ENDIF(ENABLE_SSE STREQUAL ON) ENDIF(ENABLE_SSE STREQUAL ON AND NOT ARCH_PPC64LE AND NOT ARCH_AARCH64 AND NOT ARCH_ARM)
IF(NOT TEST_HDFS_PREFIX) IF(NOT TEST_HDFS_PREFIX)
SET(TEST_HDFS_PREFIX "./" CACHE STRING "default directory prefix used for test." FORCE) SET(TEST_HDFS_PREFIX "./" CACHE STRING "default directory prefix used for test." FORCE)

2
contrib/libunwind/CMakeLists.txt
View File

@ -1,6 +1,6 @@
enable_language(ASM) enable_language(ASM)
if (PPC64LE) if (ARCH_PPC64LE)
add_library(unwind add_library(unwind
src/mi/init.c src/mi/init.c
src/mi/flush_cache.c src/mi/flush_cache.c

4
dbms/src/IO/parseDateTimeBestEffort.cpp
View File

@ -44,7 +44,7 @@ inline size_t readAlpha(char * res, size_t max_chars, ReadBuffer & in)
return num_chars; return num_chars;
} }
#if __PPC__ #if defined(__PPC__)
#if !__clang__ #if !__clang__
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif #endif
@ -519,7 +519,7 @@ ReturnType parseDateTimeBestEffortImpl(time_t & res, ReadBuffer & in, const Date
} }
#if __PPC__ #if defined(__PPC__)
#if !__clang__ #if !__clang__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif

2
libs/libcommon/cmake/find_jemalloc.cmake
View File

@ -1,4 +1,4 @@
if (OS_LINUX AND NOT SANITIZE AND NOT ARCH_ARM AND NOT ARCH_32 AND NOT PPC64LE) if (OS_LINUX AND NOT SANITIZE AND NOT ARCH_ARM AND NOT ARCH_32 AND NOT ARCH_PPC64LE)
set(ENABLE_JEMALLOC_DEFAULT 1) set(ENABLE_JEMALLOC_DEFAULT 1)
else () else ()
set(ENABLE_JEMALLOC_DEFAULT 0) set(ENABLE_JEMALLOC_DEFAULT 0)

4
libs/libcommon/include/common/DateLUTImpl.h
View File

@ -14,7 +14,7 @@
#define DATE_LUT_MAX_YEAR 2105 /// Last supported year #define DATE_LUT_MAX_YEAR 2105 /// Last supported year
#define DATE_LUT_YEARS (1 + DATE_LUT_MAX_YEAR - DATE_LUT_MIN_YEAR) /// Number of years in lookup table #define DATE_LUT_YEARS (1 + DATE_LUT_MAX_YEAR - DATE_LUT_MIN_YEAR) /// Number of years in lookup table
#if __PPC__ #if defined(__PPC__)
#if !__clang__ #if !__clang__
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif #endif
@ -690,7 +690,7 @@ public:
} }
}; };
#if __PPC__ #if defined(__PPC__)
#if !__clang__ #if !__clang__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif