rpms/acpica-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

BZ#1365193 -- s390x FTBFS due to int/ptr mismatch

Browse Source 
This is an attempt to fix the bug; the ACPI_MACHINE_WIDTH setting was
letting s390x be treated as a 32-bit machine, not a 64-bit one.

Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2016-09-01 16:06:41 -06:00
parent 3a82d24e0b
commit 659d8804ed
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acpica-tools.spec
View File

@ -33,6 +33,7 @@ Patch6: int-format.patch
Patch7: f23-harden.patch
Patch8: asllookup-ppc64.patch
Patch9: template.patch
Patch10: s390x-ptrs.patch
BuildRequires: bison patchutils flex
@ -92,6 +93,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
%patch7 -p1 -b .f23-harden
%patch8 -p1 -b .asllookup-ppc64
%patch9 -p1 -b .template
%patch10 -p1 -b .s390x-ptrs
cp -p %{SOURCE2} README.Fedora
cp -p %{SOURCE3} iasl.1
@ -189,6 +191,8 @@ fi
* Thu Sep 1 2016 Al Stone <ahs3@redhat.com> - 20160831-1
- Update to latest upstream. Closes BZ#1372107.
- Refresh patches.
- Closes BZ#1365193 -- s390x FTBFS due to int/ptr size mismatch: made sure
the tools built with 64-bit integers for s390x
* Tue Aug 2 2016 Al Stone <ahs3@redhat.com> - 20160729-1
- Update to latest upstream. Closes BZ#1361737.

13
s390x-ptrs.patch Normal file
View File

@ -0,0 +1,13 @@
diff -Naur acpica-unix2-20160831/source/include/platform/aclinux.h acpica-unix2-20160831-s390x/source/include/platform/aclinux.h
--- acpica-unix2-20160831/source/include/platform/aclinux.h 2016-09-01 15:18:36.306268594 -0600
+++ acpica-unix2-20160831-s390x/source/include/platform/aclinux.h 2016-09-01 16:01:34.955157827 -0600
@@ -194,7 +194,8 @@
#define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))
#if defined(__ia64__) || defined(__x86_64__) ||\
- defined(__aarch64__) || defined(__PPC64__)
+ defined(__aarch64__) || defined(__PPC64__) ||\
+ defined(__s390x__)
#define ACPI_MACHINE_WIDTH 64
#define COMPILER_DEPENDENT_INT64 long
#define COMPILER_DEPENDENT_UINT64 unsigned long