Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for building on s390x platform #8962

Closed
wants to merge 11 commits into from
Closed

Add support for building on s390x platform #8962

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3205e91
Add s390x builds to Travis
adamretter Oct 16, 2019
8d6670d
Set correct CPU arch for CMake on s390x
adamretter Dec 14, 2019
57b45e3
Earlier versions of GCC do not support 256 byte cache lines on s390x
adamretter Dec 14, 2019
5354800
Fix RocksJava library name on s390x
adamretter Dec 14, 2019
d0a190d
Fix Folly hardware_destructive_interference_size for s390x
adamretter Mar 24, 2020
d494c77
Implement toku_time_now(void) for s390x
jonathan-albrecht-ibm Jul 15, 2021
f6a7b54
Change delclaration of num_recovered_edits_ to size_t to match the ca…
jonathan-albrecht-ibm Jul 16, 2021
1ae47a7
On s390x, set -march=z196 (to match what major distros currently use)
jonathan-albrecht-ibm Jul 16, 2021
6e1d424
Update some expected test values for CACHE_LINE_SIZE >= 256
jonathan-albrecht-ibm Sep 17, 2021
95cde26
Fix LZ4 compression format_version==1 on big endian platforms
jonathan-albrecht-ibm Sep 21, 2021
7ec3207
On s390x, workaround versions of g++ that don't understand -march=native
jonathan-albrecht-ibm Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
On s390x, workaround versions of g++ that don't understand -march=native 
Summary:
Older versions of g++ up to at least 5.4 did not understand
-march=native. Check that flag on s390x and use -march=z196
instead.
  • Loading branch information
@jonathan-albrecht-ibm
jonathan-albrecht-ibm committed Sep 27, 2021
commit 7ec32078b96abe03025389c8551a17a2aa34b408
11 changes: 10 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,13 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64|AARCH64")
endif(HAS_ARMV8_CRC)
endif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64|AARCH64")

if(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
CHECK_C_COMPILER_FLAG("-march=native" HAS_S390X_MARCH_NATIVE)
if(HAS_S390X_MARCH_NATIVE)
message(STATUS " HAS_S390X_MARCH_NATIVE yes")
endif(HAS_S390X_MARCH_NATIVE)
endif(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")

option(PORTABLE "build a portable binary" OFF)
option(FORCE_SSE42 "force building with SSE4.2, even when PORTABLE=ON" OFF)
option(FORCE_AVX "force building with AVX, even when PORTABLE=ON" OFF)
Expand Down Expand Up @@ -300,7 +307,9 @@ else()
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
else()
if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64" AND NOT HAS_ARMV8_CRC)
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390x" AND NOT HAS_S390X_MARCH_NATIVE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=z196")
elseif(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64" AND NOT HAS_ARMV8_CRC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
endif()
endif()
Expand Down
8 changes: 8 additions & 0 deletions build_tools/build_detect_platform
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,14 @@ if test "0$PORTABLE" -eq 0; then
COMMON_FLAGS="$COMMON_FLAGS"
elif test -n "`echo $TARGET_ARCHITECTURE | grep ^aarch64`"; then
COMMON_FLAGS="$COMMON_FLAGS"
elif test -n "`echo $TARGET_ARCHITECTURE | grep ^s390x`"; then
if echo 'int main() {}' | $CXX $PLATFORM_CXXFLAGS -x c++ \
-fsyntax-only -march=native - -o /dev/null 2>/dev/null; then
COMMON_FLAGS="$COMMON_FLAGS -march=native "
else
COMMON_FLAGS="$COMMON_FLAGS -march=z196 "
fi
COMMON_FLAGS="$COMMON_FLAGS"
elif [ "$TARGET_OS" == "IOS" ]; then
COMMON_FLAGS="$COMMON_FLAGS"
elif [ "$TARGET_OS" == "AIX" ] || [ "$TARGET_OS" == "SunOS" ]; then
Expand Down