Architecture specific change in rpms/glsl-analyzer.git
by githook-noreply＠fedoraproject.org 14 Aug '24
by githook-noreply＠fedoraproject.org 14 Aug '24
14 Aug '24
The package rpms/glsl-analyzer.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glsl-analyzer.git/commit/?id=d4981c….
Change:
+%ifnarch aarch64
Thanks.
Full change:
============
commit d4981cc929ecf8857cc0147c87c9a23788512bb1
Author: Marian Koncek <mkoncek(a)redhat.com>
Date: Wed Aug 14 16:50:19 2024 +0200
Disable tests on aarch64
diff --git a/glsl-analyzer.spec b/glsl-analyzer.spec
index 8af0303..a770792 100644
--- a/glsl-analyzer.spec
+++ b/glsl-analyzer.spec
@@ -35,8 +35,11 @@ zig build install -Doptimize=ReleaseSafe --prefix ./build --verbose --verbose-cc
install -m 755 -p -D -t %{buildroot}%{_bindir} build/bin/*
%check
+# tests stuck on aarch64
+%ifnarch aarch64
export PATH="./build/bin:${PATH}"
pytest tests || : # ignore for now
+%endif
%files
%{_bindir}/glsl_analyzer
1
0
14 Aug '24
The package rpms/wine.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/wine.git/commit/?id=33346baa114f608….
Change:
-ExclusiveArch: %{ix86} x86_64 aarch64
Thanks.
Full change:
============
commit 33346baa114f608799d476ba689c9ba10c3e0bcb
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Wed Aug 14 08:41:18 2024 -0500
Wine 9.15 and higher requires ARM MinGW binaries (dlltool)
diff --git a/wine.spec b/wine.spec
index a6c773d..3dce6aa 100644
--- a/wine.spec
+++ b/wine.spec
@@ -98,12 +98,9 @@ Source900: https://github.com/wine-staging/wine-staging/archive/v%{version}.tar.
%endif
%if !%{?no64bit}
-%if 0%{?fedora} > 36
-ExclusiveArch: %{ix86} x86_64 aarch64
-%else
# Fedora 36 Clang doesn't build PE binaries on ARM at the moment
+# Wine 9.15 and higher requires ARM MinGW binaries (dlltool)
ExclusiveArch: %{ix86} x86_64
-%endif
%else
ExclusiveArch: %{ix86}
%endif
commit 7ff13e55b3d1d239a5ea6e54c273a844ae7da748
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Wed Aug 14 07:43:46 2024 -0500
Add missing esync patch
diff --git a/wine-staging-9.15-esync.patch b/wine-staging-9.15-esync.patch
new file mode 100644
index 0000000..812f3f8
--- /dev/null
+++ b/wine-staging-9.15-esync.patch
@@ -0,0 +1,143 @@
+From cd2cce28ccd2791d0a7ab02bb02b804551ee4095 Mon Sep 17 00:00:00 2001
+From: Elizabeth Figura <zfigura(a)codeweavers.com>
+Date: Mon, 12 Aug 2024 16:55:29 -0500
+Subject: [PATCH] eventfd_synchronization: Fix compile warnings.
+
+Why, GCC, did you think this was a good idea?
+---
+ ...tdll-Compile-warning-fixes-for-esync.patch | 126 ++++++++++++++++++
+ 1 file changed, 126 insertions(+)
+ create mode 100644 patches/eventfd_synchronization/0057-ntdll-Compile-warning-fixes-for-esync.patch
+
+diff --git a/patches/eventfd_synchronization/0057-ntdll-Compile-warning-fixes-for-esync.patch b/patches/eventfd_synchronization/0057-ntdll-Compile-warning-fixes-for-esync.patch
+new file mode 100644
+index 000000000..f80cdd93b
+--- /dev/null
++++ b/patches/eventfd_synchronization/0057-ntdll-Compile-warning-fixes-for-esync.patch
+@@ -0,0 +1,126 @@
++From fed04f8ef69b829fa2cf3c7051160a6f822912dd Mon Sep 17 00:00:00 2001
++From: Elizabeth Figura <zfigura(a)codeweavers.com>
++Date: Mon, 12 Aug 2024 16:54:44 -0500
++Subject: [PATCH] ntdll: Compile warning fixes for esync.
++
++---
++ dlls/ntdll/unix/esync.c | 26 +++++++++++++-------------
++ dlls/ntdll/unix/esync.h | 4 ++--
++ 2 files changed, 15 insertions(+), 15 deletions(-)
++
++diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
++index f4748e405ef..86809b610c7 100644
++--- a/dlls/ntdll/unix/esync.c
+++++ b/dlls/ntdll/unix/esync.c
++@@ -73,29 +73,29 @@ int do_esync(void)
++
++ struct esync
++ {
++- enum esync_type type;
+++ LONG type;
++ int fd;
++ void *shm;
++ };
++
++ struct semaphore
++ {
++- int max;
++- int count;
+++ LONG max;
+++ LONG count;
++ };
++ C_ASSERT(sizeof(struct semaphore) == 8);
++
++ struct mutex
++ {
++- DWORD tid;
++- int count; /* recursion count */
+++ LONG tid;
+++ LONG count; /* recursion count */
++ };
++ C_ASSERT(sizeof(struct mutex) == 8);
++
++ struct event
++ {
++- int signaled;
++- int locked;
+++ LONG signaled;
+++ LONG locked;
++ };
++ C_ASSERT(sizeof(struct event) == 8);
++
++@@ -182,7 +182,7 @@ static struct esync *add_to_list( HANDLE handle, enum esync_type type, int fd, v
++ }
++ }
++
++- if (!InterlockedCompareExchange( (int *)&esync_list[entry][idx].type, type, 0 ))
+++ if (!InterlockedCompareExchange( &esync_list[entry][idx].type, type, 0 ))
++ {
++ esync_list[entry][idx].fd = fd;
++ esync_list[entry][idx].shm = shm;
++@@ -206,7 +206,7 @@ static struct esync *get_cached_object( HANDLE handle )
++ * message queue, etc.) */
++ static NTSTATUS get_object( HANDLE handle, struct esync **obj )
++ {
++- NTSTATUS ret = STATUS_SUCCESS;
+++ int ret = STATUS_SUCCESS;
++ enum esync_type type = 0;
++ unsigned int shm_idx = 0;
++ obj_handle_t fd_handle;
++@@ -274,7 +274,7 @@ NTSTATUS esync_close( HANDLE handle )
++
++ if (entry < ESYNC_LIST_ENTRIES && esync_list[entry])
++ {
++- if (InterlockedExchange((int *)&esync_list[entry][idx].type, 0))
+++ if (InterlockedExchange(&esync_list[entry][idx].type, 0))
++ {
++ close( esync_list[entry][idx].fd );
++ return STATUS_SUCCESS;
++@@ -370,7 +370,7 @@ static NTSTATUS open_esync( enum esync_type type, HANDLE *handle,
++ }
++
++ extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
++- const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max)
+++ const OBJECT_ATTRIBUTES *attr, int initial, int max)
++ {
++ TRACE("name %s, initial %d, max %d.\n",
++ attr ? debugstr_us(attr->ObjectName) : "<no name>", initial, max);
++@@ -386,7 +386,7 @@ NTSTATUS esync_open_semaphore( HANDLE *handle, ACCESS_MASK access,
++ return open_esync( ESYNC_SEMAPHORE, handle, access, attr );
++ }
++
++-NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev )
+++NTSTATUS esync_release_semaphore( HANDLE handle, unsigned int count, ULONG *prev )
++ {
++ struct esync *obj;
++ struct semaphore *semaphore;
++@@ -800,7 +800,7 @@ static BOOL update_grabbed_object( struct esync *obj )
++
++ /* A value of STATUS_NOT_IMPLEMENTED returned from this function means that we
++ * need to delegate to server_select(). */
++-static NTSTATUS __esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_any,
+++static NTSTATUS __esync_wait_objects( unsigned int count, const HANDLE *handles, BOOLEAN wait_any,
++ BOOLEAN alertable, const LARGE_INTEGER *timeout )
++ {
++ static const LARGE_INTEGER zero;
++diff --git a/dlls/ntdll/unix/esync.h b/dlls/ntdll/unix/esync.h
++index 59f8809fc1a..9102cf911aa 100644
++--- a/dlls/ntdll/unix/esync.h
+++++ b/dlls/ntdll/unix/esync.h
++@@ -23,11 +23,11 @@ extern void esync_init(void);
++ extern NTSTATUS esync_close( HANDLE handle );
++
++ extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
++- const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max);
+++ const OBJECT_ATTRIBUTES *attr, int initial, int max);
++ extern NTSTATUS esync_open_semaphore( HANDLE *handle, ACCESS_MASK access,
++ const OBJECT_ATTRIBUTES *attr );
++ extern NTSTATUS esync_query_semaphore( HANDLE handle, void *info, ULONG *ret_len );
++-extern NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev );
+++extern NTSTATUS esync_release_semaphore( HANDLE handle, unsigned int count, ULONG *prev );
++
++ extern NTSTATUS esync_create_event( HANDLE *handle, ACCESS_MASK access,
++ const OBJECT_ATTRIBUTES *attr, EVENT_TYPE type, BOOLEAN initial );
++--
++2.45.2
++
commit 7c38d157adc02cf2338211016447f68ea8238b00
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Aug 13 23:20:50 2024 -0500
Update to 9.15
diff --git a/sources b/sources
index 227b218..582ce56 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (wine-9.5.tar.xz) = 8ccad8f6e6b1428886dee9fae771796e2021b4122cd96464350352bede25421406e6a6a0fdd63d8b99b896db8dc529aa6e05d6ac7966bee49ce3055b18a8af91
-SHA512 (wine-9.5.tar.xz.sign) = 434c3c3bb3436c03863705a147932e39c97afa52fdd5bd7ead3468770c86ea38a3a657cb4e901afe59e8a780e21f29f69f1f3b5403fe36b0975a79e3a2b0a633
-SHA512 (wine-staging-9.5.tar.gz) = 8c756fe505092e21dd37c709ac3917c305b70881c05270f0e188ccdf9ff36b9fd224adad424d37c6919637d2af55afbfba49079eb5b6708a6cf4f2dd98966784
+SHA512 (wine-9.15.tar.xz) = 4d19b7c0fbdf6ee5dc90c0aef800df47f5bda7e3506e5a3c065dcd29b33cc62840ae4eeb5c20c48e9400c0d1252b897d8bbc60fd5a58da1ad6e76ba677997cb3
+SHA512 (wine-9.15.tar.xz.sign) = 4aab92dc72d8c3d88f32cfa4905291825f20d4ba896a4c9b577cc0be6bc5de6f1441325f6a3f5ed220ba4473b3ccd23aafec93b5a89182394a72d037a6c9a76a
+SHA512 (wine-staging-9.15.tar.gz) = 37237e4f19319e34341fef1bb656d5c98309d148cdef7f105e7cd4eb10134364766df5287755ba23ebc2a3d28294bd10c7991c9a3acbe076ad33a386ae92b304
diff --git a/wine-staging-9.0.patch b/wine-staging-9.0.patch
deleted file mode 100644
index daad50e..0000000
--- a/wine-staging-9.0.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch.orig 2024-01-16 15:47:35.000000000 -0600
-+++ patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch 2024-01-17 20:36:36.796186786 -0600
-@@ -197,7 +197,7 @@
- + }
- + }
- +
--+ if (!InterlockedCompareExchange( (int *)&esync_list[entry][idx].type, type, 0 ))
-++ if (!InterlockedCompareExchange( (LONG *)&esync_list[entry][idx].type, type, 0 ))
- + {
- + esync_list[entry][idx].fd = fd;
- + esync_list[entry][idx].shm = shm;
---- patches/eventfd_synchronization/0005-ntdll-Implement-NtClose.patch.orig 2024-01-16 15:47:35.000000000 -0600
-+++ patches/eventfd_synchronization/0005-ntdll-Implement-NtClose.patch 2024-01-17 20:22:59.170405980 -0600
-@@ -25,7 +25,7 @@
- +
- + if (entry < ESYNC_LIST_ENTRIES && esync_list[entry])
- + {
--+ if (InterlockedExchange((int *)&esync_list[entry][idx].type, 0))
-++ if (InterlockedExchange((LONG *)&esync_list[entry][idx].type, 0))
- + {
- + close( esync_list[entry][idx].fd );
- + return STATUS_SUCCESS;
---- patches/eventfd_synchronization/0004-ntdll-Implement-NtReleaseSemaphore.patch.orig 2024-01-16 15:47:35.000000000 -0600
-+++ patches/eventfd_synchronization/0004-ntdll-Implement-NtReleaseSemaphore.patch 2024-01-17 20:25:51.399420034 -0600
-@@ -60,7 +60,7 @@
- +
- + if (count + current > semaphore->max)
- + return STATUS_SEMAPHORE_LIMIT_EXCEEDED;
--+ } while (InterlockedCompareExchange( &semaphore->count, count + current, current ) != current);
-++ } while (InterlockedCompareExchange( (LONG *) &semaphore->count, count + current, current ) != current);
- +
- + if (prev) *prev = current;
- +
---- patches/eventfd_synchronization/0050-ntdll-server-Try-to-avoid-poll-for-signaled-events.patch.orig 2024-01-16 15:47:35.000000000 -0600
-+++ patches/eventfd_synchronization/0050-ntdll-server-Try-to-avoid-poll-for-signaled-events.patch 2024-01-17 20:29:39.020112232 -0600
-@@ -90,7 +90,7 @@
- + if (obj->type == ESYNC_MANUAL_EVENT)
- + {
- + /* Acquire the spinlock. */
--+ while (InterlockedCompareExchange( &event->locked, 1, 0 ))
-++ while (InterlockedCompareExchange( (LONG *) &event->locked, 1, 0 ))
- + small_pause();
- + }
- +
-@@ -103,7 +103,7 @@
- + * eventfd is unsignaled (i.e. reset shm, set shm, set fd, reset fd), we
- + * *must* signal the fd now, or any waiting threads will never wake up. */
- +
--+ if (!InterlockedExchange( &event->signaled, 1 ) || obj->type == ESYNC_AUTO_EVENT)
-++ if (!InterlockedExchange( (LONG *) &event->signaled, 1 ) || obj->type == ESYNC_AUTO_EVENT)
- + {
- + if (write( obj->fd, &value, sizeof(value) ) == -1)
- + ERR("write: %s\n", strerror(errno));
-@@ -137,7 +137,7 @@
- + if (obj->type == ESYNC_MANUAL_EVENT)
- + {
- + /* Acquire the spinlock. */
--+ while (InterlockedCompareExchange( &event->locked, 1, 0 ))
-++ while (InterlockedCompareExchange( (LONG *) &event->locked, 1, 0 ))
- + small_pause();
- + }
- +
-@@ -147,7 +147,7 @@
- + * For auto-reset events, we have no guarantee that the previous "signaled"
- + * state is actually correct. We need to leave both states unsignaled after
- + * leaving this function, so we always have to read(). */
--+ if (InterlockedExchange( &event->signaled, 0 ) || obj->type == ESYNC_AUTO_EVENT)
-++ if (InterlockedExchange( (LONG *) &event->signaled, 0 ) || obj->type == ESYNC_AUTO_EVENT)
- + {
- + if (read( obj->fd, &value, sizeof(value) ) == -1 && errno != EWOULDBLOCK && errno != EAGAIN)
- + {
---- patches/eventfd_synchronization/0006-ntdll-Implement-NtWaitForMultipleObjects.patch.orig 2024-01-16 15:47:35.000000000 -0600
-+++ patches/eventfd_synchronization/0006-ntdll-Implement-NtWaitForMultipleObjects.patch 2024-01-17 20:31:23.217332813 -0600
-@@ -82,7 +82,7 @@
- + * fact that we were able to grab it at all means the count is nonzero,
- + * and if someone else grabbed it then the count must have been >= 2,
- + * etc. */
--+ InterlockedExchangeAdd( &semaphore->count, -1 );
-++ InterlockedExchangeAdd( (LONG *) &semaphore->count, -1 );
- + }
- +}
- +
---- patches/eventfd_synchronization/0007-ntdll-server-Implement-NtCreateEvent.patch.orig 2024-01-16 15:47:35.000000000 -0600
-+++ patches/eventfd_synchronization/0007-ntdll-server-Implement-NtCreateEvent.patch 2024-01-17 20:31:54.500700144 -0600
-@@ -49,7 +49,7 @@
-
- @@ -339,6 +358,14 @@ static void update_grabbed_object( struct esync *obj )
- * etc. */
-- InterlockedExchangeAdd( &semaphore->count, -1 );
-+ InterlockedExchangeAdd( (LONG *) &semaphore->count, -1 );
- }
- + else if (obj->type == ESYNC_AUTO_EVENT)
- + {
---- patches/eventfd_synchronization/0049-ntdll-Try-to-avoid-poll-for-uncontended-objects.patch.orig 2024-01-16 15:47:35.000000000 -0600
-+++ patches/eventfd_synchronization/0049-ntdll-Try-to-avoid-poll-for-uncontended-objects.patch 2024-01-17 21:07:47.674962176 -0600
-@@ -68,7 +68,7 @@
- + if ((size = read( obj->fd, &value, sizeof(value) )) == sizeof(value))
- + {
- + TRACE("Woken up by handle %p [%d].\n", handles[i], i);
--+ InterlockedDecrement( &semaphore->count );
-++ InterlockedDecrement( (LONG *) &semaphore->count );
- + return i;
- + }
- + }
---- patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch.orig 2024-01-16 15:47:35.000000000 -0600
-+++ patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch 2024-01-18 08:19:37.882485865 -0600
-@@ -74,7 +74,7 @@
- + }
- +
- + if (pdev->brush.style != BS_NULL &&
--+ !(interior = ULongToHandle(NtGdiPolyPolyDraw( ULongToHandle(ALTERNATE), points, (const UINT *)&count, 1, NtGdiPolyPolygonRgn ))))
-++ !(interior = ULongToHandle(NtGdiPolyPolyDraw( ULongToHandle(ALTERNATE), points, (const ULONG *)&count, 1, NtGdiPolyPolygonRgn ))))
- + {
- + free( points );
- + if (outline) NtGdiDeleteObjectApp( outline );
diff --git a/wine.spec b/wine.spec
index 0cb9e92..a6c773d 100644
--- a/wine.spec
+++ b/wine.spec
@@ -3,7 +3,7 @@
%global no64bit 0
%global winegecko 2.47.4
-%global winemono 9.0.0
+%global winemono 9.2.0
#global _default_patch_fuzz 2
%ifarch %{ix86}
%global winepedir i386-windows
@@ -40,8 +40,8 @@
%endif
Name: wine
-Version: 9.5
-Release: 2%{?dist}
+Version: 9.15
+Release: 1%{?dist}
Summary: A compatibility layer for windows applications
License: LGPL-2.1-or-later
@@ -88,7 +88,8 @@ Patch100: wine-7.22-autoconf-2.72.patch
Patch511: wine-cjk.patch
-Patch900: wine-staging-9.0.patch
+# https://github.com/wine-staging/wine-staging/commit/cd2cce28ccd2791d0a7ab02…
+Patch900: wine-staging-9.15-esync.patch
%if 0%{?wine_staging}
# wine-staging patches
@@ -195,8 +196,8 @@ BuildRequires: mingw32-libxml2
BuildRequires: mingw64-libxml2
BuildRequires: mingw32-libxslt
BuildRequires: mingw64-libxslt
-BuildRequires: mingw32-vkd3d >= 1.11
-BuildRequires: mingw64-vkd3d >= 1.11
+BuildRequires: mingw32-vkd3d >= 1.12
+BuildRequires: mingw64-vkd3d >= 1.12
BuildRequires: mingw32-vulkan-headers
BuildRequires: mingw64-vulkan-headers
BuildRequires: mingw32-zlib
@@ -688,12 +689,8 @@ This package adds the opencl driver for wine.
# setup and apply wine-staging patches
gzip -dc %{SOURCE900} | tar -xf - --strip-components=1
-# https://bugs.winehq.org/show_bug.cgi?id=54868
-sed -i 's/DWORD pitch_in, DWORD pitch_out/unsigned int pitch_in, unsigned int pitch_out/' patches/wined3d-WINED3DFMT_B8G8R8X8_UNORM/0001-wined3d-Implement-WINED3DFMT_B8G8R8X8_UNORM-to-WINED.patch
-
-# Fix pointer types for i686 build
-%patch -P 900 -p0 -b.staging
-staging/patchinstall.py DESTDIR="`pwd`" --all -W Compiler_Warnings -W shell32-IconCache
+%patch -P 900 -p1 -b.esync
+staging/patchinstall.py DESTDIR="`pwd`" --all -W server-Stored_ACLs
%endif
# 0%%{?wine_staging}
@@ -1214,6 +1211,7 @@ fi
%{_libdir}/wine/%{winesodir}/avicap32.so
%{_libdir}/wine/%{winepedir}/avifil32.dll
%{_libdir}/wine/%{winepedir}/avrt.dll
+%{_libdir}/wine/%{winepedir}/bcp47langs.dll
%{_libdir}/wine/%{winesodir}/bcrypt.so
%{_libdir}/wine/%{winepedir}/bcrypt.dll
%{_libdir}/wine/%{winepedir}/bcryptprimitives.dll
@@ -1237,6 +1235,7 @@ fi
%{_libdir}/wine/%{winepedir}/comsvcs.dll
%{_libdir}/wine/%{winepedir}/concrt140.dll
%{_libdir}/wine/%{winepedir}/connect.dll
+%{_libdir}/wine/%{winepedir}/coremessaging.dll
%{_libdir}/wine/%{winepedir}/credui.dll
%{_libdir}/wine/%{winepedir}/crtdll.dll
%{_libdir}/wine/%{winesodir}/crypt32.so
@@ -1564,6 +1563,7 @@ fi
%{_libdir}/wine/%{winepedir}/presentationfontcache.exe
%{_libdir}/wine/%{winepedir}/printui.dll
%{_libdir}/wine/%{winepedir}/prntvpt.dll
+%{_libdir}/wine/%{winepedir}/profapi.dll
%{_libdir}/wine/%{winepedir}/propsys.dll
%{_libdir}/wine/%{winepedir}/psapi.dll
%{_libdir}/wine/%{winepedir}/pstorec.dll
@@ -1586,6 +1586,7 @@ fi
%{_libdir}/wine/%{winepedir}/riched20.dll
%{_libdir}/wine/%{winepedir}/riched32.dll
%{_libdir}/wine/%{winepedir}/robocopy.exe
+%{_libdir}/wine/%{winepedir}/rometadata.dll
%{_libdir}/wine/%{winepedir}/rpcrt4.dll
%{_libdir}/wine/%{winepedir}/rsabase.dll
%{_libdir}/wine/%{winepedir}/rsaenh.dll
@@ -1706,7 +1707,7 @@ fi
%{_libdir}/wine/%{winepedir}/windows.media.mediacontrol.dll
%{_libdir}/wine/%{winepedir}/windows.media.speech.dll
%if 0%{?wine_staging}
-%{_libdir}/wine/%{winepedir}/windows.networking.connectivity
+%{_libdir}/wine/%{winepedir}/windows.networking.connectivity.dll
%endif
%{_libdir}/wine/%{winepedir}/windows.networking.dll
%{_libdir}/wine/%{winepedir}/windows.networking.hostname.dll
@@ -1716,6 +1717,7 @@ fi
%{_libdir}/wine/%{winepedir}/windows.storage.applicationdata.dll
%{_libdir}/wine/%{winepedir}/windows.system.profile.systemmanufacturers.dll
%{_libdir}/wine/%{winepedir}/windows.ui.dll
+%{_libdir}/wine/%{winepedir}/windows.web.dll
%{_libdir}/wine/%{winepedir}/windowscodecs.dll
%{_libdir}/wine/%{winepedir}/windowscodecsext.dll
%{_libdir}/wine/%{winepedir}/winebus.sys
@@ -1727,8 +1729,10 @@ fi
%{_libdir}/wine/%{winesodir}/wineusb.so
%{_libdir}/wine/%{winesodir}/winevulkan.so
%{_libdir}/wine/%{winepedir}/winevulkan.dll
+%if 0%{?wine_staging}
%{_libdir}/wine/%{winepedir}/winewayland.drv
%{_libdir}/wine/%{winesodir}/winewayland.so
+%endif
%{_libdir}/wine/%{winepedir}/winex11.drv
%{_libdir}/wine/%{winesodir}/winex11.so
%{_libdir}/wine/%{winepedir}/wing32.dll
@@ -2034,6 +2038,7 @@ fi
%{_libdir}/wine/%{winesodir}/avicap32.dll.so
%{_libdir}/wine/%{winesodir}/avifil32.dll.so
%{_libdir}/wine/%{winesodir}/avrt.dll.so
+%{_libdir}/wine/%{winesodir}/bcp47langs.dll.so
%{_libdir}/wine/%{winesodir}/bcrypt.dll.so
%{_libdir}/wine/%{winesodir}/bcryptprimitives.dll.so
%{_libdir}/wine/%{winesodir}/bluetoothapis.dll.so
@@ -2056,6 +2061,7 @@ fi
%{_libdir}/wine/%{winesodir}/comsvcs.dll.so
%{_libdir}/wine/%{winesodir}/concrt140.dll.so
%{_libdir}/wine/%{winesodir}/connect.dll.so
+%{_libdir}/wine/%{winesodir}/coremessaging.dll.so
%{_libdir}/wine/%{winesodir}/credui.dll.so
%{_libdir}/wine/%{winesodir}/crtdll.dll.so
%{_libdir}/wine/%{winesodir}/crypt32.dll.so
@@ -2355,6 +2361,7 @@ fi
%{_libdir}/wine/%{winesodir}/presentationfontcache.exe.so
%{_libdir}/wine/%{winesodir}/printui.dll.so
%{_libdir}/wine/%{winesodir}/prntvpt.dll.so
+%{_libdir}/wine/%{winesodir}/profapi.dll.so
%{_libdir}/wine/%{winesodir}/propsys.dll.so
%{_libdir}/wine/%{winesodir}/psapi.dll.so
%{_libdir}/wine/%{winesodir}/pstorec.dll.so
@@ -2376,6 +2383,7 @@ fi
%{_libdir}/wine/%{winesodir}/riched20.dll.so
%{_libdir}/wine/%{winesodir}/riched32.dll.so
%{_libdir}/wine/%{winesodir}/robocopy.exe.so
+%{_libdir}/wine/%{winesodir}/rometadata.dll.so
%{_libdir}/wine/%{winesodir}/rpcrt4.dll.so
%{_libdir}/wine/%{winesodir}/rsabase.dll.so
%{_libdir}/wine/%{winesodir}/rsaenh.dll.so
@@ -2498,6 +2506,7 @@ fi
%{_libdir}/wine/%{winesodir}/windows.storage.applicationdata.dll.so
%{_libdir}/wine/%{winesodir}/windows.system.profile.systemmanufacturers.dll.so
%{_libdir}/wine/%{winesodir}/windows.ui.so
+%{_libdir}/wine/%{winesodir}/windows.web.dll.so
%{_libdir}/wine/%{winesodir}/windowscodecs.dll.so
%{_libdir}/wine/%{winesodir}/windowscodecsext.dll.so
%{_libdir}/wine/%{winesodir}/winebus.sys.so
@@ -2824,6 +2833,9 @@ fi
%endif
%changelog
+* Tue Aug 13 2024 Michael Cronenworth <mike(a)cchtml.com> - 9.15-1
+- version update
+
* Sat Jul 20 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 9.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
commit d038b1d74ae89a52e8d2b884fb34735a0c5bf58a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 20 09:22:12 2024 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
diff --git a/wine.spec b/wine.spec
index a72e115..0cb9e92 100644
--- a/wine.spec
+++ b/wine.spec
@@ -41,7 +41,7 @@
Name: wine
Version: 9.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A compatibility layer for windows applications
License: LGPL-2.1-or-later
@@ -2824,6 +2824,9 @@ fi
%endif
%changelog
+* Sat Jul 20 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 9.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
* Thu Mar 28 2024 Michael Cronenworth <mike(a)cchtml.com> - 9.5-1
- version update
1
0
14 Aug '24
The package rpms/wine.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/wine.git/commit/?id=33346baa114f608….
Change:
-ExclusiveArch: %{ix86} x86_64 aarch64
Thanks.
Full change:
============
commit 33346baa114f608799d476ba689c9ba10c3e0bcb
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Wed Aug 14 08:41:18 2024 -0500
Wine 9.15 and higher requires ARM MinGW binaries (dlltool)
diff --git a/wine.spec b/wine.spec
index a6c773d..3dce6aa 100644
--- a/wine.spec
+++ b/wine.spec
@@ -98,12 +98,9 @@ Source900: https://github.com/wine-staging/wine-staging/archive/v%{version}.tar.
%endif
%if !%{?no64bit}
-%if 0%{?fedora} > 36
-ExclusiveArch: %{ix86} x86_64 aarch64
-%else
# Fedora 36 Clang doesn't build PE binaries on ARM at the moment
+# Wine 9.15 and higher requires ARM MinGW binaries (dlltool)
ExclusiveArch: %{ix86} x86_64
-%endif
%else
ExclusiveArch: %{ix86}
%endif
1
0
Architecture specific change in rpms/glsl-analyzer.git
by githook-noreply＠fedoraproject.org 14 Aug '24
by githook-noreply＠fedoraproject.org 14 Aug '24
14 Aug '24
The package rpms/glsl-analyzer.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glsl-analyzer.git/commit/?id=9f7716….
Change:
+ExclusiveArch: %{zig_arches}
Thanks.
Full change:
============
commit 9f7716cad115eac99e73814b82c28867ad50a497
Author: Marian Koncek <mkoncek(a)redhat.com>
Date: Wed Aug 14 12:06:56 2024 +0200
Build only for %{zig_arches}
diff --git a/glsl-analyzer.spec b/glsl-analyzer.spec
index 6651ee1..8af0303 100644
--- a/glsl-analyzer.spec
+++ b/glsl-analyzer.spec
@@ -4,6 +4,7 @@ Release: 1%{?dist}
Summary: Language server for GLSL
License: GPL-3.0-only
URL: https://github.com/nolanderc/glsl_analyzer
+ExclusiveArch: %{zig_arches}
Source0: %{url}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: https://github.com/nolanderc/glsl-samples/archive/95264d5602cc8542e9e8dbdaa…
1
0
Architecture specific change in rpms/glsl-analyzer.git
by githook-noreply＠fedoraproject.org 14 Aug '24
by githook-noreply＠fedoraproject.org 14 Aug '24
14 Aug '24
The package rpms/glsl-analyzer.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glsl-analyzer.git/commit/?id=9f7716….
Change:
+ExclusiveArch: %{zig_arches}
Thanks.
Full change:
============
commit 9f7716cad115eac99e73814b82c28867ad50a497
Author: Marian Koncek <mkoncek(a)redhat.com>
Date: Wed Aug 14 12:06:56 2024 +0200
Build only for %{zig_arches}
diff --git a/glsl-analyzer.spec b/glsl-analyzer.spec
index 6651ee1..8af0303 100644
--- a/glsl-analyzer.spec
+++ b/glsl-analyzer.spec
@@ -4,6 +4,7 @@ Release: 1%{?dist}
Summary: Language server for GLSL
License: GPL-3.0-only
URL: https://github.com/nolanderc/glsl_analyzer
+ExclusiveArch: %{zig_arches}
Source0: %{url}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: https://github.com/nolanderc/glsl-samples/archive/95264d5602cc8542e9e8dbdaa…
1
0
New package excluding arches (4)
============================
- CubicSDR
ExcludeArch: i686
- buildstream-plugins
ExcludeArch: %{ix86}
- gap-pkg-lins
ExcludeArch: %{ix86}
- liquid-dsp
ExcludeArch: i686
Package that edited their arches constraints (2)
=============================================
- acpica-tools
was ExcludeArch: i686 armv7hl
is ExcludeArch: i686 armv7hl s390x
- aws
was ExclusiveArch: %GPRbuild_arches
is ExclusiveArch: %{GPRbuild_arches}
Package no longer excluding arches (1)
==================================
- startdde
List of packages currently excluding arches (2278)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 0install
ExcludeArch: %{ix86}
- 389-ds-base
ExcludeArch: i686
- 4ti2
ExcludeArch: %{ix86}
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le riscv64
- AcetoneISO
ExcludeArch: ppc %{power64} s390x
- Agda
ExcludeArch: %{ix86} armv7hl
- Agda-stdlib
ExcludeArch: armv7hl %{ix86}
- BareBonesBrowserLaunch
ExclusiveArch: %{java_arches} noarch
- CFR
ExclusiveArch: %{java_arches} noarch
- COPASI
ExcludeArch: %{ix86}
- CardManager
ExclusiveArch: %{java_arches} noarch
- CubicSDR
ExcludeArch: i686
- CuraEngine
ExcludeArch: %{ix86}
- DSDP
ExcludeArch: %{ix86}
- E
ExcludeArch: %{ix86}
- GAPDoc
ExcludeArch: %{ix86}
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- HPCombi
ExclusiveArch: x86_64 %{arm64}
- IPAddress
ExclusiveArch: %{java_arches} noarch
- IQmol
ExcludeArch: %{ix86}
- JUnitParams
ExclusiveArch: %{java_arches} noarch
- L-function
ExcludeArch: %{ix86}
- LabPlot
ExcludeArch: s390x
- MUSIC
ExcludeArch: %{ix86}
- Macaulay2
ExcludeArch: %{ix86} ppc64le
- Maelstrom
ExcludeArch: %{ix86}
- Mars
ExclusiveArch: %{java_arches} noarch
- NiaAML-GUI
ExcludeArch: %{ix86}
- OpenColorIO
ExcludeArch: i686
ExclusiveArch: x86_64 ppc64le
- OpenImageIO
ExcludeArch: i686
ExclusiveArch: x86_64 ppc64le
- OpenMolcas
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- OpenStego
ExclusiveArch: %{java_arches} noarch
- Pencil2D
ExcludeArch: %{ix86}
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- ProDy
ExcludeArch: ppc64 s390x
- R-IRkernel
ExcludeArch: %{ix86}
- R-V8
ExclusiveArch: %{nodejs_arches}
- R-ape
ExcludeArch: %{ix86}
- R-igraph
ExcludeArch: %{ix86}
- R-kernlab
ExcludeArch: %{ix86} s390x
- R-rJava
ExclusiveArch: %{java_arches}
- Random123
ExcludeArch: mips64r2 mips32r2 s390
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- Singular
ExcludeArch: %{ix86}
- TOPCOM
ExcludeArch: %{ix86}
- VulkanMemoryAllocator
ExcludeArch: %{ix86}
- WoeUSB
ExcludeArch: s390x
- YafaRay
ExclusiveArch: %{ix86} x86_64
- Zim
ExcludeArch: %{ix86}
- aardvark-dns
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- abiword
ExcludeArch: %{ix86}
- abrt-java-connector
ExcludeArch: %{ix86}
- accel-config
ExclusiveArch: %{ix86} x86_64
- acpica-tools
ExcludeArch: i686 armv7hl s390x
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 riscv64
- act
ExcludeArch: %{ix86}
- admeshgui
ExcludeArch: %{ix86}
- aemu
ExcludeArch: %{ix86} %{power64} s390x
- agenda
ExcludeArch: %{ix86}
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- alienarena
ExcludeArch: s390x
- alizams
ExcludeArch: %{power64} %{ix86} s390x
- alt-ergo
ExcludeArch: %{ix86}
- amdsmi
ExclusiveArch: x86_64
- american-fuzzy-lop
ExclusiveArch: x86_64
- amg4psblas
ExcludeArch: %{ix86}
- android-tools
ExcludeArch: ppc ppc64 s390x ppc64le
- anet
ExclusiveArch: %{GPRbuild_arches}
- ansible-collection-microsoft-sql
ExcludeArch: i686
- ant
ExclusiveArch: %{java_arches} noarch
- ant-antunit
ExclusiveArch: %{java_arches} noarch
- ant-contrib
ExclusiveArch: %{java_arches} noarch
- antlr
ExclusiveArch: %{java_arches}
- antlr3
ExclusiveArch: %{java_arches}
- antlr4-project
ExclusiveArch: %{java_arches}
- antlrworks
ExclusiveArch: %{java_arches} noarch
- aopalliance
ExclusiveArch: %{java_arches} noarch
- apache-commons-beanutils
ExclusiveArch: %{java_arches} noarch
- apache-commons-cli
ExclusiveArch: %{java_arches} noarch
- apache-commons-codec
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections4
ExclusiveArch: %{java_arches} noarch
- apache-commons-compress
ExclusiveArch: %{java_arches} noarch
- apache-commons-configuration
ExclusiveArch: %{java_arches} noarch
- apache-commons-digester
ExclusiveArch: %{java_arches} noarch
- apache-commons-exec
ExclusiveArch: %{java_arches} noarch
- apache-commons-io
ExclusiveArch: %{java_arches} noarch
- apache-commons-jexl
ExclusiveArch: %{java_arches} noarch
- apache-commons-jxpath
ExclusiveArch: %{java_arches} noarch
- apache-commons-lang3
ExclusiveArch: %{java_arches} noarch
- apache-commons-logging
ExclusiveArch: %{java_arches} noarch
- apache-commons-math
ExclusiveArch: %{java_arches} noarch
- apache-commons-modeler
ExclusiveArch: %{java_arches} noarch
- apache-commons-net
ExclusiveArch: %{java_arches} noarch
- apache-commons-parent
ExclusiveArch: %{java_arches} noarch
- apache-commons-pool
ExclusiveArch: %{java_arches} noarch
- apache-commons-vfs
ExclusiveArch: %{java_arches} noarch
- apache-ivy
ExclusiveArch: %{java_arches} noarch
- apache-logging-parent
ExclusiveArch: %{java_arches} noarch
- apache-parent
ExclusiveArch: %{java_arches} noarch
- apache-resource-bundles
ExclusiveArch: %{java_arches} noarch
- apache-sshd
ExclusiveArch: %{java_arches} noarch
- apiguardian
ExclusiveArch: %{java_arches} noarch
- appeditor
ExcludeArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- apricots
ExcludeArch: ppc64le aarch64
- apron
ExcludeArch: %{ix86}
- aquamarine
ExcludeArch: %{ix86}
- aqute-bnd
ExclusiveArch: %{java_arches} noarch
- arbor
ExcludeArch: mips64r2 mips32r2 s390x %{ix86}
- arc-theme
ExcludeArch: %{ix86}
- argparse
ExcludeArch: %{ix86}
- args4j
ExclusiveArch: %{java_arches} noarch
- arianna
ExclusiveArch: %{qt6_qtwebengine_arches}
- arm-none-eabi-binutils-cs
ExcludeArch: %{ix86}
- arm-none-eabi-gcc-cs
ExcludeArch: %{ix86}
- arpwatch
ExcludeArch: %{ix86}
- asahi-installer
ExcludeArch: s390x
- asdcplib
ExcludeArch: %{ix86} %{arm}
- asmjit
ExclusiveArch: aarch64 x86_64
- assertj-core
ExclusiveArch: %{java_arches} noarch
- astromenace
ExcludeArch: ppc64 s390x
- astrometry
ExcludeArch: %{ix86}
- asv
ExcludeArch: %{ix86}
- atinject
ExclusiveArch: %{java_arches} noarch
- atlantik
ExcludeArch: %{ix86}
- atomic-queue
ExcludeArch: %{ix86}
- aubit4gl
ExcludeArch: i686 s390x ppc64le
- audacity
ExcludeArch: %{ix86} s390x
- audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- aunit
ExclusiveArch: %{GPRbuild_arches}
- auryn
ExcludeArch: %{ix86}
- auto
ExclusiveArch: %{java_arches} noarch
- autolink-java
ExclusiveArch: noarch %{java_arches}
- avgtime
ExclusiveArch: %{ldc_arches}
- avr-gcc
ExcludeArch: %{ix86}
- aws
ExclusiveArch: %{GPRbuild_arches}
- aws-c-cal
ExcludeArch: s390x
- aws-c-common
ExcludeArch: s390x
- aws-c-compression
ExcludeArch: s390x
- aws-c-event-stream
ExcludeArch: %{ix86}
ExcludeArch: s390x
- aws-c-http
ExcludeArch: %{ix86}
ExcludeArch: s390x
- aws-c-io
ExcludeArch: %{ix86}
ExcludeArch: s390x
- aws-c-sdkutils
ExcludeArch: s390x
- aws-checksums
ExcludeArch: s390x
- awscli2
ExcludeArch: s390x
- azove
ExcludeArch: %{ix86}
- azure-cli
ExclusiveArch: %{java_arches} noarch
- batik
ExclusiveArch: %{java_arches} noarch
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x riscv64
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl riscv64
- bcel
ExclusiveArch: %{java_arches} noarch
- bcftools
ExcludeArch: s390x
- bcm283x-firmware
ExclusiveArch: aarch64
- beansbinding
ExclusiveArch: %{java_arches} noarch
- bear
ExcludeArch: %{ix86}
- bear-factory
ExcludeArch: ppc64le
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips} riscv64
- beust-jcommander
ExclusiveArch: %{java_arches} noarch
- bibletime
ExclusiveArch: %{java_arches}
- bigloo
ExcludeArch: %{ix86}
- binaryen
ExcludeArch: ppc64 s390x
- binutils
ExcludeArch: aarch64-linux-gnu aarch64-redhat-linux
ExcludeArch: ppc64le-linux-gnu ppc64le-redhat-linux
ExcludeArch: s390x-linux-gnu s390x-redhat-linux
ExcludeArch: x86_64-linux-gnu x86_64-redhat-linux i686-linux-gnu i686-redhat-linux
- biosdevname
ExclusiveArch: %{ix86} x86_64
- biosig4c++
ExcludeArch: %{ix86}
- blender
ExcludeArch: %{ix86} %{arm}
- bless
ExclusiveArch: %mono_arches
- bliss
ExcludeArch: %{ix86}
- bluez-hcidump
ExcludeArch: s390 s390x
- bochs
ExcludeArch: s390x i686
- boinc-client
ExcludeArch: s390x
- bolzplatz2006
ExclusiveArch: %{java_arches}
- bootc
ExcludeArch: %{ix86}
- bouncycastle
ExclusiveArch: %{java_arches} noarch
- bout++
ExcludeArch: %{ix86}
- bowtie
ExcludeArch: i686 armv7hl
- bowtie2
ExcludeArch: %{ix86} %{arm} s390x
- box64
ExclusiveArch: aarch64 riscv64 ppc64le x86_64
- boxes
ExcludeArch: %{ix86}
- bpftop
ExcludeArch: %{ix86}
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- brazil
ExclusiveArch: %{java_arches} noarch
- breakid
ExcludeArch: %{ix86}
- brewtarget
ExcludeArch: %{ix86}
- brial
ExcludeArch: %{ix86}
- bsf
ExclusiveArch: %{java_arches} noarch
- bsh
ExclusiveArch: %{java_arches} noarch
- build-helper-maven-plugin
ExclusiveArch: %{java_arches} noarch
- buildah
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- buildbox
ExcludeArch: %{ix86}
- buildstream
ExcludeArch: %{ix86}
- buildstream-plugins
ExcludeArch: %{ix86}
- busybox
ExcludeArch: i686 s390x
- bwping
ExcludeArch: %{ix86}
- byebyebios
ExclusiveArch: x86_64
- byte-buddy
ExclusiveArch: %{java_arches} noarch
- byteman
ExclusiveArch: %{java_arches} noarch
- cachelib
ExclusiveArch: x86_64 aarch64 ppc64le
- caddy
ExclusiveArch: %{golang_arches}
ExclusiveArch: %{golang_arches_future}
- cadical
ExcludeArch: %{ix86}
- caffe
ExclusiveArch: x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64 aarch64 riscv64
- calceph
ExcludeArch: %{ix86}
- calibre
ExclusiveArch: aarch64 x86_64
- calligra
ExcludeArch: %{ix86}
- cambozola
ExclusiveArch: %{java_arches} noarch
- canl-java
ExclusiveArch: %{java_arches} noarch
- cantera
ExcludeArch: %{ix86}
- carat
ExcludeArch: %{ix86}
- casc
ExcludeArch: %{ix86}
- cataclysm-dda
ExcludeArch: i686
- catatonit
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- ccdciel
ExclusiveArch: %{fpc_arches}
ExcludeArch: %{ix86}
- ccluster
ExcludeArch: %{ix86}
- cdcollect
ExclusiveArch: %{mono_arches}
- cdi-api
ExclusiveArch: %{java_arches} noarch
- cdrdao
ExcludeArch: s390 s390x
- ceph
ExcludeArch: i686 armv7hl
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- ceres-solver
ExcludeArch: ppc64
- cfn-lint
ExcludeArch: %{ix86}
- cglib
ExclusiveArch: %{java_arches} noarch
- cgreen
ExcludeArch: s390x
- chafa
ExcludeArch: %{ix86}
- chatterino2
ExcludeArch: %{ix86}
- chatty
ExcludeArch: i686
- checkpointctl
ExclusiveArch: %{golang_arches_future}
- chez-scheme
ExcludeArch: s390x
- chromium
ExclusiveArch: x86_64 aarch64 ppc64le
ExclusiveArch: x86_64 aarch64
- cinnamon
ExcludeArch: %{ix86}
- cinnamon-control-center
ExcludeArch: %{ix86}
- cinnamon-desktop
ExcludeArch: %{ix86}
- cinnamon-menus
ExcludeArch: %{ix86}
- cinnamon-screensaver
ExcludeArch: %{ix86}
- cinnamon-session
ExcludeArch: %{ix86}
- cinnamon-settings-daemon
ExcludeArch: %{ix86}
- cjdns
ExclusiveArch: %{nodejs_arches}
- cjs
ExcludeArch: %{ix86}
- classloader-leak-test-framework
ExclusiveArch: %{java_arches} noarch
- classpathless-compiler
ExclusiveArch: %{java_arches} noarch
- cld2
ExcludeArch: ppc64 s390x
- clibs-list
ExcludeArch: %{ix86}
- clojure
ExclusiveArch: %{java_arches} noarch
- clojure-core-specs-alpha
ExclusiveArch: %{java_arches} noarch
- clojure-maven-plugin
ExclusiveArch: %{java_arches} noarch
- clojure-spec-alpha
ExclusiveArch: %{java_arches} noarch
- cloudcompare
ExcludeArch: %{ix86}
- clover2
ExcludeArch: armv7hl
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- coan
ExcludeArch: ppc64 s390x
- coccinelle
ExcludeArch: %{ix86}
- cockpit
ExcludeArch: %{ix86}
- cockpit-files
ExclusiveArch: %{nodejs_arches} noarch
- cocoalib
ExcludeArch: %{ix86}
- codeblocks
ExcludeArch: %{ix86}
- codehaus-parent
ExclusiveArch: %{java_arches} noarch
- cohomCalg
ExcludeArch: %{ix86}
- coin-or-Alps
ExcludeArch: %{ix86}
- coin-or-Bcp
ExcludeArch: %{ix86}
- coin-or-Bcps
ExcludeArch: %{ix86}
- coin-or-Blis
ExcludeArch: %{ix86}
- coin-or-Bonmin
ExcludeArch: %{ix86}
- coin-or-CoinMP
ExcludeArch: %{ix86}
- coin-or-Couenne
ExcludeArch: %{ix86}
- coin-or-Dip
ExcludeArch: %{ix86}
- coin-or-FlopC++
ExcludeArch: %{ix86}
- coin-or-HiGHS
ExcludeArch: %{ix86}
- coin-or-Ipopt
ExcludeArch: %{ix86}
- coin-or-OS
ExcludeArch: %{ix86}
- coin-or-SYMPHONY
ExcludeArch: %{ix86}
- coin-or-lemon
ExcludeArch: %{ix86}
- colorful
ExclusiveArch: %{fpc_arches}
- colossus
ExclusiveArch: %{java_arches} noarch
- compiz-plugins-experimental
ExcludeArch: s390 s390x
- conmon
ExclusiveArch: %{golang_arches_future}
- console-image-viewer
ExclusiveArch: %{java_arches} noarch
- containernetworking-plugins
ExclusiveArch: %{golang_arches}
- containers-common
ExclusiveArch: %{golang_arches} noarch
- contour-terminal
ExclusiveArch: x86_64 aarch64
- contractor
ExcludeArch: %{ix86}
- conu
ExcludeArch: ppc64
- coolreader
ExcludeArch: %{ix86}
- coq
ExclusiveArch: %{ocaml_native_compiler}
- corectrl
ExcludeArch: %{ix86}
- cortado
ExclusiveArch: %{java_arches} noarch
- cosmic-comp
ExcludeArch: %{ix86}
- cp2k
ExcludeArch: s390x
- cpp-hocon
ExcludeArch: %{ix86}
- cpu-x
ExclusiveArch: i686 x86_64
- cpufetch
ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le
- cpuid
ExclusiveArch: %{ix86} x86_64
- cpuinfo
ExclusiveArch: x86_64 aarch64
- cqrlog
ExclusiveArch: %{fpc_arches}
- cramjam-cli
ExcludeArch: %{ix86}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- credentials-fetcher
ExclusiveArch: x86_64 aarch64 s390x
- crest
ExcludeArch: s390x
- cri-o
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- crun
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64
- cryfs
ExcludeArch: i686
- cryptlib
ExclusiveArch: x86_64 aarch64 ppc64le
- crypto-policies
ExclusiveArch: %{java_arches} noarch
- cryptobone
ExclusiveArch: x86_64 ppc64le aarch64
- cryptominisat
ExcludeArch: %{ix86}
- csdp
ExcludeArch: %{ix86}
- csslint
ExclusiveArch: %{nodejs_arches} noarch
- cura
ExcludeArch: %{ix86}
- cura-fdm-materials
ExcludeArch: %{ix86}
- cvc5
ExcludeArch: %{ix86}
- cxsc
ExcludeArch: %{ix86}
- daggy
ExcludeArch: s390x
- dapl
ExcludeArch: s390, armv7hl
- daq
ExclusiveArch: x86_64 aarch64
- darktable
ExcludeArch: armv7hl i686 s390x
- dbus-parsec
ExcludeArch: ppc64le s390x
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- ddccontrol
ExcludeArch: s390 s390x
- ddcutil
ExcludeArch: s390 s390x
- ddd
ExcludeArch: %{ix86}
- ddnet
ExcludeArch: s390x
- decentxml
ExclusiveArch: %{java_arches} noarch
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- dhall
ExcludeArch: %{ix86}
- dhall-json
ExcludeArch: %{ix86}
- diffoscope
ExcludeArch: %{ix86}
- digikam
ExclusiveArch: %{qt6_qtwebengine_arches}
ExclusiveArch: %{qt5_qtwebengine_arches}
- dippi
ExcludeArch: %{ix86}
- directory-maven-plugin
ExclusiveArch: %{java_arches} noarch
- dirgra
ExclusiveArch: %{java_arches} noarch
- disruptor
ExclusiveArch: %{java_arches} noarch
- ditaa
ExclusiveArch: %{java_arches} noarch
- dl-fedora
ExcludeArch: %{ix86}
- dl_poly
ExcludeArch: i686
- dlib
ExcludeArch: %{ix86} s390x
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: x86_64
- dnsdist
ExcludeArch: %{ix86} #1994125
ExcludeArch: armv7hl #1994125
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dogtag-pki
ExclusiveArch: %{java_arches}
ExcludeArch: i686
- dolfin
ExcludeArch: %{ix86}
- dolphin-emu
ExclusiveArch: x86_64 aarch64
- dom4j
ExclusiveArch: %{java_arches} noarch
- dosbox-staging
ExcludeArch: %{ix86}
- dotnet8.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dovecot
ExcludeArch: %{ix86}
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dragonbox
ExcludeArch: %{ix86}
- drat-trim
ExcludeArch: %{ix86}
- drat2er
ExcludeArch: %{ix86}
- dub
ExclusiveArch: %{ldc_arches}
- duperemove
ExcludeArch: %{ix86}
- dvdauthor
ExcludeArch: %{ix86}
- dvgrab
ExcludeArch: s390 s390x
- dxvk-native
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e-antic
ExcludeArch: %{ix86}
- e00compr
ExcludeArch: %{ix86}
- e3
ExclusiveArch: %{ix86} x86_64
- easymock
ExclusiveArch: %{java_arches} noarch
- eccodes
ExcludeArch: i686
- ecj
ExclusiveArch: %{java_arches} noarch
- eclipse-swt
ExclusiveArch: %{java_arches}
- ecryptfs-utils
ExcludeArch: %{ix86}
- ed25519-java
ExclusiveArch: %{java_arches} noarch
- edac-utils
ExcludeArch: %{ix86}
- edflib
ExcludeArch: s390x %{ix86}
- edk2
ExclusiveArch: x86_64 aarch64 riscv64
- edwin-fonts
ExcludeArch: %{ix86}
- eegdev
ExcludeArch: %{ix86}
- eegview
ExcludeArch: %{ix86}
- efax
ExcludeArch: s390 s390x
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- electron-cash
ExcludeArch: %{ix86}
- electrum
ExcludeArch: %{ix86}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 aarch64 %{arm} %{power64}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-common-proofgeneral
ExcludeArch: %{ix86}
- emacs-company-mode
ExcludeArch: %{ix86}
- emacs-iedit
ExcludeArch: %{ix86}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- emacs-vm
ExcludeArch: %{ix86}
- embree
ExclusiveArch: aarch64 x86_64
- embree3
ExclusiveArch: aarch64 x86_64
- enjarify
ExclusiveArch: %{java_arches} noarch
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 riscv64
- eot-utils
ExcludeArch: %{ix86}
- ergo
ExcludeArch: %{ix86}
- eric
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- erlang-corba
ExclusiveArch: %{java_arches}
- erlang-riak_ensemble
ExcludeArch: ppc64le
- esmi_ib_library
ExclusiveArch: x86_64
- espresso
ExcludeArch: s390x i686 armv7hl
- eth-tools
ExclusiveArch: x86_64
- exec-maven-plugin
ExclusiveArch: %{java_arches} noarch
- external-editor-revived
ExclusiveArch: %{rust_arches}
- extra-enforcer-rules
ExclusiveArch: %{java_arches} noarch
- f3d
ExcludeArch: %{ix86}
- fasterxml-oss-parent
ExclusiveArch: %{java_arches} noarch
- fastfetch
ExcludeArch: %{ix86}
- fatcat
ExcludeArch: %{ix86}
- fb303
ExclusiveArch: x86_64 aarch64 ppc64le riscv64
- fbgemm
ExclusiveArch: x86_64
- fbreader
ExcludeArch: %{ix86}
ExcludeArch: armv7hl
- fbthrift
ExclusiveArch: x86_64 aarch64 ppc64le riscv64
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fcitx5-mozc
ExcludeArch: ppc ppc64 sparcv9 sparc64 s390x
- fcoe-utils
ExcludeArch: ppc s390
ExcludeArch: %{ix86}
- felix-parent
ExclusiveArch: %{java_arches} noarch
- felix-utils
ExclusiveArch: %{java_arches} noarch
- fernflower
ExclusiveArch: %{java_arches} noarch
- fes
ExclusiveArch: %{ix86} x86_64
- fido-device-onboard
ExcludeArch: %{ix86}
- filedrop
ExclusiveArch: %{java_arches} noarch
- filezilla
ExcludeArch: s390x
- firecracker
ExclusiveArch: aarch64 x86_64
- firefox
ExcludeArch: i686
- fishbowl
ExclusiveArch: %{java_arches} noarch
- fizz
ExclusiveArch: x86_64 aarch64 ppc64le riscv64
- flang
ExcludeArch: i686 s390x
- flashrom
ExcludeArch: s390 s390x
- flatbuffers
ExcludeArch: %{ix86}
- flatpak
ExcludeArch: %{ix86}
- flatpak-builder
ExcludeArch: %{ix86}
- flatpak-module-tools
ExcludeArch: i386 i686
- flexmark-java
ExclusiveArch: noarch %{java_arches}
- flickcurl
ExcludeArch: %{ix86}
- flint
ExcludeArch: %{ix86}
- flocq
ExclusiveArch: %{ocaml_native_compiler}
- floppy-support
ExcludeArch: %{arm} aarch64 s390x
- florist
ExclusiveArch: %{GPRbuild_arches}
- flterm
ExcludeArch: s390 s390x sparcv9
- fluent-bit
ExclusiveArch: x86_64 aarch64
- flute
ExclusiveArch: %{java_arches} noarch
- fmidi
ExcludeArch: %{ix86}
- folly
ExclusiveArch: x86_64 aarch64 ppc64le riscv64
- fop
ExclusiveArch: %{java_arches} noarch
- forge-parent
ExclusiveArch: %{java_arches} noarch
- fotocx
ExcludeArch: %{ix86}
- foxi
ExclusiveArch: x86_64 aarch64
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- fprintd
ExcludeArch: s390 s390x
- fractal
ExcludeArch: %{ix86}
- fragments
ExcludeArch: %{ix86}
- frama-c
ExclusiveArch: %{ocaml_native_compiler}
- free42
ExcludeArch: %{ix86}
- freecol
ExclusiveArch: %{java_arches} noarch
- freedink
ExcludeArch: s390x
- freedink-dfarc
ExcludeArch: s390x
- freefem++
ExcludeArch: %{ix86}
- freemarker
ExclusiveArch: %{java_arches} noarch
- freerouting
ExclusiveArch: %{java_arches} noarch
- freetennis
ExcludeArch: sparc64 s390 s390x %{ix86}
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: x86_64 ppc64
- fuse-overlayfs
ExclusiveArch: %{arm64} ppc64le s390x x86_64 riscv64
- fusesource-pom
ExclusiveArch: %{java_arches} noarch
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- fwupd-efi
ExclusiveArch: x86_64 aarch64
- ga
ExcludeArch: %{ix86}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le riscv64
- galera
ExcludeArch: %{ix86}
- gambas3
ExcludeArch: i686
- gap
ExcludeArch: %{ix86}
- gap-pkg-4ti2interface
ExcludeArch: %{ix86}
- gap-pkg-ace
ExcludeArch: %{ix86}
- gap-pkg-aclib
ExcludeArch: %{ix86}
- gap-pkg-alnuth
ExcludeArch: %{ix86}
- gap-pkg-anupq
ExcludeArch: %{ix86}
- gap-pkg-atlasrep
ExcludeArch: %{ix86}
- gap-pkg-autodoc
ExcludeArch: %{ix86}
- gap-pkg-automata
ExcludeArch: %{ix86}
- gap-pkg-autpgrp
ExcludeArch: %{ix86}
- gap-pkg-browse
ExcludeArch: %{ix86}
- gap-pkg-caratinterface
ExcludeArch: %{ix86}
- gap-pkg-circle
ExcludeArch: %{ix86}
- gap-pkg-cohomolo
ExcludeArch: %{ix86}
- gap-pkg-congruence
ExcludeArch: %{ix86}
- gap-pkg-corelg
ExcludeArch: %{ix86}
- gap-pkg-crime
ExcludeArch: %{ix86}
- gap-pkg-crisp
ExcludeArch: %{ix86}
- gap-pkg-crypting
ExcludeArch: %{ix86}
- gap-pkg-cryst
ExcludeArch: %{ix86}
- gap-pkg-crystcat
ExcludeArch: %{ix86}
- gap-pkg-ctbllib
ExcludeArch: %{ix86}
- gap-pkg-curlinterface
ExcludeArch: %{ix86}
- gap-pkg-cvec
ExcludeArch: %{ix86}
- gap-pkg-datastructures
ExcludeArch: %{ix86}
- gap-pkg-design
ExcludeArch: %{ix86}
- gap-pkg-digraphs
ExcludeArch: %{ix86}
- gap-pkg-edim
ExcludeArch: %{ix86}
- gap-pkg-factint
ExcludeArch: %{ix86}
- gap-pkg-ferret
ExcludeArch: %{ix86}
- gap-pkg-fga
ExcludeArch: %{ix86}
- gap-pkg-fining
ExcludeArch: %{ix86}
- gap-pkg-float
ExcludeArch: %{ix86}
- gap-pkg-format
ExcludeArch: %{ix86}
- gap-pkg-forms
ExcludeArch: %{ix86}
- gap-pkg-fplsa
ExcludeArch: %{ix86}
- gap-pkg-fr
ExcludeArch: %{ix86}
- gap-pkg-francy
ExcludeArch: %{ix86}
- gap-pkg-gbnp
ExcludeArch: %{ix86}
- gap-pkg-genss
ExcludeArch: %{ix86}
- gap-pkg-grape
ExcludeArch: %{ix86}
- gap-pkg-groupoids
ExcludeArch: %{ix86}
- gap-pkg-grpconst
ExcludeArch: %{ix86}
- gap-pkg-guava
ExcludeArch: %{ix86}
- gap-pkg-hap
ExcludeArch: %{ix86}
- gap-pkg-hapcryst
ExcludeArch: %{ix86}
- gap-pkg-hecke
ExcludeArch: %{ix86}
- gap-pkg-idrel
ExcludeArch: %{ix86}
- gap-pkg-images
ExcludeArch: %{ix86}
- gap-pkg-io
ExcludeArch: %{ix86}
- gap-pkg-irredsol
ExcludeArch: %{ix86}
- gap-pkg-json
ExcludeArch: %{ix86}
- gap-pkg-jupyterkernel
ExcludeArch: %{ix86}
- gap-pkg-jupyterviz
ExcludeArch: %{ix86}
- gap-pkg-laguna
ExcludeArch: %{ix86}
- gap-pkg-liealgdb
ExcludeArch: %{ix86}
- gap-pkg-liepring
ExcludeArch: %{ix86}
- gap-pkg-liering
ExcludeArch: %{ix86}
- gap-pkg-lins
ExcludeArch: %{ix86}
- gap-pkg-loops
ExcludeArch: %{ix86}
- gap-pkg-lpres
ExcludeArch: %{ix86}
- gap-pkg-mapclass
ExcludeArch: %{ix86}
- gap-pkg-nautytracesinterface
ExcludeArch: %{ix86}
- gap-pkg-nq
ExcludeArch: %{ix86}
- gap-pkg-openmath
ExcludeArch: %{ix86}
- gap-pkg-orb
ExcludeArch: %{ix86}
- gap-pkg-permut
ExcludeArch: %{ix86}
- gap-pkg-polenta
ExcludeArch: %{ix86}
- gap-pkg-polycyclic
ExcludeArch: %{ix86}
- gap-pkg-polymaking
ExcludeArch: %{ix86}
- gap-pkg-primgrp
ExcludeArch: %{ix86}
- gap-pkg-profiling
ExcludeArch: %{ix86}
- gap-pkg-qpa
ExcludeArch: %{ix86}
- gap-pkg-quagroup
ExcludeArch: %{ix86}
- gap-pkg-radiroot
ExcludeArch: %{ix86}
- gap-pkg-recog
ExcludeArch: %{ix86}
- gap-pkg-repsn
ExcludeArch: %{ix86}
- gap-pkg-resclasses
ExcludeArch: %{ix86}
- gap-pkg-scscp
ExcludeArch: %{ix86}
- gap-pkg-semigroups
ExcludeArch: %{ix86}
- gap-pkg-singular
ExcludeArch: %{ix86}
- gap-pkg-sla
ExcludeArch: %{ix86}
- gap-pkg-smallgrp
ExcludeArch: %{ix86}
- gap-pkg-smallsemi
ExcludeArch: %{ix86}
- gap-pkg-sonata
ExcludeArch: %{ix86}
- gap-pkg-sophus
ExcludeArch: %{ix86}
- gap-pkg-spinsym
ExcludeArch: %{ix86}
- gap-pkg-standardff
ExcludeArch: %{ix86}
- gap-pkg-tomlib
ExcludeArch: %{ix86}
- gap-pkg-toric
ExcludeArch: %{ix86}
- gap-pkg-transgrp
ExcludeArch: %{ix86}
- gap-pkg-typeset
ExcludeArch: %{ix86}
- gap-pkg-utils
ExcludeArch: %{ix86}
- gap-pkg-uuid
ExcludeArch: %{ix86}
- gap-pkg-xmod
ExcludeArch: %{ix86}
- gap-pkg-zeromqinterface
ExcludeArch: %{ix86}
- gappa
ExcludeArch: %{ix86}
- gappalib-coq
ExclusiveArch: %{ocaml_native_compiler}
- gauche
ExcludeArch: armv7hl
- gbrainy
ExclusiveArch: %mono_arches
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gdb-gef
ExclusiveArch: x86_64
- gdl
ExcludeArch: %{ix86}
- gearhead1
ExclusiveArch: %{fpc_arches}
- gearhead2
ExclusiveArch: %{fpc_arches}
- gearmand
ExcludeArch: ppc
- geeqie
ExcludeArch: %{ix86}
- getdp
ExcludeArch: %{ix86}
- gfan
ExcludeArch: %{ix86}
- gfs2-utils
ExcludeArch: %{ix86}
- gfxstream
ExcludeArch: %{ix86} %{power64} s390x
- ghc-cborg
ExcludeArch: %{ix86}
- ghc-cborg-json
ExcludeArch: %{ix86}
- ghc-gi-gtk
ExcludeArch: armv7hl
- ghc-serialise
ExcludeArch: %{ix86}
- ghc9.2
ExcludeArch: armv7hl
- ghc9.4
ExcludeArch: armv7hl
- ghc9.6
ExcludeArch: armv7hl
- ghdl
ExclusiveArch: %{GNAT_arches}
ExcludeArch: armv7hl %{ix86}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gimp-fourier-plugin
ExcludeArch: %{ix86}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-lfs
ExcludeArch: %{ix86}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gitqlient
ExclusiveArch: %{qt5_qtwebengine_arches}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- gkrellm-wifi
ExcludeArch: s390 s390x
- glava
ExcludeArch: %{ix86}
- glibd
ExclusiveArch: %{ldc_arches}
- gloo
ExcludeArch: i686
- glycin-loaders
ExcludeArch: %{ix86}
- gmsh
ExcludeArch: %{ix86}
- gmult
ExcludeArch: %{ix86}
- gn
ExcludeArch: %{ix86}
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnofract4d
ExcludeArch: %{ix86}
- gnome-applets
ExcludeArch: %{ix86}
- gnome-bluetooth
ExcludeArch: s390 s390x
- gnome-bluetooth3.34
ExcludeArch: s390 s390x
- gnome-boxes
ExclusiveArch: x86_64
- gnome-chemistry-utils
ExcludeArch: %{ix86}
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
ExcludeArch: armv7hl
- gnome-flashback
ExcludeArch: %{ix86}
- gnome-hexgl
ExcludeArch: i686
- gnome-initial-setup
ExcludeArch: %{ix86}
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-monitor-config
ExcludeArch: %{ix86}
- gnome-panel
ExcludeArch: %{ix86}
- gnome-rdp
ExclusiveArch: %{mono_arches}
ExcludeArch: %{ix86}
- gnome-session
ExcludeArch: %{ix86}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-shell
ExcludeArch: %{ix86}
- gnome-software
ExcludeArch: %{ix86}
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnome-terminal
ExcludeArch: %{ix86}
- gnu-efi
ExclusiveArch: %{efi}
- gnucash
ExcludeArch: %{ix86}
ExcludeArch: ppc64 s390x
- gnumeric
ExcludeArch: %{ix86}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godot
ExcludeArch: s390x
- godot3
ExcludeArch: ppc64 ppc64le s390x
- goffice
ExcludeArch: %{ix86}
- golang
ExclusiveArch: %{golang_arches}
- golang-entgo-ent
ExcludeArch: %{arm32} %{ix86}
- golang-github-ebitengine-purego
ExcludeArch: ppc64le s390x
- golang-github-elliotchance-orderedmap
ExcludeArch: aarch64
ExcludeArch: ppc64le
ExcludeArch: s390x
- golang-github-facebookincubator-nvdtools
ExcludeArch: i686 armv7hl
- golang-github-google-goterm
ExcludeArch: ppc64le s390x
- goldendict-ng
ExclusiveArch: aarch64 x86_64
- google-compute-engine-guest-configs
ExcludeArch: %{ix86}
- google-cpu_features
ExcludeArch: s390x
- google-gson
ExclusiveArch: %{java_arches} noarch
- google-guest-agent
ExcludeArch: ppc64le s390x
- google-guice
ExclusiveArch: %{java_arches} noarch
- google-osconfig-agent
ExcludeArch: ppc64le s390x
- gotcha
ExcludeArch: %{ix86}
- gotify-desktop
ExcludeArch: %{ix86}
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- gource
ExcludeArch: ppc64le
- goverlay
ExclusiveArch: %{fpc_arches}
- gpaste
ExcludeArch: %{ix86}
- gpaw
ExcludeArch: ppc64
ExcludeArch: %{ix86}
- gperftools
ExcludeArch: s390
- gprbuild
ExclusiveArch: %{GPRbuild_arches}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64
- gr-air-modes
ExcludeArch: %{ix86}
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- greenboot
ExcludeArch: s390x
- gretl
ExcludeArch: %{ix86}
- gromacs
ExcludeArch: i686 armv7hl s390x
- grub-customizer
ExcludeArch: s390 s390x %{arm}
- grub2
ExcludeArch: s390 s390x %{ix86}
- grub2-breeze-theme
ExcludeArch: s390 s390x %{arm}
- grubby
ExcludeArch: %{ix86}
- gsequencer
ExcludeArch: i686
- gthree
ExcludeArch: i686
- gthumb
ExcludeArch: s390x
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- gtkhash
ExcludeArch: %{ix86}
- gtkwave
ExcludeArch: s390x
- guava
ExclusiveArch: %{java_arches} noarch
- gudev-sharp
ExclusiveArch: %mono_arches
- guestfs-tools
ExclusiveArch: %{kernel_arches}
ExcludeArch: %{power64}
- gvisor-tap-vsock
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- hamcrest
ExclusiveArch: %{java_arches} noarch
- harec
ExclusiveArch: x86_64 aarch64 riscv64
- harmonyseq
ExcludeArch: %{ix86}
- harvey
ExcludeArch: %{ix86}
- hashcat
ExcludeArch: ppc64 s390x
- hawtjni
ExclusiveArch: %{java_arches} noarch
- haxe
ExcludeArch: %{ix86}
- hcloud
ExcludeArch: %{ix86}
- heaptrack
ExcludeArch: s390 s390x
- hedgewars
ExclusiveArch: %{fpc_arches}
ExcludeArch: ppc64le
- helix
ExcludeArch: %{ix86}
- hevea
ExcludeArch: %{ix86}
- hibernate-jpa-2.0-api
ExclusiveArch: %{java_arches} noarch
- hid4java
ExclusiveArch: %{java_arches} noarch
- highfive
ExcludeArch: %{ix86}
- hipblas
ExclusiveArch: x86_64
- hipblaslt
ExclusiveArch: x86_64
- hipcub
ExclusiveArch: x86_64
- hipfft
ExclusiveArch: x86_64
- hipify
ExclusiveArch: x86_64
- hiprand
ExclusiveArch: x86_64
- hipsolver
ExclusiveArch: x86_64
- hipsparse
ExclusiveArch: x86_64
- hmmer
ExcludeArch: aarch64 ppc64le s390x
- honggfuzz
ExcludeArch: %{arm} %{power64} s390 s390x
- howl
ExcludeArch: ppc64le s390x
ExcludeArch: %{ix86}
- hpx
ExcludeArch: i686
- hsakmt
ExclusiveArch: x86_64 aarch64 ppc64le
- httpcomponents-client
ExclusiveArch: %{java_arches} noarch
- httpcomponents-core
ExclusiveArch: %{java_arches} noarch
- httpcomponents-project
ExclusiveArch: %{java_arches} noarch
- hyperhdr
ExcludeArch: %{ix86}
- hyperrogue
ExcludeArch: armv7hl
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64 aarch64
- hyprcursor
ExcludeArch: %{ix86}
- hypridle
ExcludeArch: %{ix86}
- hyprland
ExcludeArch: %{ix86}
- hyprlang
ExcludeArch: %{ix86}
- hyprlock
ExcludeArch: %{ix86}
- hyprpaper
ExcludeArch: %{ix86}
- hyprutils
ExcludeArch: %{ix86}
- hyprwayland-scanner
ExcludeArch: %{ix86}
- i2c-tools
ExcludeArch: s390 s390x
- ibsim
ExcludeArch: s390 %{arm}
- ibus-typing-booster
ExcludeArch: ppc64 s390x
- icecat
ExcludeArch: %{ix86} %{arm}
- icedtea-web
ExclusiveArch: %{java_arches}
- icu4j
ExclusiveArch: %{java_arches} noarch
- ignition
ExcludeArch: %{ix86}
- iir1
ExcludeArch: %{ix86}
- ike-scan
ExcludeArch: %{ix86}
- ilua
ExcludeArch: %{ix86}
- imagej
ExclusiveArch: %{java_arches} noarch
- imaptest
ExcludeArch: %{ix86}
- imhex
ExclusiveArch: x86_64 %{arm64}
- iml
ExcludeArch: %{ix86}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indi-3rdparty-drivers
ExcludeArch: %{ix86}
- indi-3rdparty-libraries
ExcludeArch: %{ix86}
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cm-compiler
ExclusiveArch: i686 x86_64
- intel-cmt-cat
ExclusiveArch: x86_64
- intel-compute-runtime
ExclusiveArch: x86_64
- intel-gmmlib
ExcludeArch: s390x ppc64le
- intel-igc
ExclusiveArch: x86_64
- intel-ipp-crypto-mb
ExclusiveArch: x86_64
- intel-ipsec-mb
ExclusiveArch: x86_64
- intel-lpmd
ExclusiveArch: x86_64
- intel-media-driver-free
ExclusiveArch: i686 x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-metee
ExclusiveArch: x86_64
- intel-mpi-benchmarks
ExcludeArch: %{ix86}
- intel-qpl
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- intel-vpl-gpu-rt
ExclusiveArch: x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipe
ExcludeArch: %{ix86}
- ipmctl
ExclusiveArch: x86_64
- iprutils
ExclusiveArch: ppc64le
- irda-utils
ExcludeArch: s390 s390x
- irqbalance
ExcludeArch: s390 s390x
- isa-l
ExcludeArch: %{ix86}
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- jFormatString
ExclusiveArch: %{java_arches} noarch
- jack-mixer
ExcludeArch: armv7hl
ExcludeArch: i686
- jackson-annotations
ExclusiveArch: %{java_arches} noarch
- jackson-bom
ExclusiveArch: %{java_arches} noarch
- jackson-core
ExclusiveArch: %{java_arches} noarch
- jackson-databind
ExclusiveArch: %{java_arches} noarch
- jackson-jaxrs-providers
ExclusiveArch: %{java_arches} noarch
- jackson-modules-base
ExclusiveArch: %{java_arches} noarch
- jackson-parent
ExclusiveArch: %{java_arches} noarch
- jacoco
ExclusiveArch: %{java_arches} noarch
- jacop
ExclusiveArch: %{java_arches} noarch
- jakarta-activation
ExclusiveArch: %{java_arches} noarch
- jakarta-activation1
ExclusiveArch: %{java_arches} noarch
- jakarta-annotations
ExclusiveArch: %{java_arches} noarch
- jakarta-el
ExclusiveArch: %{java_arches} noarch
- jakarta-interceptors
ExclusiveArch: %{java_arches} noarch
- jakarta-json
ExclusiveArch: %{java_arches} noarch
- jakarta-mail
ExclusiveArch: %{java_arches} noarch
- jakarta-mail1
ExclusiveArch: %{java_arches} noarch
- jakarta-oro
ExclusiveArch: %{java_arches} noarch
- jakarta-saaj
ExclusiveArch: %{java_arches} noarch
- jakarta-server-pages
ExclusiveArch: %{java_arches} noarch
- jakarta-servlet
ExclusiveArch: %{java_arches} noarch
- jakarta-xml-ws
ExclusiveArch: %{java_arches} noarch
- janino
ExclusiveArch: %{java_arches} noarch
- jansi
ExclusiveArch: %{java_arches}
- jansi-native
ExclusiveArch: %{java_arches}
- jansi1
ExclusiveArch: %{java_arches} noarch
- java-1.8.0-openjdk
ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
- java-1.8.0-openjdk-portable
ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
- java-11-openjdk
ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
- java-11-openjdk-portable
ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
- java-17-openjdk
ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
- java-17-openjdk-portable
ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
- java-21-openjdk
ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
- java-21-openjdk-portable
ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
- java-diff-utils
ExclusiveArch: %{java_arches} noarch
- java-dirq
ExclusiveArch: %{java_arches} noarch
- java-jd-decompiler
ExclusiveArch: %{java_arches} noarch
- java-latest-openjdk
ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
- java-latest-openjdk-portable
ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
- java-runtime-decompiler
ExclusiveArch: %{java_arches} noarch
- java-scrypt
ExclusiveArch: %{java_arches} noarch
- java_cup
ExclusiveArch: %{java_arches} noarch
- javacc
ExclusiveArch: %{java_arches} noarch
- javacc-maven-plugin
ExclusiveArch: %{java_arches} noarch
- javaewah
ExclusiveArch: %{java_arches} noarch
- javapackages-bootstrap
ExclusiveArch: %{java_arches}
- javaparser
ExclusiveArch: %{java_arches} noarch
- javapoet
ExclusiveArch: %{java_arches} noarch
- javassist
ExclusiveArch: %{java_arches} noarch
- jaxb
ExclusiveArch: %{java_arches} noarch
- jaxb-api
ExclusiveArch: %{java_arches} noarch
- jaxb-api2
ExclusiveArch: %{java_arches} noarch
- jaxb-dtd-parser
ExclusiveArch: %{java_arches} noarch
- jaxb-fi
ExclusiveArch: %{java_arches} noarch
- jaxb-istack-commons
ExclusiveArch: %{java_arches} noarch
- jaxb-stax-ex
ExclusiveArch: %{java_arches} noarch
- jaxen
ExclusiveArch: %{java_arches} noarch
- jblas
ExcludeArch: %{ix86}
- jboss-jaxrs-2.0-api
ExclusiveArch: %{java_arches} noarch
- jboss-logging
ExclusiveArch: %{java_arches} noarch
- jboss-logging-tools
ExclusiveArch: %{java_arches} noarch
- jboss-parent
ExclusiveArch: %{java_arches} noarch
- jchardet
ExclusiveArch: %{java_arches} noarch
- jcip-annotations
ExclusiveArch: %{java_arches} noarch
- jctools
ExclusiveArch: %{java_arches} noarch
- jcuber
ExclusiveArch: %{java_arches} noarch
- jdeparser
ExclusiveArch: %{java_arches} noarch
- jdepend
ExclusiveArch: %{java_arches} noarch
- jdependency
ExclusiveArch: %{java_arches} noarch
- jdom
ExclusiveArch: %{java_arches} noarch
- jdom2
ExclusiveArch: %{java_arches} noarch
- jedit
ExclusiveArch: %{java_arches} noarch
- jericho-html
ExclusiveArch: %{java_arches} noarch
- jetbrains-annotations
ExclusiveArch: noarch %{java_arches}
- jetty
ExclusiveArch: %{java_arches} noarch
- jflex
ExclusiveArch: %{java_arches} noarch
- jfreechart
ExclusiveArch: %{java_arches} noarch
- jglobus
ExclusiveArch: %{java_arches} noarch
- jgoodies-common
ExclusiveArch: %{java_arches} noarch
- jgoodies-forms
ExclusiveArch: %{java_arches} noarch
- jgoodies-looks
ExclusiveArch: %{java_arches} noarch
- jigawatts
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- jline
ExclusiveArch: %{java_arches}
- jline2
ExclusiveArch: %{java_arches} noarch
- jmock
ExclusiveArch: %{java_arches} noarch
- jna
ExclusiveArch: %{java_arches}
- jneuroml-core
ExclusiveArch: %{java_arches} noarch
- jo
ExcludeArch: %{ix86}
- jol
ExclusiveArch: %{java_arches} noarch
- jopt-simple
ExclusiveArch: %{java_arches} noarch
- jorbis
ExclusiveArch: %{java_arches} noarch
- jowl
ExclusiveArch: %{nodejs_arches} noarch
- jpanoramamaker
ExclusiveArch: %{java_arches} noarch
- jpilot
ExcludeArch: s390, s390x
- jpilot-backup
ExcludeArch: s390 s390x
- jsch
ExclusiveArch: %{java_arches} noarch
- jsch-agent-proxy
ExclusiveArch: %{java_arches} noarch
- json_simple
ExclusiveArch: %{java_arches} noarch
- jsoup
ExclusiveArch: %{java_arches} noarch
- jsr-305
ExclusiveArch: %{java_arches} noarch
- jss
ExclusiveArch: %{java_arches}
ExcludeArch: i686
- jssc
ExclusiveArch: %{java_arches}
- jtidy
ExclusiveArch: %{java_arches} noarch
- julia
ExclusiveArch: x86_64
- junit
ExclusiveArch: %{java_arches} noarch
- junit5
ExclusiveArch: %{java_arches} noarch
- juniversalchardet
ExclusiveArch: %{java_arches} noarch
- jzlib
ExclusiveArch: %{java_arches} noarch
- kaffeine
ExcludeArch: %{ix86}
- kaidan
ExclusiveArch: %{qt5_qtwebengine_arches}
ExcludeArch: %{ix86}
- kata-containers
ExcludeArch: %{arm} %{ix86} s390 s390x
ExcludeArch: ppc64le
- kawa
ExcludeArch: i686
- kchmviewer
ExclusiveArch: %{qt5_qtwebengine_arches}
- kcm_wacomtablet
ExcludeArch: s390 s390x
- kcov
ExcludeArch: s390 s390x
- kdenlive
ExcludeArch: %{ix86}
- keepass
ExclusiveArch: %{mono_arches}
ExcludeArch: armv7hl
- keepassxc
ExcludeArch: s390x
- kernel
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
- kernelshark
ExcludeArch: %{ix86} %{arm}
- keydb
ExcludeArch: %{ix86}
- keylime-agent-rust
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- khelpcenter
ExclusiveArch: %{qt6_qtwebengine_arches}
- kicad
ExclusiveArch: x86_64 aarch64 ppc64le
- kissat
ExcludeArch: %{ix86}
- kitty
ExcludeArch: %{ix86}
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- kokkos
ExcludeArch: i686 armv7hl
- kpilot
ExcludeArch: s390 s390x
- krita
ExcludeArch: %{ix86}
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- ladspa-autotalent-plugins
ExcludeArch: %{ix86}
- latte-integrale
ExcludeArch: %{ix86}
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- lcd4linux
ExcludeArch: s390 s390x
- ldapjdk
ExclusiveArch: %{java_arches} noarch
- ldc
ExclusiveArch: %{ldc_arches} ppc64le
- ledmon
ExcludeArch: %{ix86}
- leland-fonts
ExcludeArch: %{ix86}
- lfortran
ExclusiveArch: x86_64
- lfsc
ExcludeArch: %{ix86}
- lib3mf
ExcludeArch: %{ix86}
- libCombine
ExcludeArch: %{ix86}
- libaiff
ExcludeArch: %{ix86}
- libarcus
ExcludeArch: %{ix86}
- libarrow
ExcludeArch: %{ix86} %{arm}
- libavc1394
ExcludeArch: s390 s390x
- libbase
ExclusiveArch: %{java_arches} noarch
- libcamera
ExcludeArch: s390x ppc64le
- libcamera-apps
ExcludeArch: %{power64} s390x
- libcint
ExcludeArch: %{power64}
ExcludeArch: x86_64
- libcircle
ExcludeArch: %{ix86}
- libcpuid
ExcludeArch: aarch64 %arm ppc64le ppc64 s390x
- libcrystalhd
ExcludeArch: s390 s390x
- libcxx
ExcludeArch: ppc64 ppc64le
- libdc1394
ExcludeArch: s390 s390x
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdigidocpp
ExcludeArch: %{ix86}
- libdispatch
ExclusiveArch: x86_64 aarch64 ppc64le
- libffado
ExcludeArch: s390 s390x
- libfilezilla
ExcludeArch: s390x
- libfonts
ExclusiveArch: %{java_arches} noarch
- libformula
ExclusiveArch: %{java_arches} noarch
- libfprint
ExcludeArch: s390 s390x
- libguestfs
ExcludeArch: %{ix86}
ExclusiveArch: %{kernel_arches}
ExcludeArch: %{power64}
- libibcommon
ExcludeArch: s390 s390x
- libica
ExclusiveArch: s390 s390x
- libiec61883
ExcludeArch: s390 s390x
- libinsane
ExcludeArch: %{ix86}
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libkrun
ExclusiveArch: x86_64 aarch64
- libkrunfw
ExclusiveArch: x86_64 aarch64
- liblayout
ExclusiveArch: %{java_arches} noarch
- libldac
ExcludeArch: s390x
- libloader
ExclusiveArch: %{java_arches} noarch
- libnuml
ExcludeArch: %{ix86}
- libnxt
ExcludeArch: %{ix86}
- libnxz
ExclusiveArch: ppc64le
- libobjc2
ExcludeArch: armv7hl i686 ppc64le s390x
- libocxl
ExclusiveArch: ppc64le
- libomp17
ExcludeArch: s390x
- libopenshot
ExcludeArch: ppc64le
- libopenshot-audio
ExcludeArch: ppc64le
- liborc
ExcludeArch: i686 armv7hl
- libpoly
ExcludeArch: %{ix86}
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libraw1394
ExcludeArch: s390 s390x
- libreoffice
ExcludeArch: %{ix86}
- libreoffice-TexMaths
ExclusiveArch: %{java_arches}
ExcludeArch: aarch64 s390x
- librepository
ExclusiveArch: %{java_arches} noarch
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- libretro-pcsx-rearmed
ExcludeArch: armv7hl
- librtas
ExclusiveArch: %{power64}
- libsavitar
ExcludeArch: %{ix86}
- libsedml
ExcludeArch: %{ix86}
- libsemigroups
ExcludeArch: %{ix86}
- libserializer
ExclusiveArch: %{java_arches} noarch
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libsonata
ExcludeArch: %{ix86}
- libstoragemgmt
ExcludeArch: %{ix86}
- libtpcmisc
ExcludeArch: %{ix86}
- libtracecmd
ExcludeArch: %{ix86} %{arm}
- libunibreak
ExcludeArch: %{ix86}
- libunicode
ExclusiveArch: x86_64 aarch64
- libunifex
ExcludeArch: i686
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64 riscv64
- libva-intel-hybrid-driver
ExclusiveArch: %{ix86} x86_64 ia64
- libva-nvidia-driver
ExclusiveArch: %{x86_64} %{ix86} %{arm64} ppc64le
- libvirt-java
ExclusiveArch: %{java_arches} noarch
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libvpl
ExclusiveArch: x86_64
- libvpl-tools
ExclusiveArch: x86_64
- libx86
ExcludeArch: ppc %{power64} s390 s390x %{sparc} aarch64 armv7hl
- libxsmm
ExclusiveArch: x86_64
- libzdnn
ExclusiveArch: s390x
- libzfcphbaapi
ExclusiveArch: s390 s390x
- libzpc
ExclusiveArch: s390x
- liferea
ExcludeArch: %{ix86}
- linbox
ExcludeArch: %{ix86}
- linux-system-roles
ExcludeArch: i686
- liquid-dsp
ExcludeArch: i686
- liquidctl
ExcludeArch: s390 s390x
- lite-xl
ExcludeArch: %{ix86}
- llama-cpp
ExclusiveArch: x86_64 aarch64
- lld13
ExcludeArch: s390x
- lld15
ExcludeArch: s390x
- lld17
ExcludeArch: s390x
- llhttp
ExclusiveArch: %{nodejs_arches}
- llvm-bolt
ExcludeArch: s390x ppc64le i686
- log4j
ExclusiveArch: %{java_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- loguru
ExcludeArch: %{ix86}
- loupe
ExcludeArch: %{ix86}
- love
ExcludeArch: ppc ppc64 s390x
- lrmi
ExclusiveArch: %{ix86}
- lrslib
ExcludeArch: %{ix86}
- lsp-plugins
ExcludeArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExcludeArch: riscv64 ppc64 ppc64le
- lucene
ExclusiveArch: %{java_arches} noarch
- luckybackup
ExcludeArch: %{ix86}
- lujavrite
ExclusiveArch: %{java_arches}
- luminance-hdr
ExcludeArch: %{ix86}
- lusol
ExcludeArch: %{ix86}
- luxcorerender
ExclusiveArch: x86_64
- lzfse
ExcludeArch: s390x
- m4ri
ExcludeArch: %{ix86}
- m4rie
ExcludeArch: %{ix86}
- mactel-boot
ExclusiveArch: x86_64
- magicmirror
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-airnow
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-onthisday
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-singlestock
ExclusiveArch: %{nodejs_arches} noarch
- magma
ExclusiveArch: x86_64
- makemusic-finale-fonts
ExcludeArch: %{ix86}
- mame
ExcludeArch: %{arm} %{ix86}
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mapnik
ExcludeArch: ppc ppc64 s390 s390x
- marcsabatella-campania-fonts
ExcludeArch: %{ix86}
- mariadb-java-client
ExclusiveArch: %{java_arches} noarch
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- mate-applets
ExcludeArch: i386 i686
- mathic
ExcludeArch: %{ix86}
- mathicgb
ExcludeArch: %{ix86}
- matrix-synapse
ExclusiveArch: %{rust_arches}
- maven
ExclusiveArch: %{java_arches} noarch
- maven-antrun-plugin
ExclusiveArch: %{java_arches} noarch
- maven-archetype
ExclusiveArch: %{java_arches} noarch
- maven-archiver
ExclusiveArch: %{java_arches} noarch
- maven-artifact-transfer
ExclusiveArch: %{java_arches} noarch
- maven-assembly-plugin
ExclusiveArch: %{java_arches} noarch
- maven-bundle-plugin
ExclusiveArch: %{java_arches} noarch
- maven-clean-plugin
ExclusiveArch: %{java_arches} noarch
- maven-common-artifact-filters
ExclusiveArch: %{java_arches} noarch
- maven-compiler-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-analyzer
ExclusiveArch: %{java_arches} noarch
- maven-dependency-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-tree
ExclusiveArch: %{java_arches} noarch
- maven-doxia
ExclusiveArch: %{java_arches} noarch
- maven-doxia-sitetools
ExclusiveArch: %{java_arches} noarch
- maven-enforcer
ExclusiveArch: %{java_arches} noarch
- maven-file-management
ExclusiveArch: %{java_arches} noarch
- maven-filtering
ExclusiveArch: %{java_arches} noarch
- maven-invoker
ExclusiveArch: %{java_arches} noarch
- maven-invoker-plugin
ExclusiveArch: %{java_arches} noarch
- maven-jar-plugin
ExclusiveArch: %{java_arches} noarch
- maven-mapping
ExclusiveArch: %{java_arches} noarch
- maven-native
ExclusiveArch: %{java_arches} noarch
- maven-parent
ExclusiveArch: %{java_arches} noarch
- maven-patch-plugin
ExclusiveArch: %{java_arches} noarch
- maven-plugin-testing
ExclusiveArch: %{java_arches} noarch
- maven-plugin-tools
ExclusiveArch: %{java_arches} noarch
- maven-remote-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-reporting-api
ExclusiveArch: %{java_arches} noarch
- maven-reporting-impl
ExclusiveArch: %{java_arches} noarch
- maven-resolver
ExclusiveArch: %{java_arches} noarch
- maven-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-script-interpreter
ExclusiveArch: %{java_arches} noarch
- maven-shade-plugin
ExclusiveArch: %{java_arches} noarch
- maven-shared-incremental
ExclusiveArch: %{java_arches} noarch
- maven-shared-io
ExclusiveArch: %{java_arches} noarch
- maven-shared-utils
ExclusiveArch: %{java_arches} noarch
- maven-source-plugin
ExclusiveArch: %{java_arches} noarch
- maven-surefire
ExclusiveArch: %{java_arches} noarch
- maven-verifier
ExclusiveArch: %{java_arches} noarch
- maven-verifier-plugin
ExclusiveArch: %{java_arches} noarch
- maven-wagon
ExclusiveArch: %{java_arches} noarch
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mcrouter
ExclusiveArch: x86_64 aarch64 ppc64le
- mecab-java
ExclusiveArch: %java_arches
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtailor
ExcludeArch: %{ix86}
- memtest86+
ExclusiveArch: x86_64 %{ix86}
- merkuro
ExclusiveArch: %{qt6_qtwebengine_arches}
- meshlab
ExclusiveArch: aarch64 x86_64
ExcludeArch: %{ix86}
- metamath
ExcludeArch: %{ix86}
- mfem
ExcludeArch: %{ix86}
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64 riscv64
- miglayout
ExclusiveArch: %{java_arches} noarch
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-libidn2
ExclusiveArch: %{ix86} x86_64 %{arm}
- mingw-qt6-qtlocation
ExcludeArch: s390x
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- miopen
ExclusiveArch: x86_64
- mirrormanager2
ExcludeArch: %{ix86}
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- mlir
ExcludeArch: i686
- mlir17
ExcludeArch: i686
- mlpack
ExcludeArch: %{ix86}
ExcludeArch: s390
- mmapper
ExcludeArch: %{ix86}
- mmlib
ExcludeArch: %{ix86}
- mmtests
ExcludeArch: s390x
- mockito
ExclusiveArch: %{java_arches} noarch
- mod_gnutls
ExcludeArch: %{ix86} %{arm}
- mod_mapcache
ExcludeArch: i686
- mod_mono
ExclusiveArch: %mono_arches
- mod_proxy_cluster
ExcludeArch: i686 i386
- modello
ExclusiveArch: %{java_arches} noarch
- moditect
ExclusiveArch: %{java_arches} noarch
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- modulemaker-maven-plugin
ExclusiveArch: %{java_arches} noarch
- mojo-executor
ExclusiveArch: %{java_arches} noarch
- mojo-parent
ExclusiveArch: %{java_arches} noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
ExcludeArch: armv7hl
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monodevelop
ExclusiveArch: %mono_arches
ExcludeArch: armv7hl
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
ExcludeArch: armv7hl
- moose
ExcludeArch: s390x
- morphio
ExcludeArch: %{ix86}
- mozc
ExcludeArch: ppc ppc64 sparcv9 sparc64 s390x
- mozilla-ublock-origin
ExcludeArch: ppc64 s390x
- mp
ExcludeArch: %{ix86}
- mpark-patterns
ExcludeArch: %{ix86}
- mpc-qt
ExcludeArch: %{ix86}
- mpi4py
ExcludeArch: %{ix86}
- mpibash
ExcludeArch: %{ix86}
- mpsolve
ExcludeArch: %{ix86}
- mrchem
ExcludeArch: s390x
- mrcpp
ExcludeArch: s390x
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msolve
ExcludeArch: %{ix86}
- msr-tools
ExclusiveArch: %{ix86} x86_64
- mstflint
ExcludeArch: s390 s390x %{arm}
- msv
ExclusiveArch: %{java_arches} noarch
- mt32emu
ExcludeArch: %{ix86}
- muffin
ExcludeArch: %{ix86}
- mumble
ExcludeArch: %{ix86}
- mupen64plus
ExcludeArch: s390x
- musescore
ExcludeArch: %{ix86}
- musl
ExcludeArch: s390
- mvfst
ExclusiveArch: x86_64 aarch64 ppc64le riscv64
- mxparser
ExclusiveArch: %{java_arches} noarch
- mysql-connector-java
ExclusiveArch: %{java_arches} noarch
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- naev
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExcludeArch: %{ix86}
- nagios-plugins-check-updates
ExcludeArch: %{ix86}
- nant
ExclusiveArch: %mono_arches
ExcludeArch: armv7hl
- nativejit
ExclusiveArch: x86_64
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExcludeArch: i686
- ncl
ExcludeArch: %{ix86}
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- nekohtml
ExclusiveArch: %{java_arches} noarch
- nemo
ExcludeArch: %{ix86}
- nemo-extensions
ExcludeArch: %{ix86}
- nest
ExcludeArch: %{ix86}
- netatalk
ExcludeArch: %{ix86}
- netavark
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- netcdf-fortran
ExcludeArch: %{ix86}
- netdata
ExcludeArch: s390x
- netgen-mesher
ExcludeArch: %{ix86}
- neuron
ExcludeArch: mips64r2 mips32r2
ExcludeArch: %{ix86}
- newtonsoft-json
ExclusiveArch: %{mono_arches}
ExcludeArch: armv7hl
- nextcloud-client
ExcludeArch: %{ix86}
ExcludeArch: ppc64 ppc64le s390x
- nnpack
ExclusiveArch: x86_64
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-aw-webui
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-language-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjs-module-lexer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le riscv64 noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-undici
ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le riscv64 noarch
- nodejs18
ExclusiveArch: %{nodejs_arches}
- nodejs20
ExclusiveArch: %{nodejs_arches}
- nodejs22
ExclusiveArch: %{nodejs_arches}
- nom-tam-fits
ExclusiveArch: %{java_arches} noarch
- normaliz
ExcludeArch: %{ix86}
- not-ocamlfind
ExcludeArch: %{ix86}
- notejot
ExcludeArch: %{ix86}
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- ntfs2btrfs
ExcludeArch: ppc64 s390x
- nuget
ExclusiveArch: %{mono_arches}
- numactl
ExcludeArch: s390 %{arm}
- numatop
ExclusiveArch: x86_64 ppc64le
- numptyphysics
ExcludeArch: ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
ExcludeArch: armv7hl
- nut
ExcludeArch: s390 s390x
- nvml
ExclusiveArch: x86_64 ppc64le
- nwchem
ExcludeArch: %{ix86} s390x
ExcludeArch: s390x
- objectweb-asm
ExclusiveArch: %{java_arches} noarch
- objenesis
ExclusiveArch: %{java_arches} noarch
- obs-cef
ExclusiveArch: x86_64 aarch64
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- obs-studio-plugin-vkcapture
ExcludeArch: s390x
- ocaml
ExcludeArch: %{ix86}
- ocaml-SDL
ExcludeArch: %{ix86}
- ocaml-alcotest
ExcludeArch: %{ix86}
- ocaml-astring
ExcludeArch: %{ix86}
- ocaml-atd
ExcludeArch: %{ix86}
- ocaml-augeas
ExcludeArch: %{ix86}
- ocaml-autoconf
ExcludeArch: %{ix86}
- ocaml-base
ExcludeArch: %{ix86}
- ocaml-base64
ExcludeArch: %{ix86}
- ocaml-benchmark
ExcludeArch: %{ix86}
- ocaml-bigarray-compat
ExcludeArch: %{ix86}
- ocaml-bin-prot
ExcludeArch: %{ix86}
- ocaml-biniou
ExcludeArch: %{ix86}
- ocaml-bisect-ppx
ExcludeArch: %{ix86}
- ocaml-bos
ExcludeArch: %{ix86}
- ocaml-cairo
ExcludeArch: %{ix86}
- ocaml-calendar
ExcludeArch: %{ix86}
- ocaml-camlbz2
ExcludeArch: %{ix86}
- ocaml-camlidl
ExcludeArch: %{ix86}
- ocaml-camlimages
ExcludeArch: %{ix86}
- ocaml-camlp-streams
ExcludeArch: %{ix86}
- ocaml-camlp5
ExcludeArch: %{ix86}
- ocaml-camlp5-buildscripts
ExcludeArch: %{ix86}
- ocaml-camomile
ExcludeArch: %{ix86}
- ocaml-cinaps
ExcludeArch: %{ix86}
- ocaml-cmdliner
ExcludeArch: %{ix86}
- ocaml-compiler-libs-janestreet
ExcludeArch: %{ix86}
- ocaml-cppo
ExcludeArch: %{ix86}
- ocaml-crunch
ExcludeArch: %{ix86}
- ocaml-cryptokit
ExcludeArch: %{ix86}
- ocaml-csexp
ExcludeArch: %{ix86}
- ocaml-csv
ExcludeArch: %{ix86}
- ocaml-ctypes
ExcludeArch: %{ix86}
- ocaml-cudf
ExcludeArch: %{ix86}
- ocaml-curl
ExcludeArch: %{ix86}
- ocaml-curses
ExcludeArch: %{ix86}
- ocaml-dbus
ExcludeArch: %{ix86}
- ocaml-dose3
ExcludeArch: %{ix86}
- ocaml-dune
ExcludeArch: %{ix86}
- ocaml-easy-format
ExcludeArch: %{ix86}
- ocaml-expat
ExcludeArch: %{ix86}
- ocaml-extlib
ExcludeArch: %{ix86}
- ocaml-facile
ExcludeArch: %{ix86}
- ocaml-fieldslib
ExcludeArch: %{ix86}
- ocaml-fileutils
ExcludeArch: %{ix86}
- ocaml-findlib
ExcludeArch: %{ix86}
- ocaml-fmt
ExcludeArch: %{ix86}
- ocaml-fpath
ExcludeArch: %{ix86}
- ocaml-gen
ExcludeArch: %{ix86}
- ocaml-gettext
ExcludeArch: %{ix86}
- ocaml-graphics
ExcludeArch: %{ix86}
- ocaml-gsl
ExcludeArch: %{arm} %{ix86}
- ocaml-integers
ExcludeArch: %{ix86}
- ocaml-intrinsics-kernel
ExcludeArch: %{ix86}
- ocaml-jane-street-headers
ExcludeArch: %{ix86}
- ocaml-jsonm
ExcludeArch: %{ix86}
- ocaml-jst-config
ExcludeArch: %{ix86}
- ocaml-lablgl
ExcludeArch: %{ix86}
- ocaml-lablgtk
ExcludeArch: %{ix86}
- ocaml-lablgtk3
ExcludeArch: %{ix86}
- ocaml-labltk
ExcludeArch: %{ix86}
- ocaml-lacaml
ExcludeArch: %{ix86}
- ocaml-lambda-term
ExcludeArch: %{ix86}
- ocaml-libvirt
ExcludeArch: %{ix86}
- ocaml-logs
ExcludeArch: %{ix86}
- ocaml-luv
ExcludeArch: %{ix86}
- ocaml-lwt
ExcludeArch: %{ix86}
- ocaml-markup
ExcludeArch: %{ix86}
- ocaml-mccs
ExcludeArch: %{ix86}
- ocaml-mdx
ExcludeArch: %{ix86}
- ocaml-menhir
ExcludeArch: %{ix86}
- ocaml-merlin
ExcludeArch: %{ix86}
- ocaml-mew
ExcludeArch: %{ix86}
- ocaml-mew-vi
ExcludeArch: %{ix86}
- ocaml-mlgmpidl
ExcludeArch: %{ix86}
- ocaml-mlmpfr
ExcludeArch: %{ix86}
- ocaml-mtime
ExcludeArch: %{ix86}
- ocaml-mysql
ExcludeArch: %{ix86}
- ocaml-num
ExcludeArch: %{ix86}
- ocaml-obuild
ExcludeArch: %{ix86}
- ocaml-ocamlbuild
ExcludeArch: %{ix86}
- ocaml-ocamlgraph
ExcludeArch: %{ix86}
- ocaml-ocamlnet
ExcludeArch: %{ix86}
- ocaml-ocp-indent
ExcludeArch: %{ix86}
- ocaml-ocplib-endian
ExcludeArch: %{ix86}
- ocaml-ocplib-simplex
ExcludeArch: %{ix86}
- ocaml-octavius
ExcludeArch: %{ix86}
- ocaml-odoc
ExcludeArch: %{ix86}
- ocaml-omake
ExcludeArch: %{ix86}
- ocaml-opam-0install
ExcludeArch: %{ix86}
- ocaml-opam-file-format
ExcludeArch: %{ix86}
- ocaml-ounit
ExcludeArch: %{ix86}
- ocaml-parmap
ExcludeArch: %{ix86}
- ocaml-parsexp
ExcludeArch: %{ix86}
- ocaml-pcre
ExcludeArch: %{ix86}
- ocaml-pcre2
ExcludeArch: %{ix86}
- ocaml-perl4caml
ExcludeArch: %{ix86}
- ocaml-postgresql
ExcludeArch: %{ix86}
- ocaml-pp
ExcludeArch: %{ix86}
- ocaml-ppx-assert
ExcludeArch: %{ix86}
- ocaml-ppx-base
ExcludeArch: %{ix86}
- ocaml-ppx-cold
ExcludeArch: %{ix86}
- ocaml-ppx-compare
ExcludeArch: %{ix86}
- ocaml-ppx-custom-printf
ExcludeArch: %{ix86}
- ocaml-ppx-derivers
ExcludeArch: %{ix86}
- ocaml-ppx-deriving
ExcludeArch: %{ix86}
- ocaml-ppx-deriving-yaml
ExcludeArch: %{ix86}
- ocaml-ppx-deriving-yojson
ExcludeArch: %{ix86}
- ocaml-ppx-enumerate
ExcludeArch: %{ix86}
- ocaml-ppx-expect
ExcludeArch: %{ix86}
- ocaml-ppx-fields-conv
ExcludeArch: %{ix86}
- ocaml-ppx-globalize
ExcludeArch: %{ix86}
- ocaml-ppx-hash
ExcludeArch: %{ix86}
- ocaml-ppx-here
ExcludeArch: %{ix86}
- ocaml-ppx-inline-test
ExcludeArch: %{ix86}
- ocaml-ppx-js-style
ExcludeArch: %{ix86}
- ocaml-ppx-let
ExcludeArch: %{ix86}
- ocaml-ppx-optcomp
ExcludeArch: %{ix86}
- ocaml-ppx-sexp-conv
ExcludeArch: %{ix86}
- ocaml-ppx-stable-witness
ExcludeArch: %{ix86}
- ocaml-ppx-variants-conv
ExcludeArch: %{ix86}
- ocaml-ppxlib
ExcludeArch: %{ix86}
- ocaml-ppxlib-jane
ExcludeArch: %{ix86}
- ocaml-psmt2-frontend
ExcludeArch: %{ix86}
- ocaml-ptime
ExcludeArch: %{ix86}
- ocaml-ptmap
ExcludeArch: %{ix86}
- ocaml-pyml
ExcludeArch: %{ix86}
- ocaml-qcheck
ExcludeArch: %{ix86}
- ocaml-qtest
ExcludeArch: %{ix86}
- ocaml-re
ExcludeArch: %{ix86}
- ocaml-react
ExcludeArch: %{ix86}
- ocaml-res
ExcludeArch: %{ix86}
- ocaml-result
ExcludeArch: %{ix86}
- ocaml-rresult
ExcludeArch: %{ix86}
- ocaml-sedlex
ExcludeArch: %{ix86}
- ocaml-sexplib
ExcludeArch: %{ix86}
- ocaml-sexplib0
ExcludeArch: %{ix86}
- ocaml-sha
ExcludeArch: %{ix86}
- ocaml-spdx-licenses
ExcludeArch: %{ix86}
- ocaml-sqlite
ExcludeArch: %{ix86}
- ocaml-ssl
ExcludeArch: %{ix86}
- ocaml-stdcompat
ExcludeArch: %{ix86}
- ocaml-stdio
ExcludeArch: %{ix86}
- ocaml-stdlib-random
ExcludeArch: %{ix86}
- ocaml-swhid-core
ExcludeArch: %{ix86}
- ocaml-time-now
ExcludeArch: %{ix86}
- ocaml-topkg
ExcludeArch: %{ix86}
- ocaml-trie
ExcludeArch: %{ix86}
- ocaml-tyxml
ExcludeArch: %{ix86}
- ocaml-unionfind
ExcludeArch: %{ix86}
- ocaml-uucd
ExcludeArch: %{ix86}
- ocaml-uucp
ExcludeArch: %{ix86}
- ocaml-uunf
ExcludeArch: %{ix86}
- ocaml-uuseg
ExcludeArch: %{ix86}
- ocaml-uutf
ExcludeArch: %{ix86}
- ocaml-variantslib
ExcludeArch: %{ix86}
- ocaml-version
ExcludeArch: %{ix86}
- ocaml-xml-light
ExcludeArch: %{ix86}
- ocaml-xmlm
ExcludeArch: %{ix86}
- ocaml-xmlrpc-light
ExcludeArch: %{ix86}
- ocaml-yaml
ExcludeArch: %{ix86}
- ocaml-yojson
ExcludeArch: %{ix86}
- ocaml-zarith
ExcludeArch: %{ix86}
- ocaml-zed
ExcludeArch: %{ix86}
- ocaml-zip
ExcludeArch: %{ix86}
- ocaml-zmq
ExcludeArch: %{ix86}
- ocamlify
ExcludeArch: %{ix86}
- ocamlmod
ExcludeArch: %{ix86}
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
ExclusiveArch: %{golang_arches_future}
- ocrmypdf
ExcludeArch: %{ix86}
- octave-communications
ExcludeArch: s390x
- octave-iso2mesh
ExcludeArch: armv7hl
- octave-signal
ExcludeArch: s390x
- oidc-agent
ExcludeArch: %{ix86}
- oidn
ExclusiveArch: x86_64
- oneVPL
ExclusiveArch: x86_64
- oneapi-level-zero
ExclusiveArch: x86_64
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- onedrive
ExclusiveArch: %{ldc_arches}
- ongres-scram
ExclusiveArch: %{java_arches} noarch
- ongres-stringprep
ExclusiveArch: %{java_arches} noarch
- onnx
ExcludeArch: s390x
- onnxruntime
ExcludeArch: s390x %{arm} %{ix86}
- oomd
ExcludeArch: i686 armv7hl
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- opam
ExcludeArch: %{ix86}
- open-vm-tools
ExclusiveArch: x86_64 aarch64
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- opencsg
ExcludeArch: %{ix86}
- opengrm-ngram
ExcludeArch: %{ix86}
- openjdk-asmtools
ExclusiveArch: %{java_arches} noarch
- openjdk-asmtools7
ExclusiveArch: %{java_arches} noarch
- openjfx
ExclusiveArch: %{java_arches}
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openmeeg
ExcludeArch: s390x
- openmpi
ExcludeArch: %{ix86}
- openms
ExclusiveArch: %{qt5_qtwebengine_arches}
ExcludeArch: %{ix86}
- openni
ExclusiveArch: x86_64 %{arm}
- openni-primesense
ExclusiveArch: x86_64 %{arm}
- openobex
ExcludeArch: s390 s390x
- openoffice.org-diafilter
ExclusiveArch: %{java_arches}
- openpgl
ExclusiveArch: aarch64 x86_64
- openrgb
ExcludeArch: %{ix86}
- openscad
ExcludeArch: %{ix86}
- openshadinglanguage
ExcludeArch: %{ix86} %{arm}
- openshot
ExcludeArch: ppc64le
- opensm
ExcludeArch: s390 %{arm}
- openssl-ibmca
ExclusiveArch: s390 s390x
- opentest4j
ExclusiveArch: %{java_arches} noarch
- opentype-sanitizer
ExcludeArch: %{ix86}
- openvdb
ExcludeArch: i686
- openvkl
ExclusiveArch: aarch64 x86_64
- openxr-simple-playground
ExcludeArch: %{ix86}
- optee_client
ExclusiveArch: aarch64
- options
ExclusiveArch: %{java_arches} noarch
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- os-autoinst
ExcludeArch: %{arm}
- osbuild-composer
ExcludeArch: i686 armv7hl
- osgi-annotation
ExclusiveArch: %{java_arches} noarch
- osgi-compendium
ExclusiveArch: %{java_arches} noarch
- osgi-core
ExclusiveArch: %{java_arches} noarch
- osm2pgsql
ExcludeArch: %{ix86}
- osslsigncode
ExcludeArch: i686
- ostree
ExcludeArch: %{ix86}
- osu-micro-benchmarks
ExcludeArch: %{ix86}
- otf2
ExcludeArch: i686 s390x
- oz
ExcludeArch: %{ix86}
- pacemaker
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm}
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- pageedit
ExclusiveArch: %{qt5_qtwebengine_arches}
- paperwork
ExcludeArch: %{ix86}
- papi
ExcludeArch: s390 s390x
- papilo
ExcludeArch: %{ix86}
- paraview
ExcludeArch: %{ix86}
- pari-nftables
ExcludeArch: %{ix86}
- parlaylib
ExcludeArch: aarch64 s390x arm-hfp ppc64le i686
- parserng
ExclusiveArch: %{java_arches} noarch
- pasdoc
ExclusiveArch: %{fpc_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcem
ExcludeArch: armv7hl i686 ppc64le s390x
- pcfi
ExclusiveArch: %{java_arches} noarch
- pcg-cpp
ExcludeArch: %{ix86}
- pcm
ExclusiveArch: %{ix86} x86_64
- pcp
ExcludeArch: %{ix86}
- pcp2pdf
ExcludeArch: %{ix86}
- pdbg
ExclusiveArch: ppc64le
- pdfarranger
ExcludeArch: %{ix86}
- pdfbox
ExclusiveArch: %{java_arches} noarch
- pdftk-java
ExclusiveArch: %{java_arches} noarch
- pdns
ExcludeArch: %{arm} %{ix86}
- pdns-recursor
ExcludeArch: %{arm} %{ix86}
- pdqsort
ExcludeArch: %{ix86}
- pengupop
ExcludeArch: s390x
- pentaho-libxml
ExclusiveArch: %{java_arches} noarch
- pentaho-reporting-flow-engine
ExclusiveArch: %{java_arches} noarch
- perftest
ExcludeArch: s390 %{arm}
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-LMDB_File
ExcludeArch: armv7hl i686
- perl-Math-Int128
ExcludeArch: %{arm32} %{ix86}
- perl-MaxMind-DB-Reader-XS
ExcludeArch: %{arm} %{ix86}
- perl-MongoDB
ExcludeArch: ppc %{sparc} s390
- perl-Net-Works
ExcludeArch: %{arm32} %{ix86}
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- perl-Task-Catalyst
ExcludeArch: %{ix86}
- perl-threads-lite
ExcludeArch: aarch64 ppc ppc64 ppc64le
- permlib
ExcludeArch: %{ix86}
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm} riscv64
- petpvc
ExcludeArch: %{ix86}
- pf-bb-config
ExcludeArch: s390x
- pgadmin4
ExcludeArch: i686 armv7hl s390x ppc64le
- phd2
ExcludeArch: %{ix86}
- phosh-mobile-settings
ExcludeArch: i686
- php
ExcludeArch: %{ix86}
- php-ast
ExcludeArch: %{ix86}
- php-facedetect
ExcludeArch: %{ix86}
- php-geos
ExcludeArch: %{ix86}
- php-libvirt
ExcludeArch: %{ix86}
- php-maxminddb
ExcludeArch: %{ix86}
- php-pecl-amqp
ExcludeArch: %{ix86}
- php-pecl-apcu
ExcludeArch: %{ix86}
- php-pecl-apfd
ExcludeArch: %{ix86}
- php-pecl-dio
ExcludeArch: %{ix86}
- php-pecl-ds
ExcludeArch: %{ix86}
- php-pecl-event
ExcludeArch: %{ix86}
- php-pecl-fann
ExcludeArch: %{ix86}
- php-pecl-gearman
ExcludeArch: %{ix86}
- php-pecl-geoip
ExcludeArch: %{ix86}
- php-pecl-gmagick
ExcludeArch: %{ix86}
- php-pecl-http
ExcludeArch: %{ix86}
- php-pecl-igbinary
ExcludeArch: %{ix86}
- php-pecl-imagick
ExcludeArch: %{ix86}
- php-pecl-inotify
ExcludeArch: %{ix86}
- php-pecl-ip2location
ExcludeArch: %{ix86}
- php-pecl-json-post
ExcludeArch: %{ix86}
- php-pecl-krb5
ExcludeArch: %{ix86}
- php-pecl-lzf
ExcludeArch: %{ix86}
- php-pecl-mailparse
ExcludeArch: %{ix86}
- php-pecl-mcrypt
ExcludeArch: %{ix86}
- php-pecl-memcache
ExcludeArch: %{ix86}
- php-pecl-memcached
ExcludeArch: %{ix86}
- php-pecl-mongodb
ExcludeArch: %{ix86}
- php-pecl-msgpack
ExcludeArch: %{ix86}
- php-pecl-oauth
ExcludeArch: %{ix86}
- php-pecl-pcov
ExcludeArch: %{ix86}
- php-pecl-pq
ExcludeArch: %{ix86}
- php-pecl-raphf
ExcludeArch: %{ix86}
- php-pecl-redis5
ExcludeArch: %{ix86}
- php-pecl-rpminfo
ExcludeArch: %{ix86}
- php-pecl-rrd
ExcludeArch: %{ix86}
- php-pecl-selinux
ExcludeArch: %{ix86}
- php-pecl-ssdeep
ExcludeArch: %{ix86}
- php-pecl-ssh2
ExcludeArch: %{ix86}
- php-pecl-uopz
ExcludeArch: %{ix86}
- php-pecl-uuid
ExcludeArch: %{ix86}
- php-pecl-var-representation
ExcludeArch: %{ix86}
- php-pecl-xattr
ExcludeArch: %{ix86}
- php-pecl-xdebug3
ExcludeArch: %{ix86}
- php-pecl-xmldiff
ExcludeArch: %{ix86}
- php-pecl-xmlrpc
ExcludeArch: %{ix86}
- php-pecl-yac
ExcludeArch: %{ix86}
- php-pecl-zip
ExcludeArch: %{ix86}
- php-phpiredis
ExcludeArch: %{ix86}
- php-smbclient
ExcludeArch: %{ix86}
- php-zmq
ExcludeArch: %{ix86}
- php-zstd
ExcludeArch: %{ix86}
- picard
ExcludeArch: ppc64
- picocli
ExclusiveArch: %{java_arches} noarch
- pigeonascent
ExcludeArch: ppc64le
ExcludeArch: s390x
- pilot-link
ExcludeArch: s390 s390x
- pinta
ExclusiveArch: %mono_arches
ExcludeArch: armv7hl
- pioneer
ExclusiveArch: %{ix86} x86_64
- pl
ExcludeArch: %{ix86}
- planets
ExcludeArch: %{ix86}
- plantri
ExcludeArch: %{ix86}
- plantuml
ExclusiveArch: %{java_arches} noarch
- plasma-dialer
ExclusiveArch: %{java_arches}
- plasma-disks
ExcludeArch: %{ix86}
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plee-the-bear
ExcludeArch: %{power64}
- plexus-archiver
ExclusiveArch: %{java_arches} noarch
- plexus-build-api
ExclusiveArch: %{java_arches} noarch
- plexus-build-api0
ExclusiveArch: %{java_arches} noarch
- plexus-cipher
ExclusiveArch: %{java_arches} noarch
- plexus-classworlds
ExclusiveArch: %{java_arches} noarch
- plexus-compiler
ExclusiveArch: %{java_arches} noarch
- plexus-component-api
ExclusiveArch: %{java_arches} noarch
- plexus-components-pom
ExclusiveArch: %{java_arches} noarch
- plexus-containers
ExclusiveArch: %{java_arches} noarch
- plexus-i18n
ExclusiveArch: %{java_arches} noarch
- plexus-interpolation
ExclusiveArch: %{java_arches} noarch
- plexus-io
ExclusiveArch: %{java_arches} noarch
- plexus-languages
ExclusiveArch: %{java_arches} noarch
- plexus-pom
ExclusiveArch: %{java_arches} noarch
- plexus-resources
ExclusiveArch: %{java_arches} noarch
- plexus-sec-dispatcher
ExclusiveArch: %{java_arches} noarch
- plexus-testing
ExclusiveArch: %{java_arches} noarch
- plexus-utils
ExclusiveArch: %{java_arches} noarch
- plexus-velocity
ExclusiveArch: %{java_arches} noarch
- plexus-xml
ExclusiveArch: %{java_arches} noarch
- pmix
ExcludeArch: %{ix86}
- pngcheck
ExcludeArch: %{ix86}
- podman
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- polymake
ExcludeArch: %{ix86}
- polyml
ExcludeArch: %{ix86}
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- postgresql-jdbc
ExclusiveArch: %{java_arches} noarch
- postgresql-pgpool-II
ExcludeArch: %{ix86}
ExcludeArch: %{ix86}
ExcludeArch: %{ix86}
- powerpc-utils
ExclusiveArch: ppc %{power64}
- powerstat
ExclusiveArch: %{ix86} x86_64
- ppc64-diag
ExclusiveArch: ppc %{power64}
- ppl
ExcludeArch: %{ix86}
- pplite
ExcludeArch: %{ix86}
- prestopalette
ExcludeArch: i686
- printer-driver-brlaser
ExcludeArch: %{ix86}
- procdump
ExcludeArch: ppc64le
- procyon
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
- proguard
ExclusiveArch: %{java_arches} noarch
- prooftree
ExcludeArch: %{ix86}
- proxmark3
ExcludeArch: ppc64le s390x i686
- proxygen
ExclusiveArch: x86_64 aarch64 ppc64le
- proxysql
ExcludeArch: %{power64} s390x %{ix86}
- prrte
ExcludeArch: %{ix86}
- prusa-slicer
ExcludeArch: %{ix86}
- psblas3
ExcludeArch: %{ix86}
- pveclib
ExclusiveArch: ppc %{power64}
- pygrib
ExcludeArch: i686
ExcludeArch: armv7hl
- pygsl
ExcludeArch: %{ix86}
- pyosmium
ExcludeArch: %{ix86}
- pypy
ExcludeArch: %{ix86}
- pypy3.10
ExcludeArch: %{ix86}
- pypy3.9
ExcludeArch: %{ix86}
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-aioresponses
ExcludeArch: s390x
- python-annarchy
ExcludeArch: %{ix86} ppc64le
- python-asn1tools
ExcludeArch: s390x
- python-ast-monitor
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- python-astroplan
ExcludeArch: %{ix86}
- python-astropy
ExcludeArch: %{ix86}
- python-astroscrappy
ExcludeArch: %{ix86}
- python-asyncmy
ExcludeArch: %{ix86}
- python-aws-sam-translator
ExcludeArch: %{ix86}
- python-awscrt
ExcludeArch: s390x
- python-bash-kernel
ExcludeArch: %{ix86}
- python-bitstruct
ExcludeArch: s390x
- python-blosc2
ExcludeArch: %{ix86}
- python-bluepyopt
ExcludeArch: s390x %{ix86} %{power64}
- python-brian2
ExcludeArch: %{ix86}
- python-calcephpy
ExcludeArch: %{ix86}
- python-cascadio
ExcludeArch: %{ix86} s390x
- python-colorthief
ExcludeArch: %{ix86}
- python-compreffor
ExcludeArch: %{ix86}
- python-contextualbandits
ExcludeArch: %{ix86}
- python-cradox
ExcludeArch: i686 armv7hl
- python-crick
ExcludeArch: %{ix86}
- python-cryptography
ExclusiveArch: %{rust_arches}
- python-cvxopt
ExcludeArch: %{ix86}
- python-cyipopt
ExcludeArch: %{ix86}
- python-dask
ExcludeArch: %{ix86}
- python-databases
ExcludeArch: %{ix86}
- python-devicely
ExcludeArch: s390x
- python-dijitso
ExcludeArch: i686
- python-dipy
ExcludeArch: %{ix86} s390x
- python-distributed
ExcludeArch: %{ix86}
- python-ducc0
ExcludeArch: %{ix86}
- python-earthpy
ExcludeArch: %{ix86}
- python-eccodes
ExcludeArch: i686
ExcludeArch: armv7hl
- python-efel
ExcludeArch: s390x
- python-elephant
ExcludeArch: s390x
ExcludeArch: %{ix86}
- python-ephyviewer
ExcludeArch: s390x %{ix86}
- python-fastavro
ExcludeArch: %{arm32} %{ix86}
- python-folium
ExcludeArch: %{ix86}
- python-formulaic
ExcludeArch: %{ix86}
- python-fsleyes
ExcludeArch: %{ix86}
- python-fsleyes-props
ExcludeArch: %{ix86}
- python-fslpy
ExcludeArch: %{ix86}
- python-gbinder
ExcludeArch: %{ix86}
- python-giacpy
ExcludeArch: aarch64 %{power64} s390x
- python-graph-tool
ExcludeArch: %{ix86}
- python-hdfs
ExcludeArch: %{ix86}
- python-healpy
ExcludeArch: %{ix86} %{arm}
- python-heapdict
ExcludeArch: %{ix86}
- python-imagecodecs
ExcludeArch: %{ix86}
- python-img2pdf
ExcludeArch: s390x
- python-javaobj
ExclusiveArch: %{java_arches} noarch
- python-jnius
ExclusiveArch: %{java_arches}
ExclusiveArch: %{java_arches}
- python-json-minify
ExcludeArch: %{ix86}
- python-jupymake
ExcludeArch: %{ix86}
- python-jupyter-c-kernel
ExcludeArch: %{ix86}
- python-jupyter-kernel-singular
ExcludeArch: %{ix86}
- python-jupyter-polymake
ExcludeArch: %{ix86}
- python-jupyter-sphinx
ExcludeArch: %{ix86}
- python-jupytext
ExcludeArch: s390x
- python-lazy-ops
ExcludeArch: %{ix86}
- python-lfpy
ExcludeArch: mips64r2 mips32r2
ExcludeArch: %{power64} %{ix86} armv7hl
- python-llama-cpp-python
ExclusiveArch: x86_64 aarch64
- python-logdetective
ExclusiveArch: x86_64 aarch64
- python-mapnik
ExcludeArch: ppc ppc64 s390 s390x
- python-missingno
ExcludeArch: %{ix86}
- python-mne
ExcludeArch: %{ix86}
- python-mne-bids
ExcludeArch: %{ix86}
- python-mplcairo
ExcludeArch: %{ix86}
- python-mplcursors
ExcludeArch: %{ix86}
- python-music21
ExcludeArch: %{ix86}
- python-nbdime
ExclusiveArch: x86_64 aarch64
- python-ndindex
ExcludeArch: %{ix86}
- python-neatdend
ExcludeArch: %{ix86}
- python-neo
ExcludeArch: s390x
- python-netpyne
ExcludeArch: %{ix86}
- python-neurom
ExcludeArch: %{ix86}
- python-neurotune
ExcludeArch: %{ix86}
- python-nifti-mrs
ExcludeArch: %{ix86}
- python-nilearn
ExcludeArch: %{ix86}
- python-nipy
ExcludeArch: %{ix86}
- python-numcodecs
ExcludeArch: %{ix86}
- python-octave-kernel
ExcludeArch: %{ix86}
- python-openpaperwork-core
ExcludeArch: %{ix86}
- python-openpaperwork-gtk
ExcludeArch: %{ix86}
- python-opentype-sanitizer
ExcludeArch: %{ix86}
- python-pandas
ExcludeArch: %{ix86}
- python-pandas-flavor
ExcludeArch: %{ix86}
- python-papermill
ExcludeArch: %{ix86}
- python-paperwork-backend
ExcludeArch: %{ix86}
- python-pari-jupyter
ExcludeArch: %{ix86}
- python-phyghtmap
ExcludeArch: %{ix86}
- python-pingouin
ExcludeArch: %{ix86}
- python-psycopg3
ExcludeArch: %{ix86}
- python-pyahocorasick
ExclusiveArch: x86_64 %{arm64} ppc64le riscv64
- python-pybbi
ExcludeArch: %{ix86}
- python-pybids
ExcludeArch: %{ix86}
- python-pybv
ExcludeArch: %{ix86}
- python-pyedflib
ExcludeArch: s390x
- python-pyfastnoisesimd
ExcludeArch: %{ix86}
- python-pyfiglet
ExcludeArch: %{ix86}
- python-pykdtree
ExcludeArch: %{ix86}
- python-pyliblzfse
ExcludeArch: s390x
- python-pymapvbvd
ExcludeArch: s390x
- python-pymatreader
ExcludeArch: %{ix86}
ExcludeArch: s390x
- python-pynn
ExcludeArch: mips64r2 mips32r2 s390x %{ix86}
- python-pyocr
ExcludeArch: %{ix86}
- python-pypet
ExcludeArch: %{ix86}
ExcludeArch: s390x
- python-pyphi
ExcludeArch: %{ix86} s390x
- python-pypillowfight
ExcludeArch: %{ix86}
- python-pyqt6-webengine
ExclusiveArch: %{qt6_qtwebengine_arches}
- python-pyriemann
ExcludeArch: %{ix86}
- python-pyroaring
ExcludeArch: %{ix86}
- python-pyscf
ExcludeArch: %{power64}
- python-pyshtools
ExcludeArch: %{ix86}
- python-pysingular
ExcludeArch: %{ix86}
- python-pyswarms
ExcludeArch: %{ix86}
- python-pyswip
ExcludeArch: %{ix86}
- python-pytest-arraydiff
ExcludeArch: %{ix86}
- python-pytest-tornado
ExcludeArch: %{ix86}
- python-python-fcl
ExcludeArch: %{ix86}
- python-pyunicorn
ExcludeArch: %{ix86}
- python-pyvat
ExcludeArch: %{ix86}
- python-ratinabox
ExcludeArch: %{ix86}
- python-recordclass
ExcludeArch: %{ix86}
- python-reproject
ExcludeArch: %{ix86}
- python-ruffus
ExcludeArch: %{ix86}
- python-scikit-learn
ExcludeArch: %{ix86}
- python-scikit-misc
ExcludeArch: %{ix86}
- python-sgp4
ExcludeArch: %{ix86}
- python-simplebayes
ExcludeArch: %{ix86}
- python-sklearn-genetic-opt
ExcludeArch: %{ix86}
- python-statsmodels
ExcludeArch: %{ix86}
- python-steps
ExcludeArch: %{ix86}
- python-tables
ExcludeArch: %{ix86}
- python-tensile
ExclusiveArch: x86_64
- python-tensordict
ExclusiveArch: x86_64 aarch64
- python-tkrzw
ExcludeArch: i686
- python-torch
ExclusiveArch: x86_64 aarch64
- python-torchaudio
ExclusiveArch: x86_64 aarch64
- python-torchdata
ExclusiveArch: x86_64 aarch64
- python-torchtext
ExclusiveArch: x86_64 aarch64
- python-torchvision
ExclusiveArch: x86_64 aarch64
- python-traitsui
ExcludeArch: ppc64le
- python-trimesh
ExcludeArch: %{ix86}
- python-uranium
ExcludeArch: %{ix86}
- python-willow
ExcludeArch: %{ix86}
- python-xattr
ExcludeArch: %{ix86}
- python-xbout
ExcludeArch: %{ix86}
- python-xmp-toolkit
ExcludeArch: %{ix86}
- python-zeep
ExcludeArch: s390x
- python-zict
ExcludeArch: %{ix86}
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qalculate-qt
ExcludeArch: %{ix86}
- qat-zstd-plugin
ExclusiveArch: x86_64
- qatengine
ExclusiveArch: x86_64
- qatlib
ExcludeArch: %{arm} aarch64 %{power64} s390x i686
- qatzip
ExclusiveArch: x86_64
- qbe
ExclusiveArch: x86_64 aarch64 riscv64
- qbittorrent
ExcludeArch: %{ix86}
- qbs
ExcludeArch: i686
- qcas
ExcludeArch: aarch64 %{power64} s390x
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qdigidoc
ExcludeArch: %{ix86}
- qdox
ExclusiveArch: %{java_arches} noarch
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
ExcludeArch: %{power64}
- qepcad-B
ExcludeArch: %{ix86}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qflipper
ExcludeArch: %{ix86}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmplay2
ExcludeArch: %{ix86}
- qoauth
ExcludeArch: ppc64
- qownnotes
ExcludeArch: %{ix86}
- qpdfview
ExcludeArch: s390x
- qperf
ExcludeArch: %{arm}
- qsopt-ex
ExcludeArch: %{ix86}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt6-qtquick3dphysics
ExclusiveArch: aarch64 i686 x86_64
- qt6-qtwebengine
ExclusiveArch: aarch64 x86_64
- qt6-qtwebview
ExclusiveArch: aarch64 x86_64
- qt6ct
ExcludeArch: s390x
- qtile
ExcludeArch: %{ix86}
- quantum-espresso
ExclusiveArch: x86_64 aarch64 %{power64}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rEFInd
ExclusiveArch: %{efi}
ExcludeArch: %{arm32}
- rasdaemon
ExcludeArch: s390 s390x
- rccl
ExclusiveArch: x86_64
- rdma-core
ExcludeArch: %{arm}
- realtime-tests
ExcludeArch: %{arm}
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64 s390x
- redeclipse
ExcludeArch: %{ix86}
- redfish-finder
ExclusiveArch: x86_64 aarch64
- redict
ExcludeArch: %{ix86}
- reflections
ExclusiveArch: %{java_arches} noarch
- reg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- regexp
ExclusiveArch: %{java_arches} noarch
- relaxng-datatype-java
ExclusiveArch: %{java_arches} noarch
- remake
ExcludeArch: %{ix86}
- renderdoc
ExclusiveArch: x86_64 aarch64
- replacer
ExclusiveArch: %{java_arches} noarch
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- rescene
ExclusiveArch: %{mono_arches}
- resteasy
ExclusiveArch: %{java_arches} noarch
- restool
ExclusiveArch: aarch64
- restsharp
ExclusiveArch: %{mono_arches}
ExcludeArch: armv7hl
- retroarch
ExcludeArch: %{ix86}
ExcludeArch: s390x
- retsnoop
ExclusiveArch: %{rust_arches}
ExcludeArch: armv7hl
- rhino
ExclusiveArch: %{java_arches} noarch
ExcludeArch: %{ix86}
- rhythmbox
ExcludeArch: s390 s390x
- rhythmbox-alternative-toolbar
ExcludeArch: s390 s390x
- rhythmbox-ampache
ExcludeArch: s390 s390x
- river
ExclusiveArch: %{zig_arches}
- rkcommon
ExclusiveArch: x86_64 aarch64
- rnp
ExcludeArch: %{ix86}
- rocalution
ExclusiveArch: x86_64
- rocblas
ExclusiveArch: x86_64
- rocclr
ExclusiveArch: x86_64
- rocfft
ExclusiveArch: x86_64
- rocm-compilersupport
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-core
ExclusiveArch: x86_64
- rocm-rpm-macros
ExclusiveArch: x86_64
- rocm-runtime
ExclusiveArch: x86_64
- rocm-smi
ExclusiveArch: x86_64 aarch64 ppc64le riscv64
- rocminfo
ExclusiveArch: x86_64
- rocprim
ExclusiveArch: x86_64
- rocrand
ExclusiveArch: x86_64
- rocsolver
ExclusiveArch: x86_64
- rocsparse
ExclusiveArch: x86_64
- rocthrust
ExclusiveArch: x86_64
- roctracer
ExclusiveArch: x86_64
- rpi-imager
ExcludeArch: s390x
- rpki-client
ExcludeArch: %{ix86}
- rpm-ostree
ExclusiveArch: %{rust_arches}
ExcludeArch: %{ix86}
- rpy
ExcludeArch: %{ix86}
- rr
ExclusiveArch: %{ix86} x86_64 aarch64
- rssguard
ExclusiveArch: %{qt6_qtwebengine_arches}
- rstudio
ExclusiveArch: %{java_arches}
- rsyntaxtextarea
ExclusiveArch: %{java_arches} noarch
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- ruff
ExcludeArch: %{ix86}
- runc
ExclusiveArch: %{golang_arches_future}
- rundoc
ExclusiveArch: %{java_arches} noarch
- rust
ExclusiveArch: %{rust_arches}
- rust-bankstown-lv2
ExcludeArch: ppc64le s390x
- rust-below
ExcludeArch: %{arm32} %{ix86}
- rust-below-btrfs
ExcludeArch: %{arm32} %{ix86}
- rust-below-config
ExcludeArch: %{arm32} %{ix86}
- rust-below-dump
ExcludeArch: %{arm32} %{ix86}
- rust-below-ethtool
ExcludeArch: %{arm32} %{ix86}
- rust-below-model
ExcludeArch: %{arm32} %{ix86}
- rust-below-render
ExcludeArch: %{arm32} %{ix86}
- rust-below-store
ExcludeArch: %{arm32} %{ix86}
- rust-below-view
ExcludeArch: %{arm32} %{ix86}
- rust-cgroupfs
ExcludeArch: %{arm32} %{ix86}
- rust-compress-tools
ExclusiveArch: %{rust_arches}
- rust-coreutils
ExcludeArch: %{ix86}
- rust-crypto-auditing-agent
ExcludeArch: i386 i686
- rust-ct-logs
ExcludeArch: ppc64le s390x
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-dashmap4
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-deflate0.8
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamming
ExclusiveArch: %{rust_arches}
- rust-hidapi
ExclusiveArch: %{rust_arches}
- rust-humantime-serde
ExclusiveArch: %{rust_arches}
- rust-hyperlocal
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-k9
ExclusiveArch: %{rust_arches}
- rust-krunvm
ExclusiveArch: x86_64 aarch64
- rust-kvm-bindings
ExcludeArch: %{ix86}
- rust-kvm-ioctls
ExclusiveArch: x86_64 aarch64
- rust-lebe
ExclusiveArch: %{rust_arches}
- rust-lv2
ExcludeArch: ppc64le s390x
- rust-lv2-atom
ExcludeArch: ppc64le s390x
- rust-lv2-core
ExcludeArch: ppc64le s390x
- rust-lv2-midi
ExcludeArch: ppc64le s390x
- rust-lv2-state
ExcludeArch: ppc64le s390x
- rust-lv2-sys
ExcludeArch: ppc64le s390x
- rust-lv2-time
ExcludeArch: ppc64le s390x
- rust-lv2-units
ExcludeArch: ppc64le s390x
- rust-lv2-urid
ExcludeArch: ppc64le s390x
- rust-lv2-worker
ExcludeArch: ppc64le s390x
- rust-msru
ExclusiveArch: x86_64
- rust-netstat2
ExclusiveArch: %{rust_arches}
- rust-nu
ExcludeArch: %{ix86}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-os_type
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pathsearch
ExclusiveArch: %{rust_arches}
- rust-prefixdevname
ExcludeArch: %{ix86}
- rust-pretty-bytes
ExclusiveArch: %{rust_arches}
- rust-probe
ExcludeArch: ppc64le s390x
- rust-psl-types
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-pwd
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-resctrlfs
ExcludeArch: %{arm32} %{ix86}
- rust-schemafy_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_lib
ExclusiveArch: %{rust_arches}
- rust-scx_layered
ExcludeArch: %{ix86}
- rust-scx_rustland
ExcludeArch: %{ix86}
- rust-scx_rusty
ExcludeArch: %{ix86}
- rust-scx_utils
ExcludeArch: %{ix86}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-sequoia-octopus-librnp
ExcludeArch: %{ix86} %{arm} s390x
- rust-serde_yaml0.8
ExclusiveArch: %{rust_arches}
- rust-sev
ExclusiveArch: x86_64
- rust-sevctl
ExclusiveArch: x86_64
- rust-sinit
ExclusiveArch: %{rust_arches}
- rust-snphost
ExclusiveArch: x86_64
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-tiny-dfr
ExcludeArch: %{ix86}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-uriparse
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-vhost-device-scmi
ExcludeArch: s390x
- rust-vhost-device-sound
ExcludeArch: %{ix86} s390x
- rust-vhost-device-vsock
ExcludeArch: s390x
- rust-virtio-bindings
ExclusiveArch: x86_64 aarch64 ppc64le riscv64
- rust-virtio-queue
ExcludeArch: i686
- rust-virtio-vsock
ExcludeArch: s390x
- rust-vm-memory
ExcludeArch: %{ix86}
- rust-vmm-sys-util
ExclusiveArch: x86_64 aarch64 ppc64le riscv64
- rust-vtparse
ExclusiveArch: %{rust_arches}
- rust-web-ext-native-messaging
ExclusiveArch: %{rust_arches}
- rust-wezterm-color-types
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic-derive
ExclusiveArch: %{rust_arches}
- rust-zbus1
ExclusiveArch: %{rust_arches}
- rust-zbus_macros1
ExclusiveArch: %{rust_arches}
- rust-zincati
ExcludeArch: armv7hl i686
- rust-zvariant2
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive2
ExclusiveArch: %{rust_arches}
- rustup
ExcludeArch: %{ix86}
- rutabaga-gfx-ffi
ExclusiveArch: x86_64 aarch64
- s2n-tls
ExcludeArch: %{ix86}
ExcludeArch: s390x
- s390utils
ExcludeArch: %{ix86}
- sac
ExclusiveArch: %{java_arches} noarch
- saclib
ExcludeArch: %{ix86}
- safeint
ExcludeArch: %{ix86}
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sandia-omega-h
ExcludeArch: %{ix86} s390x
- sayonara
ExcludeArch: %{ix86}
- sbcl
ExclusiveArch: %{ix86} x86_64 aarch64 %{power64}
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sblim-cim-client
ExclusiveArch: %{java_arches} noarch
- sblim-cim-client2
ExclusiveArch: %{java_arches} noarch
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- scala
ExclusiveArch: %{java_arches} noarch
- scalasca
ExcludeArch: s390 s390x armv7hl i686
- scannotation
ExclusiveArch: %{java_arches} noarch
- scip
ExcludeArch: %{ix86}
- scorep
ExcludeArch: s390 s390x armv7hl i686
- scx_c_schedulers
ExcludeArch: %{ix86}
- sdljava
ExclusiveArch: %{java_arches}
- sdrangel
ExclusiveArch: %{qt5_qtwebengine_arches}
- sdsl-lite
ExclusiveArch: %{power64} x86_64 aarch64
- sdubby
ExclusiveArch: %{efi}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt6_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- sedutil
ExcludeArch: ppc ppc64 s390 s390x
- sentencepiece
ExcludeArch: s390x
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- sequeler
ExcludeArch: %{ix86}
- sequence-library
ExclusiveArch: %{java_arches} noarch
- servicelog
ExclusiveArch: ppc %{power64}
- setserial
ExcludeArch: s390 s390x
- sexpp
ExcludeArch: %{ix86}
- sfnt2woff-zopfli
ExcludeArch: %{ix86}
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
ExcludeArch: %{ix86}
ExcludeArch: %{arm}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigil
ExclusiveArch: %{qt5_qtwebengine_arches}
ExcludeArch: %{ix86}
- sigul
ExclusiveArch: x86_64
ExcludeArch: %{ix86}
- simdutf
ExcludeArch: s390 s390x
- singularity-ce
ExclusiveArch: %{go_arches}
ExcludeArch: %{ix86}
- siril
ExcludeArch: %{ix86}
- sisu
ExclusiveArch: %{java_arches} noarch
- sisu-mojos
ExclusiveArch: %{java_arches} noarch
- skanpage
ExclusiveArch: %{qt6_qtwebengine_arches}
- ski
ExcludeArch: %{ix86}
ExcludeArch: aarch64
- skopeo
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- skychart
ExclusiveArch: %{fpc_arches}
ExcludeArch: %{ix86}
- slapi-nis
ExcludeArch: %{ix86}
- sleef
ExcludeArch: %{ix86}
- slf4j
ExclusiveArch: %{java_arches} noarch
- slic3r
ExcludeArch: %{ix86}
ExcludeArch: ppc ppc64 s390 s390x %{ix86}
ExcludeArch: ppc ppc64 s390 s390x
- slick-greeter
ExcludeArch: %{ix86}
- slimdata
ExcludeArch: ppc64 ppc sparcv9 sparc64
- slirp4netns
ExclusiveArch: %{golang_arches_future}
- slurm
ExcludeArch: armv7hl
ExcludeArch: i686
- smartmontools
ExcludeArch: %{ix86}
- snapd
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- snapshot
ExcludeArch: %{ix86}
- snip
ExclusiveArch: %{java_arches} noarch
- socnetv
ExcludeArch: i686
- softnet-stat
ExclusiveArch: %{rust_arches}
- soplex
ExcludeArch: %{ix86}
- sound-juicer
ExcludeArch: s390 s390x
- soup-sharp
ExclusiveArch: %{mono_arches}
- sourcextractor++
ExcludeArch: %{ix86}
- spacebar
ExclusiveArch: %{java_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
ExcludeArch: %{ix86}
- spasm
ExcludeArch: %{ix86}
- spec-version-maven-plugin
ExclusiveArch: %{java_arches} noarch
- speed-dreams
ExcludeArch: s390x
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 riscv64
- spice-parent
ExclusiveArch: %{java_arches} noarch
- springlobby
ExclusiveArch: %{ix86} x86_64
- spyder
ExcludeArch: %{ix86}
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- squirrel
ExcludeArch: %{ix86}
- stats-collect
ExclusiveArch: %{ix86} x86_64 noarch
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- statserial
ExcludeArch: s390 s390x
- steinberg-bravura-fonts
ExcludeArch: %{ix86}
- steinberg-petaluma-fonts
ExcludeArch: %{ix86}
- stellarium
ExcludeArch: armv7hl
- stlsplit
ExcludeArch: %{ix86}
- stp
ExcludeArch: %{ix86}
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
ExcludeArch: i686
- stratisd
ExclusiveArch: %{rust_arches}
ExcludeArch: i686
ExclusiveArch: %{rust_arches}
ExcludeArch: i686
ExclusiveArch: %{rust_arches}
ExcludeArch: i686
- string-template-maven-plugin
ExclusiveArch: %{java_arches} noarch
- stringtemplate
ExclusiveArch: %{java_arches} noarch
- stringtemplate4
ExclusiveArch: %{java_arches} noarch
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- subscription-manager-cockpit
ExclusiveArch: %{nodejs_arches} noarch
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExcludeArch: %{ix86}
ExclusiveArch: %{kernel_arches}
ExcludeArch: %{power64}
- supertux
ExcludeArch: s390x
- suricata
ExcludeArch: ppc64le i686
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- swiftlint
ExclusiveArch: x86_64 aarch64
- swing-layout
ExclusiveArch: %{java_arches} noarch
- symfpu
ExcludeArch: %{ix86}
- symmetrica
ExcludeArch: %{ix86}
- sympol
ExcludeArch: %{ix86}
- sympow
ExcludeArch: %{ix86}
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- system-rules
ExclusiveArch: %{java_arches} noarch
- systemd-boot
ExclusiveArch: %efi
- t-digest
ExclusiveArch: %{java_arches} noarch
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tagsoup
ExclusiveArch: %{java_arches} noarch
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tcmu-runner
ExcludeArch: i686 armv7hl
- tdlib
ExclusiveArch: x86_64 aarch64
- teem
ExcludeArch: %{ix86}
- templates_parser
ExclusiveArch: %{GPRbuild_arches}
- terminology
ExcludeArch: s390x
- terminus-fonts
ExcludeArch: %{grub2_exclude_arches}
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- testng
ExclusiveArch: %{java_arches} noarch
- texlive
ExclusiveArch: %{java_arches} noarch
- texmaker
ExclusiveArch: %{qt6_qtwebengine_arches}
ExcludeArch: ppc64 ppc64le s390x
- thermald
ExclusiveArch: %{ix86} x86_64
- thunderbird
ExcludeArch: armv7hl
ExcludeArch: s390x
- tiled
ExcludeArch: %{ix86}
- tilix
ExclusiveArch: %{ldc_arches}
- tinygo
ExcludeArch: ppc64le s390x
ExcludeArch: %{ix86}
- tokodon
ExclusiveArch: %{qt6_qtwebengine_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tomcat
ExclusiveArch: %{java_arches} noarch
- tomcat-jakartaee-migration
ExclusiveArch: %{java_arches} noarch
- tomcat-native
ExclusiveArch: %{java_arches}
- tomcat-taglibs-parent
ExclusiveArch: %{java_arches} noarch
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- trace-cmd
ExcludeArch: %{ix86} %{arm}
- trafficserver
ExcludeArch: %{arm} %{ix86} s390x
- treelayout
ExclusiveArch: %{java_arches} noarch
- trilead-ssh2
ExclusiveArch: %{java_arches} noarch
- trojita
ExcludeArch: ppc64 ppc64le s390x
- trunk
ExcludeArch: %{ix86}
- truth
ExclusiveArch: %{java_arches} noarch
- tth
ExcludeArch: %{ix86}
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- tuxguitar
ExcludeArch: s390 %{arm} %{ix86}
- tvtime
ExcludeArch: s390 s390x
- typescript
ExclusiveArch: %{nodejs_arches} noarch
- tzdata
ExcludeArch: i686
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- uboot-tools
ExcludeArch: s390x
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- udev-hid-bpf
ExcludeArch: %{ix86}
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- ugrep
ExcludeArch: %{ix86}
- umr
ExclusiveArch: x86_64 aarch64 ppc64le
- unetbootin
ExclusiveArch: %{ix86} x86_64
- unicorn
ExcludeArch: s390x
- unison
ExcludeArch: %{ix86}
- univocity-parsers
ExclusiveArch: %{java_arches} noarch
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- usbip
ExcludeArch: s390x
- usd
ExclusiveArch: aarch64 x86_64
- usnic-tools
ExcludeArch: %{arm}
- utop
ExcludeArch: %{ix86}
- uv
ExcludeArch: %{ix86}
- uwsgi
ExcludeArch: %{ix86}
- v-hacd
ExcludeArch: %{ix86}
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- vakzination
ExclusiveArch: %{java_arches}
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- valkey
ExcludeArch: %{ix86}
- vaultwarden
ExcludeArch: ppc64le s390x
ExcludeArch: i686
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vdo
ExcludeArch: %{ix86}
- vdr-tvscraper
ExcludeArch: armv7hl
- vecmath1.2
ExclusiveArch: %{java_arches} noarch
- vectorscan
ExcludeArch: s390x
- velocity
ExclusiveArch: %{java_arches} noarch
- viking
ExcludeArch: s390 s390x
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- vim-perl-support
ExcludeArch: %{ix86}
- vim-syntastic
ExclusiveArch: %{java_arches} noarch
- vinci
ExcludeArch: %{ix86}
- virt-p2v
ExclusiveArch: x86_64
- virt-top
ExcludeArch: %{ix86}
ExcludeArch: %{power64}
- virt-v2v
ExcludeArch: %{ix86}
ExclusiveArch: x86_64
- virtiofsd
ExclusiveArch: %{rust_arches}
ExcludeArch: i686
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- visidata
ExcludeArch: %{ix86}
- visualboyadvance-m
ExcludeArch: %{ix86}
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vkmark
ExcludeArch: s390x
- vmaf
ExclusiveArch: x86_64
- voms-api-java
ExclusiveArch: %{java_arches} noarch
- voms-clients-java
ExclusiveArch: %{java_arches} noarch
- votca
ExcludeArch: %{ix86}
- vrq
ExclusiveArch: %{ix86} x86_64
- wangle
ExclusiveArch: x86_64 aarch64 ppc64le riscv64
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- warzone2100
ExcludeArch: %{ix86}
- wasmedge
ExclusiveArch: x86_64 aarch64
- watchman
ExclusiveArch: x86_64 aarch64 ppc64le riscv64
- wdt
ExclusiveArch: x86_64 aarch64 ppc64le
- webkit2-sharp
ExclusiveArch: %mono_arches
- weld-parent
ExclusiveArch: %{java_arches} noarch
- whipper
ExcludeArch: s390x
- whisper-cpp
ExclusiveArch: x86_64 aarch64 ppc64le
- why3
ExclusiveArch: %{ocaml_native_compiler}
- widevine-installer
ExclusiveArch: aarch64
- wildcard
ExcludeArch: %{ix86} s390x
- wine
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- wine-mono
ExcludeArch: %{power64} s390x s390
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExcludeArch: ppc64 ppc64le
- wlmaker
ExcludeArch: %{ix86} ppc64le
- woff
ExcludeArch: %{ix86}
- workrave
ExcludeArch: %{ix86}
- ws-commons-util
ExclusiveArch: %{java_arches} noarch
- wsdl4j
ExclusiveArch: %{java_arches} noarch
- wult
ExclusiveArch: x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x2gokdrive
ExcludeArch: %{ix86}
- x86-simd-sort
ExclusiveArch: x86_64
- xalan-j2
ExclusiveArch: %{java_arches} noarch
- xapps
ExcludeArch: %{ix86}
- xbean
ExclusiveArch: %{java_arches} noarch
- xbyak
ExclusiveArch: x86_64
- xbyak_aarch64
ExclusiveArch: aarch64
- xdg-desktop-portal
ExcludeArch: %{ix86}
- xdg-desktop-portal-gnome
ExcludeArch: %{ix86}
- xdg-desktop-portal-gtk
ExcludeArch: %{ix86}
- xdg-desktop-portal-hyprland
ExcludeArch: %{ix86}
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xed
ExcludeArch: %{ix86}
- xen
ExclusiveArch: x86_64 aarch64
- xephem
ExcludeArch: %{ix86}
- xerces-j2
ExclusiveArch: %{java_arches} noarch
- xeus
ExcludeArch: %{ix86}
- xeus-zmq
ExcludeArch: %{ix86}
- xfce4-sensors-plugin
ExcludeArch: s390 s390x
- xgap
ExcludeArch: %{ix86}
- xiphos
ExcludeArch: ppc64
- xml-commons-apis
ExclusiveArch: %{java_arches} noarch
- xml-commons-resolver
ExclusiveArch: %{java_arches} noarch
- xml-maven-plugin
ExclusiveArch: %{java_arches} noarch
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xmlgraphics-commons
ExclusiveArch: %{java_arches} noarch
- xmlpull
ExclusiveArch: %{java_arches} noarch
- xmlstreambuffer
ExclusiveArch: %{java_arches} noarch
- xmlunit
ExclusiveArch: %{java_arches} noarch
- xmvn
ExclusiveArch: %{java_arches} noarch
- xmvn-connector-ivy
ExclusiveArch: %{java_arches} noarch
- xmvn-generator
ExclusiveArch: %{java_arches}
- xnnpack
ExclusiveArch: x86_64 aarch64
- xnvme
ExcludeArch: %{ix86}
- xorg-x11-drv-amdgpu
ExcludeArch: s390 s390x
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-ati
ExcludeArch: s390 s390x
- xorg-x11-drv-fbdev
ExcludeArch: s390 s390x
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-nouveau
ExcludeArch: s390 s390x
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-qxl
ExcludeArch: s390 s390x
- xorg-x11-drv-synaptics
ExcludeArch: s390 s390x
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xreader
ExcludeArch: %{ix86}
- xrgears
ExcludeArch: %{ix86}
- xsensors
ExcludeArch: %{ix86}
- xsp
ExclusiveArch: %mono_arches
- xstream
ExclusiveArch: %{java_arches} noarch
- xtb
ExcludeArch: s390x
- xtensor-python
ExcludeArch: armv7hl ppc64le s390x
- xz-java
ExclusiveArch: %{java_arches} noarch
- yarnpkg
ExclusiveArch: %{nodejs_arches}
- yices
ExcludeArch: %{ix86}
- yle-dl
ExcludeArch: %{ix86}
- yosys
ExcludeArch: %{ix86}
ExcludeArch: s390x
- zcfan
ExclusiveArch: x86_64
- zeal
ExclusiveArch: aarch64 x86_64
- zenon
ExclusiveArch: %{ocaml_native_compiler}
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zfs-fuse
ExcludeArch: s390 s390x aarch64
- zig
ExclusiveArch: %{zig_arches}
- zile
ExcludeArch: ppc64le
- zimpl
ExcludeArch: %{ix86}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zola
ExclusiveArch: %{rust_arches}
- zstr
ExcludeArch: %{ix86}
- zxcvbn-c
ExcludeArch: %{ix86}
- zycore-c
ExcludeArch: s390x
- zydis
ExcludeArch: s390x
- zynaddsubfx
ExcludeArch: i686
1
0
Architecture specific change in rpms/buildstream-plugins.git
by githook-noreply＠fedoraproject.org 13 Aug '24
by githook-noreply＠fedoraproject.org 13 Aug '24
13 Aug '24
The package rpms/buildstream-plugins.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/buildstream-plugins.git/commit/?id=….
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit ad64448de85f0dc097944cd67d9702e890cb914e
Author: Javier Jardón <jjardon(a)gnome.org>
Date: Tue Aug 13 23:26:14 2024 +0100
Initial import (fedora#2304606).
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..102dc3c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/buildstream-plugins-2.2.0.tar.gz
diff --git a/buildstream-plugins.spec b/buildstream-plugins.spec
new file mode 100644
index 0000000..e8a9560
--- /dev/null
+++ b/buildstream-plugins.spec
@@ -0,0 +1,42 @@
+Name: buildstream-plugins
+Summary: A collection of plugins for the BuildStream project
+License: Apache-2.0
+URL: https://buildstream.build/
+
+BuildArch: noarch
+ExcludeArch: %{ix86}
+
+Version: 2.2.0
+Release: %autorelease
+Source0: https://github.com/apache/buildstream-plugins/archive/%{version}/buildstrea…
+
+BuildRequires: python3-devel >= 3.8
+
+Requires: git
+Requires: lzip
+Requires: patch
+
+
+%description
+A collection of plugins for the BuildStream project
+
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+%generate_buildrequires
+%pyproject_buildrequires
+
+%build
+%pyproject_wheel
+
+%install
+%pyproject_install
+%pyproject_save_files -l buildstream_plugins
+
+
+%files -n %{name} -f %{pyproject_files}
+%doc NEWS README.rst
+
+%changelog
+%autochangelog
diff --git a/sources b/sources
new file mode 100644
index 0000000..92d8ac3
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (buildstream-plugins-2.2.0.tar.gz) = 8f51e6cb2d940e7a28ce2074d122d4847fb6df56b1f506574e5e3f69e48f6e81339f5628ec89556b09370e651a7c827a6590cb6a4af7736368fb87a0ccc00b60
1
0
Architecture specific change in rpms/acpica-tools.git
by githook-noreply＠fedoraproject.org 13 Aug '24
by githook-noreply＠fedoraproject.org 13 Aug '24
13 Aug '24
The package rpms/acpica-tools.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/acpica-tools.git/commit/?id=bada08a….
Change:
+ExcludeArch: i686 armv7hl s390x
Thanks.
Full change:
============
commit b0faa22b607566893f7a59a8f4fde83e475f0460
Author: Al Stone <ahs3(a)ahs3.net>
Date: Tue Aug 13 12:48:42 2024 -0600
Final patch cleanup
Added three new patches to fix problems with dumping various
tables, and removed all the remaining patches that no longer
serve a purpose.
Thanks to the contributors for PR#4 and PR#5 for the suggestions.
These have all been incorporated even if they are not in exactly
the same form.
Signed-off-by: Al Stone <ahs3(a)ahs3.net>
diff --git a/0001-Correct-DBG2-dump-of-OemData.patch b/0001-Correct-DBG2-dump-of-OemData.patch
new file mode 100644
index 0000000..b185343
--- /dev/null
+++ b/0001-Correct-DBG2-dump-of-OemData.patch
@@ -0,0 +1,34 @@
+From ec87f7e157a23078dc5458d6d26951fe4e2ac926 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3(a)ahs3.net>
+Date: Wed, 14 Apr 2021 20:52:05 -0600
+Subject: [PATCH 1/2] Correct DBG2 dump of OemData
+
+When OemData is present in a Device subtable, the original code was
+reading data to put in OemData from the beginning of the DBG2 table,
+not from the subtable that was being built. So, when dumping the
+table, read from the proper place (the subtable) and not the beginning
+of the DBG2 table.
+
+Signed-off-by: Al Stone <ahs3(a)ahs3.net>
+---
+ source/common/dmtbdump1.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/source/common/dmtbdump1.c b/source/common/dmtbdump1.c
+index bcf985325..56d959fd0 100644
+--- a/source/common/dmtbdump1.c
++++ b/source/common/dmtbdump1.c
+@@ -1371,8 +1371,8 @@ AcpiDmDumpDbg2 (
+
+ if (Subtable->OemDataOffset)
+ {
+- Status = AcpiDmDumpTable (Length, Offset + Subtable->OemDataOffset,
+- Table, Subtable->OemDataLength,
++ Status = AcpiDmDumpTable (Length, Subtable->OemDataOffset,
++ Subtable, Subtable->OemDataLength,
+ AcpiDmTableInfoDbg2OemData);
+ if (ACPI_FAILURE (Status))
+ {
+--
+2.45.2
+
diff --git a/0002-Correct-dumping-of-SLIC-tables.patch b/0002-Correct-dumping-of-SLIC-tables.patch
new file mode 100644
index 0000000..76dcf57
--- /dev/null
+++ b/0002-Correct-dumping-of-SLIC-tables.patch
@@ -0,0 +1,30 @@
+From 957662e99f6ec38849a9cf47eaebe1c232f74bbd Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3(a)ahs3.net>
+Date: Wed, 14 Apr 2021 21:18:12 -0600
+Subject: [PATCH 2/2] Correct dumping of SLIC tables
+
+When dumping the SLIC table, the code was not starting at the proper
+offset. Set the offset to the first byte after the header.
+
+Signed-off-by: Al Stone <ahs3(a)ahs3.net>
+---
+ source/common/dmtbdump3.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/source/common/dmtbdump3.c b/source/common/dmtbdump3.c
+index 6e5f5d7ff..9a5b5ecd5 100644
+--- a/source/common/dmtbdump3.c
++++ b/source/common/dmtbdump3.c
+@@ -177,7 +177,8 @@ AcpiDmDumpSlic (
+ ACPI_TABLE_HEADER *Table)
+ {
+
+- (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table,
++ (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER),
++ (void *) (Table + sizeof (*Table)),
+ Table->Length - sizeof (*Table), AcpiDmTableInfoSlic);
+ }
+
+--
+2.45.2
+
diff --git a/0003-PHAT-FW-health-table-can-be-zero-length.patch b/0003-PHAT-FW-health-table-can-be-zero-length.patch
new file mode 100644
index 0000000..159b56e
--- /dev/null
+++ b/0003-PHAT-FW-health-table-can-be-zero-length.patch
@@ -0,0 +1,37 @@
+From 1fb473e41bcbfbe21c02bcb30983b87aa94a6cb8 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3(a)ahs3.net>
+Date: Tue, 13 Aug 2024 09:50:37 -0600
+Subject: [PATCH] PHAT FW health table can be zero-length
+
+When calculating the VendorLength of the PHAT FW health data subtable,
+the result becomes a negative integer. However, since UINT32 is being
+used, it looks like a huge positive integer instead. Conditionalize
+the length calculation to handle this case properly.
+
+This was discovered by using the command: iasl -T phat
+
+Signed-off-by: Al Stone <ahs3(a)ahs3.net>
+---
+ source/common/dmtbdump2.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/source/common/dmtbdump2.c b/source/common/dmtbdump2.c
+index 32b76b382..dd4d4878e 100644
+--- a/source/common/dmtbdump2.c
++++ b/source/common/dmtbdump2.c
+@@ -2432,8 +2432,10 @@ AcpiDmDumpPhat (
+
+ /* Get Device-Specific Data - length of which is the remaining subtable length. */
+
+- VendorLength =
+- Subtable->Length - sizeof (ACPI_PHAT_HEALTH_DATA) - PathLength;
++ VendorLength = 0;
++ if (Subtable->Length > sizeof (ACPI_PHAT_HEALTH_DATA) + PathLength)
++ VendorLength =
++ Subtable->Length - sizeof (ACPI_PHAT_HEALTH_DATA) - PathLength;
+ DbgPrint (ASL_DEBUG_OUTPUT, "%u, Subtable->Length %X, VendorLength %X, Offset %X PathLength: %X\n",
+ __LINE__, Subtable->Length, VendorLength, Offset, PathLength);
+
+--
+2.45.2
+
diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch
deleted file mode 100644
index ff454b7..0000000
--- a/OPT_LDFLAGS.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: acpica-unix2-20240321/generate/unix/Makefile.config
-===================================================================
---- acpica-unix2-20240321.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20240321/generate/unix/Makefile.config
-@@ -23,6 +23,9 @@
- # OPT_CFLAGS can be overridden on the make command line by
- # adding OPT_CFLAGS="..." to the invocation.
- #
-+# OPT_LDFLAGS can be overridden on the make command line by
-+# adding OPT_LDFLAGS="..." to the invocation.
-+#
- # Notes:
- # gcc should be version 4 or greater, otherwise some of the options
- # used will not be recognized.
-@@ -164,6 +167,11 @@ LDFLAGS +=-m32
- endif
-
- #
-+# Common linker flags
-+#
-+OPT_LDFLAGS ?=
-+
-+#
- # Optionally disable optimizations. Optimization causes problems on
- # some compilers such as gcc 4.4
- #
diff --git a/acpica-tools.spec b/acpica-tools.spec
index f654307..4b963e7 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -27,22 +27,19 @@ Source15: run-misc-tests.sh
Source16: COPYING
# other miscellaneous patches
-Patch100: unaligned.patch
-#Patch101: OPT_LDFLAGS.patch
-#Patch102: int-format.patch
-Patch104: template.patch
-#Patch106: simple-64bit.patch
-#Patch107: mips-be-fix.patch
-Patch108: cve-2017-13693.patch
-Patch109: cve-2017-13694.patch
-Patch110: cve-2017-13695.patch
-Patch111: str-trunc-warn.patch
-#Patch112: ptr-cast.patch
-#Patch113: armv7-str-fixes.patch
-Patch114: dbtest.patch
-Patch116: dangling-ptr.patch
-Patch117: uuid-len.patch
-Patch118: fix-version.patch
+Patch00: unaligned.patch
+Patch01: template.patch
+Patch02: cve-2017-13693.patch
+Patch03: cve-2017-13694.patch
+Patch04: cve-2017-13695.patch
+Patch05: str-trunc-warn.patch
+Patch06: dbtest.patch
+Patch07: dangling-ptr.patch
+Patch08: uuid-len.patch
+Patch09: fix-version.patch
+Patch10: 0001-Correct-DBG2-dump-of-OemData.patch
+Patch11: 0002-Correct-dumping-of-SLIC-tables.patch
+Patch12: 0003-PHAT-FW-health-table-can-be-zero-length.patch
BuildRequires: make
BuildRequires: bison patchutils flex gcc
diff --git a/armv7-str-fixes.patch b/armv7-str-fixes.patch
deleted file mode 100644
index 69cc5b6..0000000
--- a/armv7-str-fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: acpica-unix2-20220331/source/include/actypes.h
-===================================================================
---- acpica-unix2-20220331.orig/source/include/actypes.h
-+++ acpica-unix2-20220331/source/include/actypes.h
-@@ -564,7 +564,7 @@ typedef UINT64
- #define ACPI_COPY_NAMESEG(dest,src) (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src)))
- #else
- #define ACPI_COMPARE_NAMESEG(a,b) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAMESEG_SIZE))
--#define ACPI_COPY_NAMESEG(dest,src) (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE))
-+#define ACPI_COPY_NAMESEG(dest,src) (memcpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE))
- #endif
-
- /* Support for the special RSDP signature (8 characters) */
diff --git a/int-format.patch b/int-format.patch
deleted file mode 100644
index ce98627..0000000
--- a/int-format.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-Use proper integer formatting
-
-From: Al Stone <ahs3(a)redhat.com>
-
-
----
- source/compiler/aslerror.c | 4 ++--
- source/compiler/aslopt.c | 2 +-
- source/compiler/aslprepkg.c | 2 +-
- source/components/debugger/dbexec.c | 2 +-
- source/components/dispatcher/dsmthdat.c | 4 ++--
- source/components/dispatcher/dsutils.c | 2 +-
- source/components/dispatcher/dswscope.c | 4 ++--
- source/components/events/evgpe.c | 4 ++--
- source/components/executer/exdump.c | 2 +-
- source/components/executer/exfldio.c | 4 ++--
- source/components/executer/exnames.c | 4 ++--
- source/components/hardware/hwregs.c | 2 +-
- source/components/tables/tbfadt.c | 6 +++---
- source/components/tables/tbxfroot.c | 6 +++---
- source/components/utilities/utownerid.c | 2 +-
- 18 files changed, 28 insertions(+), 28 deletions(-)
-
-Index: acpica-unix2-20220331/source/compiler/aslerror.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslerror.c
-+++ acpica-unix2-20220331/source/compiler/aslerror.c
-@@ -917,7 +917,7 @@ AslLogNewError (
- AslGbl_ExceptionCount[ModifiedLevel]++;
- if (!AslGbl_IgnoreErrors && AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
- {
-- printf ("\nMaximum error count (%u) exceeded (aslerror.c)\n", ASL_MAX_ERROR_COUNT);
-+ printf ("\nMaximum error count (%d) exceeded (aslerror.c)\n", ASL_MAX_ERROR_COUNT);
-
- AslGbl_SourceLine = 0;
- AslGbl_NextError = AslGbl_ErrorLog;
-Index: acpica-unix2-20220331/source/compiler/aslopt.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslopt.c
-+++ acpica-unix2-20220331/source/compiler/aslopt.c
-@@ -583,7 +583,7 @@ OptOptimizeNamePath (
- }
-
- ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS,
-- "PATH OPTIMIZE: Line %5d ParentOp [%12.12s] ThisOp [%12.12s] ",
-+ "PATH OPTIMIZE: Line %5u ParentOp [%12.12s] ThisOp [%12.12s] ",
- Op->Asl.LogicalLineNumber,
- AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
- AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
-Index: acpica-unix2-20220331/source/compiler/aslprepkg.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslprepkg.c
-+++ acpica-unix2-20220331/source/compiler/aslprepkg.c
-@@ -320,7 +320,7 @@ ApCheckPackage (
-
- if (Count & 1)
- {
-- sprintf (AslGbl_MsgBuffer, "%4.4s: Package length, %d, must be even.",
-+ sprintf (AslGbl_MsgBuffer, "%4.4s: Package length, %u, must be even.",
- Predefined->Info.Name, Count);
-
- AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
-Index: acpica-unix2-20220331/source/components/debugger/dbexec.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/debugger/dbexec.c
-+++ acpica-unix2-20220331/source/components/debugger/dbexec.c
-@@ -231,7 +231,7 @@ AcpiDbExecuteMethod (
- ACPI_ERROR ((AE_INFO,
- "Possible buffer overflow within AML Debugger "
- "buffer (size 0x%X needed 0x%X)",
-- ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
-+ (UINT32) ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
- }
- }
-
-Index: acpica-unix2-20220331/source/components/dispatcher/dsmthdat.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/dispatcher/dsmthdat.c
-+++ acpica-unix2-20220331/source/components/dispatcher/dsmthdat.c
-@@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
- if (Index > ACPI_METHOD_MAX_LOCAL)
- {
- ACPI_ERROR ((AE_INFO,
-- "Local index %u is invalid (max %u)",
-+ "Local index %u is invalid (max %d)",
- Index, ACPI_METHOD_MAX_LOCAL));
- return_ACPI_STATUS (AE_AML_INVALID_INDEX);
- }
-@@ -306,7 +306,7 @@ AcpiDsMethodDataGetNode (
- if (Index > ACPI_METHOD_MAX_ARG)
- {
- ACPI_ERROR ((AE_INFO,
-- "Arg index %u is invalid (max %u)",
-+ "Arg index %u is invalid (max %d)",
- Index, ACPI_METHOD_MAX_ARG));
- return_ACPI_STATUS (AE_AML_INVALID_INDEX);
- }
-Index: acpica-unix2-20220331/source/components/dispatcher/dsutils.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix2-20220331/source/components/dispatcher/dsutils.c
-@@ -786,7 +786,7 @@ AcpiDsCreateOperands (
- }
-
- ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
-- "NumOperands %d, ArgCount %d, Index %d\n",
-+ "NumOperands %d, ArgCount %u, Index %u\n",
- WalkState->NumOperands, ArgCount, Index));
-
- /* Create the interpreter arguments, in reverse order */
-Index: acpica-unix2-20220331/source/components/dispatcher/dswscope.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/dispatcher/dswscope.c
-+++ acpica-unix2-20220331/source/components/dispatcher/dswscope.c
-@@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
- WalkState->ScopeDepth++;
-
- ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-- "[%.2d] Pushed scope ", (UINT32) WalkState->ScopeDepth));
-+ "[%.2d] Pushed scope ", WalkState->ScopeDepth));
-
- OldScopeInfo = WalkState->ScopeInfo;
- if (OldScopeInfo)
-@@ -211,7 +211,7 @@ AcpiDsScopeStackPop (
- WalkState->ScopeDepth--;
-
- ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-- "[%.2d] Popped scope [%4.4s] (%s), New scope -> ",
-+ "[%.2u] Popped scope [%4.4s] (%s), New scope -> ",
- (UINT32) WalkState->ScopeDepth,
- AcpiUtGetNodeName (ScopeInfo->Scope.Node),
- AcpiUtGetTypeName (ScopeInfo->Common.Value)));
-Index: acpica-unix2-20220331/source/components/events/evgpe.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/events/evgpe.c
-+++ acpica-unix2-20220331/source/components/events/evgpe.c
-@@ -488,7 +488,7 @@ AcpiEvGpeDetect (
- "Ignore disabled registers for GPE %02X-%02X: "
- "RunEnable=%02X, WakeEnable=%02X\n",
- GpeRegisterInfo->BaseGpeNumber,
-- GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1),
-+ (unsigned int) (GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1)),
- GpeRegisterInfo->EnableForRun,
- GpeRegisterInfo->EnableForWake));
- continue;
-Index: acpica-unix2-20220331/source/components/executer/exdump.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/executer/exdump.c
-+++ acpica-unix2-20220331/source/components/executer/exdump.c
-@@ -678,7 +678,7 @@ AcpiExDumpOperand (
- if (Depth > 0)
- {
- ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p Refs=%u ",
-- Depth, " ", Depth, ObjDesc, ObjDesc->Common.ReferenceCount));
-+ (int) Depth, " ", Depth, ObjDesc, ObjDesc->Common.ReferenceCount));
- }
- else
- {
-Index: acpica-unix2-20220331/source/components/executer/exfldio.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/executer/exfldio.c
-+++ acpica-unix2-20220331/source/components/executer/exfldio.c
-@@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
-
- ACPI_ERROR ((AE_INFO,
- "Unknown UpdateRule value: 0x%X",
-- (ObjDesc->CommonField.FieldFlags &
-- AML_FIELD_UPDATE_RULE_MASK)));
-+ (unsigned int) (ObjDesc->CommonField.FieldFlags &
-+ AML_FIELD_UPDATE_RULE_MASK)));
- return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
- }
- }
-Index: acpica-unix2-20220331/source/components/executer/exnames.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/executer/exnames.c
-+++ acpica-unix2-20220331/source/components/executer/exnames.c
-@@ -237,7 +237,7 @@ AcpiExNameSegment (
- */
- ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
- "Leading character is not alpha: %02Xh (not a name)\n",
-- CharBuf[0]));
-+ (unsigned int) CharBuf[0]));
- Status = AE_CTRL_PENDING;
- }
- else
-@@ -249,7 +249,7 @@ AcpiExNameSegment (
- Status = AE_AML_BAD_NAME;
- ACPI_ERROR ((AE_INFO,
- "Bad character 0x%02x in name, at %p",
-- *AmlAddress, AmlAddress));
-+ (unsigned int) (*AmlAddress), AmlAddress));
- }
-
- *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
-Index: acpica-unix2-20220331/source/components/hardware/hwregs.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/hardware/hwregs.c
-+++ acpica-unix2-20220331/source/components/hardware/hwregs.c
-@@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
-
-
- ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %8.8X%8.8X\n",
-- ACPI_BITMASK_ALL_FIXED_STATUS,
-+ (UINT32) ACPI_BITMASK_ALL_FIXED_STATUS,
- ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
-
- LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
-Index: acpica-unix2-20220331/source/components/tables/tbfadt.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/tables/tbfadt.c
-+++ acpica-unix2-20220331/source/components/tables/tbfadt.c
-@@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
- if (!(Flags & ACPI_FADT_GPE_REGISTER))
- {
- ACPI_ERROR ((AE_INFO,
-- "%s - 32-bit FADT register is too long (%u bytes, %u bits) "
-+ "%s - 32-bit FADT register is too long (%u bytes, %d bits) "
- "to convert to GAS struct - 255 bits max, truncating",
- RegisterName, ByteWidth, (ByteWidth * 8)));
- }
-@@ -303,7 +303,7 @@ AcpiTbSelectAddress (
-
- ACPI_BIOS_WARNING ((AE_INFO,
- "32/64X %s address mismatch in FADT: "
-- "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
-+ "0x%8.8X/0x%8.8X%8.8X, using %d-bit address",
- RegisterName, Address32, ACPI_FORMAT_UINT64 (Address64),
- AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
-
-@@ -631,7 +631,7 @@ AcpiTbConvertFadt (
-
- ACPI_BIOS_WARNING ((AE_INFO,
- "32/64X address mismatch in FADT/%s: "
-- "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
-+ "0x%8.8X/0x%8.8X%8.8X, using %d-bit address",
- Name, Address32,
- ACPI_FORMAT_UINT64 (Address64->Address),
- AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
-Index: acpica-unix2-20220331/source/components/tables/tbxfroot.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/tables/tbxfroot.c
-+++ acpica-unix2-20220331/source/components/tables/tbxfroot.c
-@@ -177,7 +177,7 @@ AcpiFindRootPointer (
- {
- ACPI_ERROR ((AE_INFO,
- "Could not map memory at 0x%8.8X for length %u",
-- ACPI_EBDA_PTR_LOCATION, ACPI_EBDA_PTR_LENGTH));
-+ (UINT32) ACPI_EBDA_PTR_LOCATION, (UINT32) ACPI_EBDA_PTR_LENGTH));
-
- return_ACPI_STATUS (AE_NO_MEMORY);
- }
-@@ -204,7 +204,7 @@ AcpiFindRootPointer (
- {
- ACPI_ERROR ((AE_INFO,
- "Could not map memory at 0x%8.8X for length %u",
-- PhysicalAddress, ACPI_EBDA_WINDOW_SIZE));
-+ PhysicalAddress, (UINT32) ACPI_EBDA_WINDOW_SIZE));
-
- return_ACPI_STATUS (AE_NO_MEMORY);
- }
-@@ -236,7 +236,7 @@ AcpiFindRootPointer (
- {
- ACPI_ERROR ((AE_INFO,
- "Could not map memory at 0x%8.8X for length %u",
-- ACPI_HI_RSDP_WINDOW_BASE, ACPI_HI_RSDP_WINDOW_SIZE));
-+ (UINT32) ACPI_HI_RSDP_WINDOW_BASE, (UINT32) ACPI_HI_RSDP_WINDOW_SIZE));
-
- return_ACPI_STATUS (AE_NO_MEMORY);
- }
-Index: acpica-unix2-20220331/source/components/utilities/utownerid.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/utilities/utownerid.c
-+++ acpica-unix2-20220331/source/components/utilities/utownerid.c
-@@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
- else
- {
- ACPI_ERROR ((AE_INFO,
-- "Attempted release of non-allocated OwnerId: 0x%3.3X", OwnerId + 1));
-+ "Release of non-allocated OwnerId: 0x%2.2X", (UINT32) OwnerId + 1));
- }
-
- (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES);
diff --git a/mips-be-fix.patch b/mips-be-fix.patch
deleted file mode 100644
index c84e9c8..0000000
--- a/mips-be-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: acpica-unix2-20220331/source/compiler/aslparseop.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslparseop.c
-+++ acpica-unix2-20220331/source/compiler/aslparseop.c
-@@ -285,7 +285,16 @@ TrCreateValuedLeafOp (
-
-
- Op = TrAllocateOp (ParseOpcode);
-- Op->Asl.Value.Integer = Value;
-+ if (ParseOpcode == PARSEOP_NAMESTRING ||
-+ ParseOpcode == PARSEOP_NAMESEG ||
-+ ParseOpcode == PARSEOP_STRING_LITERAL)
-+ {
-+ Op->Asl.Value.String = (char *) Value;
-+ }
-+ else
-+ {
-+ Op->Asl.Value.Integer = Value;
-+ }
-
- DbgPrint (ASL_PARSE_OUTPUT,
- "\nCreateValuedLeafOp Ln/Col %u/%u NewOp %p "
diff --git a/ptr-cast.patch b/ptr-cast.patch
deleted file mode 100644
index 0a24429..0000000
--- a/ptr-cast.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: acpica-unix2-20220331/source/components/tables/tbutils.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/tables/tbutils.c
-+++ acpica-unix2-20220331/source/components/tables/tbutils.c
-@@ -238,9 +238,11 @@ AcpiTbGetRootTableEntry (
- * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
- * return 64-bit
- */
-- ACPI_MOVE_64_TO_64 (&Address64, TableEntry);
-
- #if ACPI_MACHINE_WIDTH == 32
-+ UINT32 Tmp32 = (UINT32) TableEntry;
-+
-+ Address64 = (UINT64) Tmp32;
- if (Address64 > ACPI_UINT32_MAX)
- {
- /* Will truncate 64-bit address to 32 bits, issue warning */
-@@ -250,8 +252,14 @@ AcpiTbGetRootTableEntry (
- " truncating",
- ACPI_FORMAT_UINT64 (Address64)));
- }
--#endif
-+
-+ return ((ACPI_PHYSICAL_ADDRESS) (*ACPI_CAST_PTR (
-+ UINT32, TableEntry)));
-+#else
-+ Address64 = (UINT64) TableEntry;
-+
- return ((ACPI_PHYSICAL_ADDRESS) (Address64));
-+#endif
- }
- }
-
-Index: acpica-unix2-20220331/source/compiler/aslparseop.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslparseop.c
-+++ acpica-unix2-20220331/source/compiler/aslparseop.c
-@@ -289,7 +289,11 @@ TrCreateValuedLeafOp (
- ParseOpcode == PARSEOP_NAMESEG ||
- ParseOpcode == PARSEOP_STRING_LITERAL)
- {
-+#if ACPI_MACHINE_WIDTH == 32
-+ Op->Asl.Value.String = (char *) (UINT32) Value;
-+#else
- Op->Asl.Value.String = (char *) Value;
-+#endif
- }
- else
- {
diff --git a/simple-64bit.patch b/simple-64bit.patch
deleted file mode 100644
index c0403c7..0000000
--- a/simple-64bit.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Stop listing all 64bit architectures
- Check __LP64__ instead of maintaining a list of all
- 64bit architectures.
-Author: Adrian Bunk <bunk(a)debian.org>
-
-Index: acpica-unix2-20220331/source/include/platform/aclinux.h
-===================================================================
---- acpica-unix2-20220331.orig/source/include/platform/aclinux.h
-+++ acpica-unix2-20220331/source/include/platform/aclinux.h
-@@ -220,10 +220,7 @@
- #define ACPI_FLUSH_CPU_CACHE()
- #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))
-
--#if defined(__ia64__) || (defined(__x86_64__) && !defined(__ILP32__)) ||\
-- defined(__aarch64__) || defined(__PPC64__) ||\
-- defined(__s390x__) ||\
-- (defined(__riscv) && (defined(__LP64__) || defined(_LP64)))
-+#if defined(__LP64__)
- #define ACPI_MACHINE_WIDTH 64
- #define COMPILER_DEPENDENT_INT64 long
- #define COMPILER_DEPENDENT_UINT64 unsigned long
diff --git a/wpbt-unicode.patch b/wpbt-unicode.patch
deleted file mode 100644
index 1d9c38d..0000000
--- a/wpbt-unicode.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-Index: acpica-unix2-20210604/source/common/dmtable.c
-===================================================================
---- acpica-unix2-20210604.orig/source/common/dmtable.c
-+++ acpica-unix2-20210604/source/common/dmtable.c
-@@ -979,6 +979,12 @@ AcpiDmDumpTable (
- ByteLength = 128;
- break;
-
-+ case ACPI_DMT_WPBT_UNICODE:
-+
-+ ByteLength = SubtableLength;
-+ CurrentOffset = sizeof (ACPI_TABLE_WPBT);
-+ break;
-+
- case ACPI_DMT_UNICODE:
- case ACPI_DMT_BUFFER:
- case ACPI_DMT_RAW_BUFFER:
-@@ -1596,6 +1602,7 @@ AcpiDmDumpTable (
- break;
-
- case ACPI_DMT_UNICODE:
-+ case ACPI_DMT_WPBT_UNICODE:
-
- if (ByteLength == 0)
- {
-Index: acpica-unix2-20210604/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20210604.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20210604/source/common/dmtbdump3.c
-@@ -753,8 +753,11 @@ AcpiDmDumpWpbt (
- Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
- ArgumentsLength = AcpiUtReadUint16 (&Subtable->ArgumentsLength);
-
-- /* Dump the arguments buffer */
-+ /* Dump the arguments buffer if present */
-
-- (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength,
-- AcpiDmTableInfoWpbt0);
-+ if (ArgumentsLength)
-+ {
-+ (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
-+ AcpiDmTableInfoWpbt0);
-+ }
- }
-Index: acpica-unix2-20210604/source/common/dmtbinfo3.c
-===================================================================
---- acpica-unix2-20210604.orig/source/common/dmtbinfo3.c
-+++ acpica-unix2-20210604/source/common/dmtbinfo3.c
-@@ -651,7 +651,7 @@ ACPI_DMTABLE_INFO AcpiDmTableI
-
- ACPI_DMTABLE_INFO AcpiDmTableInfoWpbt0[] =
- {
-- {ACPI_DMT_UNICODE, sizeof (ACPI_TABLE_WPBT), "Command-line Arguments", 0},
-+ {ACPI_DMT_WPBT_UNICODE, ACPI_WPBT2_OFFSET (UnicodeString), "Command-line Arguments", DT_DESCRIBES_OPTIONAL},
- ACPI_DMT_TERMINATOR
- };
-
-Index: acpica-unix2-20210604/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20210604.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20210604/source/compiler/dttable2.c
-@@ -2615,13 +2615,11 @@ DtCompileWpbt (
- DT_SUBTABLE *ParentTable;
- ACPI_TABLE_WPBT *Table;
- ACPI_STATUS Status;
-- UINT16 Length;
-
-
- /* Compile the main table */
-
-- Status = DtCompileTable (PFieldList, AcpiDmTableInfoWpbt,
-- &Subtable);
-+ Status = DtCompileTable (PFieldList, AcpiDmTableInfoWpbt, &Subtable);
- if (ACPI_FAILURE (Status))
- {
- return (Status);
-@@ -2629,11 +2627,23 @@ DtCompileWpbt (
-
- ParentTable = DtPeekSubtable ();
- DtInsertSubtable (ParentTable, Subtable);
-+ Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
-+
-+ /*
-+ * Exit now if there are no arguments specified. This is indicated by:
-+ * The "Command-line Arguments" field has not been specified (if specified,
-+ * it will be the last field in the field list -- after the main table).
-+ * Set the Argument Length in the main table to zero.
-+ */
-+ if (!*PFieldList)
-+ {
-+ Table->ArgumentsLength = 0;
-+ return (AE_OK);
-+ }
-
- /* Compile the argument list subtable */
-
-- Status = DtCompileTable (PFieldList, AcpiDmTableInfoWpbt0,
-- &Subtable);
-+ Status = DtCompileTable (PFieldList, AcpiDmTableInfoWpbt0, &Subtable);
- if (ACPI_FAILURE (Status))
- {
- return (Status);
-@@ -2641,12 +2651,8 @@ DtCompileWpbt (
-
- /* Extract the length of the Arguments buffer, insert into main table */
-
-- AcpiUtWriteUint (&Length, sizeof (UINT16),
-+ AcpiUtWriteUint (&Table->ArgumentsLength, sizeof (UINT16),
- &Subtable->TotalLength, sizeof (UINT32));
-- Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
-- Table->ArgumentsLength = AcpiUtReadUint16 (&Length);
--
-- ParentTable = DtPeekSubtable ();
- DtInsertSubtable (ParentTable, Subtable);
- return (AE_OK);
- }
-Index: acpica-unix2-20210604/source/compiler/dtutils.c
-===================================================================
---- acpica-unix2-20210604.orig/source/compiler/dtutils.c
-+++ acpica-unix2-20210604/source/compiler/dtutils.c
-@@ -344,6 +344,7 @@ DtGetFieldType (
- break;
-
- case ACPI_DMT_UNICODE:
-+ case ACPI_DMT_WPBT_UNICODE:
-
- Type = DT_FIELD_TYPE_UNICODE;
- break;
-@@ -626,12 +627,13 @@ DtGetFieldLength (
- break;
-
- case ACPI_DMT_UNICODE:
-+ case ACPI_DMT_WPBT_UNICODE:
-
- Value = DtGetFieldValue (Field);
-
- /* TBD: error if Value is NULL? (as below?) */
-
-- ByteLength = (strlen (Value) + 1) * sizeof(UINT16);
-+ ByteLength = (strlen (Value) + 1) * sizeof (UINT16);
- break;
-
- default:
-Index: acpica-unix2-20210604/source/include/acdisasm.h
-===================================================================
---- acpica-unix2-20210604.orig/source/include/acdisasm.h
-+++ acpica-unix2-20210604/source/include/acdisasm.h
-@@ -175,6 +175,7 @@ typedef enum
- ACPI_DMT_SRAT,
- ACPI_DMT_TPM2,
- ACPI_DMT_VIOT,
-+ ACPI_DMT_WPBT_UNICODE,
-
- /* Special opcodes */
-
-Index: acpica-unix2-20210604/source/include/actbinfo.h
-===================================================================
---- acpica-unix2-20210604.orig/source/include/actbinfo.h
-+++ acpica-unix2-20210604/source/include/actbinfo.h
-@@ -97,6 +97,7 @@
- #define ACPI_WDDT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_WDDT,f)
- #define ACPI_WDRT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_WDRT,f)
- #define ACPI_WPBT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_WPBT,f)
-+#define ACPI_WPBT2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_WPBT_UNICODE,f)
- #define ACPI_WSMT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_WSMT,f)
- #define ACPI_XENV_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_XENV,f)
-
-Index: acpica-unix2-20210604/source/include/actbl3.h
-===================================================================
---- acpica-unix2-20210604.orig/source/include/actbl3.h
-+++ acpica-unix2-20210604/source/include/actbl3.h
-@@ -847,6 +847,12 @@ typedef struct acpi_table_wpbt
-
- } ACPI_TABLE_WPBT;
-
-+typedef struct acpi_wpbt_unicode
-+{
-+ UINT16 *UnicodeString;
-+
-+} ACPI_WPBT_UNICODE;
-+
-
- /*******************************************************************************
- *
-Index: acpica-unix2-20210604/source/tools/acpisrc/astable.c
-===================================================================
---- acpica-unix2-20210604.orig/source/tools/acpisrc/astable.c
-+++ acpica-unix2-20210604/source/tools/acpisrc/astable.c
-@@ -772,6 +772,7 @@ ACPI_TYPED_IDENTIFIER_TABLE Ac
- {"ACPI_VIOT_VIRTIO_IOMMU_PCI", SRC_TYPE_STRUCT},
- {"ACPI_VIOT_VIRTIO_IOMMU_MMIO", SRC_TYPE_STRUCT},
- {"ACPI_WDAT_ENTRY", SRC_TYPE_STRUCT},
-+ {"ACPI_WPBT_UNICODE", SRC_TYPE_STRUCT},
-
- /* Data Table compiler */
-
commit bada08a9e12545c2332d6df5f31d31cf81d97606
Author: Al Stone <ahs3(a)ahs3.net>
Date: Mon Aug 12 15:16:04 2024 -0600
Update to 20240322 and remove support for big-endian architectures
As s390x was the only one remaining, it has now been excluded. This
was best done with an update of the source tree to match upstream.
This is turn caused additional patch updates.
With s390x gone, all of the big-endian patches can be removed,
simplifying things enormously. This is the biggest change.
Several other patches that are no longer needed due to changes
in Fedora builds (ld flags, for example), or that are no longer needed
(such as armv7) have also been removed. Further cleanup likely to
follow.
Signed-off-by: Al Stone <ahs3(a)ahs3.net>
diff --git a/.gitignore b/.gitignore
index 8d6a67f..b895859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,3 +156,9 @@ series
/acpitests-unix-20211217.tar.gz
/acpica-unix2-20220331.tar.gz
/acpitests-unix-20220331.tar.gz
+/acpica-unix2-20230331.tar.gz
+/acpitests-unix-20230331.tar.gz
+/acpica-unix2-20240321.tar.gz
+/acpitests-unix-20240321.tar.gz
+/acpica-unix2-20240322.tar.gz
+/acpitests-unix-20240322.tar.gz
diff --git a/0001-Add-in-basic-infrastructure-for-big-endian-support.patch b/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
deleted file mode 100644
index 4e12c34..0000000
--- a/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
+++ /dev/null
@@ -1,530 +0,0 @@
-From 4594630ec2e6a33efce3047a86b08fa170b75848 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Thu, 15 Oct 2020 11:53:33 -0600
-Subject: [PATCH 01/45] Add in basic infrastructure for big-endian support
-
-This adds in some basic functions -- AcpiUtReadUint32(), for example,
-to read a UINT32 value in little-endian form and return it in host-native
-format -- along with AcpiUtWriteUint() that writes out an integer in
-host-native format as a little-endian value.
-
-But, to do that, I'm adding the functions in a new file: utendian.c. So,
-the header files need fixing, and the makefiles need to be sure to compile
-the new code. Further, UtIsBigEndianMachine() needed to be moved out of
-compiler/aslutils.c so it could be used in the new functions and avoid
-having to do some conditional compilation depending on endian-ness.
-
-However, this sets things up for the future, where endian-aware code can
-be added as the need is uncovered. For now, these functions cover all of
-the cases I know about.
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- generate/unix/acpibin/Makefile | 1 +
- generate/unix/acpidump/Makefile | 1 +
- generate/unix/acpiexamples/Makefile | 1 +
- generate/unix/acpiexec/Makefile | 1 +
- generate/unix/acpihelp/Makefile | 1 +
- generate/unix/iasl/Makefile | 1 +
- source/compiler/aslcompiler.h | 4 -
- source/compiler/aslutils.c | 27 ---
- source/components/utilities/utendian.c | 236 +++++++++++++++++++++++++
- source/include/acmacros.h | 56 ------
- source/include/acutils.h | 32 ++++
- source/include/platform/aclinux.h | 1 +
- 12 files changed, 275 insertions(+), 87 deletions(-)
- create mode 100644 source/components/utilities/utendian.c
-
-Index: acpica-unix2-20220331/generate/unix/acpibin/Makefile
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/acpibin/Makefile
-+++ acpica-unix2-20220331/generate/unix/acpibin/Makefile
-@@ -37,6 +37,7 @@ OBJECTS = \
- $(OBJDIR)/utcache.o\
- $(OBJDIR)/utdebug.o\
- $(OBJDIR)/utdecode.o\
-+ $(OBJDIR)/utendian.o\
- $(OBJDIR)/utexcep.o\
- $(OBJDIR)/utglobal.o\
- $(OBJDIR)/utlock.o\
-Index: acpica-unix2-20220331/generate/unix/acpidump/Makefile
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/acpidump/Makefile
-+++ acpica-unix2-20220331/generate/unix/acpidump/Makefile
-@@ -36,6 +36,7 @@ OBJECTS = \
- $(OBJDIR)/osunixdir.o\
- $(OBJDIR)/osunixmap.o\
- $(OBJDIR)/osunixxf.o\
-+ $(OBJDIR)/utendian.o\
- $(OBJDIR)/tbprint.o\
- $(OBJDIR)/tbxfroot.o\
- $(OBJDIR)/utascii.o\
-Index: acpica-unix2-20220331/generate/unix/acpiexamples/Makefile
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/acpiexamples/Makefile
-+++ acpica-unix2-20220331/generate/unix/acpiexamples/Makefile
-@@ -139,6 +139,7 @@ OBJECTS = \
- $(OBJDIR)/utdebug.o\
- $(OBJDIR)/utdecode.o\
- $(OBJDIR)/utdelete.o\
-+ $(OBJDIR)/utendian.o\
- $(OBJDIR)/uterror.o\
- $(OBJDIR)/uteval.o\
- $(OBJDIR)/utexcep.o\
-Index: acpica-unix2-20220331/generate/unix/acpiexec/Makefile
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/acpiexec/Makefile
-+++ acpica-unix2-20220331/generate/unix/acpiexec/Makefile
-@@ -214,6 +214,7 @@ OBJECTS = \
- $(OBJDIR)/utdebug.o\
- $(OBJDIR)/utdecode.o\
- $(OBJDIR)/utdelete.o\
-+ $(OBJDIR)/utendian.o\
- $(OBJDIR)/uterror.o\
- $(OBJDIR)/uteval.o\
- $(OBJDIR)/utexcep.o\
-Index: acpica-unix2-20220331/generate/unix/acpihelp/Makefile
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/acpihelp/Makefile
-+++ acpica-unix2-20220331/generate/unix/acpihelp/Makefile
-@@ -45,6 +45,7 @@ OBJECTS = \
- $(OBJDIR)/getopt.o\
- $(OBJDIR)/osunixxf.o\
- $(OBJDIR)/utdebug.o\
-+ $(OBJDIR)/utendian.o\
- $(OBJDIR)/utexcep.o\
- $(OBJDIR)/utglobal.o\
- $(OBJDIR)/uthex.o\
-Index: acpica-unix2-20220331/generate/unix/iasl/Makefile
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/iasl/Makefile
-+++ acpica-unix2-20220331/generate/unix/iasl/Makefile
-@@ -225,6 +225,7 @@ OBJECTS = \
- $(OBJDIR)/utdebug.o\
- $(OBJDIR)/utdecode.o\
- $(OBJDIR)/utdelete.o\
-+ $(OBJDIR)/utendian.o\
- $(OBJDIR)/uterror.o\
- $(OBJDIR)/utexcep.o\
- $(OBJDIR)/utglobal.o\
-Index: acpica-unix2-20220331/source/compiler/aslcompiler.h
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslcompiler.h
-+++ acpica-unix2-20220331/source/compiler/aslcompiler.h
-@@ -1120,10 +1120,6 @@ BOOLEAN
- UtIsIdInteger (
- UINT8 *Target);
-
--UINT8
--UtIsBigEndianMachine (
-- void);
--
- BOOLEAN
- UtQueryForOverwrite (
- char *Pathname);
-Index: acpica-unix2-20220331/source/compiler/aslutils.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslutils.c
-+++ acpica-unix2-20220331/source/compiler/aslutils.c
-@@ -73,33 +73,6 @@ UtDisplayErrorSummary (
-
- /*******************************************************************************
- *
-- * FUNCTION: UtIsBigEndianMachine
-- *
-- * PARAMETERS: None
-- *
-- * RETURN: TRUE if machine is big endian
-- * FALSE if machine is little endian
-- *
-- * DESCRIPTION: Detect whether machine is little endian or big endian.
-- *
-- ******************************************************************************/
--
--UINT8
--UtIsBigEndianMachine (
-- void)
--{
-- union {
-- UINT32 Integer;
-- UINT8 Bytes[4];
-- } Overlay = {0xFF000000};
--
--
-- return (Overlay.Bytes[0]); /* Returns 0xFF (TRUE) for big endian */
--}
--
--
--/*******************************************************************************
-- *
- * FUNCTION: UtIsIdInteger
- *
- * PARAMETERS: Pointer to an ACPI ID (HID, CID) string
-Index: acpica-unix2-20220331/source/components/utilities/utendian.c
-===================================================================
---- /dev/null
-+++ acpica-unix2-20220331/source/components/utilities/utendian.c
-@@ -0,0 +1,236 @@
-+/******************************************************************************
-+ *
-+ * Module Name: utendian -- byte swapping support for other-endianness
-+ *
-+ *****************************************************************************/
-+
-+/*****************************************************************************
-+ *
-+ * Copyright (c) 2020, Al Stone <ahs3(a)redhat.com>
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions, and the following disclaimer,
-+ * without modification.
-+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
-+ * substantially similar to the "NO WARRANTY" disclaimer below
-+ * ("Disclaimer") and any redistribution must be conditioned upon
-+ * including a substantially similar Disclaimer requirement for further
-+ * binary redistribution.
-+ * 3. Neither the names of the above-listed copyright holders nor the names
-+ * of any contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * Alternatively, you may choose to be licensed under the terms of the
-+ * GNU General Public License ("GPL") version 2 as published by the Free
-+ * Software Foundation.
-+ *
-+ *****************************************************************************/
-+
-+#include "acpi.h"
-+#include "accommon.h"
-+
-+#define _COMPONENT ACPI_COMPILER
-+ ACPI_MODULE_NAME ("utendian")
-+
-+/*
-+ * Endianness support functions.
-+ *
-+ * Ultimately, everything in ACPI tables or AML must be in little-endian
-+ * format. However, we sometimes find it necessary to run on a big-endian
-+ * machine and create or read those little-endian values. This is a small
-+ * libary of functions to make that easier, and more visible.
-+ *
-+ */
-+
-+/*******************************************************************************
-+ *
-+ * FUNCTION: UtIsBigEndianMachine
-+ *
-+ * PARAMETERS: None
-+ *
-+ * RETURN: TRUE if machine is big endian
-+ * FALSE if machine is little endian
-+ *
-+ * DESCRIPTION: Detect whether machine is little endian or big endian.
-+ *
-+ ******************************************************************************/
-+
-+UINT8
-+UtIsBigEndianMachine (
-+ void)
-+{
-+ union {
-+ UINT32 Integer;
-+ UINT8 Bytes[4];
-+ } Overlay = {0xFF000000};
-+
-+
-+ return (Overlay.Bytes[0]); /* Returns 0xFF (TRUE) for big endian */
-+}
-+
-+
-+/*******************************************************************************
-+ *
-+ * FUNCTION: AcpiUtReadUint16
-+ *
-+ * PARAMETERS: Src - location containing the little-endian
-+ * value
-+ *
-+ * RETURN: UINT16 value in host-native form
-+ *
-+ * DESCRIPTION: Read a UINT16 little-endian value from a given location
-+ * and return it in host-native form
-+ *
-+ ******************************************************************************/
-+
-+UINT16
-+AcpiUtReadUint16 (
-+ void *SrcPtr)
-+{
-+ UINT16 Result = 0;
-+ UINT8 *Dst = (UINT8 *) &Result;
-+ UINT8 *Src = (UINT8 *) SrcPtr;
-+
-+ if (!UtIsBigEndianMachine())
-+ {
-+ return (*(UINT16 *) SrcPtr);
-+ }
-+
-+ Dst[0] = Src[1];
-+ Dst[1] = Src[0];
-+
-+ return (Result);
-+}
-+
-+/*******************************************************************************
-+ *
-+ * FUNCTION: AcpiUtReadUint32
-+ *
-+ * PARAMETERS: Src - location containing the little-endian
-+ * value
-+ *
-+ * RETURN: UINT32 value in host-native form
-+ *
-+ * DESCRIPTION: Read a UINT32 little-endian value from a given location
-+ * and return it in host-native form
-+ *
-+ ******************************************************************************/
-+
-+UINT32
-+AcpiUtReadUint32 (
-+ void *SrcPtr)
-+{
-+ UINT32 Result = 0;
-+ UINT8 *Dst = (UINT8 *) &Result;
-+ UINT8 *Src = (UINT8 *) SrcPtr;
-+
-+ if (!UtIsBigEndianMachine())
-+ {
-+ return (*(UINT32 *) SrcPtr);
-+ }
-+
-+ Dst[0] = Src[3];
-+ Dst[1] = Src[2];
-+ Dst[2] = Src[1];
-+ Dst[3] = Src[0];
-+
-+ return (Result);
-+}
-+
-+/*******************************************************************************
-+ *
-+ * FUNCTION: AcpiUtReadUint64
-+ *
-+ * PARAMETERS: Src - location containing the little-endian
-+ * value
-+ *
-+ * RETURN: UINT64 value in host-native form
-+ *
-+ * DESCRIPTION: Read a UINT64 little-endian value from a given location
-+ * and return it in host-native form
-+ *
-+ ******************************************************************************/
-+
-+UINT64
-+AcpiUtReadUint64 (
-+ void *SrcPtr)
-+{
-+ UINT64 Result = 0;
-+ UINT8 *Dst = (UINT8 *) &Result;
-+ UINT8 *Src = (UINT8 *) SrcPtr;
-+
-+ if (!UtIsBigEndianMachine())
-+ {
-+ return (*(UINT64 *) SrcPtr);
-+ }
-+
-+ Dst[0] = Src[7];
-+ Dst[1] = Src[6];
-+ Dst[2] = Src[5];
-+ Dst[3] = Src[4];
-+ Dst[4] = Src[3];
-+ Dst[5] = Src[2];
-+ Dst[6] = Src[1];
-+ Dst[7] = Src[0];
-+
-+ return (Result);
-+}
-+
-+/*******************************************************************************
-+ *
-+ * FUNCTION: AcpiUtWriteUint
-+ *
-+ * PARAMETERS: DstPtr - where to place the retrieved value
-+ * DstLength - space in bytes for this int type
-+ * SrcPtr - where the little-endian value lives
-+ * SrcLength - space in bytes for this int type
-+ *
-+ * RETURN: None.
-+ *
-+ * DESCRIPTION: Write a host-native integer value of the given size, and
-+ * store it in the location specified in little-endian form.
-+ * Given the amount of integer type casting done, this general
-+ * version seems the most useful (vs 32->32, 32->16, 16->32,
-+ * ad infinitum)
-+ *
-+ ******************************************************************************/
-+
-+void
-+AcpiUtWriteUint (
-+ void *DstPtr,
-+ int DstLength,
-+ const void *SrcPtr,
-+ const int SrcLength)
-+{
-+ UINT8 *Dst = (UINT8 *) DstPtr;
-+ UINT8 *Src = (UINT8 *) SrcPtr;
-+ int Length;
-+ int ii;
-+
-+ if (!UtIsBigEndianMachine())
-+ {
-+ Length = SrcLength > DstLength ? DstLength : SrcLength;
-+ memcpy (Dst, Src, Length);
-+ return;
-+ }
-+
-+ Length = SrcLength >= DstLength ? DstLength : SrcLength;
-+ for (ii = 0; ii < Length; ii++)
-+ Dst[ii] = Src[SrcLength - ii - 1];
-+
-+}
-Index: acpica-unix2-20220331/source/include/acmacros.h
-===================================================================
---- acpica-unix2-20220331.orig/source/include/acmacros.h
-+++ acpica-unix2-20220331/source/include/acmacros.h
-@@ -76,61 +76,6 @@
- * If the hardware supports the transfer of unaligned data, just do the store.
- * Otherwise, we have to move one byte at a time.
- */
--#ifdef ACPI_BIG_ENDIAN
--/*
-- * Macros for big-endian machines
-- */
--
--/* These macros reverse the bytes during the move, converting little-endian to big endian */
--
-- /* Big Endian <== Little Endian */
-- /* Hi...Lo Lo...Hi */
--/* 16-bit source, 16/32/64 destination */
--
--#define ACPI_MOVE_16_TO_16(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[1];\
-- (( UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[0];}
--
--#define ACPI_MOVE_16_TO_32(d, s) {(*(UINT32 *)(void *)(d))=0;\
-- ((UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[1];\
-- ((UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[0];}
--
--#define ACPI_MOVE_16_TO_64(d, s) {(*(UINT64 *)(void *)(d))=0;\
-- ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
-- ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
--
--/* 32-bit source, 16/32/64 destination */
--
--#define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */
--
--#define ACPI_MOVE_32_TO_32(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[3];\
-- (( UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[2];\
-- (( UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[1];\
-- (( UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[0];}
--
--#define ACPI_MOVE_32_TO_64(d, s) {(*(UINT64 *)(void *)(d))=0;\
-- ((UINT8 *)(void *)(d))[4] = ((UINT8 *)(void *)(s))[3];\
-- ((UINT8 *)(void *)(d))[5] = ((UINT8 *)(void *)(s))[2];\
-- ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
-- ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
--
--/* 64-bit source, 16/32/64 destination */
--
--#define ACPI_MOVE_64_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */
--
--#define ACPI_MOVE_64_TO_32(d, s) ACPI_MOVE_32_TO_32(d, s) /* Truncate to 32 */
--
--#define ACPI_MOVE_64_TO_64(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];\
-- (( UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[6];\
-- (( UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[5];\
-- (( UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[4];\
-- (( UINT8 *)(void *)(d))[4] = ((UINT8 *)(void *)(s))[3];\
-- (( UINT8 *)(void *)(d))[5] = ((UINT8 *)(void *)(s))[2];\
-- (( UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
-- (( UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
--#else
--/*
-- * Macros for little-endian machines
-- */
-
- #ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED
-
-@@ -193,7 +138,6 @@
- (( UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[6];\
- (( UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[7];}
- #endif
--#endif
-
-
- /*
-Index: acpica-unix2-20220331/source/include/acutils.h
-===================================================================
---- acpica-unix2-20220331.orig/source/include/acutils.h
-+++ acpica-unix2-20220331/source/include/acutils.h
-@@ -1167,4 +1167,36 @@ AcpiUtConvertUuidToString (
- char *OutString);
- #endif
-
-+
-+/*
-+ * utendian -- byte-swapping for big-endian support
-+ */
-+
-+UINT8
-+UtIsBigEndianMachine (
-+ void);
-+
-+#if defined(ACPI_ASL_COMPILER) || defined(ACPI_EXEC_APP) || \
-+ defined(ACPI_HELP_APP) || defined(ACPI_DUMP_APP) || \
-+ defined(ACPI_EXAMPLE_APP) || defined(ACPI_BIN_APP)
-+UINT32
-+AcpiUtReadUint32 (
-+ void *SrcPtr);
-+
-+UINT16
-+AcpiUtReadUint16 (
-+ void *SrcPtr);
-+
-+UINT64
-+AcpiUtReadUint64 (
-+ void *SrcPtr);
-+
-+void
-+AcpiUtWriteUint (
-+ void *DstPtr,
-+ int DstLength,
-+ const void *SrcPtr,
-+ const int SrcLength);
-+#endif
-+
- #endif /* _ACUTILS_H */
-Index: acpica-unix2-20220331/source/include/platform/aclinux.h
-===================================================================
---- acpica-unix2-20220331.orig/source/include/platform/aclinux.h
-+++ acpica-unix2-20220331/source/include/platform/aclinux.h
-@@ -203,6 +203,7 @@
-
- #ifdef ACPI_USE_STANDARD_HEADERS
- #include <unistd.h>
-+#include <endian.h>
- #endif
-
- /* Define/disable kernel-specific declarators */
diff --git a/0002-Modify-utility-functions-to-be-endian-agnostic.patch b/0002-Modify-utility-functions-to-be-endian-agnostic.patch
deleted file mode 100644
index a328096..0000000
--- a/0002-Modify-utility-functions-to-be-endian-agnostic.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From 51b0d06c0a6c4d4e19432ebf930299855c8fcf23 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Fri, 18 Sep 2020 15:14:30 -0600
-Subject: [PATCH 02/45] Modify utility functions to be endian-agnostic
-
-All of the modifications here use the big-endian code previously added
-(see utendian.c) to make themselves endian-agnostic; i.e., that the code
-does not need to change further to work on both big- and little-endian
-machines.
-
-These particular files were changed to handle the reading and writing
-of files (the length is often embedded in the binary stream), and to
-handle the reading and writing of integer values. The common cases are
-to "read" a 32-bit unsigned int in little-endian format, but convert it
-to host-native, and to write a byte, word, double word or quad word value
-as little-endian, regardless of host-native format.
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/acfileio.c | 16 ++++++++++------
- source/common/dmtable.c | 8 ++++----
- source/compiler/dtfield.c | 2 +-
- source/compiler/dtsubtable.c | 4 ++--
- source/components/tables/tbprint.c | 13 +++++++++----
- 5 files changed, 26 insertions(+), 17 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/acfileio.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/acfileio.c
-+++ acpica-unix2-20220331/source/common/acfileio.c
-@@ -280,6 +280,7 @@ AcGetOneTableFromFile (
- ACPI_TABLE_HEADER *Table;
- INT32 Count;
- long TableOffset;
-+ UINT32 Length;
-
-
- *ReturnTable = NULL;
-@@ -319,7 +320,8 @@ AcGetOneTableFromFile (
-
- /* Allocate a buffer for the entire table */
-
-- Table = AcpiOsAllocate ((ACPI_SIZE) TableHeader.Length);
-+ Length = AcpiUtReadUint32 (&TableHeader.Length);
-+ Table = AcpiOsAllocate ((ACPI_SIZE) Length);
- if (!Table)
- {
- return (AE_NO_MEMORY);
-@@ -329,13 +331,13 @@ AcGetOneTableFromFile (
-
- fseek (File, TableOffset, SEEK_SET);
-
-- Count = fread (Table, 1, TableHeader.Length, File);
-+ Count = fread (Table, 1, Length, File);
-
- /*
- * Checks for data table headers happen later in the execution. Only verify
- * for Aml tables at this point in the code.
- */
-- if (GetOnlyAmlTables && Count != (INT32) TableHeader.Length)
-+ if (GetOnlyAmlTables && Count != (INT32) Length)
- {
- Status = AE_ERROR;
- goto ErrorExit;
-@@ -343,7 +345,7 @@ AcGetOneTableFromFile (
-
- /* Validate the checksum (just issue a warning) */
-
-- Status = AcpiTbVerifyChecksum (Table, TableHeader.Length);
-+ Status = AcpiTbVerifyChecksum (Table, Length);
- if (ACPI_FAILURE (Status))
- {
- Status = AcCheckTextModeCorruption (Table);
-@@ -436,6 +438,7 @@ AcValidateTableHeader (
- long OriginalOffset;
- UINT32 FileSize;
- UINT32 i;
-+ UINT32 Length;
-
-
- ACPI_FUNCTION_TRACE (AcValidateTableHeader);
-@@ -472,11 +475,12 @@ AcValidateTableHeader (
- /* Validate table length against bytes remaining in the file */
-
- FileSize = CmGetFileSize (File);
-- if (TableHeader.Length > (UINT32) (FileSize - TableOffset))
-+ Length = AcpiUtReadUint32 (&TableHeader.Length);
-+ if (Length > (UINT32) (FileSize - TableOffset))
- {
- fprintf (stderr, "Table [%4.4s] is too long for file - "
- "needs: 0x%.2X, remaining in file: 0x%.2X\n",
-- TableHeader.Signature, TableHeader.Length,
-+ TableHeader.Signature, Length,
- (UINT32) (FileSize - TableOffset));
- return (AE_BAD_HEADER);
- }
-Index: acpica-unix2-20220331/source/common/dmtable.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtable.c
-+++ acpica-unix2-20220331/source/common/dmtable.c
-@@ -713,7 +713,7 @@ AcpiDmDumpDataTable (
- {
- /* Dump the raw table data */
-
-- Length = Table->Length;
-+ Length = AcpiUtReadUint32 (&Table->Length);
-
- AcpiOsPrintf ("\n/*\n%s: Length %d (0x%X)\n\n",
- ACPI_RAW_TABLE_DATA_HEADER, Length, Length);
-@@ -730,7 +730,7 @@ AcpiDmDumpDataTable (
- */
- if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
- {
-- Length = Table->Length;
-+ Length = AcpiUtReadUint32 (&Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs);
- if (ACPI_FAILURE (Status))
- {
-@@ -751,7 +751,7 @@ AcpiDmDumpDataTable (
- /*
- * All other tables must use the common ACPI table header, dump it now
- */
-- Length = Table->Length;
-+ Length = AcpiUtReadUint32(&Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader);
- if (ACPI_FAILURE (Status))
- {
-@@ -1415,7 +1415,7 @@ AcpiDmDumpTable (
-
- AcpiOsPrintf ("%2.2X", *Target);
- Temp8 = AcpiDmGenerateChecksum (Table,
-- ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length,
-+ AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length)),
- ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);
-
- if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum)
-Index: acpica-unix2-20220331/source/compiler/dtfield.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dtfield.c
-+++ acpica-unix2-20220331/source/compiler/dtfield.c
-@@ -361,7 +361,7 @@ DtCompileInteger (
- DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
- }
-
-- memcpy (Buffer, &Value, ByteLength);
-+ AcpiUtWriteUint (Buffer, ByteLength, &Value, sizeof (UINT64));
- return;
- }
-
-Index: acpica-unix2-20220331/source/compiler/dtsubtable.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dtsubtable.c
-+++ acpica-unix2-20220331/source/compiler/dtsubtable.c
-@@ -378,6 +378,6 @@ DtSetSubtableLength (
- return;
- }
-
-- memcpy (Subtable->LengthField, &Subtable->TotalLength,
-- Subtable->SizeOfLengthField);
-+ AcpiUtWriteUint (Subtable->LengthField, Subtable->SizeOfLengthField,
-+ &Subtable->TotalLength, sizeof (Subtable->TotalLength));
- }
-Index: acpica-unix2-20220331/source/components/tables/tbprint.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/tables/tbprint.c
-+++ acpica-unix2-20220331/source/components/tables/tbprint.c
-@@ -44,6 +44,8 @@
- #include "acpi.h"
- #include "accommon.h"
- #include "actables.h"
-+#include "platform/acenv.h"
-+#include "acutils.h"
-
- #define _COMPONENT ACPI_TABLES
- ACPI_MODULE_NAME ("tbprint")
-@@ -151,7 +153,7 @@ AcpiTbPrintTableHeader (
-
- ACPI_INFO (("%-4.4s 0x%8.8X%8.8X %06X",
- Header->Signature, ACPI_FORMAT_UINT64 (Address),
-- Header->Length));
-+ AcpiUtReadUint32 (&Header->Length)));
- }
- else if (ACPI_VALIDATE_RSDP_SIG (ACPI_CAST_PTR (ACPI_TABLE_RSDP,
- Header)->Signature))
-@@ -179,9 +181,12 @@ AcpiTbPrintTableHeader (
- "%-4.4s 0x%8.8X%8.8X"
- " %06X (v%.2d %-6.6s %-8.8s %08X %-4.4s %08X)",
- LocalHeader.Signature, ACPI_FORMAT_UINT64 (Address),
-- LocalHeader.Length, LocalHeader.Revision, LocalHeader.OemId,
-- LocalHeader.OemTableId, LocalHeader.OemRevision,
-- LocalHeader.AslCompilerId, LocalHeader.AslCompilerRevision));
-+ AcpiUtReadUint32 (&LocalHeader.Length),
-+ LocalHeader.Revision, LocalHeader.OemId,
-+ LocalHeader.OemTableId,
-+ AcpiUtReadUint32 (&LocalHeader.OemRevision),
-+ LocalHeader.AslCompilerId,
-+ AcpiUtReadUint32 (&LocalHeader.AslCompilerRevision)));
- }
- }
-
diff --git a/0003-Always-display-table-header-content-in-human-readabl.patch b/0003-Always-display-table-header-content-in-human-readabl.patch
deleted file mode 100644
index f540ac1..0000000
--- a/0003-Always-display-table-header-content-in-human-readabl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 62cc2f4ae212bd0fad83f643921ac216ebb9a986 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Fri, 18 Sep 2020 15:20:37 -0600
-Subject: [PATCH 03/45] Always display table header content in human-readable
- form
-
-When comparing two binary data tables, little-endian values are read
-from each table header and printed out. Make sure they show up in a
-form that makes sense to humans.
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/tools/acpibin/abcompare.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-Index: acpica-unix2-20220331/source/tools/acpibin/abcompare.c
-===================================================================
---- acpica-unix2-20220331.orig/source/tools/acpibin/abcompare.c
-+++ acpica-unix2-20220331/source/tools/acpibin/abcompare.c
-@@ -42,6 +42,7 @@
- */
-
- #include "acpibin.h"
-+#include "acutils.h"
-
-
- ACPI_TABLE_HEADER Header1;
-@@ -179,14 +180,14 @@ AbPrintHeadersInfo (
- /* Display header information for both headers */
-
- printf ("Signature %8.4s : %4.4s\n", Header->Signature, Header2->Signature);
-- printf ("Length %8.8X : %8.8X\n", Header->Length, Header2->Length);
-+ printf ("Length %8.8X : %8.8X\n", AcpiUtReadUint32 (&Header->Length), AcpiUtReadUint32 (&Header2->Length));
- printf ("Revision %8.2X : %2.2X\n", Header->Revision, Header2->Revision);
- printf ("Checksum %8.2X : %2.2X\n", Header->Checksum, Header2->Checksum);
- printf ("OEM ID %8.6s : %.6s\n", Header->OemId, Header2->OemId);
- printf ("OEM Table ID %8.8s : %.8s\n", Header->OemTableId, Header2->OemTableId);
-- printf ("OEM Revision %8.8X : %8.8X\n", Header->OemRevision, Header2->OemRevision);
-+ printf ("OEM Revision %8.8X : %8.8X\n", AcpiUtReadUint32 (&Header->OemRevision), AcpiUtReadUint32 (&Header2->OemRevision));
- printf ("ASL Compiler ID %8.4s : %.4s\n", Header->AslCompilerId, Header2->AslCompilerId);
-- printf ("Compiler Revision %8.8X : %8.8X\n", Header->AslCompilerRevision, Header2->AslCompilerRevision);
-+ printf ("Compiler Revision %8.8X : %8.8X\n", AcpiUtReadUint32 (&Header->AslCompilerRevision), AcpiUtReadUint32 (&Header2->AslCompilerRevision));
- printf ("\n");
- }
-
diff --git a/0004-Re-enable-support-for-big-endian-machines.patch b/0004-Re-enable-support-for-big-endian-machines.patch
deleted file mode 100644
index d2dc432..0000000
--- a/0004-Re-enable-support-for-big-endian-machines.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 16734feab4204d6930c1ede62e527920607daace Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Wed, 16 Sep 2020 16:27:06 -0600
-Subject: [PATCH 04/45] Re-enable support for big-endian machines
-
-First, disable the big-endian check and fail. Then, make sure the
-namespace gets initialized properly (NB: needed even if we are only
-compiling/disassembling data tables).
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/compiler/aslmain.c | 12 ------------
- source/components/namespace/nsutils.c | 7 +++++--
- 2 files changed, 5 insertions(+), 14 deletions(-)
-
-Index: acpica-unix2-20220331/source/compiler/aslmain.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslmain.c
-+++ acpica-unix2-20220331/source/compiler/aslmain.c
-@@ -101,18 +101,6 @@ main (
-
- signal (SIGINT, AslSignalHandler);
-
-- /*
-- * Big-endian machines are not currently supported. ACPI tables must
-- * be little-endian, and support for big-endian machines needs to
-- * be implemented.
-- */
-- if (UtIsBigEndianMachine ())
-- {
-- fprintf (stderr,
-- "iASL is not currently supported on big-endian machines.\n");
-- return (-1);
-- }
--
- AcpiOsInitialize ();
- ACPI_DEBUG_INITIALIZE (); /* For debug version only */
-
-Index: acpica-unix2-20220331/source/components/namespace/nsutils.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/namespace/nsutils.c
-+++ acpica-unix2-20220331/source/components/namespace/nsutils.c
-@@ -272,6 +272,7 @@ AcpiNsBuildInternalName (
- const char *ExternalName = Info->NextExternalChar;
- char *Result = NULL;
- UINT32 i;
-+ char TmpSeg[ACPI_NAMESEG_SIZE+1];
-
-
- ACPI_FUNCTION_TRACE (NsBuildInternalName);
-@@ -335,6 +336,7 @@ AcpiNsBuildInternalName (
-
- for (; NumSegments; NumSegments--)
- {
-+ memset (TmpSeg, 0, ACPI_NAMESEG_SIZE+1);
- for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
- {
- if (ACPI_IS_PATH_SEPARATOR (*ExternalName) ||
-@@ -342,16 +344,17 @@ AcpiNsBuildInternalName (
- {
- /* Pad the segment with underscore(s) if segment is short */
-
-- Result[i] = '_';
-+ TmpSeg[i] = '_';
- }
- else
- {
- /* Convert the character to uppercase and save it */
-
-- Result[i] = (char) toupper ((int) *ExternalName);
-+ TmpSeg[i] = (char) toupper ((int) *ExternalName);
- ExternalName++;
- }
- }
-+ AcpiUtWriteUint (Result, ACPI_NAMESEG_SIZE, TmpSeg, ACPI_NAMESEG_SIZE);
-
- /* Now we must have a path separator, or the pathname is bad */
-
diff --git a/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch b/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
deleted file mode 100644
index e5a9dc5..0000000
--- a/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 055fee09d8f9244b6c437ad18b98edb81a87e8bc Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Tue, 27 Oct 2020 17:50:52 -0600
-Subject: [PATCH 05/45] Correct an endian-ness problem when converting ASL to
- ASL+
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/compiler/cvparser.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/compiler/cvparser.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/cvparser.c
-+++ acpica-unix2-20220331/source/compiler/cvparser.c
-@@ -144,6 +144,7 @@ CvInitFileTree (
- char *ChildFilename = NULL;
- UINT8 *AmlStart;
- UINT32 AmlLength;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-
- if (!AcpiGbl_CaptureComments)
-@@ -152,7 +153,7 @@ CvInitFileTree (
- }
-
-
-- AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
-+ AmlLength = TableLength - sizeof (ACPI_TABLE_HEADER);
- AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
-
- CvDbgPrint ("AmlLength: %x\n", AmlLength);
-@@ -162,7 +163,7 @@ CvInitFileTree (
- AcpiGbl_FileTreeRoot = AcpiOsAcquireObject (AcpiGbl_FileCache);
-
- AcpiGbl_FileTreeRoot->FileStart = (char *)(AmlStart);
-- AcpiGbl_FileTreeRoot->FileEnd = (char *)(AmlStart + Table->Length);
-+ AcpiGbl_FileTreeRoot->FileEnd = (char *)(AmlStart + TableLength);
- AcpiGbl_FileTreeRoot->Next = NULL;
- AcpiGbl_FileTreeRoot->Parent = NULL;
- AcpiGbl_FileTreeRoot->Filename = (char *)(AmlStart+2);
diff --git a/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch b/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
deleted file mode 100644
index 5893e93..0000000
--- a/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 790c016107e98ded2d0ae579f84dd4cd3fa06587 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Tue, 29 Jun 2021 17:48:31 -0600
-Subject: [PATCH 06/45] Use more reliable ACPI_COPY_NAMSEG in GPE name checks
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/compiler/aslanalyze.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/compiler/aslanalyze.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslanalyze.c
-+++ acpica-unix2-20220331/source/compiler/aslanalyze.c
-@@ -469,7 +469,7 @@ ApCheckForGpeNameConflict (
-
- /* Need a null-terminated string version of NameSeg */
-
-- ACPI_MOVE_32_TO_32 (Name, Op->Asl.NameSeg);
-+ ACPI_COPY_NAMESEG (Name, Op->Asl.NameSeg);
- Name[ACPI_NAMESEG_SIZE] = 0;
-
- /*
-@@ -496,7 +496,7 @@ ApCheckForGpeNameConflict (
- * We are now sure we have an _Lxx or _Exx.
- * Create the target name that would cause collision (Flip E/L)
- */
-- ACPI_MOVE_32_TO_32 (Target, Name);
-+ ACPI_COPY_NAMESEG (Target, Name);
-
- /* Inject opposite letter ("L" versus "E") */
-
diff --git a/0007-Handle-dumping-Unicode-properly-when-big-endian.patch b/0007-Handle-dumping-Unicode-properly-when-big-endian.patch
deleted file mode 100644
index 70d83d6..0000000
--- a/0007-Handle-dumping-Unicode-properly-when-big-endian.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9a4a32c597fcdfa8a3bc33230c40a18e39c3449d Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Thu, 1 Jul 2021 17:46:19 -0600
-Subject: [PATCH 07/45] Handle dumping Unicode properly when big-endian
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20220331/source/common/dmtbdump.c
-@@ -200,6 +200,8 @@ AcpiDmDumpUnicode (
- UINT8 *Buffer;
- UINT32 Length;
- UINT32 i;
-+ UINT16 Tmp16;
-+ UINT32 start;
-
-
- Buffer = ((UINT8 *) Table) + BufferOffset;
-@@ -209,7 +211,8 @@ AcpiDmDumpUnicode (
-
- for (i = 0; i < Length; i += 2)
- {
-- if (!isprint (Buffer[i]))
-+ Tmp16 = AcpiUtReadUint16 (&Buffer[i]);
-+ if (!isprint (Tmp16))
- {
- goto DumpRawBuffer;
- }
-@@ -217,7 +220,8 @@ AcpiDmDumpUnicode (
-
- /* Ensure all high bytes are zero */
-
-- for (i = 1; i < Length; i += 2)
-+ start = UtIsBigEndianMachine() ? 0 : 1;
-+ for (i = start; i < Length; i += 2)
- {
- if (Buffer[i])
- {
-@@ -230,7 +234,8 @@ AcpiDmDumpUnicode (
- AcpiOsPrintf ("\"");
- for (i = 0; i < Length; i += 2)
- {
-- AcpiOsPrintf ("%c", Buffer[i]);
-+ Tmp16 = AcpiUtReadUint16 (&Buffer[i]);
-+ AcpiOsPrintf ("%c", Tmp16);
- }
-
- AcpiOsPrintf ("\"\n");
diff --git a/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch b/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
deleted file mode 100644
index 9121ab8..0000000
--- a/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7b107ab7348d903108140f6033e90596b12325c4 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Thu, 15 Oct 2020 12:12:11 -0600
-Subject: [PATCH 08/45] Support MADT (aka APIC) in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -763,7 +763,7 @@ AcpiDmDumpMadt (
- {
- ACPI_STATUS Status;
- ACPI_SUBTABLE_HEADER *Subtable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_MADT);
- ACPI_DMTABLE_INFO *InfoTable;
-
-@@ -781,7 +781,7 @@ AcpiDmDumpMadt (
- Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
- DbgPrint (ASL_PARSE_OUTPUT, "//0B) Offset %X, from table start: 0x%8.8X%8.8X\n",
- Offset, ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table)));
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
diff --git a/0009-Support-ASF-tables-in-a-big-endian-world.patch b/0009-Support-ASF-tables-in-a-big-endian-world.patch
deleted file mode 100644
index a3f815d..0000000
--- a/0009-Support-ASF-tables-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From ce811b4c38b9a09533ee8bafa22813f6e43c023d Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Fri, 18 Sep 2020 16:41:02 -0600
-Subject: [PATCH 09/45] Support ASF! tables in a big-endian world
-
-Read the table length properly and it all works right for big-endian.
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump1.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -358,16 +358,18 @@ AcpiDmDumpAsf (
- UINT32 DataOffset = 0;
- UINT32 i;
- UINT8 Type;
-+ UINT32 TableLength;
-
-
- /* No main table, only subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Table, Offset);
-- while (Offset < Table->Length)
-+ TableLength = AcpiUtReadUint32 (&Table->Length);
-+ while (Offset < TableLength)
- {
- /* Common subtable header */
-
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- Subtable->Header.Length, AcpiDmTableInfoAsfHdr);
- if (ACPI_FAILURE (Status))
- {
-@@ -425,7 +427,7 @@ AcpiDmDumpAsf (
- return;
- }
-
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- Subtable->Header.Length, InfoTable);
- if (ACPI_FAILURE (Status))
- {
-@@ -442,7 +444,7 @@ AcpiDmDumpAsf (
- for (i = 0; i < DataCount; i++)
- {
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, DataOffset,
-+ Status = AcpiDmDumpTable (TableLength, DataOffset,
- DataTable, DataLength, DataInfoTable);
- if (ACPI_FAILURE (Status))
- {
diff --git a/0010-Support-CPEP-tables-in-a-big-endian-world.patch b/0010-Support-CPEP-tables-in-a-big-endian-world.patch
deleted file mode 100644
index e9451cd..0000000
--- a/0010-Support-CPEP-tables-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0c4be57a5e0e45b4197c2d9a0b26462d3b1a9b80 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Fri, 18 Sep 2020 16:54:13 -0600
-Subject: [PATCH 10/45] Support CPEP tables in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump1.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -614,7 +614,7 @@ AcpiDmDumpCpep (
- {
- ACPI_STATUS Status;
- ACPI_CPEP_POLLING *Subtable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_CPEP);
-
-
-@@ -629,7 +629,7 @@ AcpiDmDumpCpep (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, Subtable,
diff --git a/0011-Support-DBG2-table-in-a-big-endian-world.patch b/0011-Support-DBG2-table-in-a-big-endian-world.patch
deleted file mode 100644
index 76cb7ac..0000000
--- a/0011-Support-DBG2-table-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From 2cb0b87a15682da4f19f707fa3ffece504f94b5a Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Sat, 19 Sep 2020 13:37:38 -0600
-Subject: [PATCH 11/45] Support DBG2 table in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump1.c | 37 ++++++++++++++++++--------------
- source/compiler/dttable1.c | 43 ++++++++++++++++++++++++--------------
- 2 files changed, 48 insertions(+), 32 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -669,7 +669,7 @@ AcpiDmDumpCsrt (
- ACPI_CSRT_GROUP *Subtable;
- ACPI_CSRT_SHARED_INFO *SharedInfoTable;
- ACPI_CSRT_DESCRIPTOR *SubSubtable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_CSRT);
- UINT32 SubOffset;
- UINT32 SubSubOffset;
-@@ -681,7 +681,7 @@ AcpiDmDumpCsrt (
- /* Subtables (Resource Groups) */
-
- Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Resource group subtable */
-
-@@ -715,7 +715,7 @@ AcpiDmDumpCsrt (
- Offset + SubOffset);
-
- while ((SubOffset < Subtable->Length) &&
-- ((Offset + SubOffset) < Table->Length))
-+ ((Offset + SubOffset) < Length))
- {
- AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
-@@ -776,12 +776,13 @@ AcpiDmDumpDbg2 (
- {
- ACPI_STATUS Status;
- ACPI_DBG2_DEVICE *Subtable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_DBG2);
- UINT32 i;
- UINT32 ArrayOffset;
- UINT32 AbsoluteOffset;
- UINT8 *Array;
-+ UINT16 SubtableLength;
-
-
- /* Main table */
-@@ -795,11 +796,12 @@ AcpiDmDumpDbg2 (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- AcpiOsPrintf ("\n");
-+ SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-- Subtable->Length, AcpiDmTableInfoDbg2Device);
-+ SubtableLength, AcpiDmTableInfoDbg2Device);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -809,13 +811,13 @@ AcpiDmDumpDbg2 (
-
- for (i = 0; i < Subtable->RegisterCount; i++)
- {
-- ArrayOffset = Subtable->BaseAddressOffset +
-+ ArrayOffset = AcpiUtReadUint16 (&Subtable->BaseAddressOffset) +
- (sizeof (ACPI_GENERIC_ADDRESS) * i);
- AbsoluteOffset = Offset + ArrayOffset;
- Array = (UINT8 *) Subtable + ArrayOffset;
-
- Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
-- Subtable->Length, AcpiDmTableInfoDbg2Addr);
-+ SubtableLength, AcpiDmTableInfoDbg2Addr);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -826,13 +828,13 @@ AcpiDmDumpDbg2 (
-
- for (i = 0; i < Subtable->RegisterCount; i++)
- {
-- ArrayOffset = Subtable->AddressSizeOffset +
-+ ArrayOffset = AcpiUtReadUint16 (&Subtable->AddressSizeOffset) +
- (sizeof (UINT32) * i);
- AbsoluteOffset = Offset + ArrayOffset;
- Array = (UINT8 *) Subtable + ArrayOffset;
-
- Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
-- Subtable->Length, AcpiDmTableInfoDbg2Size);
-+ SubtableLength, AcpiDmTableInfoDbg2Size);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -842,12 +844,12 @@ AcpiDmDumpDbg2 (
- /* Dump the Namestring (required) */
-
- AcpiOsPrintf ("\n");
-- ArrayOffset = Subtable->NamepathOffset;
-+ ArrayOffset = AcpiUtReadUint16 (&Subtable->NamepathOffset);
- AbsoluteOffset = Offset + ArrayOffset;
- Array = (UINT8 *) Subtable + ArrayOffset;
-
- Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
-- Subtable->Length, AcpiDmTableInfoDbg2Name);
-+ SubtableLength, AcpiDmTableInfoDbg2Name);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -857,8 +859,11 @@ AcpiDmDumpDbg2 (
-
- if (Subtable->OemDataOffset)
- {
-- Status = AcpiDmDumpTable (Length, Offset + Subtable->OemDataOffset,
-- Table, Subtable->OemDataLength,
-+ Array = (UINT8 *) Subtable + AcpiUtReadUint16 (&Subtable->OemDataOffset);
-+
-+ Status = AcpiDmDumpTable (Length,
-+ Offset + AcpiUtReadUint16 (&Subtable->OemDataOffset),
-+ Array, AcpiUtReadUint16 (&Subtable->OemDataLength),
- AcpiDmTableInfoDbg2OemData);
- if (ACPI_FAILURE (Status))
- {
-@@ -868,9 +873,9 @@ AcpiDmDumpDbg2 (
-
- /* Point to next subtable */
-
-- Offset += Subtable->Length;
-+ Offset += SubtableLength;
- Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Subtable,
-- Subtable->Length);
-+ SubtableLength);
- }
- }
-
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -718,6 +718,7 @@ DtCompileCsrt (
- DT_FIELD **PFieldList = (DT_FIELD **) List;
- UINT32 DescriptorCount;
- UINT32 GroupLength;
-+ UINT32 Tmp;
-
-
- /* Subtables (Resource Groups) */
-@@ -736,12 +737,13 @@ DtCompileCsrt (
-
- /* Compute the number of resource descriptors */
-
-- GroupLength =
-- (ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-- Subtable->Buffer))->Length -
-- (ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-- Subtable->Buffer))->SharedInfoLength -
-- sizeof (ACPI_CSRT_GROUP);
-+ Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-+ Subtable->Buffer))->Length);
-+ GroupLength = Tmp;
-+ Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-+ Subtable->Buffer))->SharedInfoLength);
-+ GroupLength -= Tmp;
-+ GroupLength -= sizeof (ACPI_CSRT_GROUP);
-
- DescriptorCount = (GroupLength /
- sizeof (ACPI_CSRT_DESCRIPTOR));
-@@ -829,6 +831,7 @@ DtCompileDbg2 (
- ACPI_DBG2_DEVICE *DeviceInfo;
- UINT16 CurrentOffset;
- UINT32 i;
-+ UINT32 Tmp;
-
-
- /* Main table */
-@@ -845,10 +848,12 @@ DtCompileDbg2 (
- /* Main table fields */
-
- Dbg2Header = ACPI_CAST_PTR (ACPI_DBG2_HEADER, Subtable->Buffer);
-- Dbg2Header->InfoOffset = sizeof (ACPI_TABLE_HEADER) + ACPI_PTR_DIFF (
-- ACPI_ADD_PTR (UINT8, Dbg2Header, sizeof (ACPI_DBG2_HEADER)), Dbg2Header);
-+ Tmp = sizeof (ACPI_TABLE_HEADER) + ACPI_PTR_DIFF (
-+ ACPI_ADD_PTR (UINT8, Dbg2Header, sizeof (ACPI_DBG2_HEADER)), Dbg2Header);
-+ AcpiUtWriteUint (&Dbg2Header->InfoOffset, sizeof (UINT32),
-+ &Tmp, sizeof (UINT32));
-
-- SubtableCount = Dbg2Header->InfoCount;
-+ SubtableCount = Tmp;
- DtPushSubtable (Subtable);
-
- /* Process all Device Information subtables (Count = InfoCount) */
-@@ -875,7 +880,8 @@ DtCompileDbg2 (
-
- /* BaseAddressRegister GAS array (Required, size is RegisterCount) */
-
-- DeviceInfo->BaseAddressOffset = CurrentOffset;
-+ AcpiUtWriteUint (&DeviceInfo->BaseAddressOffset, sizeof (UINT16),
-+ &CurrentOffset, sizeof (UINT16));
- for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
- {
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Addr,
-@@ -891,7 +897,8 @@ DtCompileDbg2 (
-
- /* AddressSize array (Required, size = RegisterCount) */
-
-- DeviceInfo->AddressSizeOffset = CurrentOffset;
-+ AcpiUtWriteUint (&DeviceInfo->AddressSizeOffset, sizeof (UINT16),
-+ &CurrentOffset, sizeof (UINT16));
- for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
- {
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Size,
-@@ -907,7 +914,8 @@ DtCompileDbg2 (
-
- /* NamespaceString device identifier (Required, size = NamePathLength) */
-
-- DeviceInfo->NamepathOffset = CurrentOffset;
-+ AcpiUtWriteUint (&DeviceInfo->NamepathOffset, sizeof (UINT16),
-+ &CurrentOffset, sizeof (UINT16));
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name,
- &Subtable);
- if (ACPI_FAILURE (Status))
-@@ -917,8 +925,9 @@ DtCompileDbg2 (
-
- /* Update the device info header */
-
-- DeviceInfo->NamepathLength = (UINT16) Subtable->Length;
-- CurrentOffset += (UINT16) DeviceInfo->NamepathLength;
-+ AcpiUtWriteUint (&DeviceInfo->NamepathLength, sizeof (UINT16),
-+ &Subtable->Length, sizeof (UINT32));
-+ CurrentOffset += AcpiUtReadUint16 (&DeviceInfo->NamepathLength);
- DtInsertSubtable (ParentTable, Subtable);
-
- /* OemData - Variable-length data (Optional, size = OemDataLength) */
-@@ -945,8 +954,10 @@ DtCompileDbg2 (
-
- if (Subtable && Subtable->Length)
- {
-- DeviceInfo->OemDataOffset = CurrentOffset;
-- DeviceInfo->OemDataLength = (UINT16) Subtable->Length;
-+ AcpiUtWriteUint (&DeviceInfo->OemDataOffset, sizeof (UINT16),
-+ &CurrentOffset, sizeof (UINT16));
-+ AcpiUtWriteUint (&DeviceInfo->OemDataLength, sizeof (UINT16),
-+ &Subtable->Length, sizeof (UINT32));
-
- DtInsertSubtable (ParentTable, Subtable);
- }
diff --git a/0012-Support-DMAR-in-a-big-endian-world.patch b/0012-Support-DMAR-in-a-big-endian-world.patch
deleted file mode 100644
index 3d54025..0000000
--- a/0012-Support-DMAR-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From 06623392351dfea54bd69507b6672c933a5e3fd2 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Sat, 19 Sep 2020 15:22:00 -0600
-Subject: [PATCH 12/45] Support DMAR in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtable.c | 4 ++--
- source/common/dmtbdump1.c | 26 +++++++++++++++-----------
- source/compiler/dttable1.c | 12 +++++++-----
- 3 files changed, 24 insertions(+), 18 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtable.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtable.c
-+++ acpica-unix2-20220331/source/common/dmtable.c
-@@ -1578,13 +1578,13 @@ AcpiDmDumpTable (
-
- /* DMAR subtable types */
-
-- Temp16 = ACPI_GET16 (Target);
-+ Temp16 = AcpiUtReadUint16 (Target);
- if (Temp16 > ACPI_DMAR_TYPE_RESERVED)
- {
- Temp16 = ACPI_DMAR_TYPE_RESERVED;
- }
-
-- AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
-+ AcpiOsPrintf (UINT16_FORMAT, Temp16,
- AcpiDmDmarSubnames[Temp16]);
- break;
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -899,13 +899,15 @@ AcpiDmDumpDmar (
- {
- ACPI_STATUS Status;
- ACPI_DMAR_HEADER *Subtable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_DMAR);
- ACPI_DMTABLE_INFO *InfoTable;
- ACPI_DMAR_DEVICE_SCOPE *ScopeTable;
- UINT32 ScopeOffset;
- UINT8 *PciPath;
- UINT32 PathOffset;
-+ UINT16 SubtableType;
-+ UINT16 SubtableLength;
-
-
- /* Main table */
-@@ -919,13 +921,14 @@ AcpiDmDumpDmar (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-+ SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-- Subtable->Length, AcpiDmTableInfoDmarHdr);
-+ SubtableLength, AcpiDmTableInfoDmarHdr);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -933,7 +936,8 @@ AcpiDmDumpDmar (
-
- AcpiOsPrintf ("\n");
-
-- switch (Subtable->Type)
-+ SubtableType = AcpiUtReadUint16 (&Subtable->Type);
-+ switch (SubtableType)
- {
- case ACPI_DMAR_TYPE_HARDWARE_UNIT:
-
-@@ -974,12 +978,12 @@ AcpiDmDumpDmar (
- default:
-
- AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n",
-- Subtable->Type);
-+ SubtableType);
- return;
- }
-
- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-- Subtable->Length, InfoTable);
-+ SubtableLength, InfoTable);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -988,8 +992,8 @@ AcpiDmDumpDmar (
- /*
- * Dump the optional device scope entries
- */
-- if ((Subtable->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-- (Subtable->Type == ACPI_DMAR_TYPE_NAMESPACE))
-+ if ((SubtableType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-+ (SubtableType == ACPI_DMAR_TYPE_NAMESPACE))
- {
- /* These types do not support device scopes */
-
-@@ -997,7 +1001,7 @@ AcpiDmDumpDmar (
- }
-
- ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, Subtable, ScopeOffset);
-- while (ScopeOffset < Subtable->Length)
-+ while (ScopeOffset < SubtableLength)
- {
- AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
-@@ -1038,9 +1042,9 @@ AcpiDmDumpDmar (
- NextSubtable:
- /* Point to next subtable */
-
-- Offset += Subtable->Length;
-+ Offset += SubtableLength;
- Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Subtable,
-- Subtable->Length);
-+ SubtableLength);
- }
- }
-
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -997,6 +997,7 @@ DtCompileDmar (
- ACPI_DMAR_DEVICE_SCOPE *DmarDeviceScope;
- UINT32 DeviceScopeLength;
- UINT32 PciPathLength;
-+ UINT16 DmarHeaderType;
-
-
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable);
-@@ -1027,7 +1028,8 @@ DtCompileDmar (
-
- DmarHeader = ACPI_CAST_PTR (ACPI_DMAR_HEADER, Subtable->Buffer);
-
-- switch (DmarHeader->Type)
-+ DmarHeaderType = AcpiUtReadUint16 (&DmarHeader->Type);
-+ switch (DmarHeaderType)
- {
- case ACPI_DMAR_TYPE_HARDWARE_UNIT:
-
-@@ -1079,8 +1081,8 @@ DtCompileDmar (
- /*
- * Optional Device Scope subtables
- */
-- if ((DmarHeader->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-- (DmarHeader->Type == ACPI_DMAR_TYPE_NAMESPACE))
-+ if ((DmarHeaderType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-+ (DmarHeaderType == ACPI_DMAR_TYPE_NAMESPACE))
- {
- /* These types do not support device scopes */
-
-@@ -1089,8 +1091,8 @@ DtCompileDmar (
- }
-
- DtPushSubtable (Subtable);
-- DeviceScopeLength = DmarHeader->Length - Subtable->Length -
-- ParentTable->Length;
-+ DeviceScopeLength = AcpiUtReadUint16 (&DmarHeader->Length) -
-+ Subtable->Length - ParentTable->Length;
- while (DeviceScopeLength)
- {
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmarScope,
diff --git a/0013-Support-DRTM-in-a-big-endian-world.patch b/0013-Support-DRTM-in-a-big-endian-world.patch
deleted file mode 100644
index 02725bb..0000000
--- a/0013-Support-DRTM-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From bcdec27f562b0df37546b5e8ad2eab76348062eb Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Sat, 19 Sep 2020 15:44:06 -0600
-Subject: [PATCH 13/45] Support DRTM in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump1.c | 25 +++++++++++++++----------
- source/compiler/dttable1.c | 6 ++++--
- 2 files changed, 19 insertions(+), 12 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -1071,11 +1071,14 @@ AcpiDmDumpDrtm (
- ACPI_DRTM_RESOURCE_LIST *DrtmRl;
- ACPI_DRTM_DPS_ID *DrtmDps;
- UINT32 Count;
-+ UINT32 ResourceCount;
-+ UINT32 ValidatedTableCount;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
- AcpiDmTableInfoDrtm);
- if (ACPI_FAILURE (Status))
- {
-@@ -1090,7 +1093,7 @@ AcpiDmDumpDrtm (
-
- DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset,
-+ Status = AcpiDmDumpTable (TableLength, Offset,
- DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),
- AcpiDmTableInfoDrtm0);
- if (ACPI_FAILURE (Status))
-@@ -1103,10 +1106,11 @@ AcpiDmDumpDrtm (
- /* Dump Validated table addresses */
-
- Count = 0;
-- while ((Offset < Table->Length) &&
-- (DrtmVtl->ValidatedTableCount > Count))
-+ ValidatedTableCount = AcpiUtReadUint32 (&DrtmVtl->ValidatedTableCount);
-+ while ((Offset < TableLength) &&
-+ (ValidatedTableCount > Count))
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset,
-+ Status = AcpiDmDumpTable (TableLength, Offset,
- ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),
- AcpiDmTableInfoDrtm0a);
- if (ACPI_FAILURE (Status))
-@@ -1122,7 +1126,7 @@ AcpiDmDumpDrtm (
-
- DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset,
-+ Status = AcpiDmDumpTable (TableLength, Offset,
- DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),
- AcpiDmTableInfoDrtm1);
- if (ACPI_FAILURE (Status))
-@@ -1135,10 +1139,11 @@ AcpiDmDumpDrtm (
- /* Dump the Resource List */
-
- Count = 0;
-- while ((Offset < Table->Length) &&
-- (DrtmRl->ResourceCount > Count))
-+ ResourceCount = AcpiUtReadUint32 (&DrtmRl->ResourceCount);
-+ while ((Offset < TableLength) &&
-+ (ResourceCount > Count))
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset,
-+ Status = AcpiDmDumpTable (TableLength, Offset,
- ACPI_ADD_PTR (void, Table, Offset),
- sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);
- if (ACPI_FAILURE (Status))
-@@ -1154,7 +1159,7 @@ AcpiDmDumpDrtm (
-
- DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);
- AcpiOsPrintf ("\n");
-- (void) AcpiDmDumpTable (Table->Length, Offset,
-+ (void) AcpiDmDumpTable (TableLength, Offset,
- DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);
- }
-
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -1217,7 +1217,8 @@ DtCompileDrtm (
- Count++;
- }
-
-- DrtmVtl->ValidatedTableCount = Count;
-+ AcpiUtWriteUint (&DrtmVtl->ValidatedTableCount, sizeof (UINT32),
-+ &Count, sizeof (UINT32));
- DtPopSubtable ();
- ParentTable = DtPeekSubtable ();
-
-@@ -1255,7 +1256,8 @@ DtCompileDrtm (
- Count++;
- }
-
-- DrtmRl->ResourceCount = Count;
-+ AcpiUtWriteUint(&DrtmRl->ResourceCount, sizeof(UINT32),
-+ &Count, sizeof(UINT32));
- DtPopSubtable ();
- ParentTable = DtPeekSubtable ();
-
diff --git a/0014-Support-EINJ-in-a-big-endian-world.patch b/0014-Support-EINJ-in-a-big-endian-world.patch
deleted file mode 100644
index f65e6ff..0000000
--- a/0014-Support-EINJ-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 70d1047abe010c80c2dd74f6afdc7005b91e6163 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Sat, 19 Sep 2020 15:50:19 -0600
-Subject: [PATCH 14/45] Support EINJ in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump1.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -1183,7 +1183,7 @@ AcpiDmDumpEinj (
- {
- ACPI_STATUS Status;
- ACPI_WHEA_HEADER *Subtable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_EINJ);
-
-
-@@ -1198,7 +1198,7 @@ AcpiDmDumpEinj (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, Subtable,
diff --git a/0015-Support-ERST-in-a-big-endian-world.patch b/0015-Support-ERST-in-a-big-endian-world.patch
deleted file mode 100644
index a6146e2..0000000
--- a/0015-Support-ERST-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e588961ca36e70c24aa1c49e96bcd1997bf98f89 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Sat, 19 Sep 2020 15:54:56 -0600
-Subject: [PATCH 15/45] Support ERST in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump1.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -1236,7 +1236,7 @@ AcpiDmDumpErst (
- {
- ACPI_STATUS Status;
- ACPI_WHEA_HEADER *Subtable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_ERST);
-
-
-@@ -1251,7 +1251,7 @@ AcpiDmDumpErst (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, Subtable,
diff --git a/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch b/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
deleted file mode 100644
index 1b9b3aa..0000000
--- a/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From b3051bc2bad8988f3ad81a8307de6f1d0eef4ace Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Sun, 20 Sep 2020 11:42:21 -0600
-Subject: [PATCH 16/45] Support FADT (aka, FACP) in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump.c | 25 ++++++++++++-----------
- source/components/tables/tbfadt.c | 34 +++++++++++++++++++++++--------
- 2 files changed, 38 insertions(+), 21 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20220331/source/common/dmtbdump.c
-@@ -417,11 +417,12 @@ AcpiDmDumpFadt (
- ACPI_TABLE_HEADER *Table)
- {
- ACPI_STATUS Status;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-
- /* Always dump the minimum FADT revision 1 fields (ACPI 1.0) */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
- AcpiDmTableInfoFadt1);
- if (ACPI_FAILURE (Status))
- {
-@@ -430,10 +431,10 @@ AcpiDmDumpFadt (
-
- /* Check for FADT revision 2 fields (ACPI 1.0B MS extensions) */
-
-- if ((Table->Length > ACPI_FADT_V1_SIZE) &&
-- (Table->Length <= ACPI_FADT_V2_SIZE))
-+ if ((TableLength > ACPI_FADT_V1_SIZE) &&
-+ (TableLength <= ACPI_FADT_V2_SIZE))
- {
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
- AcpiDmTableInfoFadt2);
- if (ACPI_FAILURE (Status))
- {
-@@ -443,9 +444,9 @@ AcpiDmDumpFadt (
-
- /* Check for FADT revision 3/4 fields and up (ACPI 2.0+ extended data) */
-
-- else if (Table->Length > ACPI_FADT_V2_SIZE)
-+ else if (TableLength > ACPI_FADT_V2_SIZE)
- {
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
- AcpiDmTableInfoFadt3);
- if (ACPI_FAILURE (Status))
- {
-@@ -454,9 +455,9 @@ AcpiDmDumpFadt (
-
- /* Check for FADT revision 5 fields and up (ACPI 5.0+) */
-
-- if (Table->Length > ACPI_FADT_V3_SIZE)
-+ if (TableLength > ACPI_FADT_V3_SIZE)
- {
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
- AcpiDmTableInfoFadt5);
- if (ACPI_FAILURE (Status))
- {
-@@ -466,9 +467,9 @@ AcpiDmDumpFadt (
-
- /* Check for FADT revision 6 fields and up (ACPI 6.0+) */
-
-- if (Table->Length > ACPI_FADT_V3_SIZE)
-+ if (TableLength > ACPI_FADT_V3_SIZE)
- {
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
- AcpiDmTableInfoFadt6);
- if (ACPI_FAILURE (Status))
- {
-@@ -479,11 +480,11 @@ AcpiDmDumpFadt (
-
- /* Validate various fields in the FADT, including length */
-
-- AcpiTbCreateLocalFadt (Table, Table->Length);
-+ AcpiTbCreateLocalFadt (Table, TableLength);
-
- /* Validate FADT length against the revision */
-
-- AcpiDmValidateFadtLength (Table->Revision, Table->Length);
-+ AcpiDmValidateFadtLength (Table->Revision, TableLength);
- }
-
-
-Index: acpica-unix2-20220331/source/components/tables/tbfadt.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/tables/tbfadt.c
-+++ acpica-unix2-20220331/source/components/tables/tbfadt.c
-@@ -289,7 +289,6 @@ AcpiTbSelectAddress (
- UINT32 Address32,
- UINT64 Address64)
- {
--
- if (!Address64)
- {
- /* 64-bit address is zero, use 32-bit address */
-@@ -520,6 +519,9 @@ AcpiTbConvertFadt (
- UINT8 Length;
- UINT8 Flags;
- UINT32 i;
-+ UINT32 Tmp;
-+ UINT32 Value32;
-+ UINT64 Value64;
-
-
- /*
-@@ -533,7 +535,7 @@ AcpiTbConvertFadt (
- * Note: The FADT revision value is unreliable. Only the length can be
- * trusted.
- */
-- if (AcpiGbl_FADT.Header.Length <= ACPI_FADT_V2_SIZE)
-+ if (AcpiUtReadUint32 (&AcpiGbl_FADT.Header.Length) <= ACPI_FADT_V2_SIZE)
- {
- AcpiGbl_FADT.PreferredProfile = 0;
- AcpiGbl_FADT.PstateControl = 0;
-@@ -546,14 +548,19 @@ AcpiTbConvertFadt (
- * current FADT version as defined by the ACPI specification.
- * Thus, we will have a common FADT internally.
- */
-- AcpiGbl_FADT.Header.Length = sizeof (ACPI_TABLE_FADT);
-+ Tmp = sizeof (ACPI_TABLE_FADT);
-+ AcpiUtWriteUint (&AcpiGbl_FADT.Header.Length, sizeof (UINT32),
-+ &Tmp, sizeof (UINT32));
-
- /*
- * Expand the 32-bit DSDT addresses to 64-bit as necessary.
- * Later ACPICA code will always use the X 64-bit field.
- */
-- AcpiGbl_FADT.XDsdt = AcpiTbSelectAddress ("DSDT",
-- AcpiGbl_FADT.Dsdt, AcpiGbl_FADT.XDsdt);
-+ Value32 = AcpiUtReadUint32 (&AcpiGbl_FADT.Dsdt);
-+ Value64 = AcpiUtReadUint64 (&AcpiGbl_FADT.XDsdt);
-+ Value64 = AcpiTbSelectAddress ("DSDT", Value32, Value64);
-+ AcpiUtWriteUint (&AcpiGbl_FADT.XDsdt, sizeof (UINT64),
-+ &Value64, sizeof (UINT64));
-
- /* If Hardware Reduced flag is set, we are all done */
-
-@@ -614,7 +621,11 @@ AcpiTbConvertFadt (
- {
- if (Address64->Address)
- {
-- if (Address64->Address != (UINT64) Address32)
-+ Value32 = AcpiUtReadUint32 (&Address32);
-+ Value64 = AcpiUtReadUint64 (&Address64->Address);
-+
-+ /* if (Address64->Address != (UINT64) Address32) */
-+ if (Value64 != (UINT64) Value32)
- {
- /* Address mismatch */
-
-@@ -655,9 +666,10 @@ AcpiTbConvertFadt (
- */
- if (!Address64->Address || AcpiGbl_Use32BitFadtAddresses)
- {
-+ Value32 = AcpiUtReadUint32 (&Address32);
- AcpiTbInitGenericAddress (Address64,
- ACPI_ADR_SPACE_SYSTEM_IO, Length,
-- (UINT64) Address32, Name, Flags);
-+ (UINT64) Value32, Name, Flags);
- }
- }
-
-@@ -780,10 +792,14 @@ AcpiTbSetupFadtRegisters (
-
- if (Source64->Address)
- {
-+ UINT64 Address64;
-+
-+ Address64 = AcpiUtReadUint64 (&Source64->Address);
-+ Address64 +=
-+ (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth);
- AcpiTbInitGenericAddress (FadtPmInfoTable[i].Target,
- Source64->SpaceId, Pm1RegisterByteWidth,
-- Source64->Address +
-- (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth),
-+ Address64,
- "PmRegisters", 0);
- }
- }
diff --git a/0017-Support-most-FPDTs-in-a-big-endian-world.patch b/0017-Support-most-FPDTs-in-a-big-endian-world.patch
deleted file mode 100644
index 41c0019..0000000
--- a/0017-Support-most-FPDTs-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 35f533074fb78d52e87c5a14406a136480a6fe62 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Tue, 22 Sep 2020 17:51:45 -0600
-Subject: [PATCH 17/45] Support most FPDTs in a big-endian world
-
-NB: there is no support for vendor specific records even in
-the little-endian version.
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump1.c | 12 +++++++-----
- source/compiler/dttable1.c | 4 +++-
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -1289,9 +1289,10 @@ AcpiDmDumpFpdt (
- {
- ACPI_STATUS Status;
- ACPI_FPDT_HEADER *Subtable;
-- UINT32 Length = Table->Length;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_FPDT);
- ACPI_DMTABLE_INFO *InfoTable;
-+ UINT16 SubtableType;
-
-
- /* There is no main table (other than the standard ACPI header) */
-@@ -1299,19 +1300,20 @@ AcpiDmDumpFpdt (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- Subtable->Length, AcpiDmTableInfoFpdtHdr);
- if (ACPI_FAILURE (Status))
- {
- return;
- }
-
-- switch (Subtable->Type)
-+ SubtableType = AcpiUtReadUint16 (&Subtable->Type);
-+ switch (SubtableType)
- {
- case ACPI_FPDT_TYPE_BOOT:
-
-@@ -1338,7 +1340,7 @@ AcpiDmDumpFpdt (
- goto NextSubtable;
- }
-
-- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- Subtable->Length, InfoTable);
- if (ACPI_FAILURE (Status))
- {
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -1493,6 +1493,7 @@ DtCompileFpdt (
- ACPI_DMTABLE_INFO *InfoTable;
- DT_FIELD **PFieldList = (DT_FIELD **) List;
- DT_FIELD *SubtableStart;
-+ UINT16 SubtableType;
-
-
- while (*PFieldList)
-@@ -1511,7 +1512,8 @@ DtCompileFpdt (
-
- FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
-
-- switch (FpdtHeader->Type)
-+ SubtableType = AcpiUtReadUint16 (&FpdtHeader->Type);
-+ switch (SubtableType)
- {
- case ACPI_FPDT_TYPE_BOOT:
-
diff --git a/0018-Support-GTDT-in-a-big-endian-world.patch b/0018-Support-GTDT-in-a-big-endian-world.patch
deleted file mode 100644
index 4bdb9bc..0000000
--- a/0018-Support-GTDT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 492e41a24fd088c7ab609ee8ad518f69c9cd29e3 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Tue, 22 Sep 2020 18:12:01 -0600
-Subject: [PATCH 18/45] Support GTDT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump1.c | 13 +++++++++----
- source/compiler/dttable1.c | 9 +++++++--
- 2 files changed, 16 insertions(+), 6 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -1376,7 +1376,7 @@ AcpiDmDumpGtdt (
- {
- ACPI_STATUS Status;
- ACPI_GTDT_HEADER *Subtable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_GTDT);
- ACPI_DMTABLE_INFO *InfoTable;
- UINT32 SubtableLength;
-@@ -1412,7 +1412,7 @@ AcpiDmDumpGtdt (
-
- /* Subtables */
-
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
-@@ -1430,8 +1430,13 @@ AcpiDmDumpGtdt (
- case ACPI_GTDT_TYPE_TIMER_BLOCK:
-
- SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
-- GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-- Subtable))->TimerCount;
-+ {
-+ UINT32 Tmp32;
-+
-+ Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-+ Subtable))->TimerCount;
-+ GtCount = AcpiUtReadUint32 (&Tmp32);
-+ }
-
- InfoTable = AcpiDmTableInfoGtdt0;
- break;
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -1439,8 +1439,13 @@ DtCompileGtdt (
- DtPushSubtable (Subtable);
- ParentTable = DtPeekSubtable ();
-
-- GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-- Subtable->Buffer - sizeof(ACPI_GTDT_HEADER)))->TimerCount;
-+ {
-+ UINT32 Tmp32;
-+
-+ Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-+ Subtable->Buffer - sizeof (ACPI_GTDT_HEADER)))->TimerCount;
-+ GtCount = AcpiUtReadUint32 (&Tmp32);
-+ }
-
- while (GtCount)
- {
diff --git a/0019-Support-HEST-in-a-big-endian-world.patch b/0019-Support-HEST-in-a-big-endian-world.patch
deleted file mode 100644
index e54f2ed..0000000
--- a/0019-Support-HEST-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 6b73a4881e436bb8cf86c05c1cc4b5360efe1c7f Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Wed, 23 Sep 2020 11:54:49 -0600
-Subject: [PATCH 19/45] Support HEST in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump1.c | 10 ++++++----
- source/compiler/dttable1.c | 4 +++-
- 2 files changed, 9 insertions(+), 5 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -1517,12 +1517,13 @@ AcpiDmDumpHest (
- {
- ACPI_STATUS Status;
- ACPI_HEST_HEADER *Subtable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_HEST);
- ACPI_DMTABLE_INFO *InfoTable;
- UINT32 SubtableLength;
- UINT32 BankCount;
- ACPI_HEST_IA_ERROR_BANK *BankTable;
-+ UINT16 SubtableType;
-
-
- /* Main table */
-@@ -1536,10 +1537,11 @@ AcpiDmDumpHest (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- BankCount = 0;
-- switch (Subtable->Type)
-+ SubtableType = Subtable->Type;
-+ switch (SubtableType)
- {
- case ACPI_HEST_TYPE_IA32_CHECK:
-
-@@ -1606,7 +1608,7 @@ AcpiDmDumpHest (
- /* Cannot continue on unknown type - no length */
-
- AcpiOsPrintf ("\n**** Unknown HEST subtable type 0x%X\n",
-- Subtable->Type);
-+ SubtableType);
- return;
- }
-
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -1575,6 +1575,7 @@ DtCompileHest (
- DT_FIELD *SubtableStart;
- ACPI_DMTABLE_INFO *InfoTable;
- UINT16 Type;
-+ UINT16 Tmp16;
- UINT32 BankCount;
-
-
-@@ -1593,7 +1594,8 @@ DtCompileHest (
- /* Get subtable type */
-
- SubtableStart = *PFieldList;
-- DtCompileInteger ((UINT8 *) &Type, *PFieldList, 2, 0);
-+ DtCompileInteger ((UINT8 *) &Tmp16, *PFieldList, 2, 0);
-+ Type = AcpiUtReadUint32 (&Tmp16);
-
- switch (Type)
- {
diff --git a/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch b/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
deleted file mode 100644
index e47951d..0000000
--- a/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 198abe6e9fcb03676513146bf2f9b8ccc49e5827 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Wed, 23 Sep 2020 12:11:46 -0600
-Subject: [PATCH 20/45] Support RSDT ('RSD PTR') in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20220331/source/common/dmtbdump.c
-@@ -336,6 +336,7 @@ AcpiDmDumpRsdt (
- UINT32 Entries;
- UINT32 Offset;
- UINT32 i;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-
- /* Point to start of table pointer array */
-@@ -345,12 +346,12 @@ AcpiDmDumpRsdt (
-
- /* RSDT uses 32-bit pointers */
-
-- Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
-+ Entries = (TableLength - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
-
- for (i = 0; i < Entries; i++)
- {
- AcpiDmLineHeader2 (Offset, sizeof (UINT32), "ACPI Table Address", i);
-- AcpiOsPrintf ("%8.8X\n", Array[i]);
-+ AcpiOsPrintf ("%8.8X\n", AcpiUtReadUint32 (&Array[i]));
- Offset += sizeof (UINT32);
- }
- }
diff --git a/0021-Support-XSDT-in-a-big-endian-world.patch b/0021-Support-XSDT-in-a-big-endian-world.patch
deleted file mode 100644
index 86ca379..0000000
--- a/0021-Support-XSDT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 75d974e42fefabfd6684d62f58bff678b55f396b Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Wed, 23 Sep 2020 12:16:37 -0600
-Subject: [PATCH 21/45] Support XSDT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20220331/source/common/dmtbdump.c
-@@ -377,6 +377,7 @@ AcpiDmDumpXsdt (
- UINT32 Entries;
- UINT32 Offset;
- UINT32 i;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-
- /* Point to start of table pointer array */
-@@ -386,12 +387,13 @@ AcpiDmDumpXsdt (
-
- /* XSDT uses 64-bit pointers */
-
-- Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
-+ Entries = (TableLength - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
-
- for (i = 0; i < Entries; i++)
- {
- AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
-- AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Array[i]));
-+ AcpiOsPrintf ("%8.8X%8.8X\n",
-+ ACPI_FORMAT_UINT64 (AcpiUtReadUint64 (&Array[i])));
- Offset += sizeof (UINT64);
- }
- }
diff --git a/0022-Support-SRAT-in-a-big-endian-world.patch b/0022-Support-SRAT-in-a-big-endian-world.patch
deleted file mode 100644
index 0993d26..0000000
--- a/0022-Support-SRAT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 724fcc83d359e4c8abbd2a48755e96049afa06d6 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Wed, 23 Sep 2020 12:25:38 -0600
-Subject: [PATCH 22/45] Support SRAT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump3.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -173,11 +173,12 @@ AcpiDmDumpSrat (
- UINT32 Offset = sizeof (ACPI_TABLE_SRAT);
- ACPI_SUBTABLE_HEADER *Subtable;
- ACPI_DMTABLE_INFO *InfoTable;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSrat);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSrat);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -186,12 +187,12 @@ AcpiDmDumpSrat (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- Subtable->Length, AcpiDmTableInfoSratHdr);
- if (ACPI_FAILURE (Status))
- {
-@@ -250,7 +251,7 @@ AcpiDmDumpSrat (
- }
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- Subtable->Length, InfoTable);
- if (ACPI_FAILURE (Status))
- {
diff --git a/0023-Support-SLIT-in-a-big-endian-world.patch b/0023-Support-SLIT-in-a-big-endian-world.patch
deleted file mode 100644
index 15936a4..0000000
--- a/0023-Support-SLIT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From b11d50752feb9f1b52db076d1fb4753b30a53642 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Wed, 23 Sep 2020 12:49:52 -0600
-Subject: [PATCH 23/45] Support SLIT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump3.c | 8 +++++---
- source/compiler/dttable2.c | 2 +-
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -96,11 +96,12 @@ AcpiDmDumpSlit (
- UINT32 Localities;
- UINT32 i;
- UINT32 j;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSlit);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSlit);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -108,7 +109,8 @@ AcpiDmDumpSlit (
-
- /* Display the Locality NxN Matrix */
-
-- Localities = (UINT32) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
-+ Localities = (UINT32)
-+ AcpiUtReadUint64 (&ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount);
- Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]);
- Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry;
-
-@@ -121,7 +123,7 @@ AcpiDmDumpSlit (
- {
- /* Check for beyond EOT */
-
-- if (Offset >= Table->Length)
-+ if (Offset >= TableLength)
- {
- AcpiOsPrintf (
- "\n**** Not enough room in table for all localities\n");
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -2234,7 +2234,7 @@ DtCompileSlit (
- ParentTable = DtPeekSubtable ();
- DtInsertSubtable (ParentTable, Subtable);
-
-- Localities = *ACPI_CAST_PTR (UINT32, Subtable->Buffer);
-+ Localities = (UINT32) AcpiUtReadUint64 (Subtable->Buffer);
- LocalityBuffer = UtLocalCalloc (Localities);
- LocalityListLength = 0;
-
diff --git a/0024-Support-MSCT-in-a-big-endian-world.patch b/0024-Support-MSCT-in-a-big-endian-world.patch
deleted file mode 100644
index 5ee3854..0000000
--- a/0024-Support-MSCT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ae38e1578d18abf41330bb3dbaef9ea56a52f49b Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Wed, 23 Sep 2020 15:44:21 -0600
-Subject: [PATCH 24/45] Support MSCT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -1185,11 +1185,12 @@ AcpiDmDumpMsct (
- ACPI_STATUS Status;
- UINT32 Offset = sizeof (ACPI_TABLE_MSCT);
- ACPI_MSCT_PROXIMITY *Subtable;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMsct);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoMsct);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -1198,12 +1199,12 @@ AcpiDmDumpMsct (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
- if (ACPI_FAILURE (Status))
- {
diff --git a/0025-Support-MPST-in-a-big-endian-world.patch b/0025-Support-MPST-in-a-big-endian-world.patch
deleted file mode 100644
index ef704b7..0000000
--- a/0025-Support-MPST-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From 0a25688f36df62579f4dd0444ceba33a0f8d4dcc Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Wed, 23 Sep 2020 16:08:24 -0600
-Subject: [PATCH 25/45] Support MPST in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 33 +++++++++++++++++++--------------
- source/compiler/dttable2.c | 8 ++++----
- 2 files changed, 23 insertions(+), 18 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -1047,11 +1047,13 @@ AcpiDmDumpMpst (
- UINT16 SubtableCount;
- UINT32 PowerStateCount;
- UINT32 ComponentCount;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-+ UINT16 Tmp16;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMpst);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoMpst);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -1059,13 +1061,14 @@ AcpiDmDumpMpst (
-
- /* Subtable: Memory Power Node(s) */
-
-- SubtableCount = (ACPI_CAST_PTR (ACPI_TABLE_MPST, Table))->PowerNodeCount;
-+ Tmp16 = (ACPI_CAST_PTR (ACPI_TABLE_MPST, Table))->PowerNodeCount;
-+ SubtableCount = AcpiUtReadUint16 (&Tmp16);
- Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Table, Offset);
-
-- while ((Offset < Table->Length) && SubtableCount)
-+ while ((Offset < TableLength) && SubtableCount)
- {
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable0,
- sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
- if (ACPI_FAILURE (Status))
- {
-@@ -1074,8 +1077,8 @@ AcpiDmDumpMpst (
-
- /* Extract the sub-subtable counts */
-
-- PowerStateCount = Subtable0->NumPowerStates;
-- ComponentCount = Subtable0->NumPhysicalComponents;
-+ PowerStateCount = AcpiUtReadUint16 (&Subtable0->NumPowerStates);
-+ ComponentCount = AcpiUtReadUint16 (&Subtable0->NumPhysicalComponents);
- Offset += sizeof (ACPI_MPST_POWER_NODE);
-
- /* Sub-subtables - Memory Power State Structure(s) */
-@@ -1086,7 +1089,7 @@ AcpiDmDumpMpst (
- while (PowerStateCount)
- {
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0A,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable0A,
- sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
- if (ACPI_FAILURE (Status))
- {
-@@ -1109,7 +1112,7 @@ AcpiDmDumpMpst (
-
- while (ComponentCount)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0B,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable0B,
- sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
- if (ACPI_FAILURE (Status))
- {
-@@ -1126,22 +1129,24 @@ AcpiDmDumpMpst (
- SubtableCount--;
- Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Subtable0,
- sizeof (ACPI_MPST_POWER_NODE) +
-- (sizeof (ACPI_MPST_POWER_STATE) * Subtable0->NumPowerStates) +
-- (sizeof (ACPI_MPST_COMPONENT) * Subtable0->NumPhysicalComponents));
-+ (sizeof (ACPI_MPST_POWER_STATE) *
-+ AcpiUtReadUint16 (&Subtable0->NumPowerStates)) +
-+ (sizeof (ACPI_MPST_COMPONENT) *
-+ AcpiUtReadUint16 (&Subtable0->NumPhysicalComponents)));
- }
-
- /* Subtable: Count of Memory Power State Characteristic structures */
-
- AcpiOsPrintf ("\n");
- Subtable1 = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable0);
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable1,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable1,
- sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
- if (ACPI_FAILURE (Status))
- {
- return;
- }
-
-- SubtableCount = Subtable1->CharacteristicsCount;
-+ SubtableCount = AcpiUtReadUint16 (&Subtable1->CharacteristicsCount);
- Offset += sizeof (ACPI_MPST_DATA_HDR);
-
- /* Subtable: Memory Power State Characteristics structure(s) */
-@@ -1149,10 +1154,10 @@ AcpiDmDumpMpst (
- Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
- sizeof (ACPI_MPST_DATA_HDR));
-
-- while ((Offset < Table->Length) && SubtableCount)
-+ while ((Offset < TableLength) && SubtableCount)
- {
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable2,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable2,
- sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
- if (ACPI_FAILURE (Status))
- {
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -359,7 +359,7 @@ DtCompileMpst (
- DtPushSubtable (Subtable);
-
- MpstChannelInfo = ACPI_CAST_PTR (ACPI_MPST_CHANNEL, Subtable->Buffer);
-- SubtableCount = MpstChannelInfo->PowerNodeCount;
-+ SubtableCount = AcpiUtReadUint16 (&MpstChannelInfo->PowerNodeCount);
-
- while (*PFieldList && SubtableCount)
- {
-@@ -377,8 +377,8 @@ DtCompileMpst (
- DtPushSubtable (Subtable);
-
- MpstPowerNode = ACPI_CAST_PTR (ACPI_MPST_POWER_NODE, Subtable->Buffer);
-- PowerStateCount = MpstPowerNode->NumPowerStates;
-- ComponentCount = MpstPowerNode->NumPhysicalComponents;
-+ PowerStateCount = AcpiUtReadUint16 (&MpstPowerNode->NumPowerStates);
-+ ComponentCount = AcpiUtReadUint16 (&MpstPowerNode->NumPhysicalComponents);
-
- ParentTable = DtPeekSubtable ();
-
-@@ -431,7 +431,7 @@ DtCompileMpst (
- DtPushSubtable (Subtable);
-
- MpstDataHeader = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable->Buffer);
-- SubtableCount = MpstDataHeader->CharacteristicsCount;
-+ SubtableCount = AcpiUtReadUint16(&MpstDataHeader->CharacteristicsCount);
-
- ParentTable = DtPeekSubtable ();
-
diff --git a/0026-Support-NFIT-in-a-big-endian-world.patch b/0026-Support-NFIT-in-a-big-endian-world.patch
deleted file mode 100644
index 6b85634..0000000
--- a/0026-Support-NFIT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From 5aec8511fc433a71cb8b6d26be464355d0c3f5cc Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Thu, 24 Sep 2020 15:25:53 -0600
-Subject: [PATCH 26/45] Support NFIT in a big-endian world
-
-NB: this required correcting the starting pointer for the NFIT
-SMBIOS subtable; otherwise, disassembly did not work properly.
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtable.c | 4 ++--
- source/common/dmtbdump2.c | 49 ++++++++++++++++++++++----------------
- source/compiler/dttable2.c | 11 ++++++---
- 3 files changed, 39 insertions(+), 25 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtable.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtable.c
-+++ acpica-unix2-20220331/source/common/dmtable.c
-@@ -1766,13 +1766,13 @@ AcpiDmDumpTable (
-
- /* NFIT subtable types */
-
-- Temp16 = ACPI_GET16 (Target);
-+ Temp16 = AcpiUtReadUint16 (Target);
- if (Temp16 > ACPI_NFIT_TYPE_RESERVED)
- {
- Temp16 = ACPI_NFIT_TYPE_RESERVED;
- }
-
-- AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
-+ AcpiOsPrintf (UINT16_FORMAT, Temp16,
- AcpiDmNfitSubnames[Temp16]);
- break;
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -1244,18 +1244,23 @@ AcpiDmDumpNfit (
- ACPI_STATUS Status;
- UINT32 Offset = sizeof (ACPI_TABLE_NFIT);
- UINT32 FieldOffset = 0;
-- UINT32 Length;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
- ACPI_NFIT_HEADER *Subtable;
- ACPI_DMTABLE_INFO *InfoTable;
- ACPI_NFIT_INTERLEAVE *Interleave = NULL;
- ACPI_NFIT_SMBIOS *SmbiosInfo = NULL;
- ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
- UINT32 i;
-+ UINT32 Length;
-+ UINT32 LineCount;
-+ UINT16 SubtableLength;
-+ UINT16 SubtableType;
-+ UINT16 HintCount;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoNfit);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoNfit);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -1264,19 +1269,21 @@ AcpiDmDumpNfit (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- /* NFIT subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-- Subtable->Length, AcpiDmTableInfoNfitHdr);
-+ SubtableType = AcpiUtReadUint16 (&Subtable->Type);
-+ SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+ SubtableLength, AcpiDmTableInfoNfitHdr);
- if (ACPI_FAILURE (Status))
- {
- return;
- }
-
-- switch (Subtable->Type)
-+ switch (SubtableType)
- {
- case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
-
-@@ -1327,11 +1334,11 @@ AcpiDmDumpNfit (
-
- default:
- AcpiOsPrintf ("\n**** Unknown NFIT subtable type 0x%X\n",
-- Subtable->Type);
-+ SubtableType);
-
- /* Attempt to continue */
-
-- if (!Subtable->Length)
-+ if (!SubtableLength)
- {
- AcpiOsPrintf ("Invalid zero length subtable\n");
- return;
-@@ -1340,8 +1347,8 @@ AcpiDmDumpNfit (
- }
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-- Subtable->Length, InfoTable);
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+ SubtableLength, InfoTable);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -1349,14 +1356,15 @@ AcpiDmDumpNfit (
-
- /* Per-subtable variable-length fields */
-
-- switch (Subtable->Type)
-+ switch (SubtableType)
- {
- case ACPI_NFIT_TYPE_INTERLEAVE:
-
- Interleave = ACPI_CAST_PTR (ACPI_NFIT_INTERLEAVE, Subtable);
-- for (i = 0; i < Interleave->LineCount; i++)
-+ LineCount = AcpiUtReadUint32 (&Interleave->LineCount);
-+ for (i = 0; i < LineCount; i++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
- &Interleave->LineOffset[i],
- sizeof (UINT32), AcpiDmTableInfoNfit2a);
- if (ACPI_FAILURE (Status))
-@@ -1370,14 +1378,14 @@ AcpiDmDumpNfit (
-
- case ACPI_NFIT_TYPE_SMBIOS:
-
-- Length = Subtable->Length -
-+ Length = SubtableLength -
- sizeof (ACPI_NFIT_SMBIOS) + sizeof (UINT8);
-
- if (Length)
- {
-- Status = AcpiDmDumpTable (Table->Length,
-+ Status = AcpiDmDumpTable (TableLength,
- sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
-- SmbiosInfo,
-+ SmbiosInfo + Offset,
- Length, AcpiDmTableInfoNfit3a);
- if (ACPI_FAILURE (Status))
- {
-@@ -1390,9 +1398,10 @@ AcpiDmDumpNfit (
- case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
-
- Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable);
-- for (i = 0; i < Hint->HintCount; i++)
-+ HintCount = AcpiUtReadUint16 (&Hint->HintCount);
-+ for (i = 0; i < HintCount; i++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
- &Hint->HintAddress[i],
- sizeof (UINT64), AcpiDmTableInfoNfit6a);
- if (ACPI_FAILURE (Status))
-@@ -1411,8 +1420,8 @@ AcpiDmDumpNfit (
- NextSubtable:
- /* Point to next subtable */
-
-- Offset += Subtable->Length;
-- Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, Subtable->Length);
-+ Offset += SubtableLength;
-+ Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, SubtableLength);
- }
- }
-
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -506,6 +506,7 @@ DtCompileNfit (
- UINT32 Count;
- ACPI_NFIT_INTERLEAVE *Interleave = NULL;
- ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
-+ UINT16 NfitHeaderType;
-
-
- /* Main table */
-@@ -539,7 +540,8 @@ DtCompileNfit (
-
- NfitHeader = ACPI_CAST_PTR (ACPI_NFIT_HEADER, Subtable->Buffer);
-
-- switch (NfitHeader->Type)
-+ NfitHeaderType = AcpiUtReadUint16 (&NfitHeader->Type);
-+ switch (NfitHeaderType)
- {
- case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
-
-@@ -599,7 +601,7 @@ DtCompileNfit (
- DtInsertSubtable (ParentTable, Subtable);
- DtPopSubtable ();
-
-- switch (NfitHeader->Type)
-+ switch (NfitHeaderType)
- {
- case ACPI_NFIT_TYPE_INTERLEAVE:
-
-@@ -625,7 +627,8 @@ DtCompileNfit (
- Count++;
- }
-
-- Interleave->LineCount = Count;
-+ AcpiUtWriteUint (&Interleave->LineCount, sizeof (UINT32),
-+ &Count, sizeof (UINT32));
- break;
-
- case ACPI_NFIT_TYPE_SMBIOS:
-@@ -671,6 +674,8 @@ DtCompileNfit (
- }
-
- Hint->HintCount = (UINT16) Count;
-+ AcpiUtWriteUint (&Hint->HintCount, sizeof (UINT16),
-+ &Count, sizeof (UINT32));
- break;
-
- default:
diff --git a/0027-Support-SDEV-in-a-big-endian-world.patch b/0027-Support-SDEV-in-a-big-endian-world.patch
deleted file mode 100644
index 680961e..0000000
--- a/0027-Support-SDEV-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From 3d1ac6e76ad0c0d6454671b190ccbbfafb0cb4cc Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Tue, 29 Jun 2021 16:03:36 -0600
-Subject: [PATCH 27/45] Support SDEV in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 48 +++++++++++++++++++++-----------------
- source/compiler/dttable2.c | 27 ++++++++++++++++++++-
- 2 files changed, 52 insertions(+), 23 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -2581,7 +2581,7 @@ AcpiDmDumpSdev (
- ACPI_SDEV_NAMESPACE *Namesp;
- ACPI_DMTABLE_INFO *InfoTable;
- ACPI_DMTABLE_INFO *SecureComponentInfoTable;
-- UINT32 Length = Table->Length;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_SDEV);
- UINT16 PathOffset;
- UINT16 PathLength;
-@@ -2589,11 +2589,12 @@ AcpiDmDumpSdev (
- UINT16 VendorDataLength;
- ACPI_SDEV_SECURE_COMPONENT *SecureComponent = NULL;
- UINT32 CurrentOffset = 0;
-+ UINT16 SubtableLength;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSdev);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSdev);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2602,13 +2603,14 @@ AcpiDmDumpSdev (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-- Subtable->Length, AcpiDmTableInfoSdevHdr);
-+ SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+ SubtableLength, AcpiDmTableInfoSdevHdr);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2631,8 +2633,8 @@ AcpiDmDumpSdev (
- }
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, 0, Subtable,
-- Subtable->Length, InfoTable);
-+ Status = AcpiDmDumpTable (TableLength, 0, Subtable,
-+ SubtableLength, InfoTable);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2691,12 +2693,12 @@ AcpiDmDumpSdev (
- /* Dump the PCIe device ID(s) */
-
- Namesp = ACPI_CAST_PTR (ACPI_SDEV_NAMESPACE, Subtable);
-- PathOffset = Namesp->DeviceIdOffset;
-- PathLength = Namesp->DeviceIdLength;
-+ PathOffset = AcpiUtReadUint16 (&Namesp->DeviceIdOffset);
-+ PathLength = AcpiUtReadUint16 (&Namesp->DeviceIdLength);
-
- if (PathLength)
- {
-- Status = AcpiDmDumpTable (Table->Length, CurrentOffset,
-+ Status = AcpiDmDumpTable (TableLength, CurrentOffset,
- ACPI_ADD_PTR (UINT8, Namesp, PathOffset),
- PathLength, AcpiDmTableInfoSdev0a);
- if (ACPI_FAILURE (Status))
-@@ -2708,14 +2710,14 @@ AcpiDmDumpSdev (
-
- /* Dump the vendor-specific data */
-
-- VendorDataLength =
-- Namesp->VendorDataLength;
-+ VendorDataLength = AcpiUtReadUint16 (&Namesp->VendorDataLength);
- VendorDataOffset =
-- Namesp->DeviceIdOffset + Namesp->DeviceIdLength;
-+ AcpiUtReadUint16 (&Namesp->DeviceIdOffset) +
-+ AcpiUtReadUint16 (&Namesp->DeviceIdLength);
-
- if (VendorDataLength)
- {
-- Status = AcpiDmDumpTable (Table->Length, 0,
-+ Status = AcpiDmDumpTable (TableLength, 0,
- ACPI_ADD_PTR (UINT8, Namesp, VendorDataOffset),
- VendorDataLength, AcpiDmTableInfoSdev1b);
- if (ACPI_FAILURE (Status))
-@@ -2730,12 +2732,12 @@ AcpiDmDumpSdev (
- /* PCI path substructures */
-
- Pcie = ACPI_CAST_PTR (ACPI_SDEV_PCIE, Subtable);
-- PathOffset = Pcie->PathOffset;
-- PathLength = Pcie->PathLength;
-+ PathOffset = AcpiUtReadUint16 (&Pcie->PathOffset);
-+ PathLength = AcpiUtReadUint16 (&Pcie->PathLength);
-
- while (PathLength)
- {
-- Status = AcpiDmDumpTable (Table->Length,
-+ Status = AcpiDmDumpTable (TableLength,
- PathOffset + Offset,
- ACPI_ADD_PTR (UINT8, Pcie, PathOffset),
- sizeof (ACPI_SDEV_PCIE_PATH), AcpiDmTableInfoSdev1a);
-@@ -2750,12 +2752,14 @@ AcpiDmDumpSdev (
-
- /* VendorData */
-
-- VendorDataLength = Pcie->VendorDataLength;
-- VendorDataOffset = Pcie->PathOffset + Pcie->PathLength;
-+ VendorDataLength = AcpiUtReadUint16 (&Pcie->VendorDataLength);
-+ VendorDataOffset =
-+ AcpiUtReadUint16 (&Pcie->PathOffset) +
-+ AcpiUtReadUint16 (&Pcie->PathLength);
-
- if (VendorDataLength)
- {
-- Status = AcpiDmDumpTable (Table->Length, 0,
-+ Status = AcpiDmDumpTable (TableLength, 0,
- ACPI_ADD_PTR (UINT8, Pcie, VendorDataOffset),
- VendorDataLength, AcpiDmTableInfoSdev1b);
- if (ACPI_FAILURE (Status))
-@@ -2772,8 +2776,8 @@ AcpiDmDumpSdev (
- NextSubtable:
- /* Point to next subtable */
-
-- Offset += Subtable->Length;
-+ Offset += SubtableLength;
- Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Subtable,
-- Subtable->Length);
-+ SubtableLength);
- }
- }
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -1890,6 +1890,7 @@ DtCompileSdev (
- UINT32 EntryCount;
- ACPI_SDEV_SECURE_COMPONENT *SecureComponent = NULL;
- UINT16 ComponentLength = 0;
-+ UINT16 Tmp16;
-
-
- /* Subtables */
-@@ -1911,7 +1912,7 @@ DtCompileSdev (
- DtPushSubtable (Subtable);
-
- SdevHeader = ACPI_CAST_PTR (ACPI_SDEV_HEADER, Subtable->Buffer);
-- SdevHeader->Length = (UINT8)(sizeof (ACPI_SDEV_HEADER));
-+ SdevHeader->Length = (UINT16) (sizeof (ACPI_SDEV_HEADER));
-
- switch (SdevHeader->Type)
- {
-@@ -2084,6 +2085,18 @@ DtCompileSdev (
- }
- }
-
-+ /* Make sure everything is now little-endian */
-+ Tmp16 = AcpiUtReadUint16 (&SdevHeader->Length);
-+ SdevHeader->Length = Tmp16;
-+ Tmp16 = AcpiUtReadUint16 (&Namesp->DeviceIdOffset);
-+ Namesp->DeviceIdOffset = Tmp16;
-+ Tmp16 = AcpiUtReadUint16 (&Namesp->DeviceIdLength);
-+ Namesp->DeviceIdLength = Tmp16;
-+ Tmp16 = AcpiUtReadUint16 (&Namesp->VendorDataOffset);
-+ Namesp->VendorDataOffset = Tmp16;
-+ Tmp16 = AcpiUtReadUint16 (&Namesp->VendorDataLength);
-+ Namesp->VendorDataLength = Tmp16;
-+
- break;
-
- case ACPI_SDEV_TYPE_PCIE_ENDPOINT_DEVICE:
-@@ -2146,6 +2159,18 @@ DtCompileSdev (
- SdevHeader->Length =
- sizeof (ACPI_SDEV_PCIE) +
- Pcie->PathLength + Pcie->VendorDataLength;
-+
-+ Tmp16 = AcpiUtReadUint16 (&SdevHeader->Length);
-+ SdevHeader->Length = Tmp16;
-+ Tmp16 = AcpiUtReadUint16 (&Pcie->PathOffset);
-+ Pcie->PathOffset = Tmp16;
-+ Tmp16 = AcpiUtReadUint16 (&Pcie->PathLength);
-+ Pcie->PathLength = Tmp16;
-+ Tmp16 = AcpiUtReadUint16 (&Pcie->VendorDataOffset);
-+ Pcie->VendorDataOffset = Tmp16;
-+ Tmp16 = AcpiUtReadUint16 (&Pcie->VendorDataLength);
-+ Pcie->VendorDataLength = Tmp16;
-+
- break;
-
- default:
diff --git a/0028-Support-HMAT-in-a-big-endian-world.patch b/0028-Support-HMAT-in-a-big-endian-world.patch
deleted file mode 100644
index 386db57..0000000
--- a/0028-Support-HMAT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-From 915b8b70726fd01befdeac0c8630db528ac40552 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Fri, 25 Sep 2020 16:56:55 -0600
-Subject: [PATCH 28/45] Support HMAT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump1.c | 70 ++++++++++++++++++++++----------------
- source/compiler/dttable1.c | 24 ++++++++++---
- 2 files changed, 59 insertions(+), 35 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -1680,37 +1680,45 @@ AcpiDmDumpHmat (
- UINT32 Length;
- ACPI_DMTABLE_INFO *InfoTable;
- UINT32 i, j;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-+ UINT16 HmatStructType;
-+ UINT32 HmatStructLength;
-+ UINT32 InitPDs;
-+ UINT32 TgtPDs;
-+ UINT16 SMBIOSHandles;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoHmat);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoHmat);
- if (ACPI_FAILURE (Status))
- {
- return;
- }
- Offset = sizeof (ACPI_TABLE_HMAT);
-
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- AcpiOsPrintf ("\n");
-
- /* Dump HMAT structure header */
-
- HmatStruct = ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, Table, Offset);
-- if (HmatStruct->Length < sizeof (ACPI_HMAT_STRUCTURE))
-+ HmatStructLength = AcpiUtReadUint32 (&HmatStruct->Length);
-+ if (HmatStructLength < sizeof (ACPI_HMAT_STRUCTURE))
- {
- AcpiOsPrintf ("Invalid HMAT structure length\n");
- return;
- }
-- Status = AcpiDmDumpTable (Table->Length, Offset, HmatStruct,
-- HmatStruct->Length, AcpiDmTableInfoHmatHdr);
-+ Status = AcpiDmDumpTable (TableLength, Offset, HmatStruct,
-+ HmatStructLength, AcpiDmTableInfoHmatHdr);
- if (ACPI_FAILURE (Status))
- {
- return;
- }
-
-- switch (HmatStruct->Type)
-+ HmatStructType = AcpiUtReadUint16 (&HmatStruct->Type);
-+ switch (HmatStructType)
- {
- case ACPI_HMAT_TYPE_ADDRESS_RANGE:
-
-@@ -1733,7 +1741,7 @@ AcpiDmDumpHmat (
- default:
-
- AcpiOsPrintf ("\n**** Unknown HMAT structure type 0x%X\n",
-- HmatStruct->Type);
-+ HmatStructType);
-
- /* Attempt to continue */
-
-@@ -1742,13 +1750,13 @@ AcpiDmDumpHmat (
-
- /* Dump HMAT structure body */
-
-- if (HmatStruct->Length < Length)
-+ if (HmatStructLength < Length)
- {
- AcpiOsPrintf ("Invalid HMAT structure length\n");
- return;
- }
-- Status = AcpiDmDumpTable (Table->Length, Offset, HmatStruct,
-- HmatStruct->Length, InfoTable);
-+ Status = AcpiDmDumpTable (TableLength, Offset, HmatStruct,
-+ HmatStructLength, InfoTable);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -1756,7 +1764,7 @@ AcpiDmDumpHmat (
-
- /* Dump HMAT structure additionals */
-
-- switch (HmatStruct->Type)
-+ switch (HmatStructType)
- {
- case ACPI_HMAT_TYPE_LOCALITY:
-
-@@ -1765,15 +1773,16 @@ AcpiDmDumpHmat (
-
- /* Dump initiator proximity domains */
-
-- if ((UINT32)(HmatStruct->Length - SubtableOffset) <
-- (UINT32)(HmatLocality->NumberOfInitiatorPDs * 4))
-+ InitPDs = AcpiUtReadUint32 (&HmatLocality->NumberOfInitiatorPDs);
-+ if ((UINT32) (HmatStructLength - SubtableOffset) <
-+ (UINT32) (InitPDs * 4))
- {
- AcpiOsPrintf ("Invalid initiator proximity domain number\n");
- return;
- }
-- for (i = 0; i < HmatLocality->NumberOfInitiatorPDs; i++)
-+ for (i = 0; i < InitPDs; i++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
- ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
- 4, AcpiDmTableInfoHmat1a);
- if (ACPI_FAILURE (Status))
-@@ -1786,15 +1795,16 @@ AcpiDmDumpHmat (
-
- /* Dump target proximity domains */
-
-- if ((UINT32)(HmatStruct->Length - SubtableOffset) <
-- (UINT32)(HmatLocality->NumberOfTargetPDs * 4))
-+ TgtPDs = AcpiUtReadUint32 (&HmatLocality->NumberOfTargetPDs);
-+ if ((UINT32) (HmatStructLength - SubtableOffset) <
-+ (UINT32) (TgtPDs * 4))
- {
- AcpiOsPrintf ("Invalid target proximity domain number\n");
- return;
- }
-- for (i = 0; i < HmatLocality->NumberOfTargetPDs; i++)
-+ for (i = 0; i < TgtPDs; i++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
- ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
- 4, AcpiDmTableInfoHmat1b);
- if (ACPI_FAILURE (Status))
-@@ -1807,18 +1817,17 @@ AcpiDmDumpHmat (
-
- /* Dump latency/bandwidth entris */
-
-- if ((UINT32)(HmatStruct->Length - SubtableOffset) <
-- (UINT32)(HmatLocality->NumberOfInitiatorPDs *
-- HmatLocality->NumberOfTargetPDs * 2))
-+ if ((UINT32) (HmatStructLength - SubtableOffset) <
-+ (UINT32) (InitPDs * TgtPDs * 2))
- {
- AcpiOsPrintf ("Invalid latency/bandwidth entry number\n");
- return;
- }
-- for (i = 0; i < HmatLocality->NumberOfInitiatorPDs; i++)
-+ for (i = 0; i < InitPDs; i++)
- {
-- for (j = 0; j < HmatLocality->NumberOfTargetPDs; j++)
-+ for (j = 0; j < TgtPDs; j++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
- ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
- 2, AcpiDmTableInfoHmat1c);
- if (ACPI_FAILURE(Status))
-@@ -1838,15 +1847,16 @@ AcpiDmDumpHmat (
-
- /* Dump SMBIOS handles */
-
-- if ((UINT32)(HmatStruct->Length - SubtableOffset) <
-- (UINT32)(HmatCache->NumberOfSMBIOSHandles * 2))
-+ SMBIOSHandles = AcpiUtReadUint16 (&HmatCache->NumberOfSMBIOSHandles);
-+ if ((UINT32) (HmatStructLength - SubtableOffset) <
-+ (UINT32) (SMBIOSHandles * 2))
- {
- AcpiOsPrintf ("Invalid SMBIOS handle number\n");
- return;
- }
-- for (i = 0; i < HmatCache->NumberOfSMBIOSHandles; i++)
-+ for (i = 0; i < SMBIOSHandles; i++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
- ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
- 2, AcpiDmTableInfoHmat2a);
- if (ACPI_FAILURE (Status))
-@@ -1866,6 +1876,6 @@ AcpiDmDumpHmat (
- NextSubtable:
- /* Point to next HMAT structure subtable */
-
-- Offset += (HmatStruct->Length);
-+ Offset += (HmatStructLength);
- }
- }
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -1737,6 +1737,8 @@ DtCompileHmat (
- UINT32 TgtPDNumber;
- UINT64 EntryNumber;
- UINT16 SMBIOSHandleNumber;
-+ UINT16 HmatStructType;
-+ UINT32 Length;
-
-
- ParentTable = DtPeekSubtable ();
-@@ -1767,7 +1769,8 @@ DtCompileHmat (
-
- /* Compile HMAT structure body */
-
-- switch (HmatStruct->Type)
-+ HmatStructType = AcpiUtReadUint16 (&HmatStruct->Type);
-+ switch (HmatStructType)
- {
- case ACPI_HMAT_TYPE_ADDRESS_RANGE:
-
-@@ -1800,7 +1803,7 @@ DtCompileHmat (
-
- /* Compile HMAT structure additionals */
-
-- switch (HmatStruct->Type)
-+ switch (HmatStructType)
- {
- case ACPI_HMAT_TYPE_LOCALITY:
-
-@@ -1826,7 +1829,7 @@ DtCompileHmat (
- HmatStruct->Length += Subtable->Length;
- IntPDNumber++;
- }
-- HmatLocality->NumberOfInitiatorPDs = IntPDNumber;
-+ HmatLocality->NumberOfInitiatorPDs = AcpiUtReadUint32 (&IntPDNumber);
-
- /* Compile target proximity domain list */
-
-@@ -1847,7 +1850,7 @@ DtCompileHmat (
- HmatStruct->Length += Subtable->Length;
- TgtPDNumber++;
- }
-- HmatLocality->NumberOfTargetPDs = TgtPDNumber;
-+ HmatLocality->NumberOfTargetPDs = AcpiUtReadUint32 (&TgtPDNumber);
-
- /* Save start of the entries for reporting errors */
-
-@@ -1873,6 +1876,9 @@ DtCompileHmat (
- EntryNumber++;
- }
-
-+ Length = AcpiUtReadUint32 (&HmatStruct->Length);
-+ HmatStruct->Length = Length;
-+
- /* Validate number of entries */
-
- if (EntryNumber !=
-@@ -1906,11 +1912,19 @@ DtCompileHmat (
- HmatStruct->Length += Subtable->Length;
- SMBIOSHandleNumber++;
- }
-- HmatCache->NumberOfSMBIOSHandles = SMBIOSHandleNumber;
-+ HmatCache->NumberOfSMBIOSHandles =
-+ AcpiUtReadUint16 (&SMBIOSHandleNumber);
-+
-+ Length = AcpiUtReadUint32 (&HmatStruct->Length);
-+ HmatStruct->Length = Length;
-+
- break;
-
- default:
-
-+ Length = AcpiUtReadUint32(&HmatStruct->Length);
-+ HmatStruct->Length = Length;
-+
- break;
- }
- }
diff --git a/0029-Support-PDTT-in-a-big-endian-world.patch b/0029-Support-PDTT-in-a-big-endian-world.patch
deleted file mode 100644
index 51e41d1..0000000
--- a/0029-Support-PDTT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 253fe3545e7d4eaa9cb93c771c9619f410109a02 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Fri, 25 Sep 2020 17:03:05 -0600
-Subject: [PATCH 29/45] Support PDTT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -1954,13 +1954,13 @@ AcpiDmDumpPdtt (
- {
- ACPI_STATUS Status;
- ACPI_PDTT_CHANNEL *Subtable;
-- UINT32 Length = Table->Length;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_PDTT);
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPdtt);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoPdtt);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -1969,10 +1969,10 @@ AcpiDmDumpPdtt (
- /* Subtables. Currently there is only one type, but can be multiples */
-
- Subtable = ACPI_ADD_PTR (ACPI_PDTT_CHANNEL, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- sizeof (ACPI_PDTT_CHANNEL), AcpiDmTableInfoPdtt0);
- if (ACPI_FAILURE (Status))
- {
diff --git a/0030-Support-PPTT-in-a-big-endian-world.patch b/0030-Support-PPTT-in-a-big-endian-world.patch
deleted file mode 100644
index 86fb5cd..0000000
--- a/0030-Support-PPTT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 8923211d8bc1b0e4d3af6ff31ed6479057f612f6 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Fri, 25 Sep 2020 17:16:12 -0600
-Subject: [PATCH 30/45] Support PPTT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 17 ++++++++++-------
- source/compiler/dttable2.c | 7 +++++--
- 2 files changed, 15 insertions(+), 9 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -2241,6 +2241,8 @@ AcpiDmDumpPptt (
- UINT32 Offset = sizeof (ACPI_TABLE_FPDT);
- ACPI_DMTABLE_INFO *InfoTable;
- UINT32 i;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-+ UINT32 NumPrivRes;
-
-
- /* There is no main table (other than the standard ACPI header) */
-@@ -2248,7 +2250,7 @@ AcpiDmDumpPptt (
- /* Subtables */
-
- Offset = sizeof (ACPI_TABLE_HEADER);
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- AcpiOsPrintf ("\n");
-
-@@ -2260,7 +2262,7 @@ AcpiDmDumpPptt (
- AcpiOsPrintf ("Invalid subtable length\n");
- return;
- }
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- Subtable->Length, AcpiDmTableInfoPpttHdr);
- if (ACPI_FAILURE (Status))
- {
-@@ -2302,7 +2304,7 @@ AcpiDmDumpPptt (
- AcpiOsPrintf ("Invalid subtable length\n");
- return;
- }
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- Subtable->Length, InfoTable);
- if (ACPI_FAILURE (Status))
- {
-@@ -2318,15 +2320,16 @@ AcpiDmDumpPptt (
-
- /* Dump SMBIOS handles */
-
-- if ((UINT8)(Subtable->Length - SubtableOffset) <
-- (UINT8)(PpttProcessor->NumberOfPrivResources * 4))
-+ NumPrivRes = AcpiUtReadUint32 (&PpttProcessor->NumberOfPrivResources);
-+ if ((UINT8) (Subtable->Length - SubtableOffset) <
-+ (UINT8) (NumPrivRes * 4))
- {
- AcpiOsPrintf ("Invalid private resource number\n");
- return;
- }
-- for (i = 0; i < PpttProcessor->NumberOfPrivResources; i++)
-+ for (i = 0; i < NumPrivRes; i++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
- ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, SubtableOffset),
- 4, AcpiDmTableInfoPptt0a);
- if (ACPI_FAILURE (Status))
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -1520,6 +1520,7 @@ DtCompilePptt (
- DT_FIELD **PFieldList = (DT_FIELD **) List;
- DT_FIELD *SubtableStart;
- ACPI_TABLE_HEADER *PpttAcpiHeader;
-+ UINT32 NumPrivRes;
-
-
- ParentTable = DtPeekSubtable ();
-@@ -1584,7 +1585,7 @@ DtCompilePptt (
- {
- /* Compile initiator proximity domain list */
-
-- PpttProcessor->NumberOfPrivResources = 0;
-+ NumPrivRes = 0;
- while (*PFieldList)
- {
- Status = DtCompileTable (PFieldList,
-@@ -1600,8 +1601,10 @@ DtCompilePptt (
-
- DtInsertSubtable (ParentTable, Subtable);
- PpttHeader->Length += (UINT8)(Subtable->Length);
-- PpttProcessor->NumberOfPrivResources++;
-+ NumPrivRes++;
- }
-+ PpttProcessor->NumberOfPrivResources =
-+ AcpiUtReadUint32 (&NumPrivRes);
- }
- break;
-
diff --git a/0031-Support-PCCT-in-a-big-endian-world.patch b/0031-Support-PCCT-in-a-big-endian-world.patch
deleted file mode 100644
index 6400618..0000000
--- a/0031-Support-PCCT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a58ff76fc6e68488d93b55016a7aeb257971a252 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Fri, 25 Sep 2020 17:39:34 -0600
-Subject: [PATCH 31/45] Support PCCT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -1850,13 +1850,13 @@ AcpiDmDumpPcct (
- ACPI_STATUS Status;
- ACPI_PCCT_SUBSPACE *Subtable;
- ACPI_DMTABLE_INFO *InfoTable;
-- UINT32 Length = Table->Length;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_PCCT);
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoPcct);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -1865,12 +1865,12 @@ AcpiDmDumpPcct (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- Subtable->Header.Length, AcpiDmTableInfoPcctHdr);
- if (ACPI_FAILURE (Status))
- {
-@@ -1918,7 +1918,7 @@ AcpiDmDumpPcct (
- }
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- Subtable->Header.Length, InfoTable);
- if (ACPI_FAILURE (Status))
- {
diff --git a/0032-Support-WDAT-in-a-big-endian-world.patch b/0032-Support-WDAT-in-a-big-endian-world.patch
deleted file mode 100644
index 9bf59a7..0000000
--- a/0032-Support-WDAT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ff1449919ee7d395d301e3a56a4ba333604d0458 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Fri, 25 Sep 2020 18:13:20 -0600
-Subject: [PATCH 32/45] Support WDAT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump3.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -680,11 +680,12 @@ AcpiDmDumpWdat (
- ACPI_STATUS Status;
- UINT32 Offset = sizeof (ACPI_TABLE_WDAT);
- ACPI_WDAT_ENTRY *Subtable;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoWdat);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoWdat);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -693,12 +694,12 @@ AcpiDmDumpWdat (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0);
- if (ACPI_FAILURE (Status))
- {
diff --git a/0033-Support-TCPA-in-a-big-endian-world.patch b/0033-Support-TCPA-in-a-big-endian-world.patch
deleted file mode 100644
index bccfb52..0000000
--- a/0033-Support-TCPA-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From b69b833f5a9205080b27d83379a31fad7fca1575 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Sun, 27 Sep 2020 12:09:28 -0600
-Subject: [PATCH 33/45] Support TCPA in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump3.c | 13 ++++++++-----
- source/compiler/dttable2.c | 4 +++-
- 2 files changed, 11 insertions(+), 6 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -406,11 +406,13 @@ AcpiDmDumpTcpa (
- ACPI_TABLE_TCPA_HDR *Subtable = ACPI_ADD_PTR (
- ACPI_TABLE_TCPA_HDR, Table, Offset);
- ACPI_STATUS Status;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-+ UINT16 PlatformClass;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table,
-+ Status = AcpiDmDumpTable (TableLength, 0, Table,
- 0, AcpiDmTableInfoTcpaHdr);
- if (ACPI_FAILURE (Status))
- {
-@@ -421,18 +423,19 @@ AcpiDmDumpTcpa (
- * Examine the PlatformClass field to determine the table type.
- * Either a client or server table. Only one.
- */
-- switch (CommonHeader->PlatformClass)
-+ PlatformClass = AcpiUtReadUint16 (&CommonHeader->PlatformClass);
-+ switch (PlatformClass)
- {
- case ACPI_TCPA_CLIENT_TABLE:
-
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- Table->Length - Offset, AcpiDmTableInfoTcpaClient);
- break;
-
- case ACPI_TCPA_SERVER_TABLE:
-
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-- Table->Length - Offset, AcpiDmTableInfoTcpaServer);
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+ TableLength - Offset, AcpiDmTableInfoTcpaServer);
- break;
-
- default:
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -2540,6 +2540,7 @@ DtCompileTcpa (
- ACPI_TABLE_TCPA_HDR *TcpaHeader;
- DT_SUBTABLE *ParentTable;
- ACPI_STATUS Status;
-+ UINT16 PlatformClass;
-
-
- /* Compile the main table */
-@@ -2560,7 +2561,8 @@ DtCompileTcpa (
- */
- TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer);
-
-- switch (TcpaHeader->PlatformClass)
-+ PlatformClass = AcpiUtReadUint16 (&TcpaHeader->PlatformClass);
-+ switch (PlatformClass)
- {
- case ACPI_TCPA_CLIENT_TABLE:
-
diff --git a/0034-Support-STAO-in-a-big-endian-world.patch b/0034-Support-STAO-in-a-big-endian-world.patch
deleted file mode 100644
index 45edf5e..0000000
--- a/0034-Support-STAO-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c313a76ce818135f02ab158a9f0c8e4b8e96698a Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Mon, 28 Sep 2020 11:49:42 -0600
-Subject: [PATCH 34/45] Support STAO in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump3.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -290,14 +290,14 @@ AcpiDmDumpStao (
- {
- ACPI_STATUS Status;
- char *Namepath;
-- UINT32 Length = Table->Length;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
- UINT32 StringLength;
- UINT32 Offset = sizeof (ACPI_TABLE_STAO);
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoStao);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoStao);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -305,7 +305,7 @@ AcpiDmDumpStao (
-
- /* The rest of the table consists of Namepath strings */
-
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- Namepath = ACPI_ADD_PTR (char, Table, Offset);
- StringLength = strlen (Namepath) + 1;
diff --git a/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch b/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
deleted file mode 100644
index d30b3d6..0000000
--- a/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 948bebd1a0999bc3481641d3fc996c49432709c6 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Mon, 28 Sep 2020 12:49:23 -0600
-Subject: [PATCH 35/45] Support SLIC and MSDM in a big-endian world
-
-When dumping the SLIC table, it was also found that the code was
-not starting at the proper offset on disassembly. Set the offset
-to the first byte after the header instead of the very beginning
-of the table.
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump3.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -68,9 +68,11 @@ void
- AcpiDmDumpSlic (
- ACPI_TABLE_HEADER *Table)
- {
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-- (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table,
-- Table->Length - sizeof (*Table), AcpiDmTableInfoSlic);
-+ (void) AcpiDmDumpTable (TableLength, sizeof (ACPI_TABLE_HEADER),
-+ (void *) (Table + sizeof (*Table)),
-+ TableLength - sizeof (*Table), AcpiDmTableInfoSlic);
- }
-
-
diff --git a/0036-Support-MCFG-in-a-big-endian-world.patch b/0036-Support-MCFG-in-a-big-endian-world.patch
deleted file mode 100644
index b8b09eb..0000000
--- a/0036-Support-MCFG-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0fb79a24fb70ab1e1e4879220af82a9fa00af586 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Mon, 28 Sep 2020 13:01:18 -0600
-Subject: [PATCH 36/45] Support MCFG in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -982,11 +982,12 @@ AcpiDmDumpMcfg (
- ACPI_STATUS Status;
- UINT32 Offset = sizeof (ACPI_TABLE_MCFG);
- ACPI_MCFG_ALLOCATION *Subtable;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMcfg);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoMcfg);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -995,17 +996,17 @@ AcpiDmDumpMcfg (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
-- if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Table->Length)
-+ if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > TableLength)
- {
- AcpiOsPrintf ("Warning: there are %u invalid trailing bytes\n",
-- (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Table->Length));
-+ (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - TableLength));
- return;
- }
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
- if (ACPI_FAILURE (Status))
- {
diff --git a/0037-Support-LPIT-in-a-big-endian-world.patch b/0037-Support-LPIT-in-a-big-endian-world.patch
deleted file mode 100644
index 11f3ebc..0000000
--- a/0037-Support-LPIT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d10bfd67b5352ff5587e06fc1f82b896bab49614 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Mon, 28 Sep 2020 16:49:30 -0600
-Subject: [PATCH 37/45] Support LPIT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -690,7 +690,7 @@ AcpiDmDumpLpit (
- {
- ACPI_STATUS Status;
- ACPI_LPIT_HEADER *Subtable;
-- UINT32 Length = Table->Length;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_LPIT);
- ACPI_DMTABLE_INFO *InfoTable;
- UINT32 SubtableLength;
-@@ -699,11 +699,11 @@ AcpiDmDumpLpit (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- /* Common subtable header */
-
-- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- sizeof (ACPI_LPIT_HEADER), AcpiDmTableInfoLpitHdr);
- if (ACPI_FAILURE (Status))
- {
-@@ -727,7 +727,7 @@ AcpiDmDumpLpit (
- return;
- }
-
-- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- SubtableLength, InfoTable);
- if (ACPI_FAILURE (Status))
- {
diff --git a/0038-Support-PMTT-in-a-big-endian-world.patch b/0038-Support-PMTT-in-a-big-endian-world.patch
deleted file mode 100644
index ca3ddc3..0000000
--- a/0038-Support-PMTT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From bd19995fa268ed3e93c071162d0e9c2d35ada0d4 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Tue, 29 Jun 2021 16:23:30 -0600
-Subject: [PATCH 38/45] Support PMTT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -2142,8 +2142,9 @@ AcpiDmDumpPmtt (
- {
- ACPI_STATUS Status;
- ACPI_PMTT_HEADER *Subtable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_PMTT);
-+ UINT16 SubtableLength;
-
-
- /* Main table */
-@@ -2157,17 +2158,18 @@ AcpiDmDumpPmtt (
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Each of the types below contain the common subtable header */
-
- AcpiOsPrintf ("\n");
-+ SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
- switch (Subtable->Type)
- {
- case ACPI_PMTT_TYPE_SOCKET:
-
- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-- Subtable->Length, AcpiDmTableInfoPmtt0);
-+ SubtableLength, AcpiDmTableInfoPmtt0);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2176,7 +2178,7 @@ AcpiDmDumpPmtt (
-
- case ACPI_PMTT_TYPE_CONTROLLER:
- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-- Subtable->Length, AcpiDmTableInfoPmtt1);
-+ SubtableLength, AcpiDmTableInfoPmtt1);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2185,7 +2187,7 @@ AcpiDmDumpPmtt (
-
- case ACPI_PMTT_TYPE_DIMM:
- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-- Subtable->Length, AcpiDmTableInfoPmtt2);
-+ SubtableLength, AcpiDmTableInfoPmtt2);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2194,7 +2196,7 @@ AcpiDmDumpPmtt (
-
- case ACPI_PMTT_TYPE_VENDOR:
- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-- Subtable->Length, AcpiDmTableInfoPmttVendor);
-+ SubtableLength, AcpiDmTableInfoPmttVendor);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2210,9 +2212,9 @@ AcpiDmDumpPmtt (
-
- /* Point to next subtable */
-
-- Offset += Subtable->Length;
-+ Offset += SubtableLength;
- Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
-- Subtable, Subtable->Length);
-+ Subtable, SubtableLength);
- }
- }
-
diff --git a/0039-Support-TPM2-in-a-big-endian-world.patch b/0039-Support-TPM2-in-a-big-endian-world.patch
deleted file mode 100644
index 1e26343..0000000
--- a/0039-Support-TPM2-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From c240ab3af6a4ad4405def7188e3d64da06a69f37 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Wed, 30 Sep 2020 18:42:38 -0600
-Subject: [PATCH 39/45] Support TPM2 in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump3.c | 18 ++++++++++--------
- source/compiler/dttable2.c | 8 +++++---
- 2 files changed, 15 insertions(+), 11 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -475,11 +475,12 @@ AcpiDmDumpTpm2Rev3 (
- ACPI_TABLE_TPM23 *CommonHeader = ACPI_CAST_PTR (ACPI_TABLE_TPM23, Table);
- ACPI_TPM23_TRAILER *Subtable = ACPI_ADD_PTR (ACPI_TPM23_TRAILER, Table, Offset);
- ACPI_STATUS Status;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoTpm23);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoTpm23);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -491,8 +492,8 @@ AcpiDmDumpTpm2Rev3 (
- {
- case ACPI_TPM23_ACPI_START_METHOD:
-
-- (void) AcpiDmDumpTable (Table->Length, Offset, Subtable,
-- Table->Length - Offset, AcpiDmTableInfoTpm23a);
-+ (void) AcpiDmDumpTable (TableLength, Offset, Subtable,
-+ TableLength - Offset, AcpiDmTableInfoTpm23a);
- break;
-
- default:
-@@ -522,6 +523,7 @@ AcpiDmDumpTpm2 (
- ACPI_TPM2_TRAILER *Subtable = ACPI_ADD_PTR (ACPI_TPM2_TRAILER, Table, Offset);
- ACPI_TPM2_ARM_SMC *ArmSubtable;
- ACPI_STATUS Status;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-
- if (Table->Revision == 3)
-@@ -532,7 +534,7 @@ AcpiDmDumpTpm2 (
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoTpm2);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoTpm2);
-
- if (ACPI_FAILURE (Status))
- {
-@@ -540,8 +542,8 @@ AcpiDmDumpTpm2 (
- }
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-- Table->Length - Offset, AcpiDmTableInfoTpm2a);
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+ TableLength - Offset, AcpiDmTableInfoTpm2a);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -556,8 +558,8 @@ AcpiDmDumpTpm2 (
- Offset += sizeof (ACPI_TPM2_TRAILER);
-
- AcpiOsPrintf ("\n");
-- (void) AcpiDmDumpTable (Table->Length, Offset, ArmSubtable,
-- Table->Length - Offset, AcpiDmTableInfoTpm211);
-+ (void) AcpiDmDumpTable (TableLength, Offset, ArmSubtable,
-+ TableLength - Offset, AcpiDmTableInfoTpm211);
- break;
-
- default:
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -2668,6 +2668,7 @@ DtCompileTpm2 (
- DT_SUBTABLE *ParentTable;
- ACPI_STATUS Status = AE_OK;
- ACPI_TABLE_HEADER *Header;
-+ UINT8 StartMethod;
-
-
- ParentTable = DtPeekSubtable ();
-@@ -2711,7 +2712,8 @@ DtCompileTpm2 (
-
- /* Subtable type depends on the StartMethod */
-
-- switch (Tpm2Header->StartMethod)
-+ StartMethod = *(UINT8 *) &Tpm2Header->StartMethod;
-+ switch (StartMethod)
- {
- case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
-
-@@ -2742,7 +2744,7 @@ DtCompileTpm2 (
- case ACPI_TPM2_RESERVED10:
-
- AcpiOsPrintf ("\n**** Reserved TPM2 Start Method type 0x%X\n",
-- Tpm2Header->StartMethod);
-+ StartMethod);
- Status = AE_ERROR;
- break;
-
-@@ -2750,7 +2752,7 @@ DtCompileTpm2 (
- default:
-
- AcpiOsPrintf ("\n**** Unknown TPM2 Start Method type 0x%X\n",
-- Tpm2Header->StartMethod);
-+ StartMethod);
- Status = AE_ERROR;
- break;
- }
diff --git a/0040-Support-S3PT-in-a-big-endian-world.patch b/0040-Support-S3PT-in-a-big-endian-world.patch
deleted file mode 100644
index 00678b7..0000000
--- a/0040-Support-S3PT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 9fc0e46189feb926b13713422ea2722e273a31b5 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Mon, 19 Oct 2020 17:30:30 -0400
-Subject: [PATCH 40/45] Support S3PT in a big-endian world
-
----
- source/common/dmtbdump2.c | 15 +++++++++------
- source/compiler/dttable2.c | 4 +++-
- 2 files changed, 12 insertions(+), 7 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -2495,6 +2495,8 @@ AcpiDmDumpS3pt (
- ACPI_FPDT_HEADER *Subtable;
- ACPI_DMTABLE_INFO *InfoTable;
- ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
-+ UINT32 S3ptTableLength = AcpiUtReadUint32 (&S3ptTable->Length);
-+ UINT16 SubtableType;
-
-
- /* Main table */
-@@ -2506,19 +2508,20 @@ AcpiDmDumpS3pt (
- }
-
- Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
-- while (Offset < S3ptTable->Length)
-+ while (Offset < S3ptTableLength)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (S3ptTableLength, Offset, Subtable,
- Subtable->Length, AcpiDmTableInfoS3ptHdr);
- if (ACPI_FAILURE (Status))
- {
- return 0;
- }
-
-- switch (Subtable->Type)
-+ SubtableType = AcpiUtReadUint16 (&Subtable->Type);
-+ switch (SubtableType)
- {
- case ACPI_S3PT_TYPE_RESUME:
-
-@@ -2533,7 +2536,7 @@ AcpiDmDumpS3pt (
- default:
-
- AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
-- Subtable->Type);
-+ SubtableType);
-
- /* Attempt to continue */
-
-@@ -2546,7 +2549,7 @@ AcpiDmDumpS3pt (
- }
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (S3ptTableLength, Offset, Subtable,
- Subtable->Length, InfoTable);
- if (ACPI_FAILURE (Status))
- {
-@@ -2560,7 +2563,7 @@ NextSubtable:
- Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Subtable, Subtable->Length);
- }
-
-- return (S3ptTable->Length);
-+ return (S3ptTableLength);
- }
-
-
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -1803,6 +1803,7 @@ DtCompileS3pt (
- DT_SUBTABLE *ParentTable;
- ACPI_DMTABLE_INFO *InfoTable;
- DT_FIELD *SubtableStart;
-+ UINT16 S3ptHeaderType;
-
-
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt,
-@@ -1830,7 +1831,8 @@ DtCompileS3pt (
-
- S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
-
-- switch (S3ptHeader->Type)
-+ S3ptHeaderType = AcpiUtReadUint16 (&S3ptHeader->Type);
-+ switch (S3ptHeaderType)
- {
- case ACPI_S3PT_TYPE_RESUME:
-
diff --git a/0041-Support-IORT-in-a-big-endian-world.patch b/0041-Support-IORT-in-a-big-endian-world.patch
deleted file mode 100644
index 76c9efd..0000000
--- a/0041-Support-IORT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,414 +0,0 @@
-From 5bd43bca1708a56d32e63da0278e04caf2865927 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Tue, 29 Jun 2021 17:38:20 -0600
-Subject: [PATCH 41/45] Support IORT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 85 ++++++++++++++++++++++----------------
- source/compiler/dttable1.c | 40 ++++++++++--------
- 2 files changed, 72 insertions(+), 53 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -77,17 +77,20 @@ AcpiDmDumpIort (
- ACPI_IORT_RMR *IortRmr = NULL;
- UINT32 Offset;
- UINT32 NodeOffset;
-+ UINT32 NodeLength;
- UINT32 Length;
- ACPI_DMTABLE_INFO *InfoTable;
- char *String;
- UINT32 i;
- UINT32 MappingByteLength;
- UINT8 Revision;
-+ UINT32 MappingCount;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIort);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoIort);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -109,18 +112,19 @@ AcpiDmDumpIort (
-
- /* Dump the OptionalPadding (optional) */
-
-- if (Iort->NodeOffset > Offset)
-+ NodeOffset = AcpiUtReadUint32 (&Iort->NodeOffset);
-+ if (NodeOffset > Offset)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset, Table,
-- Iort->NodeOffset - Offset, AcpiDmTableInfoIortPad);
-+ Status = AcpiDmDumpTable (TableLength, Offset, Table,
-+ NodeOffset - Offset, AcpiDmTableInfoIortPad);
- if (ACPI_FAILURE (Status))
- {
- return;
- }
- }
-
-- Offset = Iort->NodeOffset;
-- while (Offset < Table->Length)
-+ Offset = AcpiUtReadUint32 (&Iort->NodeOffset);
-+ while (Offset < TableLength)
- {
- /* Common subtable header */
-
-@@ -130,12 +134,12 @@ AcpiDmDumpIort (
-
- if (Revision == 0)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset,
-+ Status = AcpiDmDumpTable (TableLength, Offset,
- IortNode, Length, AcpiDmTableInfoIortHdr);
- }
- else if (Revision >= 3)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset,
-+ Status = AcpiDmDumpTable (TableLength, Offset,
- IortNode, Length, AcpiDmTableInfoIortHdr3);
- }
-
-@@ -166,7 +170,7 @@ AcpiDmDumpIort (
- case ACPI_IORT_NODE_PCI_ROOT_COMPLEX:
-
- InfoTable = AcpiDmTableInfoIort2;
-- Length = IortNode->Length - NodeOffset;
-+ Length = AcpiUtReadUint16 (&IortNode->Length) - NodeOffset;
- break;
-
- case ACPI_IORT_NODE_SMMU:
-@@ -179,19 +183,19 @@ AcpiDmDumpIort (
- case ACPI_IORT_NODE_SMMU_V3:
-
- InfoTable = AcpiDmTableInfoIort4;
-- Length = IortNode->Length - NodeOffset;
-+ Length = AcpiUtReadUint16 (&IortNode->Length) - NodeOffset;
- break;
-
- case ACPI_IORT_NODE_PMCG:
-
- InfoTable = AcpiDmTableInfoIort5;
-- Length = IortNode->Length - NodeOffset;
-+ Length = AcpiUtReadUint16 (&IortNode->Length) - NodeOffset;
- break;
-
- case ACPI_IORT_NODE_RMR:
-
- InfoTable = AcpiDmTableInfoIort6;
-- Length = IortNode->Length - NodeOffset;
-+ Length = AcpiUtReadUint16 (&IortNode->Length) - NodeOffset;
- IortRmr = ACPI_ADD_PTR (ACPI_IORT_RMR, IortNode, NodeOffset);
- break;
-
-@@ -202,7 +206,7 @@ AcpiDmDumpIort (
-
- /* Attempt to continue */
-
-- if (!IortNode->Length)
-+ if (!AcpiUtReadUint16 (&IortNode->Length))
- {
- AcpiOsPrintf ("Invalid zero length IORT node\n");
- return;
-@@ -213,7 +217,7 @@ AcpiDmDumpIort (
- /* Dump the node subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
- ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
- Length, InfoTable);
- if (ACPI_FAILURE (Status))
-@@ -233,9 +237,10 @@ AcpiDmDumpIort (
-
- if (IortItsGroup)
- {
-- for (i = 0; i < IortItsGroup->ItsCount; i++)
-+ UINT32 ItsCount = AcpiUtReadUint32 (&IortItsGroup->ItsCount);
-+ for (i = 0; i < ItsCount; i++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
- ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
- 4, AcpiDmTableInfoIort0a);
- if (ACPI_FAILURE (Status))
-@@ -252,12 +257,14 @@ AcpiDmDumpIort (
-
- /* Dump the Padding (optional) */
-
-- if (IortNode->Length > NodeOffset)
-+ NodeLength = AcpiUtReadUint16 (&IortNode->Length);
-+ if (NodeLength > NodeOffset)
- {
- MappingByteLength =
-- IortNode->MappingCount * sizeof (ACPI_IORT_ID_MAPPING);
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-- Table, IortNode->Length - NodeOffset - MappingByteLength,
-+ AcpiUtReadUint32 (&IortNode->MappingCount) *
-+ sizeof (ACPI_IORT_ID_MAPPING);
-+ Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
-+ Table, NodeLength - NodeOffset - MappingByteLength,
- AcpiDmTableInfoIort1a);
- if (ACPI_FAILURE (Status))
- {
-@@ -274,9 +281,11 @@ AcpiDmDumpIort (
-
- if (IortSmmu)
- {
-+ UINT32 InterruptCount;
-+
- Length = 2 * sizeof (UINT64);
-- NodeOffset = IortSmmu->GlobalInterruptOffset;
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+ NodeOffset = AcpiUtReadUint32 (&IortSmmu->GlobalInterruptOffset);
-+ Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
- ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
- Length, AcpiDmTableInfoIort3a);
- if (ACPI_FAILURE (Status))
-@@ -284,10 +293,11 @@ AcpiDmDumpIort (
- return;
- }
-
-- NodeOffset = IortSmmu->ContextInterruptOffset;
-- for (i = 0; i < IortSmmu->ContextInterruptCount; i++)
-+ NodeOffset = AcpiUtReadUint32 (&IortSmmu->ContextInterruptOffset);
-+ InterruptCount = AcpiUtReadUint32 (&IortSmmu->ContextInterruptCount);
-+ for (i = 0; i < InterruptCount; i++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
- ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
- 8, AcpiDmTableInfoIort3b);
- if (ACPI_FAILURE (Status))
-@@ -298,10 +308,11 @@ AcpiDmDumpIort (
- NodeOffset += 8;
- }
-
-- NodeOffset = IortSmmu->PmuInterruptOffset;
-- for (i = 0; i < IortSmmu->PmuInterruptCount; i++)
-+ NodeOffset = AcpiUtReadUint32 (&IortSmmu->PmuInterruptOffset);
-+ InterruptCount = AcpiUtReadUint32 (&IortSmmu->PmuInterruptCount);
-+ for (i = 0; i < InterruptCount; i++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
- ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
- 8, AcpiDmTableInfoIort3c);
- if (ACPI_FAILURE (Status))
-@@ -319,12 +330,15 @@ AcpiDmDumpIort (
- /* Validate IortRmr to avoid compiler warnings */
- if (IortRmr)
- {
-- NodeOffset = IortRmr->RmrOffset;
-+ UINT32 RmrCount;
-+
-+ NodeOffset = AcpiUtReadUint32 (&IortRmr->RmrOffset);
-+ RmrCount = AcpiUtReadUint32 (&IortRmr->RmrCount);
- Length = sizeof (ACPI_IORT_RMR_DESC);
-- for (i = 0; i < IortRmr->RmrCount; i++)
-+ for (i = 0; i < RmrCount; i++)
- {
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
- ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
- Length, AcpiDmTableInfoIort6a);
- if (ACPI_FAILURE (Status))
-@@ -344,12 +358,13 @@ AcpiDmDumpIort (
-
- /* Dump the ID mappings */
-
-- NodeOffset = IortNode->MappingOffset;
-- for (i = 0; i < IortNode->MappingCount; i++)
-+ NodeOffset = AcpiUtReadUint32 (&IortNode->MappingOffset);
-+ MappingCount = AcpiUtReadUint32 (&IortNode->MappingCount);
-+ for (i = 0; i < MappingCount; i++)
- {
- AcpiOsPrintf ("\n");
- Length = sizeof (ACPI_IORT_ID_MAPPING);
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
- ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
- Length, AcpiDmTableInfoIortMap);
- if (ACPI_FAILURE (Status))
-@@ -363,7 +378,7 @@ AcpiDmDumpIort (
- NextSubtable:
- /* Point to next node subtable */
-
-- Offset += IortNode->Length;
-+ Offset += AcpiUtReadUint16 (&IortNode->Length);
- }
- }
-
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -1960,6 +1960,7 @@ DtCompileIort (
- ACPI_IORT_ITS_GROUP *IortItsGroup;
- ACPI_IORT_SMMU *IortSmmu;
- ACPI_IORT_RMR *IortRmr;
-+ UINT32 IortNodeOffset;
- UINT32 NodeNumber;
- UINT32 NodeLength;
- UINT32 IdMappingNumber;
-@@ -2005,7 +2006,7 @@ DtCompileIort (
- * Optionally allows the generic data types to be used for filling
- * this field.
- */
-- Iort->NodeOffset = sizeof (ACPI_TABLE_IORT);
-+ IortNodeOffset = sizeof (ACPI_TABLE_IORT);
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad,
- &Subtable);
- if (ACPI_FAILURE (Status))
-@@ -2015,7 +2016,7 @@ DtCompileIort (
- if (Subtable)
- {
- DtInsertSubtable (ParentTable, Subtable);
-- Iort->NodeOffset += Subtable->Length;
-+ IortNodeOffset += Subtable->Length;
- }
- else
- {
-@@ -2025,7 +2026,7 @@ DtCompileIort (
- {
- return (Status);
- }
-- Iort->NodeOffset += PaddingLength;
-+ IortNodeOffset += PaddingLength;
- }
-
- NodeNumber = 0;
-@@ -2089,7 +2090,7 @@ DtCompileIort (
- ItsNumber++;
- }
-
-- IortItsGroup->ItsCount = ItsNumber;
-+ IortItsGroup->ItsCount = AcpiUtReadUint32 (&ItsNumber);
- break;
-
- case ACPI_IORT_NODE_NAMED_COMPONENT:
-@@ -2123,15 +2124,18 @@ DtCompileIort (
- }
- else
- {
-- if (NodeLength > IortNode->MappingOffset)
-+ UINT32 MappingOffset;
-+
-+ MappingOffset = IortNode->MappingOffset;
-+ if (NodeLength > MappingOffset)
- {
- return (AE_BAD_DATA);
- }
-
-- if (NodeLength < IortNode->MappingOffset)
-+ if (NodeLength < MappingOffset)
- {
- Status = DtCompilePadding (
-- IortNode->MappingOffset - NodeLength,
-+ MappingOffset - NodeLength,
- &Subtable);
- if (ACPI_FAILURE (Status))
- {
-@@ -2139,7 +2143,7 @@ DtCompileIort (
- }
-
- DtInsertSubtable (ParentTable, Subtable);
-- NodeLength = IortNode->MappingOffset;
-+ NodeLength = MappingOffset;
- }
- }
- break;
-@@ -2172,7 +2176,7 @@ DtCompileIort (
-
- /* Compile global interrupt array */
-
-- IortSmmu->GlobalInterruptOffset = NodeLength;
-+ IortSmmu->GlobalInterruptOffset = AcpiUtReadUint32 (&NodeLength);
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a,
- &Subtable);
- if (ACPI_FAILURE (Status))
-@@ -2186,7 +2190,7 @@ DtCompileIort (
- /* Compile context interrupt array */
-
- ContextIrptNumber = 0;
-- IortSmmu->ContextInterruptOffset = NodeLength;
-+ IortSmmu->ContextInterruptOffset = AcpiUtReadUint32 (&NodeLength);
- while (*PFieldList)
- {
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b,
-@@ -2206,12 +2210,12 @@ DtCompileIort (
- ContextIrptNumber++;
- }
-
-- IortSmmu->ContextInterruptCount = ContextIrptNumber;
-+ IortSmmu->ContextInterruptCount = AcpiUtReadUint32 (&ContextIrptNumber);
-
- /* Compile PMU interrupt array */
-
- PmuIrptNumber = 0;
-- IortSmmu->PmuInterruptOffset = NodeLength;
-+ IortSmmu->PmuInterruptOffset = AcpiUtReadUint32 (&NodeLength);
- while (*PFieldList)
- {
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c,
-@@ -2231,7 +2235,7 @@ DtCompileIort (
- PmuIrptNumber++;
- }
-
-- IortSmmu->PmuInterruptCount = PmuIrptNumber;
-+ IortSmmu->PmuInterruptCount = AcpiUtReadUint32 (&PmuIrptNumber);
- break;
-
- case ACPI_IORT_NODE_SMMU_V3:
-@@ -2276,7 +2280,7 @@ DtCompileIort (
- /* Compile RMR Descriptors */
-
- RmrCount = 0;
-- IortRmr->RmrOffset = NodeLength;
-+ IortRmr->RmrOffset = AcpiUtReadUint32 (&NodeLength);
- while (*PFieldList)
- {
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort6a,
-@@ -2296,7 +2300,7 @@ DtCompileIort (
- RmrCount++;
- }
-
-- IortRmr->RmrCount = RmrCount;
-+ IortRmr->RmrCount = AcpiUtReadUint32 (&RmrCount);
- break;
-
- default:
-@@ -2307,7 +2311,7 @@ DtCompileIort (
-
- /* Compile Array of ID mappings */
-
-- IortNode->MappingOffset = NodeLength;
-+ IortNode->MappingOffset = AcpiUtReadUint32 (&NodeLength);
- IdMappingNumber = 0;
- while (*PFieldList)
- {
-@@ -2328,7 +2332,7 @@ DtCompileIort (
- IdMappingNumber++;
- }
-
-- IortNode->MappingCount = IdMappingNumber;
-+ IortNode->MappingCount = AcpiUtReadUint32 (&IdMappingNumber);
- if (!IdMappingNumber)
- {
- IortNode->MappingOffset = 0;
-@@ -2343,7 +2347,7 @@ DtCompileIort (
- NodeNumber++;
- }
-
-- Iort->NodeCount = NodeNumber;
-+ Iort->NodeCount = AcpiUtReadUint32 (&NodeNumber);
- return (AE_OK);
- }
-
diff --git a/0042-Support-IVRS-in-a-big-endian-world.patch b/0042-Support-IVRS-in-a-big-endian-world.patch
deleted file mode 100644
index 9d0a88f..0000000
--- a/0042-Support-IVRS-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From b64cff82b2b33ed659826d777d2db039f64fd198 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Tue, 29 Jun 2021 17:45:24 -0600
-Subject: [PATCH 42/45] Support IVRS in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 34 +++++++++++++++++++---------------
- 1 file changed, 19 insertions(+), 15 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -419,11 +419,14 @@ AcpiDmDumpIvrs (
- ACPI_IVRS_DE_HEADER *DeviceEntry;
- ACPI_IVRS_HEADER *Subtable;
- ACPI_DMTABLE_INFO *InfoTable;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-+ UINT16 SubtableLength;
-+
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIvrs);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoIvrs);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -433,8 +436,9 @@ AcpiDmDumpIvrs (
-
- Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset);
-
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
-+ SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
- switch (Subtable->Type)
- {
- /* Type 10h, IVHD (I/O Virtualization Hardware Definition) */
-@@ -471,7 +475,7 @@ AcpiDmDumpIvrs (
-
- /* Attempt to continue */
-
-- if (!Subtable->Length)
-+ if (!SubtableLength)
- {
- AcpiOsPrintf ("Invalid zero length subtable\n");
- return;
-@@ -481,8 +485,8 @@ AcpiDmDumpIvrs (
-
- /* Dump the subtable */
-
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-- Subtable->Length, InfoTable);
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+ SubtableLength, InfoTable);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -511,7 +515,7 @@ AcpiDmDumpIvrs (
-
- /* Process all of the Device Entries */
-
-- while (EntryOffset < (Offset + Subtable->Length))
-+ while (EntryOffset < (Offset + SubtableLength))
- {
- AcpiOsPrintf ("\n");
-
-@@ -581,7 +585,7 @@ AcpiDmDumpIvrs (
-
- /* Dump the Device Entry */
-
-- Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+ Status = AcpiDmDumpTable (TableLength, EntryOffset,
- DeviceEntry, EntryLength, InfoTable);
- if (ACPI_FAILURE (Status))
- {
-@@ -605,12 +609,12 @@ AcpiDmDumpIvrs (
- */
- if (UtIsIdInteger ((UINT8 *) &HidSubtable->AcpiHid))
- {
-- Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+ Status = AcpiDmDumpTable (TableLength, EntryOffset,
- &HidSubtable->AcpiHid, 8, AcpiDmTableInfoIvrsHidInteger);
- }
- else
- {
-- Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+ Status = AcpiDmDumpTable (TableLength, EntryOffset,
- &HidSubtable->AcpiHid, 8, AcpiDmTableInfoIvrsHidString);
- }
- if (ACPI_FAILURE (Status))
-@@ -628,12 +632,12 @@ AcpiDmDumpIvrs (
- */
- if (UtIsIdInteger ((UINT8 *) &HidSubtable->AcpiCid))
- {
-- Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+ Status = AcpiDmDumpTable (TableLength, EntryOffset,
- &HidSubtable->AcpiCid, 8, AcpiDmTableInfoIvrsCidInteger);
- }
- else
- {
-- Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+ Status = AcpiDmDumpTable (TableLength, EntryOffset,
- &HidSubtable->AcpiCid, 8, AcpiDmTableInfoIvrsCidString);
- }
- if (ACPI_FAILURE (Status))
-@@ -650,7 +654,7 @@ AcpiDmDumpIvrs (
-
- if (HidSubtable->UidType == ACPI_IVRS_UID_IS_STRING)
- {
-- Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+ Status = AcpiDmDumpTable (TableLength, EntryOffset,
- &HidSubtable->UidType, EntryLength, AcpiDmTableInfoIvrsUidString);
- if (ACPI_FAILURE (Status))
- {
-@@ -659,7 +663,7 @@ AcpiDmDumpIvrs (
- }
- else /* ACPI_IVRS_UID_IS_INTEGER */
- {
-- Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+ Status = AcpiDmDumpTable (TableLength, EntryOffset,
- &HidSubtable->UidType, EntryLength, AcpiDmTableInfoIvrsUidInteger);
- if (ACPI_FAILURE (Status))
- {
-@@ -678,8 +682,8 @@ AcpiDmDumpIvrs (
- NextSubtable:
- /* Point to next subtable */
-
-- Offset += Subtable->Length;
-- Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, Subtable->Length);
-+ Offset += SubtableLength;
-+ Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, SubtableLength);
- }
- }
-
diff --git a/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch b/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
deleted file mode 100644
index 777f74a..0000000
--- a/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,3171 +0,0 @@
-From 14d220a34462e61fe69141c86f4c3cd2ae68c279 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Wed, 30 Sep 2020 18:59:57 -0600
-Subject: [PATCH 43/45] Support DSDT/SSDT in a big-endian world.
-
-NB: this is a very large diff. The problem is that ResourceTemplates
-are treated differently during compilation and disassembly so each of
-the resource types had code that needed to be touched directly.
-
-In general, however, just reading or writing individual AML opcodes
-wasn't that much of a change, and most of it was on the codegen side.
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/adwalk.c | 3 +-
- source/common/dmrestag.c | 2 +-
- source/common/dmtables.c | 17 +-
- source/common/dmtbdump.c | 3 +-
- source/common/dmtbdump3.c | 8 +-
- source/compiler/aslcodegen.c | 59 ++++--
- source/compiler/aslopcodes.c | 3 +-
- source/compiler/aslrestype1.c | 60 ++++--
- source/compiler/aslrestype1i.c | 35 ++--
- source/compiler/aslrestype2.c | 20 +-
- source/compiler/aslrestype2d.c | 99 ++++++----
- source/compiler/aslrestype2e.c | 90 ++++++---
- source/compiler/aslrestype2q.c | 81 +++++---
- source/compiler/aslrestype2s.c | 214 +++++++++++++++++----
- source/compiler/aslrestype2w.c | 94 +++++----
- source/compiler/dttable2.c | 3 +-
- source/components/disassembler/dmbuffer.c | 37 +++-
- source/components/disassembler/dmopcode.c | 21 +-
- source/components/disassembler/dmresrc.c | 2 +-
- source/components/disassembler/dmresrcl.c | 43 +++--
- source/components/disassembler/dmresrcl2.c | 128 +++++++-----
- source/components/disassembler/dmresrcs.c | 18 +-
- source/components/disassembler/dmwalk.c | 2 +-
- source/components/namespace/nsaccess.c | 2 +-
- source/components/namespace/nsnames.c | 4 +-
- source/components/namespace/nsparse.c | 6 +-
- source/components/namespace/nsutils.c | 7 +-
- source/components/utilities/utresrc.c | 2 +-
- 28 files changed, 721 insertions(+), 341 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/adwalk.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/adwalk.c
-+++ acpica-unix2-20220331/source/common/adwalk.c
-@@ -679,7 +679,8 @@ AcpiDmLoadDescendingOp (
-
- if (!Path && Op->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
- {
-- *ACPI_CAST_PTR (UINT32, &FieldPath[0]) = Op->Named.Name;
-+ AcpiUtWriteUint (FieldPath, ACPI_NAMESEG_SIZE,
-+ &Op->Named.Name, ACPI_NAMESEG_SIZE);
- FieldPath[4] = 0;
- Path = FieldPath;
- }
-Index: acpica-unix2-20220331/source/common/dmrestag.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmrestag.c
-+++ acpica-unix2-20220331/source/common/dmrestag.c
-@@ -1048,7 +1048,7 @@ AcpiDmAddResourcesToNamespace (
- * NextOp contains the Aml pointer and the Aml length
- */
- AcpiUtWalkAmlResources (NULL, (UINT8 *) NextOp->Named.Data,
-- (ACPI_SIZE) NextOp->Common.Value.Integer,
-+ (ACPI_SIZE) NextOp->Common.Value.Size,
- AcpiDmAddResourceToNamespace, (void **) BufferNode);
- }
-
-Index: acpica-unix2-20220331/source/common/dmtables.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtables.c
-+++ acpica-unix2-20220331/source/common/dmtables.c
-@@ -142,6 +142,10 @@ AdCreateTableHeader (
- ACPI_TABLE_HEADER *Table)
- {
- UINT8 Checksum;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-+ UINT32 OemRevision = AcpiUtReadUint32 (&Table->OemRevision);
-+ UINT32 CompilerRevision =
-+ AcpiUtReadUint32 (&Table->AslCompilerRevision);
-
-
- /* Reset globals for External statements */
-@@ -156,7 +160,7 @@ AdCreateTableHeader (
-
- AcpiOsPrintf (" * Original Table Header:\n");
- AcpiOsPrintf (" * Signature \"%4.4s\"\n", Table->Signature);
-- AcpiOsPrintf (" * Length 0x%8.8X (%u)\n", Table->Length, Table->Length);
-+ AcpiOsPrintf (" * Length 0x%8.8X (%u)\n", TableLength, TableLength);
-
- /* Print and validate the revision */
-
-@@ -188,7 +192,7 @@ AdCreateTableHeader (
-
- AcpiOsPrintf ("\n * Checksum 0x%2.2X", Table->Checksum);
-
-- Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), Table->Length);
-+ Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), TableLength);
- if (Checksum)
- {
- AcpiOsPrintf (" **** Incorrect checksum, should be 0x%2.2X",
-@@ -198,9 +202,9 @@ AdCreateTableHeader (
- AcpiOsPrintf ("\n");
- AcpiOsPrintf (" * OEM ID \"%.6s\"\n", Table->OemId);
- AcpiOsPrintf (" * OEM Table ID \"%.8s\"\n", Table->OemTableId);
-- AcpiOsPrintf (" * OEM Revision 0x%8.8X (%u)\n", Table->OemRevision, Table->OemRevision);
-+ AcpiOsPrintf (" * OEM Revision 0x%8.8X (%u)\n", OemRevision, OemRevision);
- AcpiOsPrintf (" * Compiler ID \"%.4s\"\n", Table->AslCompilerId);
-- AcpiOsPrintf (" * Compiler Version 0x%8.8X (%u)\n", Table->AslCompilerRevision, Table->AslCompilerRevision);
-+ AcpiOsPrintf (" * Compiler Version 0x%8.8X (%u)\n", CompilerRevision, CompilerRevision);
- AcpiOsPrintf (" */\n");
-
- /*
-@@ -221,7 +225,7 @@ AdCreateTableHeader (
- AcpiOsPrintf (
- "DefinitionBlock (\"\", \"%4.4s\", %u, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
- Table->Signature, Table->Revision,
-- Table->OemId, Table->OemTableId, Table->OemRevision);
-+ Table->OemId, Table->OemTableId, OemRevision);
- }
-
-
-@@ -396,7 +400,8 @@ AdParseTable (
-
- fprintf (stderr, "Pass 1 parse of [%4.4s]\n", (char *) Table->Signature);
-
-- AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
-+ AmlLength = AcpiUtReadUint32 (&Table->Length);
-+ AmlLength -= sizeof (ACPI_TABLE_HEADER);
- AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
-
- AcpiUtSetIntegerWidth (Table->Revision);
-Index: acpica-unix2-20220331/source/common/dmtbdump.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20220331/source/common/dmtbdump.c
-@@ -392,8 +392,7 @@ AcpiDmDumpXsdt (
- for (i = 0; i < Entries; i++)
- {
- AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
-- AcpiOsPrintf ("%8.8X%8.8X\n",
-- ACPI_FORMAT_UINT64 (AcpiUtReadUint64 (&Array[i])));
-+ AcpiOsPrintf ("%16.16lX\n", AcpiUtReadUint64 (&Array[i]));
- Offset += sizeof (UINT64);
- }
- }
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -741,12 +741,13 @@ AcpiDmDumpWpbt (
- {
- ACPI_STATUS Status;
- ACPI_TABLE_WPBT *Subtable;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
- UINT16 ArgumentsLength;
-
-
- /* Dump the main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoWpbt);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoWpbt);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -755,13 +756,13 @@ AcpiDmDumpWpbt (
- /* Extract the arguments buffer length from the main table */
-
- Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
-- ArgumentsLength = Subtable->ArgumentsLength;
-+ ArgumentsLength = AcpiUtReadUint16 (&Subtable->ArgumentsLength);
-
- /* Dump the arguments buffer if present */
-
- if (ArgumentsLength)
- {
-- (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
-+ (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength,
- AcpiDmTableInfoWpbt0);
- }
- }
-Index: acpica-unix2-20220331/source/compiler/aslcodegen.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslcodegen.c
-+++ acpica-unix2-20220331/source/compiler/aslcodegen.c
-@@ -238,6 +238,10 @@ CgWriteAmlOpcode (
- {
- UINT8 PkgLenFirstByte;
- UINT32 i;
-+ UINT8 Tmp8;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-+ UINT64 Tmp64;
- union {
- UINT16 Opcode;
- UINT8 OpcodeBytes[2];
-@@ -312,14 +316,15 @@ CgWriteAmlOpcode (
-
- /* Check for two-byte opcode */
-
-+ Tmp16 = AcpiUtReadUint16 (&Aml.Opcode);
- if (Aml.Opcode > 0x00FF)
- {
- /* Write the high byte first */
-
-- CgLocalWriteAmlData (Op, &Aml.OpcodeBytes[1], 1);
-+ CgLocalWriteAmlData (Op, ((UINT8 *) &Tmp16)+1, 1);
- }
-
-- CgLocalWriteAmlData (Op, &Aml.OpcodeBytes[0], 1);
-+ CgLocalWriteAmlData (Op, (UINT8 *) &Tmp16, 1);
-
- /* Subtreelength doesn't include length of package length bytes */
-
-@@ -335,7 +340,8 @@ CgWriteAmlOpcode (
- {
- /* Simplest case -- no bytes to follow, just write the count */
-
-- CgLocalWriteAmlData (Op, &PkgLen.LenBytes[0], 1);
-+ Tmp8 = (UINT8) PkgLen.Len;
-+ CgLocalWriteAmlData (Op, &Tmp8, 1);
- }
- else if (Op->Asl.AmlPkgLenBytes != 0)
- {
-@@ -343,9 +349,10 @@ CgWriteAmlOpcode (
- * Encode the "bytes to follow" in the first byte, top two bits.
- * The low-order nybble of the length is in the bottom 4 bits
- */
-+ Tmp8 = (UINT8) PkgLen.Len;
- PkgLenFirstByte = (UINT8)
- (((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) |
-- (PkgLen.LenBytes[0] & 0x0F));
-+ (Tmp8 & 0x0F));
-
- CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1);
-
-@@ -359,6 +366,9 @@ CgWriteAmlOpcode (
- * Now we can write the remaining bytes -
- * either 1, 2, or 3 bytes
- */
-+ Tmp32 = PkgLen.Len;
-+ AcpiUtWriteUint (&PkgLen.Len, Op->Asl.AmlPkgLenBytes,
-+ &Tmp32, sizeof (UINT32));
- for (i = 0; i < (UINT32) (Op->Asl.AmlPkgLenBytes - 1); i++)
- {
- CgLocalWriteAmlData (Op, &PkgLen.LenBytes[i], 1);
-@@ -370,22 +380,30 @@ CgWriteAmlOpcode (
- {
- case AML_BYTE_OP:
-
-- CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 1);
-+ Tmp64 = 0;
-+ AcpiUtWriteUint (&Tmp64, 1, &Op->Asl.Value.Integer, 8);
-+ CgLocalWriteAmlData (Op, &Tmp64, 1);
- break;
-
- case AML_WORD_OP:
-
-- CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 2);
-- break;
-+ Tmp64 = 0;
-+ AcpiUtWriteUint (&Tmp64, 2, &Op->Asl.Value.Integer, 8);
-+ CgLocalWriteAmlData (Op, &Tmp64, 2);
-+ break;
-
- case AML_DWORD_OP:
-
-- CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 4);
-+ Tmp64 = 0;
-+ AcpiUtWriteUint (&Tmp64, 4, &Op->Asl.Value.Integer, 8);
-+ CgLocalWriteAmlData (Op, &Tmp64, 4);
- break;
-
- case AML_QWORD_OP:
-
-- CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 8);
-+ Tmp64 = 0;
-+ AcpiUtWriteUint (&Tmp64, 8, &Op->Asl.Value.Integer, 8);
-+ CgLocalWriteAmlData (Op, &Tmp64, 8);
- break;
-
- case AML_STRING_OP:
-@@ -423,6 +441,7 @@ CgWriteTableHeader (
- ACPI_PARSE_OBJECT *Child;
- UINT32 CommentLength;
- ACPI_COMMENT_NODE *Current;
-+ UINT32 Tmp32;
-
-
- memset (&AslGbl_TableHeader, 0, sizeof (ACPI_TABLE_HEADER));
-@@ -478,7 +497,9 @@ CgWriteTableHeader (
- /* OEM Revision */
-
- Child = Child->Asl.Next;
-- AslGbl_TableHeader.OemRevision = (UINT32) Child->Asl.Value.Integer;
-+ AcpiUtWriteUint (&Tmp32, sizeof (UINT32),
-+ &Child->Asl.Value.Integer, sizeof (Child->Asl.Value.Integer));
-+ AslGbl_TableHeader.OemRevision = Tmp32;
-
- /* Compiler ID */
-
-@@ -486,7 +507,8 @@ CgWriteTableHeader (
-
- /* Compiler version */
-
-- AslGbl_TableHeader.AslCompilerRevision = ACPI_CA_VERSION;
-+ Tmp32 = ACPI_CA_VERSION;
-+ AslGbl_TableHeader.AslCompilerRevision = AcpiUtReadUint32 (&Tmp32);
-
- /* Table length. Checksum zero for now, will rewrite later */
-
-@@ -541,6 +563,15 @@ CgWriteTableHeader (
- AslGbl_TableHeader.Checksum = 0;
- Op->Asl.FinalAmlOffset = ftell (AslGbl_Files[ASL_FILE_AML_OUTPUT].Handle);
-
-+ /*
-+ * Adjust the Table length; it will only change when big-endian
-+ * but we have to wait until here in case there is arithmetic to
-+ * be done on the length before this step in the function
-+ */
-+
-+ Tmp32 = AslGbl_TableHeader.Length;
-+ AslGbl_TableHeader.Length = AcpiUtReadUint32 (&Tmp32);
-+
- /* Write entire header and clear the table header global */
-
- CgLocalWriteAmlData (Op, &AslGbl_TableHeader, sizeof (ACPI_TABLE_HEADER));
-@@ -625,6 +656,7 @@ CgWriteNode (
- ACPI_PARSE_OBJECT *Op)
- {
- ASL_RESOURCE_NODE *Rnode;
-+ UINT64 Tmp64;
-
-
- /* Write all comments here. */
-@@ -653,7 +685,10 @@ CgWriteNode (
- case AML_RAW_DATA_DWORD:
- case AML_RAW_DATA_QWORD:
-
-- CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, Op->Asl.AmlLength);
-+ Tmp64 = 0;
-+ AcpiUtWriteUint (&Tmp64, Op->Asl.AmlLength,
-+ &Op->Asl.Value.Integer, sizeof (UINT64));
-+ CgLocalWriteAmlData (Op, &Tmp64, Op->Asl.AmlLength);
- return;
-
-
-Index: acpica-unix2-20220331/source/compiler/aslopcodes.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslopcodes.c
-+++ acpica-unix2-20220331/source/compiler/aslopcodes.c
-@@ -511,7 +511,8 @@ OpcDoUnicode (
-
- for (i = 0; i < Count; i++)
- {
-- UnicodeString[i] = (UINT16) AsciiString[i];
-+ AcpiUtWriteUint (&UnicodeString[i], sizeof (UINT16),
-+ &AsciiString[i], sizeof (UINT8));
- }
-
- /*
-Index: acpica-unix2-20220331/source/compiler/aslrestype1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype1.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype1.c
-@@ -143,6 +143,7 @@ RsDoMemory24Descriptor (
- ASL_RESOURCE_NODE *Rnode;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -151,7 +152,8 @@ RsDoMemory24Descriptor (
-
- Descriptor = Rnode->Buffer;
- Descriptor->Memory24.DescriptorType = ACPI_RESOURCE_NAME_MEMORY24;
-- Descriptor->Memory24.ResourceLength = 9;
-+ Tmp16 = 9;
-+ Descriptor->Memory24.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-
- /* Process all child initialization nodes */
-
-@@ -168,7 +170,8 @@ RsDoMemory24Descriptor (
-
- case 1: /* Min Address */
-
-- Descriptor->Memory24.Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Memory24.Minimum = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Minimum));
- MinOp = InitializerOp;
-@@ -176,7 +179,8 @@ RsDoMemory24Descriptor (
-
- case 2: /* Max Address */
-
-- Descriptor->Memory24.Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Memory24.Maximum = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Maximum));
- MaxOp = InitializerOp;
-@@ -184,14 +188,16 @@ RsDoMemory24Descriptor (
-
- case 3: /* Alignment */
-
-- Descriptor->Memory24.Alignment = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Memory24.Alignment = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Alignment));
- break;
-
- case 4: /* Length */
-
-- Descriptor->Memory24.AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Memory24.AddressLength = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.AddressLength));
- LengthOp = InitializerOp;
-@@ -214,10 +220,10 @@ RsDoMemory24Descriptor (
- /* Validate the Min/Max/Len/Align values (Alignment==0 means 64K) */
-
- RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY24,
-- Descriptor->Memory24.Minimum,
-- Descriptor->Memory24.Maximum,
-- Descriptor->Memory24.AddressLength,
-- Descriptor->Memory24.Alignment,
-+ (UINT32) AcpiUtReadUint16 (&Descriptor->Memory24.Minimum),
-+ (UINT32) AcpiUtReadUint16 (&Descriptor->Memory24.Maximum),
-+ (UINT32) AcpiUtReadUint16 (&Descriptor->Memory24.AddressLength),
-+ (UINT32) AcpiUtReadUint16 (&Descriptor->Memory24.Alignment),
- MinOp, MaxOp, LengthOp, NULL, Info->DescriptorTypeOp);
-
- return (Rnode);
-@@ -249,6 +255,8 @@ RsDoMemory32Descriptor (
- ASL_RESOURCE_NODE *Rnode;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -257,7 +265,8 @@ RsDoMemory32Descriptor (
-
- Descriptor = Rnode->Buffer;
- Descriptor->Memory32.DescriptorType = ACPI_RESOURCE_NAME_MEMORY32;
-- Descriptor->Memory32.ResourceLength = 17;
-+ Tmp16 = 17;
-+ Descriptor->Memory32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-
- /* Process all child initialization nodes */
-
-@@ -274,7 +283,8 @@ RsDoMemory32Descriptor (
-
- case 1: /* Min Address */
-
-- Descriptor->Memory32.Minimum = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Memory32.Minimum = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Minimum));
- MinOp = InitializerOp;
-@@ -282,7 +292,8 @@ RsDoMemory32Descriptor (
-
- case 2: /* Max Address */
-
-- Descriptor->Memory32.Maximum = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Memory32.Maximum = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Maximum));
- MaxOp = InitializerOp;
-@@ -290,7 +301,8 @@ RsDoMemory32Descriptor (
-
- case 3: /* Alignment */
-
-- Descriptor->Memory32.Alignment = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Memory32.Alignment = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Alignment));
- AlignOp = InitializerOp;
-@@ -298,7 +310,8 @@ RsDoMemory32Descriptor (
-
- case 4: /* Length */
-
-- Descriptor->Memory32.AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Memory32.AddressLength = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.AddressLength));
- LengthOp = InitializerOp;
-@@ -321,10 +334,10 @@ RsDoMemory32Descriptor (
- /* Validate the Min/Max/Len/Align values */
-
- RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY32,
-- Descriptor->Memory32.Minimum,
-- Descriptor->Memory32.Maximum,
-- Descriptor->Memory32.AddressLength,
-- Descriptor->Memory32.Alignment,
-+ AcpiUtReadUint32 (&Descriptor->Memory32.Minimum),
-+ AcpiUtReadUint32 (&Descriptor->Memory32.Maximum),
-+ AcpiUtReadUint32 (&Descriptor->Memory32.AddressLength),
-+ AcpiUtReadUint32 (&Descriptor->Memory32.Alignment),
- MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
-
- return (Rnode);
-@@ -352,6 +365,8 @@ RsDoMemory32FixedDescriptor (
- ASL_RESOURCE_NODE *Rnode;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -360,7 +375,8 @@ RsDoMemory32FixedDescriptor (
-
- Descriptor = Rnode->Buffer;
- Descriptor->FixedMemory32.DescriptorType = ACPI_RESOURCE_NAME_FIXED_MEMORY32;
-- Descriptor->FixedMemory32.ResourceLength = 9;
-+ Tmp16 = 9;
-+ Descriptor->FixedMemory32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-
- /* Process all child initialization nodes */
-
-@@ -377,14 +393,16 @@ RsDoMemory32FixedDescriptor (
-
- case 1: /* Address */
-
-- Descriptor->FixedMemory32.Address = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->FixedMemory32.Address = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_BASEADDRESS,
- CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.Address));
- break;
-
- case 2: /* Length */
-
-- Descriptor->FixedMemory32.AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->FixedMemory32.AddressLength = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
- break;
-Index: acpica-unix2-20220331/source/compiler/aslrestype1i.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype1i.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype1i.c
-@@ -199,6 +199,7 @@ RsDoFixedDmaDescriptor (
- ASL_RESOURCE_NODE *Rnode;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -217,14 +218,16 @@ RsDoFixedDmaDescriptor (
- {
- case 0: /* DMA Request Lines [WORD] (_DMA) */
-
-- Descriptor->FixedDma.RequestLines = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->FixedDma.RequestLines = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_DMA,
- CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.RequestLines));
- break;
-
- case 1: /* DMA Channel [WORD] (_TYP) */
-
-- Descriptor->FixedDma.Channels = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->FixedDma.Channels = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_DMATYPE,
- CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.Channels));
- break;
-@@ -275,6 +278,7 @@ RsDoFixedIoDescriptor (
- ASL_RESOURCE_NODE *Rnode;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -293,8 +297,8 @@ RsDoFixedIoDescriptor (
- {
- case 0: /* Base Address */
-
-- Descriptor->FixedIo.Address =
-- (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->FixedIo.Address = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_BASEADDRESS,
- CurrentByteOffset + ASL_RESDESC_OFFSET (FixedIo.Address));
- AddressOp = InitializerOp;
-@@ -324,7 +328,7 @@ RsDoFixedIoDescriptor (
-
- /* Error checks */
-
-- if (Descriptor->FixedIo.Address > 0x03FF)
-+ if (AcpiUtReadUint16 (&Descriptor->FixedIo.Address) > 0x03FF)
- {
- AslError (ASL_WARNING, ASL_MSG_ISA_ADDRESS, AddressOp, NULL);
- }
-@@ -358,6 +362,7 @@ RsDoIoDescriptor (
- ASL_RESOURCE_NODE *Rnode;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -383,8 +388,8 @@ RsDoIoDescriptor (
-
- case 1: /* Min Address */
-
-- Descriptor->Io.Minimum =
-- (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Io.Minimum = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Minimum));
- MinOp = InitializerOp;
-@@ -392,8 +397,8 @@ RsDoIoDescriptor (
-
- case 2: /* Max Address */
-
-- Descriptor->Io.Maximum =
-- (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Io.Maximum = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Maximum));
- MaxOp = InitializerOp;
-@@ -434,10 +439,10 @@ RsDoIoDescriptor (
- /* Validate the Min/Max/Len/Align values */
-
- RsSmallAddressCheck (ACPI_RESOURCE_NAME_IO,
-- Descriptor->Io.Minimum,
-- Descriptor->Io.Maximum,
-- Descriptor->Io.AddressLength,
-- Descriptor->Io.Alignment,
-+ (UINT32) (AcpiUtReadUint16 (&Descriptor->Io.Minimum)),
-+ (UINT32) (AcpiUtReadUint16 (&Descriptor->Io.Maximum)),
-+ (UINT32) Descriptor->Io.AddressLength,
-+ (UINT32) Descriptor->Io.Alignment,
- MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
-
- return (Rnode);
-@@ -561,7 +566,7 @@ RsDoIrqDescriptor (
-
- /* Now we can set the channel mask */
-
-- Descriptor->Irq.IrqMask = IrqMask;
-+ Descriptor->Irq.IrqMask = AcpiUtReadUint16 (&IrqMask);
- return (Rnode);
- }
-
-@@ -660,6 +665,6 @@ RsDoIrqNoFlagsDescriptor (
-
- /* Now we can set the interrupt mask */
-
-- Descriptor->Irq.IrqMask = IrqMask;
-+ Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask);
- return (Rnode);
- }
-Index: acpica-unix2-20220331/source/compiler/aslrestype2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype2.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype2.c
-@@ -77,6 +77,8 @@ RsDoGeneralRegisterDescriptor (
- ASL_RESOURCE_NODE *Rnode;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-+ UINT64 Tmp64;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -85,7 +87,8 @@ RsDoGeneralRegisterDescriptor (
-
- Descriptor = Rnode->Buffer;
- Descriptor->GenericReg.DescriptorType = ACPI_RESOURCE_NAME_GENERIC_REGISTER;
-- Descriptor->GenericReg.ResourceLength = 12;
-+ Tmp16 = 12;
-+ Descriptor->GenericReg.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-
- /* Process all child initialization nodes */
-
-@@ -116,7 +119,8 @@ RsDoGeneralRegisterDescriptor (
-
- case 3: /* Register Address */
-
-- Descriptor->GenericReg.Address = InitializerOp->Asl.Value.Integer;
-+ Tmp64 = InitializerOp->Asl.Value.Integer;
-+ Descriptor->GenericReg.Address = AcpiUtReadUint64 (&Tmp64);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_ADDRESS,
- CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.Address));
- break;
-@@ -184,6 +188,8 @@ RsDoInterruptDescriptor (
- BOOLEAN HasResSourceIndex = FALSE;
- UINT8 ResSourceIndex = 0;
- UINT8 *ResSourceString = NULL;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -225,7 +231,7 @@ RsDoInterruptDescriptor (
- * Initial descriptor length -- may be enlarged if there are
- * optional fields present
- */
-- Descriptor->ExtendedIrq.ResourceLength = 2; /* Flags and table length byte */
-+ Descriptor->ExtendedIrq.ResourceLength = 2; /* Flags and table length byte */
- Descriptor->ExtendedIrq.InterruptCount = 0;
-
- Rover = ACPI_CAST_PTR (AML_RESOURCE,
-@@ -333,7 +339,8 @@ RsDoInterruptDescriptor (
-
- /* Save the integer and move pointer to the next one */
-
-- Rover->DwordItem = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Rover->DwordItem = AcpiUtReadUint32 (&Tmp32);
- Rover = ACPI_ADD_PTR (AML_RESOURCE, &(Rover->DwordItem), 4);
- Descriptor->ExtendedIrq.InterruptCount++;
- Descriptor->ExtendedIrq.ResourceLength += 4;
-@@ -384,6 +391,8 @@ RsDoInterruptDescriptor (
- Descriptor->ExtendedIrq.ResourceLength = (UINT16)
- (Descriptor->ExtendedIrq.ResourceLength + StringLength);
- }
-+ Tmp16 = Descriptor->ExtendedIrq.ResourceLength;
-+ Descriptor->ExtendedIrq.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-
- Rnode->BufferLength =
- (ASL_RESDESC_OFFSET (ExtendedIrq.Interrupts[0]) -
-@@ -436,7 +445,8 @@ RsDoVendorLargeDescriptor (
-
- Descriptor = Rnode->Buffer;
- Descriptor->VendorLarge.DescriptorType = ACPI_RESOURCE_NAME_VENDOR_LARGE;
-- Descriptor->VendorLarge.ResourceLength = (UINT16) i;
-+ AcpiUtWriteUint (&Descriptor->VendorLarge.ResourceLength, sizeof (UINT16),
-+ &i, sizeof (UINT32));
-
- /* Point to end-of-descriptor for vendor data */
-
-Index: acpica-unix2-20220331/source/compiler/aslrestype2d.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype2d.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype2d.c
-@@ -84,6 +84,8 @@ RsDoDwordIoDescriptor (
- UINT32 CurrentByteOffset;
- UINT32 i;
- BOOLEAN ResSourceIndex = FALSE;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -147,8 +149,8 @@ RsDoDwordIoDescriptor (
-
- case 5: /* Address Granularity */
-
-- Descriptor->Address32.Granularity =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.Granularity = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
- GranOp = InitializerOp;
-@@ -156,8 +158,8 @@ RsDoDwordIoDescriptor (
-
- case 6: /* Address Min */
-
-- Descriptor->Address32.Minimum =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.Minimum = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
- MinOp = InitializerOp;
-@@ -165,8 +167,8 @@ RsDoDwordIoDescriptor (
-
- case 7: /* Address Max */
-
-- Descriptor->Address32.Maximum =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.Maximum = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
- MaxOp = InitializerOp;
-@@ -174,16 +176,16 @@ RsDoDwordIoDescriptor (
-
- case 8: /* Translation Offset */
-
-- Descriptor->Address32.TranslationOffset =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.TranslationOffset = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
- break;
-
- case 9: /* Address Length */
-
-- Descriptor->Address32.AddressLength =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.AddressLength = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
- LengthOp = InitializerOp;
-@@ -271,11 +273,14 @@ RsDoDwordIoDescriptor (
-
- /* Validate the Min/Max/Len/Gran values */
-
-+ Tmp16 = Descriptor->Address32.ResourceLength;
-+ Descriptor->Address32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
- RsLargeAddressCheck (
-- (UINT64) Descriptor->Address32.Minimum,
-- (UINT64) Descriptor->Address32.Maximum,
-- (UINT64) Descriptor->Address32.AddressLength,
-- (UINT64) Descriptor->Address32.Granularity,
-+ (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Minimum),
-+ (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Maximum),
-+ (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.AddressLength),
-+ (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Granularity),
- Descriptor->Address32.Flags,
- MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-
-@@ -314,6 +319,8 @@ RsDoDwordMemoryDescriptor (
- UINT32 CurrentByteOffset;
- UINT32 i;
- BOOLEAN ResSourceIndex = FALSE;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -385,8 +392,8 @@ RsDoDwordMemoryDescriptor (
-
- case 6: /* Address Granularity */
-
-- Descriptor->Address32.Granularity =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.Granularity = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
- GranOp = InitializerOp;
-@@ -394,8 +401,8 @@ RsDoDwordMemoryDescriptor (
-
- case 7: /* Min Address */
-
-- Descriptor->Address32.Minimum =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.Minimum = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
- MinOp = InitializerOp;
-@@ -403,8 +410,8 @@ RsDoDwordMemoryDescriptor (
-
- case 8: /* Max Address */
-
-- Descriptor->Address32.Maximum =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.Maximum = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
- MaxOp = InitializerOp;
-@@ -412,16 +419,16 @@ RsDoDwordMemoryDescriptor (
-
- case 9: /* Translation Offset */
-
-- Descriptor->Address32.TranslationOffset =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.TranslationOffset = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
- break;
-
- case 10: /* Address Length */
-
-- Descriptor->Address32.AddressLength =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.AddressLength = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
- LengthOp = InitializerOp;
-@@ -506,11 +513,14 @@ RsDoDwordMemoryDescriptor (
-
- /* Validate the Min/Max/Len/Gran values */
-
-+ Tmp16 = Descriptor->Address32.ResourceLength;
-+ Descriptor->Address32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
- RsLargeAddressCheck (
-- (UINT64) Descriptor->Address32.Minimum,
-- (UINT64) Descriptor->Address32.Maximum,
-- (UINT64) Descriptor->Address32.AddressLength,
-- (UINT64) Descriptor->Address32.Granularity,
-+ (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Minimum),
-+ (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Maximum),
-+ (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.AddressLength),
-+ (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Granularity),
- Descriptor->Address32.Flags,
- MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-
-@@ -549,6 +559,8 @@ RsDoDwordSpaceDescriptor (
- UINT32 CurrentByteOffset;
- UINT32 i;
- BOOLEAN ResSourceIndex = FALSE;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -616,8 +628,8 @@ RsDoDwordSpaceDescriptor (
-
- case 6: /* Address Granularity */
-
-- Descriptor->Address32.Granularity =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.Granularity = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
- GranOp = InitializerOp;
-@@ -625,8 +637,8 @@ RsDoDwordSpaceDescriptor (
-
- case 7: /* Min Address */
-
-- Descriptor->Address32.Minimum =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.Minimum = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
- MinOp = InitializerOp;
-@@ -634,8 +646,8 @@ RsDoDwordSpaceDescriptor (
-
- case 8: /* Max Address */
-
-- Descriptor->Address32.Maximum =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.Maximum = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
- MaxOp = InitializerOp;
-@@ -643,16 +655,16 @@ RsDoDwordSpaceDescriptor (
-
- case 9: /* Translation Offset */
-
-- Descriptor->Address32.TranslationOffset =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.TranslationOffset = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
- break;
-
- case 10: /* Address Length */
-
-- Descriptor->Address32.AddressLength =
-- (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address32.AddressLength = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
- LengthOp = InitializerOp;
-@@ -723,11 +735,14 @@ RsDoDwordSpaceDescriptor (
-
- /* Validate the Min/Max/Len/Gran values */
-
-+ Tmp16 = Descriptor->Address32.ResourceLength;
-+ Descriptor->Address32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
- RsLargeAddressCheck (
-- (UINT64) Descriptor->Address32.Minimum,
-- (UINT64) Descriptor->Address32.Maximum,
-- (UINT64) Descriptor->Address32.AddressLength,
-- (UINT64) Descriptor->Address32.Granularity,
-+ (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Minimum),
-+ (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Maximum),
-+ (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.AddressLength),
-+ (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Granularity),
- Descriptor->Address32.Flags,
- MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-
-Index: acpica-unix2-20220331/source/compiler/aslrestype2q.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype2q.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype2q.c
-@@ -84,6 +84,7 @@ RsDoQwordIoDescriptor (
- UINT32 CurrentByteOffset;
- UINT32 i;
- BOOLEAN ResSourceIndex = FALSE;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -147,7 +148,8 @@ RsDoQwordIoDescriptor (
-
- case 5: /* Address Granularity */
-
-- Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.Granularity =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
- GranOp = InitializerOp;
-@@ -155,7 +157,8 @@ RsDoQwordIoDescriptor (
-
- case 6: /* Address Min */
-
-- Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.Minimum =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
- MinOp = InitializerOp;
-@@ -163,7 +166,8 @@ RsDoQwordIoDescriptor (
-
- case 7: /* Address Max */
-
-- Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.Maximum =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
- MaxOp = InitializerOp;
-@@ -171,14 +175,16 @@ RsDoQwordIoDescriptor (
-
- case 8: /* Translation Offset */
-
-- Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.TranslationOffset =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateByteField (InitializerOp, ACPI_RESTAG_TRANSLATION,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
- break;
-
- case 9: /* Address Length */
-
-- Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.AddressLength =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
- LengthOp = InitializerOp;
-@@ -262,11 +268,14 @@ RsDoQwordIoDescriptor (
-
- /* Validate the Min/Max/Len/Gran values */
-
-+ Tmp16 = Descriptor->Address64.ResourceLength;
-+ Descriptor->Address64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
- RsLargeAddressCheck (
-- Descriptor->Address64.Minimum,
-- Descriptor->Address64.Maximum,
-- Descriptor->Address64.AddressLength,
-- Descriptor->Address64.Granularity,
-+ AcpiUtReadUint64 (&Descriptor->Address64.Minimum),
-+ AcpiUtReadUint64 (&Descriptor->Address64.Maximum),
-+ AcpiUtReadUint64 (&Descriptor->Address64.AddressLength),
-+ AcpiUtReadUint64 (&Descriptor->Address64.Granularity),
- Descriptor->Address64.Flags,
- MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-
-@@ -305,6 +314,7 @@ RsDoQwordMemoryDescriptor (
- UINT32 CurrentByteOffset;
- UINT32 i;
- BOOLEAN ResSourceIndex = FALSE;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -375,7 +385,8 @@ RsDoQwordMemoryDescriptor (
-
- case 6: /* Address Granularity */
-
-- Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.Granularity =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
- GranOp = InitializerOp;
-@@ -383,7 +394,8 @@ RsDoQwordMemoryDescriptor (
-
- case 7: /* Min Address */
-
-- Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.Minimum =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
- MinOp = InitializerOp;
-@@ -391,7 +403,8 @@ RsDoQwordMemoryDescriptor (
-
- case 8: /* Max Address */
-
-- Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.Maximum =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
- MaxOp = InitializerOp;
-@@ -399,14 +412,16 @@ RsDoQwordMemoryDescriptor (
-
- case 9: /* Translation Offset */
-
-- Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.TranslationOffset =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
- break;
-
- case 10: /* Address Length */
-
-- Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.AddressLength =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
- LengthOp = InitializerOp;
-@@ -491,11 +506,14 @@ RsDoQwordMemoryDescriptor (
-
- /* Validate the Min/Max/Len/Gran values */
-
-+ Tmp16 = Descriptor->Address64.ResourceLength;
-+ Descriptor->Address64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
- RsLargeAddressCheck (
-- Descriptor->Address64.Minimum,
-- Descriptor->Address64.Maximum,
-- Descriptor->Address64.AddressLength,
-- Descriptor->Address64.Granularity,
-+ AcpiUtReadUint64 (&Descriptor->Address64.Minimum),
-+ AcpiUtReadUint64 (&Descriptor->Address64.Maximum),
-+ AcpiUtReadUint64 (&Descriptor->Address64.AddressLength),
-+ AcpiUtReadUint64 (&Descriptor->Address64.Granularity),
- Descriptor->Address64.Flags,
- MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-
-@@ -534,6 +552,7 @@ RsDoQwordSpaceDescriptor (
- UINT32 CurrentByteOffset;
- UINT32 i;
- BOOLEAN ResSourceIndex = FALSE;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -601,7 +620,8 @@ RsDoQwordSpaceDescriptor (
-
- case 6: /* Address Granularity */
-
-- Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.Granularity =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
- GranOp = InitializerOp;
-@@ -609,7 +629,8 @@ RsDoQwordSpaceDescriptor (
-
- case 7: /* Min Address */
-
-- Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.Minimum =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
- MinOp = InitializerOp;
-@@ -617,7 +638,8 @@ RsDoQwordSpaceDescriptor (
-
- case 8: /* Max Address */
-
-- Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.Maximum =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
- MaxOp = InitializerOp;
-@@ -625,14 +647,16 @@ RsDoQwordSpaceDescriptor (
-
- case 9: /* Translation Offset */
-
-- Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.TranslationOffset =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
- break;
-
- case 10: /* Address Length */
-
-- Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address64.AddressLength =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
- LengthOp = InitializerOp;
-@@ -702,11 +726,14 @@ RsDoQwordSpaceDescriptor (
-
- /* Validate the Min/Max/Len/Gran values */
-
-+ Tmp16 = Descriptor->Address64.ResourceLength;
-+ Descriptor->Address64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
- RsLargeAddressCheck (
-- Descriptor->Address64.Minimum,
-- Descriptor->Address64.Maximum,
-- Descriptor->Address64.AddressLength,
-- Descriptor->Address64.Granularity,
-+ AcpiUtReadUint64 (&Descriptor->Address64.Minimum),
-+ AcpiUtReadUint64 (&Descriptor->Address64.Maximum),
-+ AcpiUtReadUint64 (&Descriptor->Address64.AddressLength),
-+ AcpiUtReadUint64 (&Descriptor->Address64.Granularity),
- Descriptor->Address64.Flags,
- MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-
-Index: acpica-unix2-20220331/source/compiler/aslrestype2w.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype2w.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype2w.c
-@@ -84,6 +84,7 @@ RsDoWordIoDescriptor (
- UINT32 CurrentByteOffset;
- UINT32 i;
- BOOLEAN ResSourceIndex = FALSE;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -147,7 +148,8 @@ RsDoWordIoDescriptor (
-
- case 5: /* Address Granularity */
-
-- Descriptor->Address16.Granularity = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.Granularity = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
- GranOp = InitializerOp;
-@@ -155,7 +157,8 @@ RsDoWordIoDescriptor (
-
- case 6: /* Address Min */
-
-- Descriptor->Address16.Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.Minimum = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
- MinOp = InitializerOp;
-@@ -163,7 +166,8 @@ RsDoWordIoDescriptor (
-
- case 7: /* Address Max */
-
-- Descriptor->Address16.Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.Maximum = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
- MaxOp = InitializerOp;
-@@ -171,14 +175,16 @@ RsDoWordIoDescriptor (
-
- case 8: /* Translation Offset */
-
-- Descriptor->Address16.TranslationOffset = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.TranslationOffset = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
- break;
-
- case 9: /* Address Length */
-
-- Descriptor->Address16.AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.AddressLength = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
- LengthOp = InitializerOp;
-@@ -263,13 +269,17 @@ RsDoWordIoDescriptor (
- /* Validate the Min/Max/Len/Gran values */
-
- RsLargeAddressCheck (
-- (UINT64) Descriptor->Address16.Minimum,
-- (UINT64) Descriptor->Address16.Maximum,
-- (UINT64) Descriptor->Address16.AddressLength,
-- (UINT64) Descriptor->Address16.Granularity,
-+ (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Minimum),
-+ (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Maximum),
-+ (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.AddressLength),
-+ (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Granularity),
- Descriptor->Address16.Flags,
- MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-
-+ /* correct enddianness */
-+ Tmp16 = Descriptor->Address16.ResourceLength;
-+ Descriptor->Address16.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
- Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
- OptionIndex + StringLength;
- return (Rnode);
-@@ -305,6 +315,7 @@ RsDoWordBusNumberDescriptor (
- UINT32 CurrentByteOffset;
- UINT32 i;
- BOOLEAN ResSourceIndex = FALSE;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -361,8 +372,8 @@ RsDoWordBusNumberDescriptor (
-
- case 4: /* Address Granularity */
-
-- Descriptor->Address16.Granularity =
-- (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.Granularity = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
- GranOp = InitializerOp;
-@@ -370,8 +381,8 @@ RsDoWordBusNumberDescriptor (
-
- case 5: /* Min Address */
-
-- Descriptor->Address16.Minimum =
-- (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.Minimum = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
- MinOp = InitializerOp;
-@@ -379,8 +390,8 @@ RsDoWordBusNumberDescriptor (
-
- case 6: /* Max Address */
-
-- Descriptor->Address16.Maximum =
-- (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.Maximum = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
- MaxOp = InitializerOp;
-@@ -388,16 +399,16 @@ RsDoWordBusNumberDescriptor (
-
- case 7: /* Translation Offset */
-
-- Descriptor->Address16.TranslationOffset =
-- (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.TranslationOffset = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
- break;
-
- case 8: /* Address Length */
-
-- Descriptor->Address16.AddressLength =
-- (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.AddressLength = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
- LengthOp = InitializerOp;
-@@ -468,13 +479,17 @@ RsDoWordBusNumberDescriptor (
- /* Validate the Min/Max/Len/Gran values */
-
- RsLargeAddressCheck (
-- (UINT64) Descriptor->Address16.Minimum,
-- (UINT64) Descriptor->Address16.Maximum,
-- (UINT64) Descriptor->Address16.AddressLength,
-- (UINT64) Descriptor->Address16.Granularity,
-+ (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Minimum),
-+ (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Maximum),
-+ (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.AddressLength),
-+ (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Granularity),
- Descriptor->Address16.Flags,
- MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-
-+ /* correct enddianness */
-+ Tmp16 = Descriptor->Address16.ResourceLength;
-+ Descriptor->Address16.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
- Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
- OptionIndex + StringLength;
- return (Rnode);
-@@ -510,6 +525,7 @@ RsDoWordSpaceDescriptor (
- UINT32 CurrentByteOffset;
- UINT32 i;
- BOOLEAN ResSourceIndex = FALSE;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -577,8 +593,8 @@ RsDoWordSpaceDescriptor (
-
- case 6: /* Address Granularity */
-
-- Descriptor->Address16.Granularity =
-- (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.Granularity = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
- GranOp = InitializerOp;
-@@ -586,8 +602,8 @@ RsDoWordSpaceDescriptor (
-
- case 7: /* Min Address */
-
-- Descriptor->Address16.Minimum =
-- (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.Minimum = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
- MinOp = InitializerOp;
-@@ -595,8 +611,8 @@ RsDoWordSpaceDescriptor (
-
- case 8: /* Max Address */
-
-- Descriptor->Address16.Maximum =
-- (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.Maximum = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
- MaxOp = InitializerOp;
-@@ -604,16 +620,16 @@ RsDoWordSpaceDescriptor (
-
- case 9: /* Translation Offset */
-
-- Descriptor->Address16.TranslationOffset =
-- (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.TranslationOffset = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
- break;
-
- case 10: /* Address Length */
-
-- Descriptor->Address16.AddressLength =
-- (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->Address16.AddressLength = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
- LengthOp = InitializerOp;
-@@ -684,13 +700,17 @@ RsDoWordSpaceDescriptor (
- /* Validate the Min/Max/Len/Gran values */
-
- RsLargeAddressCheck (
-- (UINT64) Descriptor->Address16.Minimum,
-- (UINT64) Descriptor->Address16.Maximum,
-- (UINT64) Descriptor->Address16.AddressLength,
-- (UINT64) Descriptor->Address16.Granularity,
-+ (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Minimum),
-+ (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Maximum),
-+ (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.AddressLength),
-+ (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Granularity),
- Descriptor->Address16.Flags,
- MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-
-+ /* correct enddianness */
-+ Tmp16 = Descriptor->Address16.ResourceLength;
-+ Descriptor->Address16.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
- Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
- OptionIndex + StringLength;
- return (Rnode);
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -3046,7 +3046,8 @@ DtCompileWpbt (
-
- /* Extract the length of the Arguments buffer, insert into main table */
-
-- Table->ArgumentsLength = (UINT16) Subtable->TotalLength;
-+ AcpiUtWriteUint (&Table->ArgumentsLength, sizeof (UINT16),
-+ &Subtable->TotalLength, sizeof (UINT32));
- DtInsertSubtable (ParentTable, Subtable);
- return (AE_OK);
- }
-Index: acpica-unix2-20220331/source/components/disassembler/dmbuffer.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix2-20220331/source/components/disassembler/dmbuffer.c
-@@ -204,7 +204,7 @@ AcpiDmByteList (
-
-
- ByteData = Op->Named.Data;
-- ByteCount = (UINT32) Op->Common.Value.Integer;
-+ ByteCount = (UINT32) Op->Common.Value.Size;
-
- /*
- * The byte list belongs to a buffer, and can be produced by either
-@@ -308,7 +308,7 @@ AcpiDmIsUuidBuffer (
- /* Extract the byte list info */
-
- ByteData = NextOp->Named.Data;
-- ByteCount = (UINT32) NextOp->Common.Value.Integer;
-+ ByteCount = (UINT32) NextOp->Common.Value.Size;
-
- /* Byte count must be exactly 16 */
-
-@@ -436,7 +436,7 @@ AcpiDmIsUnicodeBuffer (
- /* Extract the byte list info */
-
- ByteData = NextOp->Named.Data;
-- ByteCount = (UINT32) NextOp->Common.Value.Integer;
-+ ByteCount = (UINT32) NextOp->Common.Value.Size;
- WordCount = ACPI_DIV_2 (ByteCount);
-
- /*
-@@ -878,14 +878,14 @@ AcpiDmUnicode (
- /* Extract the buffer info as a WORD buffer */
-
- WordData = ACPI_CAST_PTR (UINT16, Op->Named.Data);
-- WordCount = ACPI_DIV_2 (((UINT32) Op->Common.Value.Integer));
-+ WordCount = ACPI_DIV_2 (((UINT32) Op->Common.Value.Size));
-
- /* Write every other byte as an ASCII character */
-
- AcpiOsPrintf ("\"");
- for (i = 0; i < (WordCount - 1); i++)
- {
-- OutputValue = (int) WordData[i];
-+ OutputValue = (int) AcpiUtReadUint16 (&WordData[i]);
-
- /* Handle values that must be escaped */
-
-@@ -947,7 +947,29 @@ AcpiDmGetHardwareIdType (
-
- /* Swap from little-endian to big-endian to simplify conversion */
-
-- BigEndianId = AcpiUtDwordByteSwap ((UINT32) Op->Common.Value.Integer);
-+ BigEndianId = (UINT32) Op->Common.Value.Integer;
-+ if (UtIsBigEndianMachine())
-+ {
-+ /*
-+ * We'll need to store the bytes in little-endian order
-+ * so they can be re-used properly later since everything is
-+ * assumed to be in little-endian form.
-+ */
-+
-+ UINT32 *Ptr = (UINT32 *)(&Op->Common.Value.Integer);
-+ *Ptr = AcpiUtDwordByteSwap (BigEndianId);
-+ }
-+ else
-+ {
-+ /*
-+ * We'll need to just use the bytes in big-endian order;
-+ * they're already in little-endian order.
-+ */
-+
-+ UINT32 Tmp32 = BigEndianId;
-+
-+ BigEndianId = AcpiUtDwordByteSwap ((UINT32) Tmp32);
-+ }
-
- /* Create the 3 leading ASCII letters */
-
-@@ -1073,11 +1095,12 @@ AcpiDmDecompressEisaId (
- {
- char IdBuffer[ACPI_EISAID_STRING_SIZE];
- const AH_DEVICE_ID *Info;
-+ UINT32 Tmp32 = EncodedId;
-
-
- /* Convert EISAID to a string an emit the statement */
-
-- AcpiExEisaIdToString (IdBuffer, EncodedId);
-+ AcpiExEisaIdToString (IdBuffer, AcpiUtReadUint32 (&Tmp32));
- AcpiOsPrintf ("EisaId (\"%s\")", IdBuffer);
-
- /* If we know about the ID, emit the description */
-Index: acpica-unix2-20220331/source/components/disassembler/dmopcode.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/disassembler/dmopcode.c
-+++ acpica-unix2-20220331/source/components/disassembler/dmopcode.c
-@@ -778,7 +778,9 @@ AcpiDmDisassembleOneOp (
- }
- else
- {
-- AcpiOsPrintf ("0x%4.4X", (UINT32) Op->Common.Value.Integer);
-+ UINT16 Tmp16 = (UINT16) Op->Common.Value.Integer;
-+
-+ AcpiOsPrintf ("0x%4.4X", (UINT32) AcpiUtReadUint16 (&Tmp16));
- }
- break;
-
-@@ -790,14 +792,19 @@ AcpiDmDisassembleOneOp (
- }
- else
- {
-- AcpiOsPrintf ("0x%8.8X", (UINT32) Op->Common.Value.Integer);
-+ UINT32 Tmp32 = (UINT32) Op->Common.Value.Integer;
-+
-+ AcpiOsPrintf ("0x%8.8X", (UINT32) AcpiUtReadUint32 (&Tmp32));
- }
- break;
-
- case AML_QWORD_OP:
-
-- AcpiOsPrintf ("0x%8.8X%8.8X",
-- ACPI_FORMAT_UINT64 (Op->Common.Value.Integer));
-+ {
-+ UINT64 Tmp64 = AcpiUtReadUint64 (&Op->Common.Value.Integer);
-+
-+ AcpiOsPrintf ("0x%8.8X%8.8X", ACPI_FORMAT_UINT64 (Tmp64));
-+ }
- break;
-
- case AML_STRING_OP:
-@@ -887,18 +894,18 @@ AcpiDmDisassembleOneOp (
- AcpiOsPrintf (",");
- ASL_CV_PRINT_ONE_COMMENT (Op, AML_NAMECOMMENT, NULL, 0);
- AcpiOsPrintf ("%*.s %u", (unsigned) (5 - Length), " ",
-- (UINT32) Op->Common.Value.Integer);
-+ (UINT32) Op->Common.Value.Size);
-
- AcpiDmCommaIfFieldMember (Op);
-
-- Info->BitOffset += (UINT32) Op->Common.Value.Integer;
-+ Info->BitOffset += (UINT32) Op->Common.Value.Size;
- break;
-
- case AML_INT_RESERVEDFIELD_OP:
-
- /* Offset() -- Must account for previous offsets */
-
-- Offset = (UINT32) Op->Common.Value.Integer;
-+ Offset = (UINT32) Op->Common.Value.Size;
- Info->BitOffset += Offset;
-
- if (Info->BitOffset % 8 == 0)
-Index: acpica-unix2-20220331/source/components/disassembler/dmresrc.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/disassembler/dmresrc.c
-+++ acpica-unix2-20220331/source/components/disassembler/dmresrc.c
-@@ -417,7 +417,7 @@ AcpiDmIsResourceTemplate (
- return (AE_TYPE);
- }
-
-- DeclaredBufferLength = NextOp->Common.Value.Size;
-+ DeclaredBufferLength = NextOp->Common.Value.Integer;
-
- /* Get the length of the raw initialization byte list */
-
-Index: acpica-unix2-20220331/source/components/disassembler/dmresrcl.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/disassembler/dmresrcl.c
-+++ acpica-unix2-20220331/source/components/disassembler/dmresrcl.c
-@@ -141,6 +141,8 @@ AcpiDmMemoryFields (
- UINT32 Level)
- {
- UINT32 i;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
-
- for (i = 0; i < 4; i++)
-@@ -151,14 +153,16 @@ AcpiDmMemoryFields (
- {
- case 16:
-
-- AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i],
-- AcpiDmMemoryNames[i]);
-+ Tmp16 = ACPI_CAST_PTR (UINT16, Source)[i];
-+ AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Tmp16),
-+ AcpiDmMemoryNames[i]);
- break;
-
- case 32:
-
-- AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i],
-- AcpiDmMemoryNames[i]);
-+ Tmp32 = ACPI_CAST_PTR (UINT32, Source)[i];
-+ AcpiDmDumpInteger32 (AcpiUtReadUint32 (&Tmp32),
-+ AcpiDmMemoryNames[i]);
- break;
-
- default:
-@@ -190,6 +194,9 @@ AcpiDmAddressFields (
- UINT32 Level)
- {
- UINT32 i;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-+ UINT64 Tmp64;
-
-
- AcpiOsPrintf ("\n");
-@@ -202,20 +209,23 @@ AcpiDmAddressFields (
- {
- case 16:
-
-- AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i],
-- AcpiDmAddressNames[i]);
-+ Tmp16 = ACPI_CAST_PTR (UINT16, Source)[i];
-+ AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Tmp16),
-+ AcpiDmAddressNames[i]);
- break;
-
- case 32:
-
-- AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i],
-- AcpiDmAddressNames[i]);
-+ Tmp32 = ACPI_CAST_PTR (UINT32, Source)[i];
-+ AcpiDmDumpInteger32 (AcpiUtReadUint32 (&Tmp32),
-+ AcpiDmAddressNames[i]);
- break;
-
- case 64:
-
-- AcpiDmDumpInteger64 (ACPI_CAST_PTR (UINT64, Source)[i],
-- AcpiDmAddressNames[i]);
-+ Tmp64 = ACPI_CAST_PTR (UINT64, Source)[i];
-+ AcpiDmDumpInteger64 (AcpiUtReadUint64 (&Tmp64),
-+ AcpiDmAddressNames[i]);
- break;
-
- default:
-@@ -749,7 +759,7 @@ AcpiDmExtendedDescriptor (
- /* Extra field for this descriptor only */
-
- AcpiDmIndent (Level + 1);
-- AcpiDmDumpInteger64 (Resource->ExtAddress64.TypeSpecific,
-+ AcpiDmDumpInteger64 (AcpiUtReadUint64 (&Resource->ExtAddress64.TypeSpecific),
- "Type-Specific Attributes");
-
- /* Insert a descriptor name */
-@@ -876,11 +886,11 @@ AcpiDmFixedMemory32Descriptor (
- AcpiGbl_RwDecode [ACPI_GET_1BIT_FLAG (Resource->FixedMemory32.Flags)]);
-
- AcpiDmIndent (Level + 1);
-- AcpiDmDumpInteger32 (Resource->FixedMemory32.Address,
-+ AcpiDmDumpInteger32 (AcpiUtReadUint32 (&Resource->FixedMemory32.Address),
- "Address Base");
-
- AcpiDmIndent (Level + 1);
-- AcpiDmDumpInteger32 (Resource->FixedMemory32.AddressLength,
-+ AcpiDmDumpInteger32 (AcpiUtReadUint32 (&Resource->FixedMemory32.AddressLength),
- "Address Length");
-
- /* Insert a descriptor name */
-@@ -926,7 +936,8 @@ AcpiDmGenericRegisterDescriptor (
- AcpiDmDumpInteger8 (Resource->GenericReg.BitOffset, "Bit Offset");
-
- AcpiDmIndent (Level + 1);
-- AcpiDmDumpInteger64 (Resource->GenericReg.Address, "Address");
-+ AcpiDmDumpInteger64 (AcpiUtReadUint64 (&Resource->GenericReg.Address),
-+ "Address");
-
- /* Optional field for ACPI 3.0 */
-
-@@ -989,7 +1000,7 @@ AcpiDmInterruptDescriptor (
- AcpiDmResourceSource (Resource,
- sizeof (AML_RESOURCE_EXTENDED_IRQ) +
- ((UINT32) Resource->ExtendedIrq.InterruptCount - 1) * sizeof (UINT32),
-- Resource->ExtendedIrq.ResourceLength);
-+ AcpiUtReadUint16 (&Resource->ExtendedIrq.ResourceLength));
-
- /* Insert a descriptor name */
-
-@@ -1004,7 +1015,7 @@ AcpiDmInterruptDescriptor (
- {
- AcpiDmIndent (Level + 1);
- AcpiOsPrintf ("0x%8.8X,\n",
-- (UINT32) Resource->ExtendedIrq.Interrupts[i]);
-+ AcpiUtReadUint32 (&Resource->ExtendedIrq.Interrupts[i]));
- }
-
- AcpiDmIndent (Level);
-Index: acpica-unix2-20220331/source/components/disassembler/dmresrcl2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/disassembler/dmresrcl2.c
-+++ acpica-unix2-20220331/source/components/disassembler/dmresrcl2.c
-@@ -199,22 +199,27 @@ AcpiDmGpioCommon (
- char *DeviceName = NULL;
- UINT32 PinCount;
- UINT32 i;
-+ UINT16 ResSourceOffset;
-+ UINT16 VendorOffset;
-+ UINT16 VendorLength;
-+ UINT16 Tmp16;
-
-
- /* ResourceSource, ResourceSourceIndex, ResourceType */
-
- AcpiDmIndent (Level + 1);
-- if (Resource->Gpio.ResSourceOffset)
-+ ResSourceOffset = AcpiUtReadUint16 (&Resource->Gpio.ResSourceOffset);
-+ if (ResSourceOffset)
- {
- DeviceName = ACPI_ADD_PTR (char,
-- Resource, Resource->Gpio.ResSourceOffset),
-+ Resource, ResSourceOffset),
- AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
- }
-
- AcpiOsPrintf (", ");
- AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.ResSourceIndex);
-- AcpiOsPrintf ("%s, ",
-- AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.Flags)]);
-+ Tmp16 = AcpiUtReadUint16 (&Resource->Gpio.Flags);
-+ AcpiOsPrintf ("%s, ", AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Tmp16)]);
-
- /* Insert a descriptor name */
-
-@@ -223,15 +228,15 @@ AcpiDmGpioCommon (
-
- /* Dump the vendor data */
-
-- if (Resource->Gpio.VendorOffset)
-+ VendorOffset = AcpiUtReadUint16 (&Resource->Gpio.VendorOffset);
-+ VendorLength = AcpiUtReadUint16 (&Resource->Gpio.VendorLength);
-+ if (VendorOffset)
- {
- AcpiOsPrintf ("\n");
- AcpiDmIndent (Level + 1);
-- VendorData = ACPI_ADD_PTR (UINT8, Resource,
-- Resource->Gpio.VendorOffset);
-+ VendorData = ACPI_ADD_PTR (UINT8, Resource, VendorOffset);
-
-- AcpiDmDumpRawDataBuffer (VendorData,
-- Resource->Gpio.VendorLength, Level);
-+ AcpiDmDumpRawDataBuffer (VendorData, VendorLength, Level);
- }
-
- AcpiOsPrintf (")\n");
-@@ -241,17 +246,17 @@ AcpiDmGpioCommon (
- AcpiDmIndent (Level + 1);
- AcpiOsPrintf ("{ // Pin list\n");
-
-- PinCount = ((UINT32) (Resource->Gpio.ResSourceOffset -
-- Resource->Gpio.PinTableOffset)) /
-- sizeof (UINT16);
-+ PinCount = (UINT32) AcpiUtReadUint16 (&Resource->Gpio.ResSourceOffset);
-+ PinCount -= (UINT32) AcpiUtReadUint16 (&Resource->Gpio.PinTableOffset);
-+ PinCount /= sizeof (UINT16);
-
- PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource,
-- Resource->Gpio.PinTableOffset);
-+ AcpiUtReadUint16 (&Resource->Gpio.PinTableOffset));
-
- for (i = 0; i < PinCount; i++)
- {
- AcpiDmIndent (Level + 2);
-- AcpiOsPrintf ("0x%4.4X%s\n", PinList[i],
-+ AcpiOsPrintf ("0x%4.4X%s\n", AcpiUtReadUint16 (&(PinList[i])),
- ((i + 1) < PinCount) ? "," : "");
- }
-
-@@ -285,16 +290,18 @@ AcpiDmGpioIntDescriptor (
- UINT32 Length,
- UINT32 Level)
- {
-+ UINT16 Tmp16;
-
- /* Dump the GpioInt-specific portion of the descriptor */
-
- /* EdgeLevel, ActiveLevel, Shared */
-
- AcpiDmIndent (Level);
-+ Tmp16 = AcpiUtReadUint16 (&Resource->Gpio.IntFlags);
- AcpiOsPrintf ("GpioInt (%s, %s, %s, ",
-- AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.IntFlags)],
-- AcpiGbl_LlDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 1)],
-- AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
-+ AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Tmp16)],
-+ AcpiGbl_LlDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 1)],
-+ AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 3)]);
-
- /* PinConfig, DebounceTimeout */
-
-@@ -307,7 +314,8 @@ AcpiDmGpioIntDescriptor (
- {
- AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.PinConfig);
- }
-- AcpiOsPrintf ("0x%4.4X,\n", Resource->Gpio.DebounceTimeout);
-+ AcpiOsPrintf ("0x%4.4X,\n",
-+ AcpiUtReadUint16 (&Resource->Gpio.DebounceTimeout));
-
- /* Dump the GpioInt/GpioIo common portion of the descriptor */
-
-@@ -337,14 +345,16 @@ AcpiDmGpioIoDescriptor (
- UINT32 Length,
- UINT32 Level)
- {
-+ UINT16 Tmp16;
-
- /* Dump the GpioIo-specific portion of the descriptor */
-
- /* Shared, PinConfig */
-
- AcpiDmIndent (Level);
-+ Tmp16 = AcpiUtReadUint16 (&Resource->Gpio.IntFlags);
- AcpiOsPrintf ("GpioIo (%s, ",
-- AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
-+ AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 3)]);
-
- if (Resource->Gpio.PinConfig <= 3)
- {
-@@ -358,10 +368,10 @@ AcpiDmGpioIoDescriptor (
-
- /* DebounceTimeout, DriveStrength, IoRestriction */
-
-- AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DebounceTimeout);
-- AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DriveStrength);
-- AcpiOsPrintf ("%s,\n",
-- AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Resource->Gpio.IntFlags)]);
-+ AcpiOsPrintf ("0x%4.4X, ", AcpiUtReadUint16 (&Resource->Gpio.DebounceTimeout));
-+ AcpiOsPrintf ("0x%4.4X, ", AcpiUtReadUint16 (&Resource->Gpio.DriveStrength));
-+ Tmp16 = AcpiUtReadUint16 (&Resource->Gpio.IntFlags);
-+ AcpiOsPrintf ("%s,\n", AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Tmp16)]);
-
- /* Dump the GpioInt/GpioIo common portion of the descriptor */
-
-@@ -442,6 +452,9 @@ AcpiDmPinFunctionDescriptor (
- char *DeviceName = NULL;
- UINT32 PinCount;
- UINT32 i;
-+ UINT16 ResSourceOffset;
-+ UINT16 VendorOffset;
-+ UINT16 VendorLength;
-
- AcpiDmIndent (Level);
- AcpiOsPrintf ("PinFunction (%s, ",
-@@ -459,12 +472,14 @@ AcpiDmPinFunctionDescriptor (
-
- /* FunctionNumber */
-
-- AcpiOsPrintf ("0x%4.4X, ", Resource->PinFunction.FunctionNumber);
-+ AcpiOsPrintf ("0x%4.4X, ",
-+ AcpiUtReadUint16 (&Resource->PinFunction.FunctionNumber));
-
-- if (Resource->PinFunction.ResSourceOffset)
-+ ResSourceOffset = AcpiUtReadUint16 (&Resource->PinFunction.ResSourceOffset);
-+ if (ResSourceOffset)
- {
- DeviceName = ACPI_ADD_PTR (char,
-- Resource, Resource->PinFunction.ResSourceOffset),
-+ Resource, ResSourceOffset),
- AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
- }
-
-@@ -484,15 +499,15 @@ AcpiDmPinFunctionDescriptor (
-
- /* Dump the vendor data */
-
-- if (Resource->PinFunction.VendorLength)
-+ VendorOffset = AcpiUtReadUint16 (&Resource->PinFunction.VendorOffset);
-+ VendorLength = AcpiUtReadUint16 (&Resource->PinFunction.VendorLength);
-+ if (VendorLength)
- {
- AcpiOsPrintf ("\n");
- AcpiDmIndent (Level + 1);
-- VendorData = ACPI_ADD_PTR (UINT8, Resource,
-- Resource->PinFunction.VendorOffset);
-+ VendorData = ACPI_ADD_PTR (UINT8, Resource, VendorOffset);
-
-- AcpiDmDumpRawDataBuffer (VendorData,
-- Resource->PinFunction.VendorLength, Level);
-+ AcpiDmDumpRawDataBuffer (VendorData, VendorLength, Level);
- }
-
- AcpiOsPrintf (")\n");
-@@ -503,17 +518,17 @@ AcpiDmPinFunctionDescriptor (
-
- AcpiOsPrintf ("{ // Pin list\n");
-
-- PinCount = ((UINT32) (Resource->PinFunction.ResSourceOffset -
-- Resource->PinFunction.PinTableOffset)) /
-- sizeof (UINT16);
-+ PinCount = AcpiUtReadUint16 (&Resource->PinFunction.ResSourceOffset);
-+ PinCount -= AcpiUtReadUint16 (&Resource->PinFunction.PinTableOffset);
-+ PinCount /= sizeof (UINT16);
-
- PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource,
-- Resource->PinFunction.PinTableOffset);
-+ AcpiUtReadUint16 (&Resource->PinFunction.PinTableOffset));
-
- for (i = 0; i < PinCount; i++)
- {
- AcpiDmIndent (Level + 2);
-- AcpiOsPrintf ("0x%4.4X%s\n", PinList[i],
-+ AcpiOsPrintf ("0x%4.4X%s\n", AcpiUtReadUint16 (&(PinList[i])),
- ((i + 1) < PinCount) ? "," : "");
- }
-
-@@ -549,7 +564,8 @@ AcpiDmDumpSerialBusVendorData (
- {
- case AML_RESOURCE_I2C_SERIALBUSTYPE:
-
-- VendorLength = Resource->CommonSerialBus.TypeDataLength -
-+ VendorLength =
-+ AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength) -
- AML_RESOURCE_I2C_MIN_DATA_LEN;
-
- VendorData = ACPI_ADD_PTR (UINT8, Resource,
-@@ -558,7 +574,8 @@ AcpiDmDumpSerialBusVendorData (
-
- case AML_RESOURCE_SPI_SERIALBUSTYPE:
-
-- VendorLength = Resource->CommonSerialBus.TypeDataLength -
-+ VendorLength =
-+ AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength) -
- AML_RESOURCE_SPI_MIN_DATA_LEN;
-
- VendorData = ACPI_ADD_PTR (UINT8, Resource,
-@@ -567,7 +584,8 @@ AcpiDmDumpSerialBusVendorData (
-
- case AML_RESOURCE_UART_SERIALBUSTYPE:
-
-- VendorLength = Resource->CommonSerialBus.TypeDataLength -
-+ VendorLength =
-+ AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength) -
- AML_RESOURCE_UART_MIN_DATA_LEN;
-
- VendorData = ACPI_ADD_PTR (UINT8, Resource,
-@@ -693,9 +711,9 @@ AcpiDmI2cSerialBusDescriptor (
-
- AcpiDmIndent (Level);
- AcpiOsPrintf ("I2cSerialBusV2 (0x%4.4X, %s, 0x%8.8X,\n",
-- Resource->I2cSerialBus.SlaveAddress,
-+ AcpiUtReadUint16 (&Resource->I2cSerialBus.SlaveAddress),
- AcpiGbl_SmDecode [ACPI_GET_1BIT_FLAG (Resource->I2cSerialBus.Flags)],
-- Resource->I2cSerialBus.ConnectionSpeed);
-+ AcpiUtReadUint32 (&Resource->I2cSerialBus.ConnectionSpeed));
-
- AcpiDmIndent (Level + 1);
- AcpiOsPrintf ("%s, ",
-@@ -704,7 +722,7 @@ AcpiDmI2cSerialBusDescriptor (
- /* ResourceSource is a required field */
-
- ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
-- Resource->CommonSerialBus.TypeDataLength;
-+ AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength);
-
- DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
- AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-@@ -761,15 +779,17 @@ AcpiDmSpiSerialBusDescriptor (
- {
- UINT32 ResourceSourceOffset;
- char *DeviceName;
-+ UINT16 Tmp16;
-
-
- /* DeviceSelection, DeviceSelectionPolarity, WireMode, DataBitLength */
-
- AcpiDmIndent (Level);
-+ Tmp16 = AcpiUtReadUint16 (&Resource->SpiSerialBus.TypeSpecificFlags);
- AcpiOsPrintf ("SpiSerialBusV2 (0x%4.4X, %s, %s, 0x%2.2X,\n",
-- Resource->SpiSerialBus.DeviceSelection,
-- AcpiGbl_DpDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->SpiSerialBus.TypeSpecificFlags, 1)],
-- AcpiGbl_WmDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.TypeSpecificFlags)],
-+ AcpiUtReadUint16 (&Resource->SpiSerialBus.DeviceSelection),
-+ AcpiGbl_DpDecode [ACPI_EXTRACT_1BIT_FLAG (Tmp16, 1)],
-+ AcpiGbl_WmDecode [ACPI_GET_1BIT_FLAG (Tmp16)],
- Resource->SpiSerialBus.DataBitLength);
-
- /* SlaveMode, ConnectionSpeed, ClockPolarity, ClockPhase */
-@@ -777,7 +797,7 @@ AcpiDmSpiSerialBusDescriptor (
- AcpiDmIndent (Level + 1);
- AcpiOsPrintf ("%s, 0x%8.8X, %s,\n",
- AcpiGbl_SmDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.Flags)],
-- Resource->SpiSerialBus.ConnectionSpeed,
-+ AcpiUtReadUint32 (&Resource->SpiSerialBus.ConnectionSpeed),
- AcpiGbl_CpoDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.ClockPolarity)]);
-
- AcpiDmIndent (Level + 1);
-@@ -787,7 +807,7 @@ AcpiDmSpiSerialBusDescriptor (
- /* ResourceSource is a required field */
-
- ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
-- Resource->CommonSerialBus.TypeDataLength;
-+ AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength);
-
- DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
- AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-@@ -844,15 +864,17 @@ AcpiDmUartSerialBusDescriptor (
- {
- UINT32 ResourceSourceOffset;
- char *DeviceName;
-+ UINT16 Tmp16;
-
-
- /* ConnectionSpeed, BitsPerByte, StopBits */
-
- AcpiDmIndent (Level);
-+ Tmp16 = AcpiUtReadUint16 (&Resource->UartSerialBus.TypeSpecificFlags);
- AcpiOsPrintf ("UartSerialBusV2 (0x%8.8X, %s, %s,\n",
-- Resource->UartSerialBus.DefaultBaudRate,
-- AcpiGbl_BpbDecode [ACPI_EXTRACT_3BIT_FLAG (Resource->UartSerialBus.TypeSpecificFlags, 4)],
-- AcpiGbl_SbDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->UartSerialBus.TypeSpecificFlags, 2)]);
-+ AcpiUtReadUint32 (&Resource->UartSerialBus.DefaultBaudRate),
-+ AcpiGbl_BpbDecode [ACPI_EXTRACT_3BIT_FLAG (Tmp16, 4)],
-+ AcpiGbl_SbDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 2)]);
-
- /* LinesInUse, IsBigEndian, Parity, FlowControl */
-
-@@ -867,13 +889,13 @@ AcpiDmUartSerialBusDescriptor (
-
- AcpiDmIndent (Level + 1);
- AcpiOsPrintf ("0x%4.4X, 0x%4.4X, ",
-- Resource->UartSerialBus.RxFifoSize,
-- Resource->UartSerialBus.TxFifoSize);
-+ AcpiUtReadUint16 (&Resource->UartSerialBus.RxFifoSize),
-+ AcpiUtReadUint16 (&Resource->UartSerialBus.TxFifoSize));
-
- /* ResourceSource is a required field */
-
- ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
-- Resource->CommonSerialBus.TypeDataLength;
-+ AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength);
-
- DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
- AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-Index: acpica-unix2-20220331/source/components/disassembler/dmresrcs.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/disassembler/dmresrcs.c
-+++ acpica-unix2-20220331/source/components/disassembler/dmresrcs.c
-@@ -93,7 +93,7 @@ AcpiDmIrqDescriptor (
- AcpiOsPrintf (")\n");
-
- AcpiDmIndent (Level + 1);
-- AcpiDmBitList (Resource->Irq.IrqMask);
-+ AcpiDmBitList (AcpiUtReadUint16 (&Resource->Irq.IrqMask));
- }
-
-
-@@ -161,8 +161,8 @@ AcpiDmFixedDmaDescriptor (
-
- AcpiDmIndent (Level);
- AcpiOsPrintf ("FixedDMA (0x%4.4X, 0x%4.4X, ",
-- Resource->FixedDma.RequestLines,
-- Resource->FixedDma.Channels);
-+ AcpiUtReadUint16 (&Resource->FixedDma.RequestLines),
-+ AcpiUtReadUint16 (&Resource->FixedDma.Channels));
-
- if (Resource->FixedDma.Width <= 5)
- {
-@@ -210,10 +210,12 @@ AcpiDmIoDescriptor (
- AcpiGbl_IoDecode [ACPI_GET_1BIT_FLAG (Resource->Io.Flags)]);
-
- AcpiDmIndent (Level + 1);
-- AcpiDmDumpInteger16 (Resource->Io.Minimum, "Range Minimum");
-+ AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Resource->Io.Minimum),
-+ "Range Minimum");
-
- AcpiDmIndent (Level + 1);
-- AcpiDmDumpInteger16 (Resource->Io.Maximum, "Range Maximum");
-+ AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Resource->Io.Maximum),
-+ "Range Maximum");
-
- AcpiDmIndent (Level + 1);
- AcpiDmDumpInteger8 (Resource->Io.Alignment, "Alignment");
-@@ -256,10 +258,12 @@ AcpiDmFixedIoDescriptor (
- AcpiOsPrintf ("FixedIO (\n");
-
- AcpiDmIndent (Level + 1);
-- AcpiDmDumpInteger16 (Resource->FixedIo.Address, "Address");
-+ AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Resource->FixedIo.Address),
-+ "Address");
-
- AcpiDmIndent (Level + 1);
-- AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
-+ AcpiDmDumpInteger8 (AcpiUtReadUint16 (&Resource->FixedIo.AddressLength),
-+ "Length");
-
- /* Insert a descriptor name */
-
-Index: acpica-unix2-20220331/source/components/disassembler/dmwalk.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/disassembler/dmwalk.c
-+++ acpica-unix2-20220331/source/components/disassembler/dmwalk.c
-@@ -1163,7 +1163,7 @@ AcpiDmAscendingOp (
- {
- ParentOp->Common.DisasmFlags |= ACPI_PARSEOP_EMPTY_TERMLIST;
- ASL_CV_CLOSE_PAREN (Op, Level);
-- AcpiOsPrintf ("{");
-+ AcpiOsPrintf (" {");
- }
- }
-
-Index: acpica-unix2-20220331/source/components/namespace/nsaccess.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/namespace/nsaccess.c
-+++ acpica-unix2-20220331/source/components/namespace/nsaccess.c
-@@ -644,7 +644,7 @@ AcpiNsLookup (
-
- /* Extract one ACPI name from the front of the pathname */
-
-- ACPI_MOVE_32_TO_32 (&SimpleName, Path);
-+ ACPI_COPY_NAMESEG (&SimpleName, Path);
-
- /* Try to find the single (4 character) ACPI name */
-
-Index: acpica-unix2-20220331/source/components/namespace/nsnames.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/namespace/nsnames.c
-+++ acpica-unix2-20220331/source/components/namespace/nsnames.c
-@@ -297,10 +297,10 @@ AcpiNsBuildNormalizedPath (
- {
- if (NextNode != Node)
- {
-- ACPI_PATH_PUT8(FullPath, PathSize, AML_DUAL_NAME_PREFIX, Length);
-+ ACPI_PATH_PUT8 (FullPath, PathSize, AML_DUAL_NAME_PREFIX, Length);
- }
-
-- ACPI_MOVE_32_TO_32 (Name, &NextNode->Name);
-+ ACPI_COPY_NAMESEG (Name, &NextNode->Name);
- DoNoTrailing = NoTrailing;
- for (i = 0; i < 4; i++)
- {
-Index: acpica-unix2-20220331/source/components/namespace/nsparse.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/namespace/nsparse.c
-+++ acpica-unix2-20220331/source/components/namespace/nsparse.c
-@@ -203,6 +203,7 @@ AcpiNsOneCompleteParse (
- ACPI_WALK_STATE *WalkState;
- ACPI_TABLE_HEADER *Table;
- ACPI_OWNER_ID OwnerId;
-+ UINT32 TableLength;
-
-
- ACPI_FUNCTION_TRACE (NsOneCompleteParse);
-@@ -216,13 +217,14 @@ AcpiNsOneCompleteParse (
-
- /* Table must consist of at least a complete header */
-
-- if (Table->Length < sizeof (ACPI_TABLE_HEADER))
-+ TableLength = AcpiUtReadUint32 (&Table->Length);
-+ if (TableLength < sizeof (ACPI_TABLE_HEADER))
- {
- return_ACPI_STATUS (AE_BAD_HEADER);
- }
-
- AmlStart = (UINT8 *) Table + sizeof (ACPI_TABLE_HEADER);
-- AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
-+ AmlLength = TableLength - sizeof (ACPI_TABLE_HEADER);
-
- Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
- if (ACPI_FAILURE (Status))
-Index: acpica-unix2-20220331/source/components/namespace/nsutils.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/namespace/nsutils.c
-+++ acpica-unix2-20220331/source/components/namespace/nsutils.c
-@@ -272,7 +272,6 @@ AcpiNsBuildInternalName (
- const char *ExternalName = Info->NextExternalChar;
- char *Result = NULL;
- UINT32 i;
-- char TmpSeg[ACPI_NAMESEG_SIZE+1];
-
-
- ACPI_FUNCTION_TRACE (NsBuildInternalName);
-@@ -336,7 +335,6 @@ AcpiNsBuildInternalName (
-
- for (; NumSegments; NumSegments--)
- {
-- memset (TmpSeg, 0, ACPI_NAMESEG_SIZE+1);
- for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
- {
- if (ACPI_IS_PATH_SEPARATOR (*ExternalName) ||
-@@ -344,17 +342,16 @@ AcpiNsBuildInternalName (
- {
- /* Pad the segment with underscore(s) if segment is short */
-
-- TmpSeg[i] = '_';
-+ Result[i] = '_';
- }
- else
- {
- /* Convert the character to uppercase and save it */
-
-- TmpSeg[i] = (char) toupper ((int) *ExternalName);
-+ Result[i] = (char) toupper ((int) *ExternalName);
- ExternalName++;
- }
- }
-- AcpiUtWriteUint (Result, ACPI_NAMESEG_SIZE, TmpSeg, ACPI_NAMESEG_SIZE);
-
- /* Now we must have a path separator, or the pathname is bad */
-
-Index: acpica-unix2-20220331/source/components/utilities/utresrc.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/utilities/utresrc.c
-+++ acpica-unix2-20220331/source/components/utilities/utresrc.c
-@@ -541,7 +541,7 @@ AcpiUtGetResourceLength (
- {
- /* Large Resource type -- bytes 1-2 contain the 16-bit length */
-
-- ACPI_MOVE_16_TO_16 (&ResourceLength, ACPI_ADD_PTR (UINT8, Aml, 1));
-+ ResourceLength = AcpiUtReadUint16 (ACPI_ADD_PTR (UINT8, Aml, 1));
-
- }
- else
-Index: acpica-unix2-20220331/source/compiler/aslrestype2e.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype2e.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype2e.c
-@@ -80,6 +80,7 @@ RsDoExtendedIoDescriptor (
- UINT16 StringLength = 0;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -139,7 +140,8 @@ RsDoExtendedIoDescriptor (
-
- case 5: /* Address Granularity */
-
-- Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.Granularity =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
- GranOp = InitializerOp;
-@@ -147,7 +149,8 @@ RsDoExtendedIoDescriptor (
-
- case 6: /* Address Min */
-
-- Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.Minimum =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
- MinOp = InitializerOp;
-@@ -155,7 +158,8 @@ RsDoExtendedIoDescriptor (
-
- case 7: /* Address Max */
-
-- Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.Maximum =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
- MaxOp = InitializerOp;
-@@ -163,14 +167,16 @@ RsDoExtendedIoDescriptor (
-
- case 8: /* Translation Offset */
-
-- Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.TranslationOffset =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
- break;
-
- case 9: /* Address Length */
-
-- Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.AddressLength =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
- LengthOp = InitializerOp;
-@@ -178,7 +184,8 @@ RsDoExtendedIoDescriptor (
-
- case 10: /* Type-Specific Attributes */
-
-- Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.TypeSpecific =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
- break;
-@@ -213,11 +220,14 @@ RsDoExtendedIoDescriptor (
-
- /* Validate the Min/Max/Len/Gran values */
-
-+ Tmp16 = Descriptor->ExtAddress64.ResourceLength;
-+ Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
- RsLargeAddressCheck (
-- Descriptor->ExtAddress64.Minimum,
-- Descriptor->ExtAddress64.Maximum,
-- Descriptor->ExtAddress64.AddressLength,
-- Descriptor->ExtAddress64.Granularity,
-+ AcpiUtReadUint64 (&Descriptor->ExtAddress64.Minimum),
-+ AcpiUtReadUint64 (&Descriptor->ExtAddress64.Maximum),
-+ AcpiUtReadUint64 (&Descriptor->ExtAddress64.AddressLength),
-+ AcpiUtReadUint64 (&Descriptor->ExtAddress64.Granularity),
- Descriptor->ExtAddress64.Flags,
- MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-
-@@ -253,6 +263,7 @@ RsDoExtendedMemoryDescriptor (
- UINT16 StringLength = 0;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -319,7 +330,8 @@ RsDoExtendedMemoryDescriptor (
-
- case 6: /* Address Granularity */
-
-- Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.Granularity =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
- GranOp = InitializerOp;
-@@ -327,7 +339,8 @@ RsDoExtendedMemoryDescriptor (
-
- case 7: /* Min Address */
-
-- Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.Minimum =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
- MinOp = InitializerOp;
-@@ -335,7 +348,8 @@ RsDoExtendedMemoryDescriptor (
-
- case 8: /* Max Address */
-
-- Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.Maximum =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
- MaxOp = InitializerOp;
-@@ -343,14 +357,16 @@ RsDoExtendedMemoryDescriptor (
-
- case 9: /* Translation Offset */
-
-- Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.TranslationOffset =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
- break;
-
- case 10: /* Address Length */
-
-- Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.AddressLength =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
- LengthOp = InitializerOp;
-@@ -358,7 +374,8 @@ RsDoExtendedMemoryDescriptor (
-
- case 11: /* Type-Specific Attributes */
-
-- Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.TypeSpecific =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
- break;
-@@ -394,11 +411,14 @@ RsDoExtendedMemoryDescriptor (
-
- /* Validate the Min/Max/Len/Gran values */
-
-+ Tmp16 = Descriptor->ExtAddress64.ResourceLength;
-+ Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
- RsLargeAddressCheck (
-- Descriptor->ExtAddress64.Minimum,
-- Descriptor->ExtAddress64.Maximum,
-- Descriptor->ExtAddress64.AddressLength,
-- Descriptor->ExtAddress64.Granularity,
-+ AcpiUtReadUint64 (&Descriptor->ExtAddress64.Minimum),
-+ AcpiUtReadUint64 (&Descriptor->ExtAddress64.Maximum),
-+ AcpiUtReadUint64 (&Descriptor->ExtAddress64.AddressLength),
-+ AcpiUtReadUint64 (&Descriptor->ExtAddress64.Granularity),
- Descriptor->ExtAddress64.Flags,
- MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-
-@@ -434,6 +454,7 @@ RsDoExtendedSpaceDescriptor (
- UINT16 StringLength = 0;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -497,7 +518,8 @@ RsDoExtendedSpaceDescriptor (
-
- case 6: /* Address Granularity */
-
-- Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.Granularity =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
- GranOp = InitializerOp;
-@@ -505,7 +527,8 @@ RsDoExtendedSpaceDescriptor (
-
- case 7: /* Min Address */
-
-- Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.Minimum =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
- MinOp = InitializerOp;
-@@ -513,7 +536,8 @@ RsDoExtendedSpaceDescriptor (
-
- case 8: /* Max Address */
-
-- Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.Maximum =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
- MaxOp = InitializerOp;
-@@ -521,14 +545,16 @@ RsDoExtendedSpaceDescriptor (
-
- case 9: /* Translation Offset */
-
-- Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.TranslationOffset =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
- break;
-
- case 10: /* Address Length */
-
-- Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.AddressLength =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
- LengthOp = InitializerOp;
-@@ -536,7 +562,8 @@ RsDoExtendedSpaceDescriptor (
-
- case 11: /* Type-Specific Attributes */
-
-- Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
-+ Descriptor->ExtAddress64.TypeSpecific =
-+ AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
- RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
- CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
- break;
-@@ -557,11 +584,14 @@ RsDoExtendedSpaceDescriptor (
-
- /* Validate the Min/Max/Len/Gran values */
-
-+ Tmp16 = Descriptor->ExtAddress64.ResourceLength;
-+ Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
- RsLargeAddressCheck (
-- Descriptor->ExtAddress64.Minimum,
-- Descriptor->ExtAddress64.Maximum,
-- Descriptor->ExtAddress64.AddressLength,
-- Descriptor->ExtAddress64.Granularity,
-+ AcpiUtReadUint64 (&Descriptor->ExtAddress64.Minimum),
-+ AcpiUtReadUint64 (&Descriptor->ExtAddress64.Maximum),
-+ AcpiUtReadUint64 (&Descriptor->ExtAddress64.AddressLength),
-+ AcpiUtReadUint64 (&Descriptor->ExtAddress64.Granularity),
- Descriptor->ExtAddress64.Flags,
- MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-
-Index: acpica-unix2-20220331/source/compiler/aslrestype2s.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype2s.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype2s.c
-@@ -343,6 +343,7 @@ RsDoGpioIntDescriptor (
- UINT32 CurrentByteOffset;
- UINT32 PinCount = 0;
- UINT32 i;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -485,7 +486,8 @@ RsDoGpioIntDescriptor (
- * (implies resource source must immediately follow the pin list.)
- * Name: _PIN
- */
-- *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ *InterruptList = AcpiUtReadUint16 (&Tmp16);
- InterruptList++;
- PinCount++;
-
-@@ -518,6 +520,27 @@ RsDoGpioIntDescriptor (
-
- MpSaveGpioInfo (Info->MappingOp, Descriptor,
- PinCount, PinList, ResourceSource);
-+
-+ /* correct endian-ness issues */
-+ Tmp16 = Descriptor->Gpio.ResourceLength;
-+ Descriptor->Gpio.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.Flags;
-+ Descriptor->Gpio.Flags = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.IntFlags;
-+ Descriptor->Gpio.IntFlags = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.DriveStrength;
-+ Descriptor->Gpio.DriveStrength = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.DebounceTimeout;
-+ Descriptor->Gpio.DebounceTimeout = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.PinTableOffset;
-+ Descriptor->Gpio.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.ResSourceOffset;
-+ Descriptor->Gpio.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.VendorOffset;
-+ Descriptor->Gpio.VendorOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.VendorLength;
-+ Descriptor->Gpio.VendorLength = AcpiUtReadUint16 (&Tmp16);
-+
- return (Rnode);
- }
-
-@@ -552,6 +575,7 @@ RsDoGpioIoDescriptor (
- UINT32 CurrentByteOffset;
- UINT32 PinCount = 0;
- UINT32 i;
-+ UINT16 Tmp16;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -691,7 +715,8 @@ RsDoGpioIoDescriptor (
- * (implies resource source must immediately follow the pin list.)
- * Name: _PIN
- */
-- *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ *InterruptList = AcpiUtReadUint16 (&Tmp16);
- InterruptList++;
- PinCount++;
-
-@@ -724,6 +749,27 @@ RsDoGpioIoDescriptor (
-
- MpSaveGpioInfo (Info->MappingOp, Descriptor,
- PinCount, PinList, ResourceSource);
-+
-+ /* correct endian-ness issues */
-+ Tmp16 = Descriptor->Gpio.ResourceLength;
-+ Descriptor->Gpio.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.Flags;
-+ Descriptor->Gpio.Flags = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.IntFlags;
-+ Descriptor->Gpio.IntFlags = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.DriveStrength;
-+ Descriptor->Gpio.DriveStrength = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.DebounceTimeout;
-+ Descriptor->Gpio.DebounceTimeout = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.PinTableOffset;
-+ Descriptor->Gpio.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.ResSourceOffset;
-+ Descriptor->Gpio.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.VendorOffset;
-+ Descriptor->Gpio.VendorOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->Gpio.VendorLength;
-+ Descriptor->Gpio.VendorLength = AcpiUtReadUint16 (&Tmp16);
-+
- return (Rnode);
- }
-
-@@ -754,6 +800,8 @@ RsDoI2cSerialBusDescriptor (
- UINT16 DescriptorSize;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -781,7 +829,8 @@ RsDoI2cSerialBusDescriptor (
- Descriptor->I2cSerialBus.RevisionId = AML_RESOURCE_I2C_REVISION;
- Descriptor->I2cSerialBus.TypeRevisionId = AML_RESOURCE_I2C_TYPE_REVISION;
- Descriptor->I2cSerialBus.Type = AML_RESOURCE_I2C_SERIALBUSTYPE;
-- Descriptor->I2cSerialBus.TypeDataLength = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
-+ Tmp16 = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
-+ Descriptor->I2cSerialBus.TypeDataLength = AcpiUtReadUint16 (&Tmp16);
-
- if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_I2C_SERIALBUS_V2)
- {
-@@ -795,13 +844,15 @@ RsDoI2cSerialBusDescriptor (
-
- /* Process all child initialization nodes */
-
-+ Descriptor->I2cSerialBus.TypeSpecificFlags = 0;
- for (i = 0; InitializerOp; i++)
- {
- switch (i)
- {
- case 0: /* Slave Address [WORD] (_ADR) */
-
-- Descriptor->I2cSerialBus.SlaveAddress = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->I2cSerialBus.SlaveAddress = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
- CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.SlaveAddress));
- break;
-@@ -815,16 +866,19 @@ RsDoI2cSerialBusDescriptor (
-
- case 2: /* Connection Speed [DWORD] (_SPE) */
-
-- Descriptor->I2cSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->I2cSerialBus.ConnectionSpeed = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
- CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.ConnectionSpeed));
- break;
-
- case 3: /* Addressing Mode [Flag] (_MOD) */
-
-- RsSetFlagBits16 (&Descriptor->I2cSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+ Tmp16 = AcpiUtReadUint16 (&Descriptor->I2cSerialBus.TypeSpecificFlags);
-+ RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
- RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
- CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.TypeSpecificFlags), 0);
-+ Descriptor->I2cSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);
- break;
-
- case 4: /* ResSource [Optional Field - STRING] */
-@@ -882,6 +936,8 @@ RsDoI2cSerialBusDescriptor (
- InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
- }
-
-+ Tmp16 = Descriptor->I2cSerialBus.ResourceLength;
-+ Descriptor->I2cSerialBus.ResourceLength = AcpiUtReadUint16 (&Tmp16);
- MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
- return (Rnode);
- }
-@@ -913,6 +969,8 @@ RsDoSpiSerialBusDescriptor (
- UINT16 DescriptorSize;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -935,12 +993,13 @@ RsDoSpiSerialBusDescriptor (
- sizeof (AML_RESOURCE_LARGE_HEADER));
-
- Descriptor = Rnode->Buffer;
-- Descriptor->SpiSerialBus.ResourceLength = DescriptorSize;
-+ Descriptor->SpiSerialBus.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
- Descriptor->SpiSerialBus.DescriptorType = ACPI_RESOURCE_NAME_SERIAL_BUS;
- Descriptor->SpiSerialBus.RevisionId = AML_RESOURCE_SPI_REVISION;
- Descriptor->SpiSerialBus.TypeRevisionId = AML_RESOURCE_SPI_TYPE_REVISION;
- Descriptor->SpiSerialBus.Type = AML_RESOURCE_SPI_SERIALBUSTYPE;
-- Descriptor->SpiSerialBus.TypeDataLength = AML_RESOURCE_SPI_MIN_DATA_LEN + VendorLength;
-+ Tmp16 = AML_RESOURCE_SPI_MIN_DATA_LEN + VendorLength;
-+ Descriptor->SpiSerialBus.TypeDataLength = AcpiUtReadUint16 (&Tmp16);
-
- if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_SPI_SERIALBUS_V2)
- {
-@@ -955,29 +1014,35 @@ RsDoSpiSerialBusDescriptor (
-
- /* Process all child initialization nodes */
-
-+ Descriptor->SpiSerialBus.TypeSpecificFlags = 0;
- for (i = 0; InitializerOp; i++)
- {
- switch (i)
- {
- case 0: /* Device Selection [WORD] (_ADR) */
-
-- Descriptor->SpiSerialBus.DeviceSelection = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->SpiSerialBus.DeviceSelection = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
- CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.DeviceSelection));
- break;
-
- case 1: /* Device Polarity [Flag] (_DPL) */
-
-- RsSetFlagBits16 (&Descriptor->SpiSerialBus.TypeSpecificFlags, InitializerOp, 1, 0);
-+ Tmp16 = AcpiUtReadUint16 (&Descriptor->SpiSerialBus.TypeSpecificFlags);
-+ RsSetFlagBits16 (&Tmp16, InitializerOp, 1, 0);
- RsCreateBitField (InitializerOp, ACPI_RESTAG_DEVICEPOLARITY,
- CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 1);
-+ Descriptor->SpiSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);
- break;
-
- case 2: /* Wire Mode [Flag] (_MOD) */
-
-- RsSetFlagBits16 (&Descriptor->SpiSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+ Tmp16 = AcpiUtReadUint16 (&Descriptor->SpiSerialBus.TypeSpecificFlags);
-+ RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
- RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
- CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 0);
-+ Descriptor->SpiSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);
- break;
-
- case 3: /* Device Bit Length [BYTE] (_LEN) */
-@@ -996,7 +1061,8 @@ RsDoSpiSerialBusDescriptor (
-
- case 5: /* Connection Speed [DWORD] (_SPE) */
-
-- Descriptor->SpiSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->SpiSerialBus.ConnectionSpeed = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
- CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.ConnectionSpeed));
- break;
-@@ -1101,6 +1167,8 @@ RsDoUartSerialBusDescriptor (
- UINT16 DescriptorSize;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -1123,12 +1191,13 @@ RsDoUartSerialBusDescriptor (
- sizeof (AML_RESOURCE_LARGE_HEADER));
-
- Descriptor = Rnode->Buffer;
-- Descriptor->UartSerialBus.ResourceLength = DescriptorSize;
-+ Descriptor->UartSerialBus.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
- Descriptor->UartSerialBus.DescriptorType = ACPI_RESOURCE_NAME_SERIAL_BUS;
- Descriptor->UartSerialBus.RevisionId = AML_RESOURCE_UART_REVISION;
- Descriptor->UartSerialBus.TypeRevisionId = AML_RESOURCE_UART_TYPE_REVISION;
- Descriptor->UartSerialBus.Type = AML_RESOURCE_UART_SERIALBUSTYPE;
-- Descriptor->UartSerialBus.TypeDataLength = AML_RESOURCE_UART_MIN_DATA_LEN + VendorLength;
-+ Tmp16 = AML_RESOURCE_UART_MIN_DATA_LEN + VendorLength;
-+ Descriptor->UartSerialBus.TypeDataLength = AcpiUtReadUint16 (&Tmp16);
-
- if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_UART_SERIALBUS_V2)
- {
-@@ -1142,29 +1211,35 @@ RsDoUartSerialBusDescriptor (
-
- /* Process all child initialization nodes */
-
-+ Descriptor->UartSerialBus.TypeSpecificFlags = 0;
- for (i = 0; InitializerOp; i++)
- {
- switch (i)
- {
- case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */
-
-- Descriptor->UartSerialBus.DefaultBaudRate = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->UartSerialBus.DefaultBaudRate = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
- CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.DefaultBaudRate));
- break;
-
- case 1: /* Bits Per Byte [Flags] (_LEN) */
-
-- RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 4, 3);
-+ Tmp16 = AcpiUtReadUint16 (&Descriptor->UartSerialBus.TypeSpecificFlags);
-+ RsSetFlagBits16 (&Tmp16, InitializerOp, 4, 3);
- RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_LENGTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 4, 3);
-+ Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);;
- break;
-
- case 2: /* Stop Bits [Flags] (_STB) */
-
-- RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 2, 1);
-+ Tmp16 = AcpiUtReadUint16 (&Descriptor->UartSerialBus.TypeSpecificFlags);
-+ RsSetFlagBits16 (&Tmp16, InitializerOp, 2, 1);
- RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_STOPBITS,
- CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 2, 2);
-+ Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);;
- break;
-
- case 3: /* Lines In Use [BYTE] (_LIN) */
-@@ -1176,9 +1251,11 @@ RsDoUartSerialBusDescriptor (
-
- case 4: /* Endianness [Flag] (_END) */
-
-- RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 7, 0);
-+ Tmp16 = AcpiUtReadUint16 (&Descriptor->UartSerialBus.TypeSpecificFlags);
-+ RsSetFlagBits16 (&Tmp16, InitializerOp, 7, 0);
- RsCreateBitField (InitializerOp, ACPI_RESTAG_ENDIANNESS,
- CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 7);
-+ Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);;
- break;
-
- case 5: /* Parity [BYTE] (_PAR) */
-@@ -1190,21 +1267,25 @@ RsDoUartSerialBusDescriptor (
-
- case 6: /* Flow Control [Flags] (_FLC) */
-
-- RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+ Tmp16 = AcpiUtReadUint16 (&Descriptor->UartSerialBus.TypeSpecificFlags);
-+ RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
- RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_FLOWCONTROL,
- CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 0, 2);
-+ Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);;
- break;
-
- case 7: /* Rx Buffer Size [WORD] (_RXL) */
-
-- Descriptor->UartSerialBus.RxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->UartSerialBus.RxFifoSize = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_RX,
- CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.RxFifoSize));
- break;
-
- case 8: /* Tx Buffer Size [WORD] (_TXL) */
-
-- Descriptor->UartSerialBus.TxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->UartSerialBus.TxFifoSize = AcpiUtReadUint16 (&Tmp16);
- RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_TX,
- CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TxFifoSize));
- break;
-@@ -1444,6 +1525,7 @@ RsDoPinFunctionDescriptor (
- UINT32 CurrentByteOffset;
- UINT32 PinCount = 0;
- UINT32 i;
-+ UINT16 Tmp16;
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
- CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1467,7 +1549,7 @@ RsDoPinFunctionDescriptor (
- sizeof (AML_RESOURCE_LARGE_HEADER));
-
- Descriptor = Rnode->Buffer;
-- Descriptor->PinFunction.ResourceLength = DescriptorSize;
-+ Descriptor->PinFunction.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
- Descriptor->PinFunction.DescriptorType = ACPI_RESOURCE_NAME_PIN_FUNCTION;
- Descriptor->PinFunction.RevisionId = AML_RESOURCE_PIN_FUNCTION_REVISION;
-
-@@ -1507,7 +1589,8 @@ RsDoPinFunctionDescriptor (
-
- case 2: /* Function Number [WORD] (_FUN) */
-
-- Descriptor->PinFunction.FunctionNumber = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->PinFunction.FunctionNumber = AcpiUtReadUint16 (&Tmp16);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_FUNCTION,
- CurrentByteOffset + ASL_RESDESC_OFFSET (PinFunction.FunctionNumber));
- break;
-@@ -1555,6 +1638,12 @@ RsDoPinFunctionDescriptor (
- {
- Descriptor->PinFunction.VendorLength = VendorLength;
- }
-+ Tmp16 = (UINT16) ACPI_PTR_DIFF (VendorData, Descriptor);
-+ Descriptor->PinFunction.VendorOffset = AcpiUtReadUint16 (&Tmp16);
-+
-+ Tmp16 = Descriptor->PinFunction.VendorLength;
-+ Descriptor->PinFunction.VendorLength = AcpiUtReadUint16 (&Tmp16);
-+
- break;
-
- default:
-@@ -1566,7 +1655,8 @@ RsDoPinFunctionDescriptor (
- * (implies resource source must immediately follow the pin list.)
- * Name: _PIN
- */
-- *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ *PinList = AcpiUtReadUint16 (&Tmp16);
- PinList++;
- PinCount++;
-
-@@ -1597,6 +1687,13 @@ RsDoPinFunctionDescriptor (
- InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
- }
-
-+ /* correct the endian-ness of the values */
-+ Tmp16 = Descriptor->PinFunction.PinTableOffset;
-+ Descriptor->PinFunction.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
-+
-+ Tmp16 = Descriptor->PinFunction.ResSourceOffset;
-+ Descriptor->PinFunction.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
-+
- return (Rnode);
- }
-
-@@ -1630,6 +1727,8 @@ RsDoPinConfigDescriptor (
- UINT32 CurrentByteOffset;
- UINT32 PinCount = 0;
- UINT32 i;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
- CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1653,7 +1752,7 @@ RsDoPinConfigDescriptor (
- sizeof (AML_RESOURCE_LARGE_HEADER));
-
- Descriptor = Rnode->Buffer;
-- Descriptor->PinConfig.ResourceLength = DescriptorSize;
-+ Descriptor->PinConfig.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
- Descriptor->PinConfig.DescriptorType = ACPI_RESOURCE_NAME_PIN_CONFIG;
- Descriptor->PinConfig.RevisionId = AML_RESOURCE_PIN_CONFIG_REVISION;
-
-@@ -1707,7 +1806,8 @@ RsDoPinConfigDescriptor (
-
- case 2: /* Pin Config Value [DWORD] (_VAL) */
-
-- Descriptor->PinConfig.PinConfigValue = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->PinConfig.PinConfigValue = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_PINCONFIG_VALUE,
- CurrentByteOffset + ASL_RESDESC_OFFSET (PinConfig.PinConfigValue));
- break;
-@@ -1766,7 +1866,8 @@ RsDoPinConfigDescriptor (
- * (implies resource source must immediately follow the pin list.)
- * Name: _PIN
- */
-- *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ *PinList = AcpiUtReadUint16 (&Tmp16);
- PinList++;
- PinCount++;
-
-@@ -1797,6 +1898,16 @@ RsDoPinConfigDescriptor (
- InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
- }
-
-+ /* correct the endianness if needed */
-+ Tmp16 = Descriptor->PinConfig.PinTableOffset;
-+ Descriptor->PinConfig.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->PinConfig.ResSourceOffset;
-+ Descriptor->PinConfig.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->PinConfig.VendorOffset;
-+ Descriptor->PinConfig.VendorOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->PinConfig.VendorLength;
-+ Descriptor->PinConfig.VendorLength = AcpiUtReadUint16 (&Tmp16);
-+
- return (Rnode);
- }
-
-@@ -1830,6 +1941,7 @@ RsDoPinGroupDescriptor (
- UINT32 CurrentByteOffset;
- UINT32 PinCount = 0;
- UINT32 i;
-+ UINT16 Tmp16;
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
- CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1853,7 +1965,7 @@ RsDoPinGroupDescriptor (
- sizeof (AML_RESOURCE_LARGE_HEADER));
-
- Descriptor = Rnode->Buffer;
-- Descriptor->PinGroup.ResourceLength = DescriptorSize;
-+ Descriptor->PinGroup.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
- Descriptor->PinGroup.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP;
- Descriptor->PinGroup.RevisionId = AML_RESOURCE_PIN_GROUP_REVISION;
-
-@@ -1920,7 +2032,8 @@ RsDoPinGroupDescriptor (
- * (implies resource source must immediately follow the pin list.)
- * Name: _PIN
- */
-- *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ *PinList = AcpiUtReadUint16 (&Tmp16);
- PinList++;
- PinCount++;
-
-@@ -1951,6 +2064,16 @@ RsDoPinGroupDescriptor (
- InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
- }
-
-+ /* correct enddianness as needed */
-+ Tmp16 = Descriptor->PinGroup.PinTableOffset;
-+ Descriptor->PinGroup.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->PinGroup.LabelOffset;
-+ Descriptor->PinGroup.LabelOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->PinGroup.VendorOffset;
-+ Descriptor->PinGroup.VendorOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->PinGroup.VendorLength;
-+ Descriptor->PinGroup.VendorLength = AcpiUtReadUint16 (&Tmp16);
-+
- return (Rnode);
- }
-
-@@ -1983,6 +2106,7 @@ RsDoPinGroupFunctionDescriptor (
- UINT16 DescriptorSize;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
- CurrentByteOffset = Info->CurrentByteOffset;
-@@ -2006,7 +2130,7 @@ RsDoPinGroupFunctionDescriptor (
- sizeof (AML_RESOURCE_LARGE_HEADER));
-
- Descriptor = Rnode->Buffer;
-- Descriptor->PinGroupFunction.ResourceLength = DescriptorSize;
-+ Descriptor->PinGroupFunction.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
- Descriptor->PinGroupFunction.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION;
- Descriptor->PinGroupFunction.RevisionId = AML_RESOURCE_PIN_GROUP_FUNCTION_REVISION;
-
-@@ -2038,7 +2162,8 @@ RsDoPinGroupFunctionDescriptor (
-
- case 1: /* Function Number [WORD] */
-
-- Descriptor->PinGroupFunction.FunctionNumber = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+ Descriptor->PinGroupFunction.FunctionNumber = AcpiUtReadUint16 (&Tmp16);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_FUNCTION,
- CurrentByteOffset + ASL_RESDESC_OFFSET (PinGroupFunction.FunctionNumber));
- break;
-@@ -2097,6 +2222,16 @@ RsDoPinGroupFunctionDescriptor (
- InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
- }
-
-+ /* correct enddianness as needed */
-+ Tmp16 = Descriptor->PinGroupFunction.ResSourceOffset;
-+ Descriptor->PinGroupFunction.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->PinGroupFunction.ResSourceLabelOffset;
-+ Descriptor->PinGroupFunction.ResSourceLabelOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->PinGroupFunction.VendorOffset;
-+ Descriptor->PinGroupFunction.VendorOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->PinGroupFunction.VendorLength;
-+ Descriptor->PinGroupFunction.VendorLength = AcpiUtReadUint16 (&Tmp16);
-+
- return (Rnode);
- }
-
-@@ -2129,6 +2264,8 @@ RsDoPinGroupConfigDescriptor (
- UINT16 DescriptorSize;
- UINT32 CurrentByteOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
- InitializerOp = Info->DescriptorTypeOp->Asl.Child;
- CurrentByteOffset = Info->CurrentByteOffset;
-@@ -2152,7 +2289,7 @@ RsDoPinGroupConfigDescriptor (
- sizeof (AML_RESOURCE_LARGE_HEADER));
-
- Descriptor = Rnode->Buffer;
-- Descriptor->PinGroupConfig.ResourceLength = DescriptorSize;
-+ Descriptor->PinGroupConfig.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
- Descriptor->PinGroupConfig.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG;
- Descriptor->PinGroupConfig.RevisionId = AML_RESOURCE_PIN_GROUP_CONFIG_REVISION;
-
-@@ -2205,7 +2342,8 @@ RsDoPinGroupConfigDescriptor (
-
- case 2: /* Pin Config Value [DWORD] (_VAL) */
-
-- Descriptor->PinGroupConfig.PinConfigValue = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+ Descriptor->PinGroupConfig.PinConfigValue = AcpiUtReadUint32 (&Tmp32);
- RsCreateDwordField (InitializerOp, ACPI_RESTAG_PINCONFIG_VALUE,
- CurrentByteOffset + ASL_RESDESC_OFFSET (PinGroupConfig.PinConfigValue));
- break;
-@@ -2266,5 +2404,15 @@ RsDoPinGroupConfigDescriptor (
- InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
- }
-
-+ /* correct enddianness as needed */
-+ Tmp16 = Descriptor->PinGroupConfig.ResSourceOffset;
-+ Descriptor->PinGroupConfig.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->PinGroupConfig.ResSourceLabelOffset;
-+ Descriptor->PinGroupConfig.ResSourceLabelOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->PinGroupConfig.VendorOffset;
-+ Descriptor->PinGroupConfig.VendorOffset = AcpiUtReadUint16 (&Tmp16);
-+ Tmp16 = Descriptor->PinGroupConfig.VendorLength;
-+ Descriptor->PinGroupConfig.VendorLength = AcpiUtReadUint16 (&Tmp16);
-+
- return (Rnode);
- }
diff --git a/0044-Initial-support-for-WPBT-in-big-endian-needs-more.patch b/0044-Initial-support-for-WPBT-in-big-endian-needs-more.patch
deleted file mode 100644
index 1a2b1a2..0000000
--- a/0044-Initial-support-for-WPBT-in-big-endian-needs-more.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From bd137d3712e6bc7e4d2d11350a208a36750e4063 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Tue, 6 Jul 2021 18:26:41 -0600
-Subject: [PATCH 44/45] Initial support for WPBT in big-endian, needs more
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/compiler/dttable2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: acpica-unix2-20210604/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20210604.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20210604/source/compiler/dttable2.c
-@@ -2638,7 +2638,7 @@ DtCompileWpbt (
- AcpiUtWriteUint (&Length, sizeof (UINT16),
- &Subtable->TotalLength, sizeof (UINT32));
- Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
-- Table->ArgumentsLength = Length;
-+ Table->ArgumentsLength = AcpiUtReadUint16 (&Length);
-
- ParentTable = DtPeekSubtable ();
- DtInsertSubtable (ParentTable, Subtable);
diff --git a/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch b/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
deleted file mode 100644
index 201e19b..0000000
--- a/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-From 0d87ee42adda7837bec3cc0ff86e40c2f2e8dc4f Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Fri, 9 Jul 2021 14:52:55 -0600
-Subject: [PATCH 45/45] CSRT: fixed use of optional ResourceInfo
-
-In a resource sub-sub-table, there may be a ResourceInfo entry. Neither
-the compiler nor disassembler accounted for that possibility properly.
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump1.c | 43 +++++++++++++++++++++-----------------
- source/compiler/dttable1.c | 28 +++++++++++++------------
- 2 files changed, 39 insertions(+), 32 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -669,11 +669,13 @@ AcpiDmDumpCsrt (
- ACPI_CSRT_GROUP *Subtable;
- ACPI_CSRT_SHARED_INFO *SharedInfoTable;
- ACPI_CSRT_DESCRIPTOR *SubSubtable;
-- UINT32 Length = AcpiUtReadUint32 (&Table->Length);
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_CSRT);
- UINT32 SubOffset;
- UINT32 SubSubOffset;
- UINT32 InfoLength;
-+ UINT32 SubtableLength;
-+ UINT32 SubSubtableLength;
-
-
- /* The main table only contains the ACPI header, thus already handled */
-@@ -681,13 +683,14 @@ AcpiDmDumpCsrt (
- /* Subtables (Resource Groups) */
-
- Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
-- while (Offset < Length)
-+ while (Offset < TableLength)
- {
- /* Resource group subtable */
-
-+ SubtableLength = AcpiUtReadUint32 (&Subtable->Length);
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Length, Offset, Subtable,
-- Subtable->Length, AcpiDmTableInfoCsrt0);
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+ SubtableLength, AcpiDmTableInfoCsrt0);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -700,26 +703,28 @@ AcpiDmDumpCsrt (
- Offset + SubOffset);
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Length, Offset + SubOffset, SharedInfoTable,
-- sizeof (ACPI_CSRT_SHARED_INFO), AcpiDmTableInfoCsrt1);
-+ Status = AcpiDmDumpTable (TableLength, Offset + SubOffset,
-+ SharedInfoTable, sizeof (ACPI_CSRT_SHARED_INFO),
-+ AcpiDmTableInfoCsrt1);
- if (ACPI_FAILURE (Status))
- {
- return;
- }
-
-- SubOffset += Subtable->SharedInfoLength;
-+ SubOffset += AcpiUtReadUint32 (&Subtable->SharedInfoLength);
-
- /* Sub-Subtables (Resource Descriptors) */
-
- SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, Table,
- Offset + SubOffset);
-
-- while ((SubOffset < Subtable->Length) &&
-- ((Offset + SubOffset) < Length))
-+ while ((SubOffset < SubtableLength) &&
-+ ((Offset + SubOffset) < TableLength))
- {
-+ SubSubtableLength = AcpiUtReadUint32 (&SubSubtable->Length);
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
-- SubSubtable->Length, AcpiDmTableInfoCsrt2);
-+ Status = AcpiDmDumpTable (TableLength, Offset + SubOffset,
-+ SubSubtable, SubSubtableLength, AcpiDmTableInfoCsrt2);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -729,11 +734,12 @@ AcpiDmDumpCsrt (
-
- /* Resource-specific info buffer */
-
-- InfoLength = SubSubtable->Length - SubSubOffset;
-+ InfoLength = SubSubtableLength - SubSubOffset;
- if (InfoLength)
- {
-- Status = AcpiDmDumpTable (Length,
-- Offset + SubOffset + SubSubOffset, Table,
-+ Status = AcpiDmDumpTable (TableLength,
-+ Offset + SubOffset + SubSubOffset,
-+ (UINT8 *)SubSubtable + SubSubOffset,
- InfoLength, AcpiDmTableInfoCsrt2a);
- if (ACPI_FAILURE (Status))
- {
-@@ -743,16 +749,15 @@ AcpiDmDumpCsrt (
-
- /* Point to next sub-subtable */
-
-- SubOffset += SubSubtable->Length;
-+ SubOffset += SubSubtableLength;
- SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, SubSubtable,
-- SubSubtable->Length);
-+ SubSubtableLength);
- }
-
- /* Point to next subtable */
-
-- Offset += Subtable->Length;
-- Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable,
-- Subtable->Length);
-+ Offset += SubtableLength;
-+ Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable, SubtableLength);
- }
- }
-
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -716,14 +716,16 @@ DtCompileCsrt (
- DT_SUBTABLE *Subtable;
- DT_SUBTABLE *ParentTable;
- DT_FIELD **PFieldList = (DT_FIELD **) List;
-- UINT32 DescriptorCount;
-+ UINT32 DescriptorLength;
- UINT32 GroupLength;
- UINT32 Tmp;
-+ UINT32 Offset;
-
-
- /* Subtables (Resource Groups) */
-
- ParentTable = DtPeekSubtable ();
-+
- while (*PFieldList)
- {
- /* Resource group subtable */
-@@ -738,16 +740,13 @@ DtCompileCsrt (
- /* Compute the number of resource descriptors */
-
- Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-- Subtable->Buffer))->Length);
-+ Subtable->Buffer))->Length);
- GroupLength = Tmp;
- Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-- Subtable->Buffer))->SharedInfoLength);
-+ Subtable->Buffer))->SharedInfoLength);
- GroupLength -= Tmp;
- GroupLength -= sizeof (ACPI_CSRT_GROUP);
-
-- DescriptorCount = (GroupLength /
-- sizeof (ACPI_CSRT_DESCRIPTOR));
--
- DtInsertSubtable (ParentTable, Subtable);
- DtPushSubtable (Subtable);
- ParentTable = DtPeekSubtable ();
-@@ -762,10 +761,13 @@ DtCompileCsrt (
- }
-
- DtInsertSubtable (ParentTable, Subtable);
-+ DtPushSubtable (Subtable);
-+ ParentTable = DtPeekSubtable ();
-
- /* Sub-Subtables (Resource Descriptors) */
-
-- while (*PFieldList && DescriptorCount)
-+ Offset = 0;
-+ while (*PFieldList && (Offset < GroupLength))
- {
-
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2,
-@@ -774,6 +776,10 @@ DtCompileCsrt (
- {
- return (Status);
- }
-+ DescriptorLength = AcpiUtReadUint32 (
-+ &(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-+ Subtable->Buffer))->Length);
-+
-
- DtInsertSubtable (ParentTable, Subtable);
-
-@@ -783,11 +789,7 @@ DtCompileCsrt (
- {
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2a,
- &Subtable);
-- if (ACPI_FAILURE (Status))
-- {
-- return (Status);
-- }
-- if (Subtable)
-+ if (ACPI_SUCCESS (Status) && Subtable)
- {
- DtInsertSubtable (ParentTable, Subtable);
- }
-@@ -795,7 +797,7 @@ DtCompileCsrt (
-
- DtPopSubtable ();
- ParentTable = DtPeekSubtable ();
-- DescriptorCount--;
-+ Offset += DescriptorLength;
- }
-
- DtPopSubtable ();
diff --git a/0046-Support-PHAT-in-a-big-endian-world.patch b/0046-Support-PHAT-in-a-big-endian-world.patch
deleted file mode 100644
index 9a22b3b..0000000
--- a/0046-Support-PHAT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From 5fd729c8f6c4ce295edd142fc41e03e831ba4afb Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3(a)redhat.com>
-Date: Mon, 12 Jul 2021 09:39:38 -0600
-Subject: [PATCH] Support PHAT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 36 ++++++++++++++++++++----------------
- source/compiler/dttable2.c | 12 +++++++++---
- 2 files changed, 29 insertions(+), 19 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -2029,39 +2029,41 @@ AcpiDmDumpPhat (
- ACPI_PHAT_HEADER *Subtable;
- ACPI_PHAT_VERSION_DATA *VersionData;
- UINT32 RecordCount;
-- UINT32 Length = Table->Length;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_PHAT);
-- UINT32 SubtableLength;
-+ UINT16 SubtableLength;
- UINT32 PathLength;
- UINT32 VendorLength;
-+ UINT16 SubtableType;
-
-
- Subtable = ACPI_ADD_PTR (ACPI_PHAT_HEADER, Table, sizeof (ACPI_TABLE_PHAT));
-
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- /* Common subtable header */
-
-+ SubtableType = AcpiUtReadUint16 (&Subtable->Type);
-+ SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
-+
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Length, 0, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, 0, Subtable,
- sizeof (ACPI_PHAT_HEADER), AcpiDmTableInfoPhatHdr);
- if (ACPI_FAILURE (Status))
- {
- return;
- }
-
-- switch (Subtable->Type)
-+ switch (SubtableType)
- {
- case ACPI_PHAT_TYPE_FW_VERSION_DATA:
-
- InfoTable = AcpiDmTableInfoPhat0;
-- SubtableLength = sizeof (ACPI_PHAT_VERSION_DATA);
- break;
-
- case ACPI_PHAT_TYPE_FW_HEALTH_DATA:
-
- InfoTable = AcpiDmTableInfoPhat1;
-- SubtableLength = sizeof (ACPI_PHAT_HEALTH_DATA);
- break;
-
- default:
-@@ -2072,22 +2074,22 @@ AcpiDmDumpPhat (
- return;
- }
-
-- Status = AcpiDmDumpTable (Length, 0, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, 0, Subtable,
- SubtableLength, InfoTable);
- if (ACPI_FAILURE (Status))
- {
- return;
- }
-
-- switch (Subtable->Type)
-+ switch (SubtableType)
- {
- case ACPI_PHAT_TYPE_FW_VERSION_DATA:
-
- VersionData = ACPI_CAST_PTR (ACPI_PHAT_VERSION_DATA, Subtable);
-- RecordCount = VersionData->ElementCount;
-+ RecordCount = AcpiUtReadUint32 (&VersionData->ElementCount);
- while (RecordCount)
- {
-- Status = AcpiDmDumpTable (Length, Offset,
-+ Status = AcpiDmDumpTable (TableLength, Offset,
- ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_VERSION_DATA)),
- sizeof (ACPI_PHAT_VERSION_ELEMENT), AcpiDmTableInfoPhat0a);
- if (ACPI_FAILURE (Status))
-@@ -2105,7 +2107,7 @@ AcpiDmDumpPhat (
- /* account for the null terminator */
-
- PathLength = strlen (ACPI_ADD_PTR (char, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA))) + 1;
-- Status = AcpiDmDumpTable (Length, Offset,
-+ Status = AcpiDmDumpTable (TableLength, Offset,
- ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA)),
- PathLength, AcpiDmTableInfoPhat1a);
- if (ACPI_FAILURE (Status))
-@@ -2116,8 +2118,8 @@ AcpiDmDumpPhat (
- /* Get vendor data - data length is the remaining subtable length */
-
- VendorLength =
-- Subtable->Length - sizeof (ACPI_PHAT_HEALTH_DATA) - PathLength;
-- Status = AcpiDmDumpTable (Length, 0,
-+ SubtableLength - sizeof (ACPI_PHAT_HEALTH_DATA) - PathLength;
-+ Status = AcpiDmDumpTable (TableLength, 0,
- ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA) + PathLength),
- VendorLength, AcpiDmTableInfoPhat1b);
- if (ACPI_FAILURE (Status))
-@@ -2129,15 +2131,15 @@ AcpiDmDumpPhat (
- default:
-
- AcpiOsPrintf ("\n**** Unknown PHAT subtable type 0x%X\n\n",
-- Subtable->Type);
-+ SubtableType);
- return;
- }
-
- /* Next subtable */
-
-- Offset += Subtable->Length;
-+ Offset += SubtableLength;
- Subtable = ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable,
-- Subtable->Length);
-+ SubtableLength);
- }
- }
-
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -1267,6 +1267,8 @@ DtCompilePhat (
- ACPI_DMTABLE_INFO *Info;
- ACPI_PHAT_VERSION_DATA *VersionData;
- UINT32 RecordCount;
-+ UINT16 SubtableType;
-+ UINT16 Tmp16;
-
-
- /* The table consist of subtables */
-@@ -1284,8 +1286,9 @@ DtCompilePhat (
- DtPushSubtable (Subtable);
-
- PhatHeader = ACPI_CAST_PTR (ACPI_PHAT_HEADER, Subtable->Buffer);
-+ SubtableType = AcpiUtReadUint16 (&PhatHeader->Type);
-
-- switch (PhatHeader->Type)
-+ switch (SubtableType)
- {
- case ACPI_PHAT_TYPE_FW_VERSION_DATA:
-
-@@ -1316,13 +1319,13 @@ DtCompilePhat (
- ParentTable = DtPeekSubtable ();
- DtInsertSubtable (ParentTable, Subtable);
-
-- switch (PhatHeader->Type)
-+ switch (SubtableType)
- {
- case ACPI_PHAT_TYPE_FW_VERSION_DATA:
-
- VersionData = ACPI_CAST_PTR (ACPI_PHAT_VERSION_DATA,
- (Subtable->Buffer - sizeof (ACPI_PHAT_HEADER)));
-- RecordCount = VersionData->ElementCount;
-+ RecordCount = AcpiUtReadUint32 (&VersionData->ElementCount);
-
- while (RecordCount)
- {
-@@ -1373,6 +1376,9 @@ DtCompilePhat (
- DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, *PFieldList, "PHAT");
- return (AE_ERROR);
- }
-+
-+ Tmp16 = AcpiUtReadUint16 (&PhatHeader->Length);
-+ PhatHeader->Length = Tmp16;
- }
-
- return (Status);
diff --git a/0047-Support-PRMT-in-a-big-endian-world.patch b/0047-Support-PRMT-in-a-big-endian-world.patch
deleted file mode 100644
index 96df1d5..0000000
--- a/0047-Support-PRMT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Signed-off-by: Dean Nelson <dnelson(a)redhat.com>
-Reviewed-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -2415,13 +2415,14 @@ AcpiDmDumpPrmt (
- ACPI_PRMT_MODULE_INFO *PrmtModuleInfo;
- ACPI_PRMT_HANDLER_INFO *PrmtHandlerInfo;
- ACPI_STATUS Status;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
- UINT32 i, j;
-
-
- /* Main table header */
-
- PrmtHeader = ACPI_ADD_PTR (ACPI_TABLE_PRMT_HEADER, Table, CurrentOffset);
-- Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtHeader,
-+ Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtHeader,
- sizeof (ACPI_TABLE_PRMT_HEADER), AcpiDmTableInfoPrmtHdr);
- if (ACPI_FAILURE (Status))
- {
-@@ -2433,20 +2434,20 @@ AcpiDmDumpPrmt (
-
- /* PRM Module Information Structure array */
-
-- for (i = 0; i < PrmtHeader->ModuleInfoCount; ++i)
-+ for (i = 0; i < AcpiUtReadUint32 (&PrmtHeader->ModuleInfoCount); ++i)
- {
- PrmtModuleInfo = ACPI_ADD_PTR (ACPI_PRMT_MODULE_INFO, Table, CurrentOffset);
-- Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtModuleInfo,
-+ Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtModuleInfo,
- sizeof (ACPI_PRMT_MODULE_INFO), AcpiDmTableInfoPrmtModule);
-
- CurrentOffset += sizeof (ACPI_PRMT_MODULE_INFO);
-
- /* PRM handler information structure array */
-
-- for (j = 0; j < PrmtModuleInfo->HandlerInfoCount; ++j)
-+ for (j = 0; j < AcpiUtReadUint16 (&PrmtModuleInfo->HandlerInfoCount); ++j)
- {
- PrmtHandlerInfo = ACPI_ADD_PTR (ACPI_PRMT_HANDLER_INFO, Table, CurrentOffset);
-- Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtHandlerInfo,
-+ Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtHandlerInfo,
- sizeof (ACPI_PRMT_HANDLER_INFO), AcpiDmTableInfoPrmtHandler);
-
- CurrentOffset += sizeof (ACPI_PRMT_HANDLER_INFO);
diff --git a/0048-Support-RGRT-in-a-big-endian-world.patch b/0048-Support-RGRT-in-a-big-endian-world.patch
deleted file mode 100644
index 818d335..0000000
--- a/0048-Support-RGRT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Signed-off-by: Dean Nelson <dnelson(a)redhat.com>
-Reviewed-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump2.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -2475,11 +2475,12 @@ AcpiDmDumpRgrt (
- ACPI_STATUS Status;
- ACPI_TABLE_RGRT *Subtable = ACPI_CAST_PTR (ACPI_TABLE_RGRT, Table);
- UINT32 Offset = sizeof (ACPI_TABLE_RGRT);
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoRgrt);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoRgrt);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2487,8 +2488,8 @@ AcpiDmDumpRgrt (
-
- /* Dump the binary image as a subtable */
-
-- Status = AcpiDmDumpTable (Table->Length, Offset, &Subtable->Image,
-- Table->Length - Offset, AcpiDmTableInfoRgrt0);
-+ Status = AcpiDmDumpTable (TableLength, Offset, &Subtable->Image,
-+ TableLength - Offset, AcpiDmTableInfoRgrt0);
- if (ACPI_FAILURE (Status))
- {
- return;
diff --git a/0049-Support-SVKL-in-a-big-endian-world.patch b/0049-Support-SVKL-in-a-big-endian-world.patch
deleted file mode 100644
index 8ba5efc..0000000
--- a/0049-Support-SVKL-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Signed-off-by: Dean Nelson <dnelson(a)redhat.com>
-Reviewed-by: Al Stone <ahs3(a)redhat.com>
----
- source/common/dmtbdump3.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -344,14 +344,14 @@ AcpiDmDumpSvkl (
- ACPI_TABLE_HEADER *Table)
- {
- ACPI_STATUS Status;
-- UINT32 Length = Table->Length;
-+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
- UINT32 Offset = sizeof (ACPI_TABLE_SVKL);
- ACPI_SVKL_KEY *Subtable;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSvkl);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSvkl);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -360,12 +360,12 @@ AcpiDmDumpSvkl (
- /* The rest of the table consists of subtables (single type) */
-
- Subtable = ACPI_ADD_PTR (ACPI_SVKL_KEY, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- /* Dump the subtable */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
- sizeof (ACPI_SVKL_KEY), AcpiDmTableInfoSvkl0);
- if (ACPI_FAILURE (Status))
- {
diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch
index 2afc266..ff454b7 100644
--- a/OPT_LDFLAGS.patch
+++ b/OPT_LDFLAGS.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20220331/generate/unix/Makefile.config
+Index: acpica-unix2-20240321/generate/unix/Makefile.config
===================================================================
---- acpica-unix2-20220331.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20220331/generate/unix/Makefile.config
+--- acpica-unix2-20240321.orig/generate/unix/Makefile.config
++++ acpica-unix2-20240321/generate/unix/Makefile.config
@@ -23,6 +23,9 @@
# OPT_CFLAGS can be overridden on the make command line by
# adding OPT_CFLAGS="..." to the invocation.
diff --git a/acpica-tools.spec b/acpica-tools.spec
index d63e30e..f654307 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,13 +1,13 @@
Name: acpica-tools
-Version: 20220331
-Release: 10%{?dist}
+Version: 20240322
+Release: 1%{?dist}
Summary: ACPICA tools for the development and debug of ACPI tables
# Automatically converted from old format: GPLv2 - review is highly recommended.
License: GPL-2.0-only
URL: https://www.acpica.org/
-ExcludeArch: i686 armv7hl
+ExcludeArch: i686 armv7hl s390x
Source0: https://acpica.org/sites/acpica/files/acpica-unix2-%{version}.tar.gz
Source1: https://acpica.org/sites/acpica/files/acpitests-unix-%{version}.tar.gz
@@ -26,75 +26,23 @@ Source14: converterSample.asl.result
Source15: run-misc-tests.sh
Source16: COPYING
-# the big-endian patch set
-Patch0: 0001-Add-in-basic-infrastructure-for-big-endian-support.patch
-Patch1: 0002-Modify-utility-functions-to-be-endian-agnostic.patch
-Patch2: 0003-Always-display-table-header-content-in-human-readabl.patch
-Patch3: 0004-Re-enable-support-for-big-endian-machines.patch
-Patch4: 0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
-Patch5: 0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
-Patch6: 0007-Handle-dumping-Unicode-properly-when-big-endian.patch
-Patch7: 0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
-Patch8: 0009-Support-ASF-tables-in-a-big-endian-world.patch
-Patch9: 0010-Support-CPEP-tables-in-a-big-endian-world.patch
-Patch10: 0011-Support-DBG2-table-in-a-big-endian-world.patch
-Patch11: 0012-Support-DMAR-in-a-big-endian-world.patch
-Patch12: 0013-Support-DRTM-in-a-big-endian-world.patch
-Patch13: 0014-Support-EINJ-in-a-big-endian-world.patch
-Patch14: 0015-Support-ERST-in-a-big-endian-world.patch
-Patch15: 0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
-Patch16: 0017-Support-most-FPDTs-in-a-big-endian-world.patch
-Patch17: 0018-Support-GTDT-in-a-big-endian-world.patch
-Patch18: 0019-Support-HEST-in-a-big-endian-world.patch
-Patch19: 0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
-Patch20: 0021-Support-XSDT-in-a-big-endian-world.patch
-Patch21: 0022-Support-SRAT-in-a-big-endian-world.patch
-Patch22: 0023-Support-SLIT-in-a-big-endian-world.patch
-Patch23: 0024-Support-MSCT-in-a-big-endian-world.patch
-Patch24: 0025-Support-MPST-in-a-big-endian-world.patch
-Patch25: 0026-Support-NFIT-in-a-big-endian-world.patch
-Patch26: 0027-Support-SDEV-in-a-big-endian-world.patch
-Patch27: 0028-Support-HMAT-in-a-big-endian-world.patch
-Patch28: 0029-Support-PDTT-in-a-big-endian-world.patch
-Patch29: 0030-Support-PPTT-in-a-big-endian-world.patch
-Patch30: 0031-Support-PCCT-in-a-big-endian-world.patch
-Patch31: 0032-Support-WDAT-in-a-big-endian-world.patch
-Patch32: 0033-Support-TCPA-in-a-big-endian-world.patch
-Patch33: 0034-Support-STAO-in-a-big-endian-world.patch
-Patch34: 0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
-Patch35: 0036-Support-MCFG-in-a-big-endian-world.patch
-Patch36: 0037-Support-LPIT-in-a-big-endian-world.patch
-Patch37: 0038-Support-PMTT-in-a-big-endian-world.patch
-Patch38: 0039-Support-TPM2-in-a-big-endian-world.patch
-Patch39: 0040-Support-S3PT-in-a-big-endian-world.patch
-Patch40: 0041-Support-IORT-in-a-big-endian-world.patch
-Patch41: 0042-Support-IVRS-in-a-big-endian-world.patch
-Patch42: 0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
-Patch43: 0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
-Patch44: 0046-Support-PHAT-in-a-big-endian-world.patch
-Patch45: 0047-Support-PRMT-in-a-big-endian-world.patch
-Patch46: 0048-Support-RGRT-in-a-big-endian-world.patch
-Patch47: 0049-Support-SVKL-in-a-big-endian-world.patch
-
# other miscellaneous patches
Patch100: unaligned.patch
-Patch101: OPT_LDFLAGS.patch
-Patch102: int-format.patch
-Patch103: f23-harden.patch
+#Patch101: OPT_LDFLAGS.patch
+#Patch102: int-format.patch
Patch104: template.patch
-Patch105: arm7hl.patch
-Patch106: simple-64bit.patch
-Patch107: mips-be-fix.patch
+#Patch106: simple-64bit.patch
+#Patch107: mips-be-fix.patch
Patch108: cve-2017-13693.patch
Patch109: cve-2017-13694.patch
Patch110: cve-2017-13695.patch
Patch111: str-trunc-warn.patch
-Patch112: ptr-cast.patch
-Patch113: armv7-str-fixes.patch
+#Patch112: ptr-cast.patch
+#Patch113: armv7-str-fixes.patch
Patch114: dbtest.patch
-Patch115: ull-32bit.patch
Patch116: dangling-ptr.patch
Patch117: uuid-len.patch
+Patch118: fix-version.patch
BuildRequires: make
BuildRequires: bison patchutils flex gcc
@@ -204,7 +152,7 @@ OPT_LDFLAGS="%{__global_ldflags}"
export OPT_CFLAGS
export OPT_LDFLAGS
-make
+%{make_build}
%install
@@ -260,6 +208,23 @@ fi
%changelog
+* Mon Aug 12 2024 Al Stone <ahs3(a)fedoraproject.org> - 20240322-1
+- Update source tree to 20240322 version from upstream. NB: this update
+ is done in conjunction with removing s390x support due to the large
+ number of patches that are now rendered obsolete. Closes BZ#2138250.
+- Note, too, that the upstream version of the tarball is missing two
+ commits and has the wrong name; discussed this with upstream and
+ included a patch with the two commits to correct this, and renamed
+ the tarballs to try to maintain consistency. So, upstream is actually
+ named version 20240321, but it should be 20240322 according to their
+ own git tree (see tag G20240322 on github).
+- Removed executable bit from all the upstream source files
+- Remove big-endian support, aka s390x. Closes BZ#2298855.
+- Remove several 32-bit only patches that are also obsolete since they
+ are for unsupported architectures (thanks to pbonzini and PR#5).
+- Remove PIE patches since that is currently the default (again, thanks
+ to pbonzini and PR#5)
+
* Mon Jul 29 2024 Miroslav Suchý <msuchy(a)redhat.com> - 20220331-10
- convert license to SPDX
diff --git a/arm7hl.patch b/arm7hl.patch
deleted file mode 100644
index ffe22e9..0000000
--- a/arm7hl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: acpica-unix2-20220331/source/include/acmacros.h
-===================================================================
---- acpica-unix2-20220331.orig/source/include/acmacros.h
-+++ acpica-unix2-20220331/source/include/acmacros.h
-@@ -108,6 +108,8 @@
-
- /* 16-bit source, 16/32/64 destination */
-
-+#define ACPI_MOVE_16_TO_8(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];}
-+
- #define ACPI_MOVE_16_TO_16(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\
- (( UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[1];}
-
-@@ -127,6 +129,7 @@
-
- /* 64-bit source, 16/32/64 destination */
-
-+#define ACPI_MOVE_64_TO_8(d, s) ACPI_MOVE_16_TO_8(d, s) /* Truncate to 8 */
- #define ACPI_MOVE_64_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */
- #define ACPI_MOVE_64_TO_32(d, s) ACPI_MOVE_32_TO_32(d, s) /* Truncate to 32 */
- #define ACPI_MOVE_64_TO_64(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\
diff --git a/badcode.asl.result b/badcode.asl.result
index d1229f4..a2e1a2c 100644
--- a/badcode.asl.result
+++ b/badcode.asl.result
@@ -1,3 +1,12 @@
+badcode.asl 37: Name (PATH, Buffer() {"\_SB_.PCI2._CRS"})
+Warning 3046 - ^ Invalid or unknown escape sequence
+
+badcode.asl 41: Name (ESC1, "abcdefg\x00hijklmn")
+Warning 3055 - ^ Invalid Hex/Octal Escape - Non-ASCII or NULL
+
+badcode.asl 268: QWordSpace (0xB0, ResourceConsumer, PosDecode, MinFixed, MaxFixed, 0xA5,
+Error 6139 - Constant out of range ^ (0xB0, allowable: 0xC0-0xFF)
+
badcode.asl 25: Mutex (MTX1, 32)
Error 6125 - ^ SyncLevel must be in the range 0-15
@@ -256,11 +265,11 @@ Warning 3144 - ^ Method Local is set but never used
Intel ACPI Component Architecture
ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2022 Intel Corporation
+Copyright (c) 2000 - 2023 Intel Corporation
Ignoring all errors, forcing AML file generation
-ASL Input: badcode.asl - 11588 bytes 81 keywords 408 source lines
+ASL Input: badcode.asl - 11588 bytes 81 keywords 0 source lines
AML Output: badcode.aml - 1195 bytes 20 opcodes 61 named objects
-Compilation successful. 0 Errors, 28 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded
+Compilation successful. 46 Errors, 28 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded
diff --git a/converterSample.asl.result b/converterSample.asl.result
index c890c9d..ccc9971 100644
--- a/converterSample.asl.result
+++ b/converterSample.asl.result
@@ -4,6 +4,21 @@ Remark 2182 - ^ At least one lower case letter found in N
converterSample.asl 16: Name(p008, Package()
Remark 2182 - ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (P008)
+converterSample.asl 48: Name(b,0);
+Remark 2182 - ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (B___)
+
+converterSample.asl 53: Name (a,
+Remark 2182 - ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (A___)
+
+converterSample.asl 68: Name (a1, 0x04)
+Remark 2182 - ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (A1__)
+
+converterSample.asl 15: Name (b, 5)
+Remark 2182 - ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (B___)
+
+converterSample.asl 16: Name(p008, Package()
+Remark 2182 - ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (P008)
+
converterSample.asl 37: Method(MAIN) {
Remark 2120 - ^ Control Method should be made Serialized due to creation of named objects within (\MAIN)
@@ -28,11 +43,11 @@ Remark 2089 - Object is not referenced ^ (Name [A1__] is within a method [SC
Intel ACPI Component Architecture
ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2022 Intel Corporation
+Copyright (c) 2000 - 2023 Intel Corporation
Ignoring all errors, forcing AML file generation
-ASL Input: converterSample.asl - 1968 bytes 11 keywords 85 source lines
+ASL Input: converterSample.asl - 1968 bytes 11 keywords 0 source lines
AML Output: converterSample.aml - 184 bytes 2 opcodes 9 named objects
Compilation successful. 0 Errors, 0 Warnings, 9 Remarks, 9 Optimizations
diff --git a/cve-2017-13693.patch b/cve-2017-13693.patch
index 7e1a156..3e1849c 100644
--- a/cve-2017-13693.patch
+++ b/cve-2017-13693.patch
@@ -63,10 +63,10 @@ Github-Location: https://github.com/acpica/acpica/pull/295/commits/987a3b5cf7175
source/components/dispatcher/dsutils.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
-Index: acpica-unix2-20220331/source/components/dispatcher/dsutils.c
+Index: acpica-unix2-20240321/source/components/dispatcher/dsutils.c
===================================================================
---- acpica-unix2-20220331.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix2-20220331/source/components/dispatcher/dsutils.c
+--- acpica-unix2-20240321.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix2-20240321/source/components/dispatcher/dsutils.c
@@ -759,6 +759,8 @@ AcpiDsCreateOperands (
ACPI_PARSE_OBJECT *Arguments[ACPI_OBJ_NUM_OPERANDS];
UINT32 ArgCount = 0;
diff --git a/cve-2017-13694.patch b/cve-2017-13694.patch
index d1d3032..8ae2da4 100644
--- a/cve-2017-13694.patch
+++ b/cve-2017-13694.patch
@@ -130,10 +130,10 @@ Github-Location: https://github.com/acpica/acpica/pull/278/commits/4a0243ecb4c94
source/components/parser/psobject.c | 44 ++++++++++++++-----------------------
1 file changed, 16 insertions(+), 28 deletions(-)
-Index: acpica-unix2-20220331/source/components/parser/psobject.c
+Index: acpica-unix2-20240321/source/components/parser/psobject.c
===================================================================
---- acpica-unix2-20220331.orig/source/components/parser/psobject.c
-+++ acpica-unix2-20220331/source/components/parser/psobject.c
+--- acpica-unix2-20240321.orig/source/components/parser/psobject.c
++++ acpica-unix2-20240321/source/components/parser/psobject.c
@@ -707,7 +707,8 @@ AcpiPsCompleteFinalOp (
ACPI_PARSE_OBJECT *Op,
ACPI_STATUS Status)
diff --git a/cve-2017-13695.patch b/cve-2017-13695.patch
index e183a46..1a80450 100644
--- a/cve-2017-13695.patch
+++ b/cve-2017-13695.patch
@@ -67,10 +67,10 @@ Github-Location: https://github.com/acpica/acpica/pull/296/commits/37f2c716f2c6a
source/components/namespace/nseval.c | 10 ++++++++++
1 file changed, 10 insertions(+)
-Index: acpica-unix2-20220331/source/components/namespace/nseval.c
+Index: acpica-unix2-20240321/source/components/namespace/nseval.c
===================================================================
---- acpica-unix2-20220331.orig/source/components/namespace/nseval.c
-+++ acpica-unix2-20220331/source/components/namespace/nseval.c
+--- acpica-unix2-20240321.orig/source/components/namespace/nseval.c
++++ acpica-unix2-20240321/source/components/namespace/nseval.c
@@ -329,6 +329,16 @@ AcpiNsEvaluate (
Info->ReturnObject = NULL;
}
diff --git a/dangling-ptr.patch b/dangling-ptr.patch
index 582fb9e..178020d 100644
--- a/dangling-ptr.patch
+++ b/dangling-ptr.patch
@@ -1,7 +1,8 @@
-diff -Naur acpica-unix2-20211217/source/components/utilities/utdebug.c acpica-unix2-20211217.orig/source/components/utilities/utdebug.c
---- acpica-unix2-20211217/source/components/utilities/utdebug.c 2022-03-15 17:05:07.992387565 -0600
-+++ acpica-unix2-20211217.orig/source/components/utilities/utdebug.c 2021-12-17 10:48:16.000000000 -0700
-@@ -58,6 +58,10 @@
+Index: acpica-unix2-20240321/source/components/utilities/utdebug.c
+===================================================================
+--- acpica-unix2-20240321.orig/source/components/utilities/utdebug.c
++++ acpica-unix2-20240321/source/components/utilities/utdebug.c
+@@ -58,6 +58,10 @@ static const char *AcpiGbl_Fun
static const char *AcpiGbl_FunctionExitPrefix = "----Exit-";
@@ -12,7 +13,7 @@ diff -Naur acpica-unix2-20211217/source/components/utilities/utdebug.c acpica-un
/*******************************************************************************
*
* FUNCTION: AcpiUtInitStackPtrTrace
-@@ -114,6 +110,9 @@
+@@ -120,6 +124,9 @@ AcpiUtTrackStackPtr (
AcpiGbl_DeepestNesting = AcpiGbl_NestingLevel;
}
}
diff --git a/dbtest.patch b/dbtest.patch
index b33e90b..54faf57 100644
--- a/dbtest.patch
+++ b/dbtest.patch
@@ -4,10 +4,10 @@ into an ACPI_OBJECT instead of just the pointer (see the use in the call
to memcpy()). So, move the init so GCC recognizes that ValueToWrite is
only a pointer, and not a whole string that needs to be moved.
-Index: acpica-unix2-20220331/source/components/debugger/dbtest.c
+Index: acpica-unix2-20240321/source/components/debugger/dbtest.c
===================================================================
---- acpica-unix2-20220331.orig/source/components/debugger/dbtest.c
-+++ acpica-unix2-20220331/source/components/debugger/dbtest.c
+--- acpica-unix2-20240321.orig/source/components/debugger/dbtest.c
++++ acpica-unix2-20240321/source/components/debugger/dbtest.c
@@ -719,9 +719,10 @@ AcpiDbTestStringType (
ACPI_OBJECT *Temp1 = NULL;
ACPI_OBJECT *Temp2 = NULL;
diff --git a/f23-harden.patch b/f23-harden.patch
deleted file mode 100644
index 4279c50..0000000
--- a/f23-harden.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Introduce build hardening flags for f23
-
-From: Al Stone <ahs3(a)redhat.com>
-
-
----
- generate/unix/Makefile.config | 2 ++
- generate/unix/iasl/Makefile | 13 +++++++------
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-Index: acpica-unix2-20220331/generate/unix/Makefile.config
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20220331/generate/unix/Makefile.config
-@@ -189,6 +189,8 @@ ifneq ($(NOFORTIFY),TRUE)
- OPT_CFLAGS += -D_FORTIFY_SOURCE=2
- endif
-
-+OPT_CFLAGS += -fPIC -pie
-+
- CFLAGS += \
- -D$(ACPI_HOST)\
- -D_GNU_SOURCE\
-Index: acpica-unix2-20220331/generate/unix/iasl/Makefile
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/iasl/Makefile
-+++ acpica-unix2-20220331/generate/unix/iasl/Makefile
-@@ -359,34 +359,35 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
- # Cannot use the common compile warning flags since the C files are created
- # by the utilities above and they are not necessarily ANSI C, etc.
- #
-+HARDENING_FLAGS = -fPIC -pie
- $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c
- @echo "- " "Intermediate" $<
-- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
-
- $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c
- @echo "- " "Intermediate" $<
-- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
-
- $(OBJDIR)/dtcompilerparserlex.o : $(OBJDIR)/dtcompilerparserlex.c
- @echo "- " "Intermediate" $<
-- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
-
- $(OBJDIR)/dtcompilerparserparse.o : $(OBJDIR)/dtcompilerparserparse.c
- @echo "- " "Intermediate" $<
-- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
-
- $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c
- @echo "- " "Intermediate" $<
-- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
-
- $(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c
- @echo "- " "Intermediate" $<
-- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
-
- $(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c
- @echo "- " "Intermediate" $<
-- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
-
- $(OBJDIR)/prparserparse.o : $(OBJDIR)/prparserparse.c
- @echo "- " "Intermediate" $<
-- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
diff --git a/fix-version.patch b/fix-version.patch
new file mode 100644
index 0000000..2ff7407
--- /dev/null
+++ b/fix-version.patch
@@ -0,0 +1,50 @@
+The two changes that follow were inadvertently dropped by upstream
+when creating the source tarball; the G20240322 tag in github contains
+them.
+
+Signed-off-by: Al Stone <ahs3(a)fedoraproject.org>
+
+diff -Naur acpica-unix-20240321/changes.txt acpica-unix-20240808/changes.txt
+--- acpica-unix-20240321/changes.txt 2024-03-22 00:16:29.000000000 -0600
++++ acpica-unix-20240808/changes.txt 2024-08-08 10:54:25.000000000 -0600
+@@ -1,4 +1,28 @@
+ ----------------------------------------
++22 March 2024. Summary of changes for version 20240322:
++
++Major changes:
++
++Update all the license header year from 2023 to 2024.
++
++Fix table argument ordering to work properly with iasl.
++
++Get rid of the annoying repeated warning types in MSVC and Windows.
++
++Fix a test in ASLTS with edge case failure.
++
++Fix a couple of issues with how GPEs are counted and enabled.
++
++Add new tables for various architectures/OS, mainly RISC-V and also update many more.
++
++Add an option to either make the output deterministic or non-deterministic.
++
++Remove redundant checks, duplicated code and fix spellings in various files.
++
++Fix flex arrays for C++ compilers and also make ACPICA overall more compatible with different compilers which throw warnings related to memory sanitization etc.
++
++
++----------------------------------------
+ 28 June 2023. Summary of changes for version 20230628:
+
+ 0) Global changes:
+diff -Naur acpica-unix-20240321/source/include/acpixf.h acpica-unix-20240808/source/include/acpixf.h
+--- acpica-unix-20240321/source/include/acpixf.h 2024-03-22 00:16:32.000000000 -0600
++++ acpica-unix-20240808/source/include/acpixf.h 2024-08-08 10:54:25.000000000 -0600
+@@ -154,7 +154,7 @@
+
+ /* Current ACPICA subsystem version in YYYYMMDD format */
+
+-#define ACPI_CA_VERSION 0x20230628
++#define ACPI_CA_VERSION 0x20240322
+
+ #include "acconfig.h"
+ #include "actypes.h"
diff --git a/grammar.asl.result b/grammar.asl.result
index 5517bd6..8bc361b 100644
--- a/grammar.asl.result
+++ b/grammar.asl.result
@@ -1,3 +1,18 @@
+grammar.asl 522: NAME (ESC1, "abcdefg\x00hijklmn")
+Warning 3055 - ^ Invalid Hex/Octal Escape - Non-ASCII or NULL
+
+grammar.asl 523: NAME (ESC2, "abcdefg\000hijklmn")
+Warning 3055 - ^ Invalid Hex/Octal Escape - Non-ASCII or NULL
+
+grammar.asl 552: IRQNoFlags(xxxt){3,4,10,11}
+Remark 2182 - ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (XXXT)
+
+grammar.asl 566: Name(Bxxx,0xFFFFFFFF)
+Remark 2182 - ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (BXXX)
+
+grammar.asl 6478: Name (_CRS, Buffer(26) {"\_SB_.PCI2._CRS..........."})
+Warning 3046 - Invalid or unknown escape sequence ^
+
grammar.asl 120: Device (A1)
Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR)
@@ -595,11 +610,11 @@ Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR)
Intel ACPI Component Architecture
ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2022 Intel Corporation
+Copyright (c) 2000 - 2023 Intel Corporation
Ignoring all errors, forcing AML file generation
-ASL Input: grammar.asl - 323653 bytes 4818 keywords 10284 source lines
+ASL Input: grammar.asl - 323653 bytes 4818 keywords 0 source lines
AML Output: grammar.aml - 43758 bytes 4148 opcodes 670 named objects
-Compilation successful. 0 Errors, 41 Warnings, 97 Remarks, 1106 Optimizations
+Compilation successful. 60 Errors, 41 Warnings, 97 Remarks, 1106 Optimizations
diff --git a/run-misc-tests.sh b/run-misc-tests.sh
index c0da397..41e788c 100644
--- a/run-misc-tests.sh
+++ b/run-misc-tests.sh
@@ -16,7 +16,7 @@ BINDIR="$1"
VERSION="$2"
# create files to compare against
-$BINDIR/iasl -hZZ
+$BINDIR/iasl -h
sed -e "s/VVVVVVVV/$VERSION/" \
../badcode.asl.result > misc/badcode.asl.expected
diff --git a/sources b/sources
index d4bf4b2..3f9ece6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20220331.tar.gz) = c606396323dc342ae4c7bab9526b04aca09b00a932363146c1791523962ade0bdb4e40b67ff2a0a246df3ce322592879288c3fcc5fb7a450beb87a6d70c5ef40
-SHA512 (acpitests-unix-20220331.tar.gz) = 28ead3ff06fc7e409e5fd02358048470daac6d3a96f24408068b84199f33513b5fcaa7c00a31972e63fc481d4b5980f8b8f131549d9d1bcd19fa20f3a1c2aaaf
+SHA512 (acpica-unix2-20240322.tar.gz) = 199a5acb93193f22b9f85690ad87cdf914185fdf52beafaec8c4299c29f4c9d5b618c72a62413b228307f5be3933cf51cdcd91a6728d9caea66408534006e3f8
+SHA512 (acpitests-unix-20240322.tar.gz) = e09b0b953d53e28b9849b1ed41068c5542f0e36eb47f442bba6238727bfd96ad94584c0aa1e8d92c307c317dbd208388d3d9c83c2d17e146571a7373bff40b98
diff --git a/str-trunc-warn.patch b/str-trunc-warn.patch
index c866985..e510c7a 100644
--- a/str-trunc-warn.patch
+++ b/str-trunc-warn.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20220331/source/compiler/aslanalyze.c
+Index: acpica-unix2-20240321/source/compiler/aslanalyze.c
===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslanalyze.c
-+++ acpica-unix2-20220331/source/compiler/aslanalyze.c
+--- acpica-unix2-20240321.orig/source/compiler/aslanalyze.c
++++ acpica-unix2-20240321/source/compiler/aslanalyze.c
@@ -358,11 +358,16 @@ AnCheckMethodReturnValue (
*/
if (ThisNodeBtype != 0)
@@ -21,10 +21,10 @@ Index: acpica-unix2-20220331/source/compiler/aslanalyze.c
}
}
-Index: acpica-unix2-20220331/source/compiler/aslpredef.c
+Index: acpica-unix2-20240321/source/compiler/aslpredef.c
===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslpredef.c
-+++ acpica-unix2-20220331/source/compiler/aslpredef.c
+--- acpica-unix2-20240321.orig/source/compiler/aslpredef.c
++++ acpica-unix2-20240321/source/compiler/aslpredef.c
@@ -159,14 +159,19 @@ ApCheckForPredefinedMethod (
if (MethodInfo->NumReturnNoValue &&
ThisName->Info.ExpectedBtypes)
@@ -84,10 +84,10 @@ Index: acpica-unix2-20220331/source/compiler/aslpredef.c
return (AE_TYPE);
}
-Index: acpica-unix2-20220331/source/compiler/aslwalks.c
+Index: acpica-unix2-20240321/source/compiler/aslwalks.c
===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslwalks.c
-+++ acpica-unix2-20220331/source/compiler/aslwalks.c
+--- acpica-unix2-20240321.orig/source/compiler/aslwalks.c
++++ acpica-unix2-20240321/source/compiler/aslwalks.c
@@ -515,15 +515,19 @@ AnOperandTypecheckWalkEnd (
else if (!CommonBtypes)
{
diff --git a/template.patch b/template.patch
index 4f9af9b..c80287c 100644
--- a/template.patch
+++ b/template.patch
@@ -7,10 +7,10 @@ From: Al Stone <ahs3(a)redhat.com>
tests/templates/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: acpica-unix2-20220331/tests/templates/Makefile
+Index: acpica-unix2-20240321/tests/templates/Makefile
===================================================================
---- acpica-unix2-20220331.orig/tests/templates/Makefile
-+++ acpica-unix2-20220331/tests/templates/Makefile
+--- acpica-unix2-20240321.orig/tests/templates/Makefile
++++ acpica-unix2-20240321/tests/templates/Makefile
@@ -26,7 +26,7 @@ $(aml_obj): %.aml: %.asl
diff --git a/ull-32bit.patch b/ull-32bit.patch
deleted file mode 100644
index 9de0473..0000000
--- a/ull-32bit.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: acpica-unix2-20220331/source/common/dmtbdump.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20220331/source/common/dmtbdump.c
-@@ -392,7 +392,11 @@ AcpiDmDumpXsdt (
- for (i = 0; i < Entries; i++)
- {
- AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
-+#if ACPI_MACHINE_WIDTH == 32
-+ AcpiOsPrintf ("%16.16llX\n", AcpiUtReadUint64 (&Array[i]));
-+#else
- AcpiOsPrintf ("%16.16lX\n", AcpiUtReadUint64 (&Array[i]));
-+#endif
- Offset += sizeof (UINT64);
- }
- }
diff --git a/unaligned.patch b/unaligned.patch
index 11d6c86..ff5c729 100644
--- a/unaligned.patch
+++ b/unaligned.patch
@@ -14,10 +14,10 @@ Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com>
source/include/actypes.h | 26 +++++++++++++-------------
3 files changed, 32 insertions(+), 21 deletions(-)
-Index: acpica-unix2-20220331/source/components/executer/exoparg2.c
+Index: acpica-unix2-20240321/source/components/executer/exoparg2.c
===================================================================
---- acpica-unix2-20220331.orig/source/components/executer/exoparg2.c
-+++ acpica-unix2-20220331/source/components/executer/exoparg2.c
+--- acpica-unix2-20240321.orig/source/components/executer/exoparg2.c
++++ acpica-unix2-20240321/source/components/executer/exoparg2.c
@@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R (
ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0];
ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL;
@@ -58,10 +58,10 @@ Index: acpica-unix2-20220331/source/components/executer/exoparg2.c
break;
case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */
-Index: acpica-unix2-20220331/source/include/actypes.h
+Index: acpica-unix2-20240321/source/include/actypes.h
===================================================================
---- acpica-unix2-20220331.orig/source/include/actypes.h
-+++ acpica-unix2-20220331/source/include/actypes.h
+--- acpica-unix2-20240321.orig/source/include/actypes.h
++++ acpica-unix2-20240321/source/include/actypes.h
@@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64
*/
#define ACPI_THREAD_ID UINT64
diff --git a/uuid-len.patch b/uuid-len.patch
index 26fd798..8e240e9 100644
--- a/uuid-len.patch
+++ b/uuid-len.patch
@@ -1,7 +1,8 @@
-diff -Naur acpica-unix2-20211217.orig/source/tools/acpiexec/aeregion.c acpica-unix2-20211217/source/tools/acpiexec/aeregion.c
---- acpica-unix2-20211217.orig/source/tools/acpiexec/aeregion.c 2021-12-17 10:48:17.000000000 -0700
-+++ acpica-unix2-20211217/source/tools/acpiexec/aeregion.c 2022-03-18 15:53:25.032687782 -0600
-@@ -97,7 +97,7 @@
+Index: acpica-unix2-20240321/source/tools/acpiexec/aeregion.c
+===================================================================
+--- acpica-unix2-20240321.orig/source/tools/acpiexec/aeregion.c
++++ acpica-unix2-20240321/source/tools/acpiexec/aeregion.c
+@@ -97,7 +97,7 @@ AeRegionHandler (
UINT32 Value1;
UINT32 Value2;
ACPI_RESOURCE *Resource;
1
0
Architecture specific change in rpms/nodejs-cjs-module-lexer.git
by githook-noreply＠fedoraproject.org 13 Aug '24
by githook-noreply＠fedoraproject.org 13 Aug '24
13 Aug '24
The package rpms/nodejs-cjs-module-lexer.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nodejs-cjs-module-lexer.git/commit/….
Change:
+ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le riscv64 noarch
Thanks.
Full change:
============
commit 14504e91c93902b70cdb2a1dc372b025d7f2a130
Author: Jan Staněk <jstanek(a)redhat.com>
Date: Tue Aug 13 16:23:29 2024 +0200
enable binaryen optimization
diff --git a/nodejs-cjs-module-lexer.spec b/nodejs-cjs-module-lexer.spec
index 932e985..ad39b2d 100644
--- a/nodejs-cjs-module-lexer.spec
+++ b/nodejs-cjs-module-lexer.spec
@@ -1,6 +1,8 @@
%global npm_name cjs-module-lexer
%global prebuilt_blobs lib/lexer.wasm
+%bcond wasm_opt 1
+
Name: nodejs-%{npm_name}
Summary: A very fast lexer used to detect the named exports of a CommonJS module
Version: 1.3.1
@@ -28,6 +30,9 @@ ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le riscv64 noarch
BuildRequires: clang lld make wasi-libc-devel
BuildRequires: nodejs-devel npm
+%if %{with wasm_opt}
+BuildRequires: binaryen
+%endif
# for autosetup -S git_am
BuildRequires: git-core
@@ -49,7 +54,8 @@ tar -xzf %{S:2} && ln -rsf node_modules_dev node_modules
WASM_CC=clang \
WASM_CFLAGS='--target=wasm32-wasi --sysroot=/usr/wasm32-wasi' \
WASM_LDFLAGS='-nostartfiles -nodefaultlibs -lc' \
- clean lib/lexer.wasm
+ %{?with_wasm_opt:WASM_OPT=/usr/bin/wasm-opt} \
+ clean lib/lexer.wasm %{?with_wasm_opt:optimize}
npm --offline run build
npm --offline pack
commit a9291b4b0db4102d038fbb9b76ed4e9a6949aab7
Author: Jan Staněk <jstanek(a)redhat.com>
Date: Tue Aug 13 16:11:33 2024 +0200
Update to version 1.3.1 (rhbz#2277570)
diff --git a/.gitignore b/.gitignore
index 681a41d..c5a4beb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
/cjs-module-lexer-1.2.3.tar.gz
/cjs-module-lexer-1.2.3-nm-dev.tgz
/cjs-module-lexer-1.2.3-bundled-licenses.txt
+/cjs-module-lexer-1.3.1.tar.gz
+/cjs-module-lexer-1.3.1-nm-dev.tgz
+/cjs-module-lexer-1.3.1-bundled-licenses.txt
diff --git a/nodejs-cjs-module-lexer.spec b/nodejs-cjs-module-lexer.spec
index d90b17c..932e985 100644
--- a/nodejs-cjs-module-lexer.spec
+++ b/nodejs-cjs-module-lexer.spec
@@ -3,7 +3,7 @@
Name: nodejs-%{npm_name}
Summary: A very fast lexer used to detect the named exports of a CommonJS module
-Version: 1.2.3
+Version: 1.3.1
Release: %autorelease
License: MIT
@@ -14,9 +14,6 @@ Source: https://github.com/nodejs/%{npm_name}/archive/%{version}/%{npm_name}
Source2: %{npm_name}-%{version}-nm-dev.tgz
Source3: %{npm_name}-%{version}-bundled-licenses.txt
-# Adapt Makefile for easier rebuilds
-Patch: 0001-parametrize-wasm-compilation-process.patch
-
# Binary files in this package are aimed at the wasm32-wasi "architecture".
%global _binaries_in_noarch_packages_terminate_build 0
BuildArch: noarch
diff --git a/sources b/sources
index 4c60588..0f91297 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (cjs-module-lexer-1.2.3.tar.gz) = dab77f606c0b0c12abf9e91994cd56b3492e45ecb6e615236abb948fa2a66146d25776bb895b4b25a1b3cb15168eb073b07ff405da47d3b2a1e62428171b4f76
-SHA512 (cjs-module-lexer-1.2.3-nm-dev.tgz) = 44d91bfe4e782a47d0506ec5d0bf12877083b263222535019efd0e0d50614d6688edde17571025ddd9c8f1c2a428974bfb59ee9d9c97d1b7e20150785cfab3de
-SHA512 (cjs-module-lexer-1.2.3-bundled-licenses.txt) = 3e591adb16e09b1c6fb75eb97a6ac51cd06e0aeae2bd5950a15902346e2c9626cb50203bfd0e15c7e8c98af8f24b81c1ce6617c359e7c0e7d0a6366457c844ba
+SHA512 (cjs-module-lexer-1.3.1.tar.gz) = cfd082aeb096bfa1ca9213571c072b6e0a13ba8ffdff3e12def6ea3f21a9ab6fcd4ad1ce342dff0a2a89f999b3bd1609e37aa11139b3deef39341b28cc856f4f
+SHA512 (cjs-module-lexer-1.3.1-nm-dev.tgz) = e0473ed3ff0514eab817641dc97ffca67b92d65a5817652eb48598e1fb3bd7095f1422fa2f4ae3c942d20ad0466f1aea7d8eabf71aa02de7f7f2bf656329aeb0
+SHA512 (cjs-module-lexer-1.3.1-bundled-licenses.txt) = 3e591adb16e09b1c6fb75eb97a6ac51cd06e0aeae2bd5950a15902346e2c9626cb50203bfd0e15c7e8c98af8f24b81c1ce6617c359e7c0e7d0a6366457c844ba
commit d65191509e7fbd33a7cc620d2c97818b56799eda
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 18 19:37:08 2024 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
commit 073bb8876de078519f32ec7b34f70ac880edc858
Author: Jan Staněk <jstanek(a)redhat.com>
Date: Thu Apr 4 12:14:42 2024 +0200
Enable gating
diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..dd02a0b
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,19 @@
+--- !Policy # testing repository
+product_versions:
+ - fedora-*
+decision_contexts: [bodhi_update_push_testing]
+subject_type: koji_build
+rules:
+ - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+ - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis}
+ - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional}
+--- !Policy # stable repository
+product_versions:
+ - fedora-*
+decision_contexts: [bodhi_update_push_stable]
+subject_type: koji_build
+rules:
+ - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+ - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis}
+ - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional}
+...
diff --git a/test-plan.fmf b/test-plan.fmf
new file mode 100644
index 0000000..35d1404
--- /dev/null
+++ b/test-plan.fmf
@@ -0,0 +1,15 @@
+---
+summary: Package test suite
+discover:
+ how: fmf
+ url: https://gitlab.com/redhat/centos-stream/tests/nodejs
+ filter: 'component: nodejs-cjs-module-lexer'
+prepare:
+ - name: install nodejs and cjs-module-lexer
+ how: install
+ package:
+ - nodejs
+ - nodejs-cjs-module-lexer
+execute:
+ how: tmt
+...
commit 7cc71b9fdf0c55984462d20dcfed376024831c2f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 25 09:08:02 2024 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
commit 4d2718332710f3054176ccb00b7ff7620c287768
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Mon Jan 15 12:32:48 2024 -0500
Do not attempt to build on s390x
lld is a build requirement of the WASI toolchain but is not yet
supported on s390x (although work is underway upstream). Therefore,
%nodejs_arches cannot be used here until that changes.
diff --git a/nodejs-cjs-module-lexer.spec b/nodejs-cjs-module-lexer.spec
index fcb3d8c..d90b17c 100644
--- a/nodejs-cjs-module-lexer.spec
+++ b/nodejs-cjs-module-lexer.spec
@@ -20,7 +20,14 @@ Patch: 0001-parametrize-wasm-compilation-process.patch
# Binary files in this package are aimed at the wasm32-wasi "architecture".
%global _binaries_in_noarch_packages_terminate_build 0
BuildArch: noarch
+# change this conditional to the fedora and rhel releases containing lld
+# versions which include support for s390x:
+# https://github.com/llvm/llvm-project/issues/57097
+%if 0
ExclusiveArch: %{nodejs_arches} noarch
+%else
+ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le riscv64 noarch
+%endif
BuildRequires: clang lld make wasi-libc-devel
BuildRequires: nodejs-devel npm
commit 14938ca14b7eef9b6c38859cf855c56c0914089f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sun Jan 21 09:47:20 2024 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
1
0
13 Aug '24
The package rpms/DisplayCAL.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/DisplayCAL.git/commit/?id=1a3ad0134….
Change:
+%ifarch %{arm32} %{ix86}
Thanks.
Full change:
============
commit 1a3ad0134e0bfa010ff3a65069f66f42c7ec963c
Author: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Sun Jul 28 22:10:06 2024 -0400
Initial import into Fedora
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5a5cf70
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/DisplayCAL-3.9.12.tar.gz
diff --git a/DisplayCAL.spec b/DisplayCAL.spec
new file mode 100644
index 0000000..1bdf7d0
--- /dev/null
+++ b/DisplayCAL.spec
@@ -0,0 +1,294 @@
+# Use define instead of global to ensure it's evaluated when used
+%define lc_name %(echo "%{name}" | tr '[:upper:]' '[:lower:]')
+
+Name: DisplayCAL
+Version: 3.9.12
+Release: 3%{?dist}
+Summary: Display calibration and profiling tool focusing on accuracy and versatility
+License: GPL-3.0-or-later
+URL: https://github.com/eoyilmaz/displaycal-py3
+Source0: %{pypi_source}
+Patch0: displaycal-3.9.3-udev-dir.patch
+Patch1: displaycal-skip-update-check.patch
+Patch2: displaycal-3.9.8-fix-autostart-location.patch
+
+BuildRequires: gcc
+BuildRequires: pkgconfig(xxf86vm)
+BuildRequires: pkgconfig(xinerama)
+BuildRequires: pkgconfig(xrandr)
+BuildRequires: pkgconfig(python3)
+BuildRequires: pyproject-rpm-macros
+BuildRequires: xdg-user-dirs
+
+Requires: argyllcms
+Requires: hicolor-icon-theme
+# workaround for crash with pyglet as sound backend
+Requires: SDL2_mixer
+
+Provides: %{lc_name} = %{version}-%{release}
+Provides: dispcalGUI = %{version}-%{release}
+
+%description
+This utility calibrates and characterizes display devices using one
+of many supported measurement instruments, with support for
+multi-display setups and a variety of available options for advanced
+users, such as verification and reporting functionality to evaluate
+ICC profiles and display devices, creating video 3D LUTs, as well as
+optional CIECAM02 gamut mapping to take into account varying viewing
+conditions.
+
+%prep
+%autosetup -p1 -n %{name}-%{version}
+
+# Delete existing egg
+rm -rf DisplayCAL.egg-info
+# Delete PKG-INFO that causes inadvertent Python version restrictions
+rm PKG-INFO
+
+# hack to force creating dist/net.displaycal... (missed due pyproject)
+sed -i -e 's|create_appdata = |create_appdata = True or |' setup.py
+
+# drop prebuilt modules
+find . -name '*.so' -print -delete
+
+# fix paths
+%ifarch %{arm32} %{ix86}
+ln -s ./lib64 DisplayCAL/lib32
+sed -i -e 's/DisplayCAL\.lib64/DisplayCAL\.lib32/g' DisplayCAL/RealDisplaySizeMM.py
+%endif
+
+%generate_buildrequires
+%pyproject_buildrequires
+
+%build
+export CFLAGS="%{build_cflags} -Wno-incompatible-pointer-types"
+%pyproject_wheel
+
+%install
+%pyproject_install
+mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart/
+mv %{buildroot}%{_datadir}/DisplayCAL/z-displaycal-apply-profiles.desktop %{buildroot}%{_sysconfdir}/xdg/autostart/
+
+%files
+%docdir %{_docdir}/%{name}-%{version}/
+%doc %{_docdir}/%{name}-%{version}/*
+%license LICENSE.txt
+%{_sysconfdir}/xdg/autostart/z-displaycal-apply-profiles.desktop
+%{_bindir}/%{lc_name}*
+%{_datadir}/%{name}/
+%{_datadir}/icons/hicolor/*/apps/%{lc_name}*.png
+%{_datadir}/applications/%{lc_name}*.desktop
+%{_metainfodir}/net.displaycal.%{name}.appdata.xml
+%{python3_sitearch}/%{name}/
+%{python3_sitearch}/%{name}-%{version}.dist-info/
+%{_mandir}/man1/%{lc_name}*
+
+%changelog
+* Sat Jul 27 2024 Neal Gompa <ngompa(a)fedoraproject.org> - 3.9.12-3
+- Drop unneeded egg data
+
+* Sat Jul 13 2024 Neal Gompa <ngompa(a)fedoraproject.org> - 3.9.12-2
+- Adapt for Fedora
+
+* Thu Apr 04 2024 David GEIGER <daviddavid(a)mageia.org> 3.9.12-1.mga10
++ Revision: 2054356
+- new version: 3.9.12
+
+* Tue Jan 16 2024 papoteur <papoteur(a)mageia.org> 3.9.11-3.mga10
++ Revision: 2031653
+- workaround for crash with pyglet as sound backend, pulling sdl2_mixer which has precedence (mga#32697)
+
+* Sun Dec 31 2023 David GEIGER <daviddavid(a)mageia.org> 3.9.11-2.mga10
++ Revision: 2024873
+- add py3.12 support
+
+* Tue Dec 19 2023 David GEIGER <daviddavid(a)mageia.org> 3.9.11-1.mga10
++ Revision: 2019816
+- new version: 3.9.11
+
+* Tue Dec 19 2023 papoteur <papoteur(a)mageia.org> 3.9.10-3.mga10
++ Revision: 2019485
+- Mass Rebuild - Python 3.12
++ David GEIGER <daviddavid(a)mageia.org>
+- rebuild for py3.12
+
+* Thu Dec 01 2022 David GEIGER <daviddavid(a)mageia.org> 3.9.10-1.mga9
++ Revision: 1913674
+- new version: 3.9.10
+- rediff skip-update-check patch
+
+* Fri Sep 30 2022 papoteur <papoteur(a)mageia.org> 3.9.8-1.mga9
++ Revision: 1893487
+- fix installation location of autostart file
+- new version: 3.9.8
+
+* Sun May 15 2022 papoteur <papoteur(a)mageia.org> 3.9.3-1.mga9
++ Revision: 1858237
+- new 3.9.3
+- restore displaycal now ported to Python 3
++ Sysadmin Bot <umeabot(a)mageia.org>
+- Mageia 8 Mass Rebuild
+
+* Mon Aug 19 2019 David GEIGER <daviddavid(a)mageia.org> 3.8.5.0-1.mga8
++ Revision: 1429917
+- new version: 3.8.5.0
+
+* Mon Jul 08 2019 David GEIGER <daviddavid(a)mageia.org> 3.8.3.0-1.mga8
++ Revision: 1419467
+- new version: 3.8.3.0
+
+* Fri Apr 05 2019 David GEIGER <daviddavid(a)mageia.org> 3.7.2.0-1.mga7
++ Revision: 1385912
+- new version: 3.7.2.0
+
+* Mon Jan 28 2019 David GEIGER <daviddavid(a)mageia.org> 3.7.1.4-1.mga7
++ Revision: 1361558
+- new version: 3.7.1.4
+
+* Tue Dec 25 2018 David GEIGER <daviddavid(a)mageia.org> 3.7.1.3-1.mga7
++ Revision: 1344960
+- new version: 3.7.1.3
+
+* Fri Nov 30 2018 David GEIGER <daviddavid(a)mageia.org> 3.7.1.2-1.mga7
++ Revision: 1336811
+- new version: 3.7.1.2
+
+* Sun Nov 18 2018 David GEIGER <daviddavid(a)mageia.org> 3.7.1.1-1.mga7
++ Revision: 1330755
+- new version: 3.7.1.1
+
+* Sun Oct 21 2018 David GEIGER <daviddavid(a)mageia.org> 3.7.0.0-1.mga7
++ Revision: 1323222
+- new version: 3.7.0.0
+- switch to 55-Argyll.rules to support new udev (mga#23733)
+
+* Fri Sep 21 2018 David GEIGER <daviddavid(a)mageia.org> 3.6.2.0-1.mga7
++ Revision: 1295897
+- new version: 3.6.2.0
+
+* Sat Aug 18 2018 David GEIGER <daviddavid(a)mageia.org> 3.6.1.1-1.mga7
++ Revision: 1252514
+- new version: 3.6.1.1
+
+* Mon Apr 30 2018 David GEIGER <daviddavid(a)mageia.org> 3.5.3.0-1.mga7
++ Revision: 1223902
+- new version: 3.5.3.0
+
+* Sat Apr 07 2018 David GEIGER <daviddavid(a)mageia.org> 3.5.2.0-1.mga7
++ Revision: 1215879
+- new version: 3.5.2.0
+
+* Fri Mar 23 2018 David GEIGER <daviddavid(a)mageia.org> 3.5.1.0-1.mga7
++ Revision: 1211431
+- new version: 3.5.1.0
+- rename and rediff udev-dir patch
+
+* Mon Feb 26 2018 David GEIGER <daviddavid(a)mageia.org> 3.5.0.0-1.mga7
++ Revision: 1205245
+- new version: 3.5.0.0
+
+* Thu Jan 04 2018 David GEIGER <daviddavid(a)mageia.org> 3.4.0.0-1.mga7
++ Revision: 1190081
+- new version: 3.4.0.0
+
+* Thu Nov 09 2017 David GEIGER <daviddavid(a)mageia.org> 3.3.5.0-1.mga7
++ Revision: 1176692
+- new version: 3.3.5.0
+
+* Sat Sep 23 2017 David GEIGER <daviddavid(a)mageia.org> 3.3.4.1-1.mga7
++ Revision: 1157787
+- new version: 3.3.4.1
+
+* Sat Sep 02 2017 David GEIGER <daviddavid(a)mageia.org> 3.3.3.0-1.mga7
++ Revision: 1150723
+- new version: 3.3.3.0
+
+* Sun Jul 02 2017 David GEIGER <daviddavid(a)mageia.org> 3.3.2.0-1.mga6
++ Revision: 1108913
+- new version: 3.3.2.0
+
+* Sun Jan 15 2017 David GEIGER <daviddavid(a)mageia.org> 3.2.3.0-1.mga6
++ Revision: 1081884
+- new version: 3.2.3.0
+
+* Sun Dec 11 2016 David GEIGER <daviddavid(a)mageia.org> 3.2.1.0-1.mga6
++ Revision: 1074203
+- new version: 3.2.1.0
+
+* Sun Oct 30 2016 David GEIGER <daviddavid(a)mageia.org> 3.1.7.3-1.mga6
++ Revision: 1064156
+- new version: 3.1.7.3
+
+* Fri Oct 14 2016 David GEIGER <daviddavid(a)mageia.org> 3.1.7.0-1.mga6
++ Revision: 1060737
+- new version: 3.1.7.0
+
+* Sun Aug 28 2016 David GEIGER <daviddavid(a)mageia.org> 3.1.6.0-1.mga6
++ Revision: 1049349
+- new version: 3.1.6.0
+
+* Sat Aug 20 2016 David GEIGER <daviddavid(a)mageia.org> 3.1.5.0-1.mga6
++ Revision: 1047143
+- new version: 3.1.5.0
+
+* Sun Jul 24 2016 David GEIGER <daviddavid(a)mageia.org> 3.1.4.0-1.mga6
++ Revision: 1043512
+- new version: 3.1.4.0
+
+* Tue May 10 2016 David GEIGER <daviddavid(a)mageia.org> 3.1.3.1-1.mga6
++ Revision: 1012317
+- new version: 3.1.3.1
+
+* Mon Feb 22 2016 David GEIGER <daviddavid(a)mageia.org> 3.1.0.0-1.mga6
++ Revision: 976005
+- new version: 3.1.0.0 (fixes mga#17803)
+- new upstream URL and Source URL
+- rename and rediff udev-dir patch
+- use new python macros
+- requires python-numpy
+- obsoletes/provides old upstream name on dispcalGUI
+- update files list
+- move to new upstream name on displaycal
+
+* Fri Feb 05 2016 Sysadmin Bot <umeabot(a)mageia.org> 1.2.7.0-9.mga6
++ Revision: 938821
+- Mageia 6 Mass Rebuild
+
+* Wed Oct 15 2014 Sysadmin Bot <umeabot(a)mageia.org> 1.2.7.0-8.mga5
++ Revision: 744682
+- Second Mageia 5 Mass Rebuild
+
+* Sat Sep 27 2014 Thierry Vignaud <tv(a)mageia.org> 1.2.7.0-7.mga5
++ Revision: 726130
+- rebuild for missing pythoneggs deps
+
+* Tue Sep 16 2014 Sysadmin Bot <umeabot(a)mageia.org> 1.2.7.0-6.mga5
++ Revision: 678756
+- Mageia 5 Mass Rebuild
++ Olav Vitters <ovitters(a)mageia.org>
+- add gobject-introspection BR for typelib auto BR
+
+* Sat May 31 2014 Pascal Terjan <pterjan(a)mageia.org> 1.2.7.0-5.mga5
++ Revision: 628160
+- Rebuild for new Python
+
+* Sat Nov 02 2013 Funda Wang <fwang(a)mageia.org> 1.2.7.0-4.mga4
++ Revision: 548862
+- add requires on python-gi
+
+* Tue Oct 22 2013 Sysadmin Bot <umeabot(a)mageia.org> 1.2.7.0-3.mga4
++ Revision: 542551
+- Mageia 4 Mass Rebuild
+
+* Mon Oct 14 2013 Pascal Terjan <pterjan(a)mageia.org> 1.2.7.0-2.mga4
++ Revision: 497727
+- Rebuild to add different pythonegg provides for python 2 and 3
+
+* Wed Jul 31 2013 Funda Wang <fwang(a)mageia.org> 1.2.7.0-1.mga4
++ Revision: 461407
+- update file list
+- new version 1.2.7.0
+
+* Sun Feb 10 2013 Nicolas Lécureuil <neoclust(a)mageia.org> 0.8.9.3-1.mga3
++ Revision: 397779
+- imported package dispcalGUI
diff --git a/displaycal-3.9.3-udev-dir.patch b/displaycal-3.9.3-udev-dir.patch
new file mode 100644
index 0000000..bf2803e
--- /dev/null
+++ b/displaycal-3.9.3-udev-dir.patch
@@ -0,0 +1,32 @@
+diff -ruN DisplayCAL-3.9.3/DisplayCAL/setup.py DisplayCAL-3.9.3-new/DisplayCAL/setup.py
+--- DisplayCAL-3.9.3/DisplayCAL/setup.py 2022-04-30 13:17:33.000000000 +0200
++++ DisplayCAL-3.9.3-new/DisplayCAL/setup.py 2022-05-13 13:14:54.617154160 +0200
+@@ -748,13 +748,13 @@
+ )
+ else:
+ devconf_files = []
+- if os.path.isdir("/etc/udev/rules.d"):
++ if os.path.isdir("/usr/lib/udev/rules.d"):
+ if safe_glob("/dev/bus/usb/*/*"):
+ # USB and serial instruments using udev, where udev
+ # already creates /dev/bus/usb/00X/00X devices
+ devconf_files.append(
+ (
+- "/etc/udev/rules.d",
++ "/usr/lib/udev/rules.d",
+ [
+ os.path.join(
+ pydir, "..", "misc", "55-Argyll.rules"
+@@ -767,10 +767,10 @@
+ # devices
+ devconf_files.append(
+ (
+- "/etc/udev/rules.d",
++ "/usr/lib/udev/rules.d",
+ [
+ os.path.join(
+- pydir, "..", "misc", "45-Argyll.rules"
++ pydir, "..", "misc", "55-Argyll.rules"
+ )
+ ],
+ )
diff --git a/displaycal-3.9.8-fix-autostart-location.patch b/displaycal-3.9.8-fix-autostart-location.patch
new file mode 100644
index 0000000..5b0c6f3
--- /dev/null
+++ b/displaycal-3.9.8-fix-autostart-location.patch
@@ -0,0 +1,31 @@
+diff -ruN DisplayCAL-3.9.8/DisplayCAL/setup.py DisplayCAL-3.9.8.new/DisplayCAL/setup.py
+--- DisplayCAL-3.9.8/DisplayCAL/setup.py 2022-09-15 11:51:25.000000000 +0200
++++ DisplayCAL-3.9.8.new/DisplayCAL/setup.py 2022-09-30 14:08:31.055892853 +0200
+@@ -709,9 +709,7 @@
+ )
+ data_files.append(
+ (
+- autostart
+- if os.geteuid() == 0 or prefix.startswith("/")
+- else autostart_home,
++ "share/DisplayCAL",
+ [
+ os.path.join(
+ pydir,
+@@ -722,6 +720,7 @@
+ ],
+ )
+ )
++ print(f"Fichiers {data_files[-1]}")
+ data_files.append(
+ (
+ os.path.join(os.path.dirname(data), "man", "man1"),
+@@ -977,6 +976,7 @@
+ # On Linux the libraries will be built on build step
+ pass
+
++ print(data_files)
+ attrs = {
+ "author": author_ascii,
+ "author_email": author_email,
+Les fichiers binaires DisplayCAL-3.9.8/DisplayCAL/.setup.py.kate-swp et DisplayCAL-3.9.8.new/DisplayCAL/.setup.py.kate-swp sont différents
diff --git a/displaycal-skip-update-check.patch b/displaycal-skip-update-check.patch
new file mode 100644
index 0000000..6ea3602
--- /dev/null
+++ b/displaycal-skip-update-check.patch
@@ -0,0 +1,106 @@
+diff --git a/DisplayCAL/config.py b/DisplayCAL/config.py
+index ff13261..b67afa0 100644
+--- a/DisplayCAL/config.py
++++ b/DisplayCAL/config.py
+@@ -1355,7 +1355,7 @@ defaults = {
+ "untethered.max_delta.chroma": 0.5,
+ "untethered.min_delta": 1.5,
+ "untethered.min_delta.lightness": 1.0,
+- "update_check": 1,
++ "update_check": 0,
+ "use_fancy_progress": 1,
+ "use_separate_lut_access": 0,
+ "vrml.compress": 1,
+diff --git a/DisplayCAL/display_cal.py b/DisplayCAL/display_cal.py
+index 3b4661c..dde15bc 100644
+--- a/DisplayCAL/display_cal.py
++++ b/DisplayCAL/display_cal.py
+@@ -497,8 +497,8 @@ def app_uptodate(parent=None, appname=ap
+ dlg.sizer0.SetSizeHints(dlg)
+ dlg.sizer0.Layout()
+ dlg.ShowModalThenDestroy()
+- if parent and getattr(parent, "menuitem_app_auto_update_check", None):
+- parent.menuitem_app_auto_update_check.Check(bool(getcfg("update_check")))
++ #if parent and getattr(parent, "menuitem_app_auto_update_check", None):
++ # parent.menuitem_app_auto_update_check.Check(bool(getcfg("update_check")))
+
+
+ def app_update_confirm(
+@@ -584,8 +584,8 @@ def app_update_confirm(
+ dlg.Center()
+ result = dlg.ShowModal()
+ dlg.Destroy()
+- if parent and getattr(parent, "menuitem_app_auto_update_check", None):
+- parent.menuitem_app_auto_update_check.Check(bool(getcfg("update_check")))
++ #if parent and getattr(parent, "menuitem_app_auto_update_check", None):
++ # parent.menuitem_app_auto_update_check.Check(bool(getcfg("update_check")))
+ if result == wx.ID_OK and (
+ zeroinstall or (sys.platform in ("darwin", "win32") or argyll)
+ ):
+@@ -3118,17 +3118,17 @@ class MainFrame(ReportFrame, BaseFrame,
+ menuitem = help.FindItemById(help.FindItem("help_support"))
+ self.Bind(wx.EVT_MENU, self.help_support_handler, menuitem)
+ menuitem = help.FindItemById(help.FindItem("bug_report"))
+- self.Bind(wx.EVT_MENU, self.bug_report_handler, menuitem)
+- self.menuitem_app_auto_update_check = help.FindItemById(
+- help.FindItem("update_check.onstartup")
+- )
+- self.Bind(
+- wx.EVT_MENU,
+- self.app_auto_update_check_handler,
+- self.menuitem_app_auto_update_check,
+- )
+- menuitem = help.FindItemById(help.FindItem("update_check"))
+- self.Bind(wx.EVT_MENU, self.app_update_check_handler, menuitem)
++ #self.Bind(wx.EVT_MENU, self.bug_report_handler, menuitem)
++ #self.menuitem_app_auto_update_check = help.FindItemById(
++ # help.FindItem("update_check.onstartup")
++ #)
++ #self.Bind(
++ # wx.EVT_MENU,
++ # self.app_auto_update_check_handler,
++ # self.menuitem_app_auto_update_check,
++ #)
++ #menuitem = help.FindItemById(help.FindItem("update_check"))
++ #self.Bind(wx.EVT_MENU, self.app_update_check_handler, menuitem)
+
+ if sys.platform == "darwin":
+ wx.GetApp().SetMacAboutMenuItemId(self.menuitem_about.GetId())
+@@ -3257,7 +3257,7 @@ class MainFrame(ReportFrame, BaseFrame,
+ self.menuitem_show_log.Check(bool(getcfg("log.show")))
+ self.menuitem_log_autoshow.Enable(not bool(getcfg("log.show")))
+ self.menuitem_log_autoshow.Check(bool(getcfg("log.autoshow")))
+- self.menuitem_app_auto_update_check.Check(bool(getcfg("update_check")))
++ #self.menuitem_app_auto_update_check.Check(bool(getcfg("update_check")))
+
+ def init_controls(self):
+ """Initialize the main window controls and their event handlers."""
+@@ -19485,7 +19485,7 @@ class StartupFrame(start_cls):
+ app.process_argv(1)
+ wx.CallAfter(app.frame.Raise)
+ # Check for updates if configured
+- if getcfg("update_check"):
++ if getcfg("update_check") and False:
+ # Give time for the main window to gain focus before checking for
+ # update, otherwise the main window may steal the update
+ # confirmation dialog's focus which looks weird
+diff --git a/DisplayCAL/xrc/mainmenu.xrc b/DisplayCAL/xrc/mainmenu.xrc
+index 2735be4..6c86b09 100644
+--- a/DisplayCAL/xrc/mainmenu.xrc
++++ b/DisplayCAL/xrc/mainmenu.xrc
+@@ -231,6 +231,7 @@
+ <label>bug_report</label>
+ </object>
+ <object class="separator"/>
++ <!--
+ <object class="wxMenuItem" name="update_check.onstartup">
+ <label>update_check.onstartup</label>
+ <checkable>1</checkable>
+@@ -239,6 +240,7 @@
+ <label>update_check</label>
+ </object>
+ <object class="separator"/>
++ -->
+ <label>menu.help</label>
+ </object>
+ </object>
diff --git a/sources b/sources
new file mode 100644
index 0000000..15872b4
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (DisplayCAL-3.9.12.tar.gz) = f42111359ae63f0d2a2c6239d0a3a43bd5b52a2efed3c8decc186c180811353c48f094724205cb4e06af762f4c209d13f9fb959eab2d17c8425f218c9f913072
1
0