From 8fb077111e17722035c6fb903cb7fb4c7d38052c Mon Sep 17 00:00:00 2001 From: wzx <471319475@qq.com> Date: Wed, 27 Jul 2022 17:21:54 +0800 Subject: [PATCH 1/2] sw --- acpica-tools.spec | 4 ++++ acpica-unix2-20210604-sw.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100755 acpica-unix2-20210604-sw.patch diff --git a/acpica-tools.spec b/acpica-tools.spec index f43690d..3442442 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -14,6 +14,7 @@ Patch0001: cve-2017-13693.patch Patch0002: cve-2017-13694.patch Patch0003: cve-2017-13695.patch Patch0004: openEuler-harden.patch +Patch0005: acpica-unix2-20210604-sw.patch BuildRequires: bison patchutils flex gcc Provides: acpixtract >= 20120913-7 iasl = %{version}-%{release} acpidump >= 20100513-5 @@ -85,6 +86,9 @@ fi %{_docdir}/* %changelog +* Wed Jul 20 2022 wuzx - 20210604-1 +- add sw64 patch + * Wed Dec 30 2021 zhouwenpei - 20210604-1 - Upgrade to version 20210604 diff --git a/acpica-unix2-20210604-sw.patch b/acpica-unix2-20210604-sw.patch new file mode 100755 index 0000000..2925d06 --- /dev/null +++ b/acpica-unix2-20210604-sw.patch @@ -0,0 +1,12 @@ +diff -Naur acpica-unix2-20210604.org/source/include/platform/aclinux.h acpica-unix2-20210604.sw/source/include/platform/aclinux.h +--- acpica-unix2-20210604.org/source/include/platform/aclinux.h 2022-03-14 07:35:19.998814120 +0000 ++++ acpica-unix2-20210604.sw/source/include/platform/aclinux.h 2022-03-14 07:56:03.958814120 +0000 +@@ -215,7 +215,7 @@ + #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread)) + + #if defined(__ia64__) || (defined(__x86_64__) && !defined(__ILP32__)) ||\ +- defined(__aarch64__) || defined(__PPC64__) ||\ ++ defined(__aarch64__) || defined(__sw_64__) || defined(__PPC64__) ||\ + defined(__s390x__) ||\ + (defined(__riscv) && (defined(__LP64__) || defined(_LP64))) + #define ACPI_MACHINE_WIDTH 64 From 11944aee556bef12d51301ea709d0c2cf016312a Mon Sep 17 00:00:00 2001 From: wzx <471319475@qq.com> Date: Thu, 28 Jul 2022 09:59:19 +0800 Subject: [PATCH 2/2] sw --- acpica-tools.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/acpica-tools.spec b/acpica-tools.spec index 3442442..c2fe9d5 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -1,6 +1,6 @@ Name: acpica-tools Version: 20210604 -Release: 1 +Release: 2 Summary: Tools for OS-independent reference implementation of ACPI License: GPLv2 @@ -86,7 +86,7 @@ fi %{_docdir}/* %changelog -* Wed Jul 20 2022 wuzx - 20210604-1 +* Wed Jul 20 2022 wuzx - 20210604-2 - add sw64 patch * Wed Dec 30 2021 zhouwenpei - 20210604-1