From 4ba35dfafb4e9a812c79bac75df9116ca46b548e Mon Sep 17 00:00:00 2001 From: xunian Date: Mon, 31 Mar 2025 17:13:54 +0800 Subject: [PATCH] Add sw_64 support Project:TC2024110202 Signed-off-by: xunian --- 0002-add-sw_64-support.patch | 54 ++++++++++++++++++++++++++++++++++++ redis.spec | 7 ++++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 0002-add-sw_64-support.patch diff --git a/0002-add-sw_64-support.patch b/0002-add-sw_64-support.patch new file mode 100644 index 0000000..baaf4cf --- /dev/null +++ b/0002-add-sw_64-support.patch @@ -0,0 +1,54 @@ +From d96f7d68c40fe90a9eea0e00efd61e6096983af0 Mon Sep 17 00:00:00 2001 +From: xunian +Date: Mon, 31 Mar 2025 17:04:47 +0800 +Subject: [PATCH] add sw_64 support + +--- + deps/jemalloc/build-aux/config.guess | 3 +++ + deps/jemalloc/build-aux/config.sub | 1 + + deps/jemalloc/include/jemalloc/internal/quantum.h | 3 +++ + 3 files changed, 7 insertions(+) + +diff --git a/deps/jemalloc/build-aux/config.guess b/deps/jemalloc/build-aux/config.guess +index f772702..32ae30a 100755 +--- a/deps/jemalloc/build-aux/config.guess ++++ b/deps/jemalloc/build-aux/config.guess +@@ -1102,6 +1102,9 @@ EOF + sparc:Linux:*:* | sparc64:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; ++ sw_64:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + tile*:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; +diff --git a/deps/jemalloc/build-aux/config.sub b/deps/jemalloc/build-aux/config.sub +index b0f8492..ec6bae2 100755 +--- a/deps/jemalloc/build-aux/config.sub ++++ b/deps/jemalloc/build-aux/config.sub +@@ -1241,6 +1241,7 @@ case $cpu-$vendor in + | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ + | spu \ ++ | sw_64 \ + | tahoe \ + | thumbv7* \ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ +diff --git a/deps/jemalloc/include/jemalloc/internal/quantum.h b/deps/jemalloc/include/jemalloc/internal/quantum.h +index c22d753..3fbef00 100644 +--- a/deps/jemalloc/include/jemalloc/internal/quantum.h ++++ b/deps/jemalloc/include/jemalloc/internal/quantum.h +@@ -62,6 +62,9 @@ + defined(__SH4_SINGLE_ONLY__)) + # define LG_QUANTUM 4 + # endif ++# ifdef __sw_64__ ++# define LG_QUANTUM 4 ++# endif + # ifdef __tile__ + # define LG_QUANTUM 4 + # endif +-- +2.41.0 + diff --git a/redis.spec b/redis.spec index a6235e7..7bb4fab 100644 --- a/redis.spec +++ b/redis.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 # temp workaround to https://bugzilla.redhat.com/2059488 %undefine _package_note_file @@ -29,6 +29,7 @@ Source9: macros.%{name} Source10: https://github.com/%{name}/%{name}-doc/archive/%{doc_commit}/%{name}-doc-%{short_doc_commit}.tar.gz Patch0001: 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch +Patch0002: 0002-add-sw_64-support.patch BuildRequires: make BuildRequires: gcc @@ -113,6 +114,7 @@ administration and development. %setup -q -n %{name}-%{version} -b 10 mv ../%{name}-doc-%{doc_commit} doc %patch -P0001 -p1 +%patch -P0002 -p1 mv deps/lua/COPYRIGHT COPYRIGHT-lua mv deps/jemalloc/COPYING COPYING-jemalloc @@ -286,6 +288,9 @@ fi %changelog +* Mon Mar 31 2025 xunian - 7.2.7-2 +- Add sw_64 support + * Mon Feb 24 2025 yangxinyu - 7.2.7-1 - New version 7.2.7 - For CVE-2024-51741 -- Gitee