Skip to content

Commit 2714777

Browse files
committed
fix arm build
Signed-off-by: zhuangbowei.zbw <[email protected]>
1 parent acf9140 commit 2714777

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

.github/workflows/release/build.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,15 @@ elif [[ ${OS} =~ "centos" ]]; then
5959
export PATH="/opt/rh/devtoolset-7/root/usr/bin:$PATH"
6060
PACKAGE_RELEASE="-DPACKAGE_RELEASE=${RELEASE_NO}.el7"
6161
COMPILER="-DCMAKE_C_COMPILER=/opt/rh/devtoolset-7/root/usr/bin/gcc -DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-7/root/usr/bin/g++"
62+
/opt/rh/devtoolset-7/root/usr/bin/gcc --version
63+
/opt/rh/devtoolset-7/root/usr/bin/g++ --version
6264
elif [[ ${OS} == "centos:8" ]]; then
6365
rm -rf /etc/yum.repos.d/* && curl -o /etc/yum.repos.d/CentOS-Base.repo https://mirrors.aliyun.com/repo/Centos-vault-8.5.2111.repo
64-
yum install -y gcc gcc-c++
66+
67+
yum install -y gcc-toolset-9-gcc gcc-toolset-9-gcc-c++
68+
COMPILER="-DCMAKE_C_COMPILER=/opt/rh/gcc-toolset-9/root/usr/bin/gcc -DCMAKE_CXX_COMPILER=/opt/rh/gcc-toolset-9/root/usr/bin/g++"
69+
/opt/rh/gcc-toolset-9/root/usr/bin/gcc --version
70+
/opt/rh/gcc-toolset-9/root/usr/bin/g++ --version
6571

6672
PACKAGE_RELEASE="-DPACKAGE_RELEASE=${RELEASE_NO}.el8"
6773
fi

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ project(
66
)
77
enable_language(C)
88

9+
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
10+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -DNDEBUG -g")
11+
912
# Get CPU arch
1013
execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
1114
if (NOT (${ARCH} STREQUAL x86_64) AND NOT (${ARCH} STREQUAL aarch64) AND NOT (${ARCH} STREQUAL arm64))
@@ -23,7 +26,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic -Wall -Werror=sign-compare")
2326
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpic -Wall -Werror=sign-compare -DOVERLAYBD_VER=${OBD_VER}")
2427

2528
if (${ARCH} STREQUAL aarch64)
26-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")
29+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc -fsigned-char -fno-stack-protector -fomit-frame-pointer")
2730
endif ()
2831

2932
set(CMAKE_CXX_STANDARD_LIBRARIES "-static-libgcc ${CMAKE_CXX_STANDARD_LIBRARIES}")

src/overlaybd/zfile/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ target_include_directories(crc32_lib PUBLIC
1717
if (${ARCH} STREQUAL x86_64)
1818
target_compile_options(crc32_lib PUBLIC -msse4.2 -mcrc32)
1919
else()
20-
target_compile_options(crc32_lib PUBLIC -march=native -mcpu=generic+crc)
20+
target_compile_options(crc32_lib PRIVATE -march=native -mcpu=generic+crc)
2121
endif()
2222

2323
if(ENABLE_DSA OR ENABLE_ISAL)

0 commit comments

Comments
 (0)