Skip to content

Commit

Permalink
miminal changes for s390x
Browse files Browse the repository at this point in the history
  • Loading branch information
akostadinov committed Dec 15, 2024
1 parent 004fd4d commit 8494125
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ set ( CMAKE_ENABLE_EXPORTS ON )

set ( _CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} )

set(UNALIGNED_RAM_ACCESS_EXITCODE "0")

This comment has been minimized.

Copy link
@akostadinov

akostadinov Dec 15, 2024

Author Owner

FYI setting this to 1 does not help manticore crashing on s390x


PROJECT ( MANTICORE )

# sometimes CMAKE_BUILD_TYPE became set after PROJECT statement, undo it.
Expand Down
7 changes: 4 additions & 3 deletions dist/build_dockers/cross/external_toolchain/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y \
flex \
curl \
software-properties-common \
libssl-dev \
&& rm -rf /var/lib/apt/lists/*

# 2-nd layer, llvm
Expand Down Expand Up @@ -46,9 +47,9 @@ RUN apt-get update && apt-get install -y \
# 4-th layer, cmake
ENV cmakever="3.26.3"
RUN cd / \
&& export arch=$(uname -m) \
&& curl -L https://github.com/Kitware/CMake/releases/download/v$cmakever/cmake-$cmakever-linux-$arch.tar.gz | tar -zx
ENV PATH $PATH:/cmake-$cmakever-linux-x86_64/bin:/cmake-$cmakever-linux-aarch64/bin
&& export CXX=clang++-16 \
&& curl -L https://github.com/Kitware/CMake/releases/download/v$cmakever/cmake-$cmakever.tar.gz | tar -zx \
&& cd cmake-$cmakever && ./bootstrap && make && make install

# 5-th layer. Everything to build, except actual sysroot archives
ENV CMAKE_GENERATOR=Ninja
Expand Down
6 changes: 3 additions & 3 deletions dist/build_dockers/cross/linux.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ set ( CMAKE_CXX_COMPILER_TARGET ${OS_TRIPLE} )
# debug in DWARF-4 is set for fresh clang (>=15), as debugedit in rpm can't understand DWARF-5 flavour
# build-id set to sha1, as it is mandatory for debuginfo.
set ( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -gdwarf-4 -DNDEBUG" CACHE STRING "" )
set ( CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld -Xlinker --build-id=sha1" )
set ( CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=lld -Xlinker --build-id=sha1" )
set ( CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld -Xlinker --build-id=sha1" )
set ( CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=bfd -Xlinker --build-id=sha1" )
set ( CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=bfd -Xlinker --build-id=sha1" )
set ( CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=bfd -Xlinker --build-id=sha1" )

# search for programs in the build host directories
set ( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
Expand Down

0 comments on commit 8494125

Please sign in to comment.