0001-Fix-GCC-12-dangling-pointer-warning.patch

@@ -1,54 +0,0 @@
-From aea0a5cfce262ce2ab16fd96d87c12cf5e756380 Mon Sep 17 00:00:00 2001
-From: Philip Prindeville <philipp@redfish-solutions.com>
-Date: Wed, 12 Apr 2023 10:18:20 -0600
-Subject: [PATCH] Fix GCC 12 dangling-pointer warning
-
-We're storing a persistent pointer to an ephemeral local variable
-which technically is a dangling pointer and the compiler is correct.
-However, since we never indirect the pointer, this is a safe
-operation and we can suppress the warning.
-
-Also, some C run-times (like MUSL) aren't including <stdint.h>
-indirectly so we must include it explicitly or we won't have the
-type definition for uintptr_t.
-
-Fixes issue #867.
-
-Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
----
- source/components/utilities/utdebug.c | 5 +++++
- source/include/platform/aclinux.h     | 1 +
- 2 files changed, 6 insertions(+)
-
-diff --git a/source/components/utilities/utdebug.c b/source/components/utilities/utdebug.c
-index 0060fdf..2f60bca 100644
---- a/source/components/utilities/utdebug.c
-+++ b/source/components/utilities/utdebug.c
-@@ -77,7 +77,12 @@ AcpiUtInitStackPtrTrace (
-     ACPI_SIZE               CurrentSp;
- 
- 
-+#pragma GCC diagnostic push
-+#if defined(__GNUC__) && __GNUC__ >= 12
-+#pragma GCC diagnostic ignored "-Wdangling-pointer="
-+#endif
-     AcpiGbl_EntryStackPointer = &CurrentSp;
-+#pragma GCC diagnostic pop
- }
- 
- 
-diff --git a/source/include/platform/aclinux.h b/source/include/platform/aclinux.h
-index 52a3293..20680d0 100644
---- a/source/include/platform/aclinux.h
-+++ b/source/include/platform/aclinux.h
-@@ -198,6 +198,7 @@
- 
- #ifdef ACPI_USE_STANDARD_HEADERS
- #include <unistd.h>
-+#include <stdint.h>
- #endif
- 
- /* Define/disable kernel-specific declarators */
--- 
-2.33.0
-

0001-fix-building-error-caused-by-variable-CurrentSp.patch

@@ -1,25 +0,0 @@
-From dd222c68bcab456f0230e6cd737969ccd84307fd Mon Sep 17 00:00:00 2001
-From: guojunding <guojunding@kylinos.cn>
-Date: Thu, 7 Mar 2024 09:27:56 +0800
-Subject: [PATCH] fix building error caused by variable 'CurrentSp'
-
----
- source/components/utilities/utdebug.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/components/utilities/utdebug.c b/source/components/utilities/utdebug.c
-index 2f60bca..509815f 100644
---- a/source/components/utilities/utdebug.c
-+++ b/source/components/utilities/utdebug.c
-@@ -74,7 +74,7 @@ void
- AcpiUtInitStackPtrTrace (
-     void)
- {
--    ACPI_SIZE               CurrentSp;
-+  static  ACPI_SIZE               CurrentSp;
- 
- 
- #pragma GCC diagnostic push
--- 
-2.27.0
-

9000-to-support-sw64-mips64el.patch

@@ -1,25 +0,0 @@
-From b57d5419e8eeef15a7b5192f64c89b9989b36d6a Mon Sep 17 00:00:00 2001
-From: kkz <zhaoshuang@uniontech.com>
-Date: Tue, 7 Jan 2025 15:11:07 +0800
-Subject: [PATCH] to support sw64 mips64el
-
----
- source/include/platform/aclinux.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/include/platform/aclinux.h b/source/include/platform/aclinux.h
-index 20680d0..ec1889e 100644
---- a/source/include/platform/aclinux.h
-+++ b/source/include/platform/aclinux.h
-@@ -217,7 +217,7 @@
- 
- #if defined(__ia64__)    || (defined(__x86_64__) && !defined(__ILP32__)) ||\
-     defined(__aarch64__) || defined(__PPC64__) ||\
--    defined(__s390x__) ||\
-+    defined(__s390x__) || defined(__sw_64__) || defined(__mips__) || \
-     (defined(__riscv) && (defined(__LP64__) || defined(_LP64))) || defined(__loongarch64)
- #define ACPI_MACHINE_WIDTH          64
- #define COMPILER_DEPENDENT_INT64    long
--- 
-2.43.0
-

acpica-tools.spec

@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20210604
-Release:        7
+Release:        2
 Summary:        Tools for OS-independent reference implementation of ACPI
 
 License:        GPLv2
@@ -15,9 +15,6 @@ Patch0002:	cve-2017-13694.patch
 Patch0003:      cve-2017-13695.patch
 Patch0004:      openEuler-harden.patch
 Patch0005:	0001-add-loongarch64-support-for-acpica-tools.patch
-Patch0006:	0001-Fix-GCC-12-dangling-pointer-warning.patch
-Patch0007:      0001-fix-building-error-caused-by-variable-CurrentSp.patch
-Patch0008:      9000-to-support-sw64-mips64el.patch
 
 BuildRequires:  bison patchutils flex gcc
 Provides:       acpixtract >= 20120913-7 iasl = %{version}-%{release} acpidump >= 20100513-5
@@ -58,10 +55,6 @@ CWARNINGFLAGS="\
 export OPT_CFLAGS="%{optflags} $CWARNINGFLAGS"
 export OPT_LDFLAGS="%{__global_ldflags}"
 
-%if "%{?toolchain}" == "clang"
-    CFLAGS="${CFLAGS:-%{?build_cflags}}"; export CFLAGS;
-%endif
-
 %make_build
 
 %install
@@ -93,25 +86,10 @@ fi
 %{_docdir}/*
 
 %changelog
-* Thu Feb 27 2025 zhaoshuang <zhaoshuang@uniontech.com> - 20210604-7
-- arch: to support sw64 mips64 arch
-
-* Thu Mar 7 2024 guojunding <guojunding@kylinos.cn> - 20210604-6
-- fix building error caused by variable 'CurrentSp'
-
-* Wed Mar 6 2024 guojunding <guojunding@kylinos.cn> - 20210604-5
-- support clang build
-
-* Tue Mar 5 2024 guojunding <guojunding@kylinos.cn> - 20210604-4
-- fix invalid dates
-
-* Tue Jul 18 2023 Ni Cunshu <nicunshu@huawei.com> - 20210604-3
-- fix building error caused by gcc 12 dangling pointer warning
-
 * Mon May  8 2023 Wenlong Zhang <zhangwenlong@loongson.cn> - 20210604-2
 - add loongarch64 support
 
-* Thu Dec 30 2021 zhouwenpei <zhouwenpei1@huawei.com> - 20210604-1
+* Wed Dec 30 2021 zhouwenpei <zhouwenpei1@huawei.com> - 20210604-1
 - Upgrade to version 20210604
 
 * Sat Jan 30 2021 xinghe <xinghe1@huawei.com> - 20210105-1