diff --git a/3000-add-sw_64-support.patch b/3000-add-sw_64-support.patch new file mode 100644 index 0000000000000000000000000000000000000000..063afad4b6ad294fb7fc3bc020462d89411f8e64 --- /dev/null +++ b/3000-add-sw_64-support.patch @@ -0,0 +1,58 @@ +From 2b0bb695685309578dbd8970724dba9e5456f211 Mon Sep 17 00:00:00 2001 +From: yangchenguang +Date: Tue, 16 May 2023 19:25:04 +0800 +Subject: [PATCH] Add sw_64 support + +Signed-off-by: yangchenguang +--- + etmem/CMakeLists.txt | 6 ++++++ + etmem/test/CMakeLists.txt | 2 ++ + 2 files changed, 8 insertions(+) + +diff --git a/etmem/CMakeLists.txt b/etmem/CMakeLists.txt +index 9e3194a..dd430d2 100644 +--- a/etmem/CMakeLists.txt ++++ b/etmem/CMakeLists.txt +@@ -92,6 +92,8 @@ if( ${ARCHITECTURE} STREQUAL "aarch64" ) + target_compile_options(etmemd PRIVATE -march=armv8-a) + elseif( ${ARCHITECTURE} STREQUAL "loongarch64" ) + target_compile_options(etmemd PRIVATE -march=loongarch64) ++elseif( ${ARCHITECTURE} STREQUAL "sw_64" ) ++ target_compile_options(etmemd PRIVATE) + else() + target_compile_options(etmemd PRIVATE -march=core-avx-i -m64) + endif() +@@ -109,6 +111,8 @@ if( ${ARCHITECTURE} STREQUAL "aarch64" ) + target_compile_options(etmem PRIVATE -march=armv8-a) + elseif( ${ARCHITECTURE} STREQUAL "loongarch64" ) + target_compile_options(etmemd PRIVATE -march=loongarch64) ++elseif( ${ARCHITECTURE} STREQUAL "sw_64" ) ++ target_compile_options(etmemd PRIVATE) + else() + target_compile_options(etmem PRIVATE -march=core-avx-i -m64) + endif() +@@ -127,6 +131,8 @@ if( ${ARCHITECTURE} STREQUAL "aarch64" ) + target_compile_options(etmemd_scan PRIVATE -march=armv8-a) + elseif( ${ARCHITECTURE} STREQUAL "loongarch64" ) + target_compile_options(etmemd_scan PRIVATE -march=loongarch64) ++elseif( ${ARCHITECTURE} STREQUAL "sw_64" ) ++ target_compile_options(etmemd PRIVATE) + else() + target_compile_options(etmemd_scan PRIVATE -march=core-avx-i -m64) + endif() +diff --git a/etmem/test/CMakeLists.txt b/etmem/test/CMakeLists.txt +index 928e358..dcfc717 100644 +--- a/etmem/test/CMakeLists.txt ++++ b/etmem/test/CMakeLists.txt +@@ -156,6 +156,8 @@ if( ${ARCHITECTURE} STREQUAL "aarch64") + SET(COMMON_COMPILE_OPT ${COMMON_COMPILE_OPT} -march=armv8-a) + elseif( ${ARCHITECTURE} STREQUAL "loongarch64" ) + SET(COMMON_COMPILE_OPT ${COMMON_COMPILE_OPT} -march=loongarch64) ++elseif( ${ARCHITECTURE} STREQUAL "sw_64" ) ++ SET(COMMON_COMPILE_OPT ${COMMON_COMPILE_OPT}) + else() + SET(COMMON_COMPILE_OPT ${COMMON_COMPILE_OPT} -march=core-avx-i -m64) + endif() +-- +2.33.0 + diff --git a/etmem.spec b/etmem.spec index 0de75ea805d10a88576eb2fe2cb8c9a18118b065..93e58e376fb09c9ef393fd88e171f9a7d6e1b0f5 100644 --- a/etmem.spec +++ b/etmem.spec @@ -2,8 +2,8 @@ Name: etmem Version: 1.0 -Release: 14 -Summary: etmem +Release: 15 +Summary: etmem License: MulanPSL-2.0 URL: https://gitee.com/openeuler/etmem Source0: https://gitee.com/openeuler/etmem/repository/archive/%{version}.tar.gz @@ -96,7 +96,7 @@ Patch84: 0085-add-loongarch64-support.patch Patch85: 0086-etmem-remove-unnecessary-log-code.patch Patch86: 0087-etmem-fix-memory-leak-and-fd-leak.patch Patch87: 0088-etmem-fix-multiple-etmemd-and-too-many-err-log-probl.patch - +Patch3000: 3000-add-sw_64-support.patch #Dependency BuildRequires: cmake gcc gcc-c++ glib2-devel BuildRequires: libboundscheck numactl-devel libcap-devel json-c-devel @@ -113,7 +113,7 @@ etmem module %build mkdir -p build cd build -cmake .. +cmake .. make %install @@ -149,6 +149,9 @@ install -m 0644 userswap/include/uswap_api.h $RPM_BUILD_ROOT%{_includedir} %postun -p /sbin/ldconfig %changelog +* Mon Aug 14 2023 herengui - 1.0-15 +- add sw_64 support + * Thu Jun 8 2023 liubo 1.0-14 - backport bugfix patch from upstream @@ -159,7 +162,7 @@ install -m 0644 userswap/include/uswap_api.h $RPM_BUILD_ROOT%{_includedir} - Modify License to MulanPSL-2.0 in the spec * Mon Aug 1 2022 liubo 1.0-11 -- Sync the features and bug fixes in the etmem source repo. +- Sync the features and bug fixes in the etmem source repo. * Thu Dec 16 2021 YangXin <245051644@qq.com> 1.0-10 - Update memdcd engine for userswap page filter.