已开启
Add sw_64 support #77
maqi77创建于 2025年2月28日
Add sw_64 support #77
已开启
从refs/pull/77/head合入到openEuler-24.03-LTS-SP1
共 2 个文件变更+72-1
| @@ -0,0 +1,67 @@ | |||
| 1 | +From eceb494ef5f94152fe45d1ac401aa5b73bf4aa05 Mon Sep 17 00:00:00 2001 | ||
| 2 | +From: maqi <maqi@uniontech.com> | ||
| 3 | +Date: Fri, 28 Feb 2025 14:17:57 +0800 | ||
| 4 | +Subject: [PATCH] add sw_64 support | ||
| 5 | + | ||
| 6 | +--- | ||
| 7 | + build/_aux/config.guess | 3 +++ | ||
| 8 | + build/_aux/config.sub | 1 + | ||
| 9 | + include/tscore/ink_queue.h | 2 +- | ||
| 10 | + iocore/eventsystem/UnixEventProcessor.cc | 2 +- | ||
| 11 | + 4 files changed, 6 insertions(+), 2 deletions(-) | ||
| 12 | + | ||
| 13 | +diff --git a/build/_aux/config.guess b/build/_aux/config.guess | ||
| 14 | +index ce201f8..84aa38a 100755 | ||
| 15 | +--- a/build/_aux/config.guess | ||
| 16 | ++++ b/build/_aux/config.guess | ||
| 17 | + EOF | ||
| 18 | + loongarch32:Linux:*:* | loongarch64:Linux:*:*) | ||
| 19 | + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC | ||
| 20 | + ;; | ||
| 21 | ++ sw_64:Linux:*:*) | ||
| 22 | ++ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC | ||
| 23 | ++ ;; | ||
| 24 | + m32r*:Linux:*:*) | ||
| 25 | + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC | ||
| 26 | + ;; | ||
| 27 | +diff --git a/build/_aux/config.sub b/build/_aux/config.sub | ||
| 28 | +index a6d99a0..1e177fc 100755 | ||
| 29 | +--- a/build/_aux/config.sub | ||
| 30 | ++++ b/build/_aux/config.sub | ||
| 31 | + case $cpu-$vendor in | ||
| 32 | + | le32 | le64 \ | ||
| 33 | + | lm32 \ | ||
| 34 | + | loongarch32 | loongarch64 \ | ||
| 35 | ++ | sw_64 \ | ||
| 36 | + | m32c | m32r | m32rle \ | ||
| 37 | + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ | ||
| 38 | + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ | ||
| 39 | +diff --git a/include/tscore/ink_queue.h b/include/tscore/ink_queue.h | ||
| 40 | +index a9fb1b5..d181b3d 100644 | ||
| 41 | +--- a/include/tscore/ink_queue.h | ||
| 42 | ++++ b/include/tscore/ink_queue.h | ||
| 43 | + union head_p { | ||
| 44 | + #define SET_FREELIST_POINTER_VERSION(_x, _p, _v) \ | ||
| 45 | + (_x).s.pointer = _p; \ | ||
| 46 | + (_x).s.version = _v | ||
| 47 | +-#elif defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__mips64) || defined(__riscv) || defined(__loongarch64) | ||
| 48 | ++#elif defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__mips64) || defined(__riscv) || defined(__loongarch64) || defined(__sw_64__) | ||
| 49 | + /* Layout of FREELIST_POINTER | ||
| 50 | + * | ||
| 51 | + * 0 ~ 47 bits : 48 bits, Virtual Address | ||
| 52 | +diff --git a/iocore/eventsystem/UnixEventProcessor.cc b/iocore/eventsystem/UnixEventProcessor.cc | ||
| 53 | +index 3fb27cb..f3cd5e6 100644 | ||
| 54 | +--- a/iocore/eventsystem/UnixEventProcessor.cc | ||
| 55 | ++++ b/iocore/eventsystem/UnixEventProcessor.cc | ||
| 56 | + void | ||
| 57 | + ThreadAffinityInitializer::setup_stack_guard(void *stack, int stackguard_pages) | ||
| 58 | + { | ||
| 59 | + #if !(defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__arm64__) || defined(__aarch64__) || \ | ||
| 60 | +- defined(__mips__) || defined(__powerpc64__) || defined(__riscv) || defined(__loongarch64)) | ||
| 61 | ++ defined(__mips__) || defined(__powerpc64__) || defined(__riscv) || defined(__loongarch64) || defined(__sw_64__)) | ||
| 62 | + #error Unknown stack growth direction. Determine the stack growth direction of your platform. | ||
| 63 | + // If your stack grows upwards, you need to change this function and the calculation of stack_begin in do_alloc_stack. | ||
| 64 | + #endif | ||
| 65 | +-- | ||
| 66 | +2.39.3 | ||
| 67 | + | ||
| @@ -2,7 +2,7 @@ | |||
| 2 | %global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler} | 2 | %global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler} |
| 3 | Name: trafficserver | 3 | Name: trafficserver |
| 4 | Version: 9.2.5 | 4 | Version: 9.2.5 |
| 5 | -Release: 3 | 5 | +Release: 4 |
| 6 | Summary: Apache Traffic Server, a reverse, forward and transparent HTTP proxy cache | 6 | Summary: Apache Traffic Server, a reverse, forward and transparent HTTP proxy cache |
| 7 | License: Apache-2.0 | 7 | License: Apache-2.0 |
| 8 | URL: https://trafficserver.apache.org/ | 8 | URL: https://trafficserver.apache.org/ |
| @@ -18,6 +18,7 @@ Patch0007: CVE-2024-38479.patch | |||
| 18 | Patch0008: CVE-2024-50305.patch | 18 | Patch0008: CVE-2024-50305.patch |
| 19 | Patch0009: CVE-2024-50306.patch | 19 | Patch0009: CVE-2024-50306.patch |
| 20 | Patch0010: Invoke-initgroups-iff-we-got-enough-privileges.patch | 20 | Patch0010: Invoke-initgroups-iff-we-got-enough-privileges.patch |
| 21 | +Patch0011: add-sw_64-support.patch | ||
| 21 | BuildRequires: expat-devel hwloc-devel openssl-devel pcre-devel zlib-devel xz-devel | 22 | BuildRequires: expat-devel hwloc-devel openssl-devel pcre-devel zlib-devel xz-devel |
| 22 | BuildRequires: libcurl-devel ncurses-devel gcc gcc-c++ perl-ExtUtils-MakeMaker | 23 | BuildRequires: libcurl-devel ncurses-devel gcc gcc-c++ perl-ExtUtils-MakeMaker |
| 23 | BuildRequires: libcap-devel cmake libunwind-devel automake chrpath | 24 | BuildRequires: libcap-devel cmake libunwind-devel automake chrpath |
| @@ -138,6 +139,9 @@ getent passwd ats >/dev/null || useradd -r -u 176 -g ats -d / -s /sbin/nologin - | |||
| 138 | %{_datadir}/pkgconfig/trafficserver.pc | 139 | %{_datadir}/pkgconfig/trafficserver.pc |
| 139 | 140 | ||
| 140 | %changelog | 141 | %changelog |
| 142 | +* Fri Feb 28 2025 maqi <maqi@uniontech.com> - 9.2.5-4 | ||
| 143 | +- Add sw_64 support | ||
| 144 | + | ||
| 141 | * Tue Dec 03 2024 yaoxin <yao_xin001@hoperun.com> - 9.2.5-3 | 145 | * Tue Dec 03 2024 yaoxin <yao_xin001@hoperun.com> - 9.2.5-3 |
| 142 | - Fix trafficserver service error | 146 | - Fix trafficserver service error |
| 143 | 147 | ||