summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-01-02 14:12:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-03 09:26:37 +0000
commit5ccae89a4aba55102ad50bc61cd6f675b2da45f1 (patch)
tree5392a16893d07f68545eceb58ee7232b36fdff57 /meta/recipes-extended
parenta9dd130009ee7565fab6916bc7f3c9b2319b3174 (diff)
downloadpoky-5ccae89a4aba55102ad50bc61cd6f675b2da45f1.tar.gz
acpica: fix build with x32
Make sure architecture dependent defines are correct for x32 by checking for both ILP32 and x86_64. Fixes [YOCTO #12123] (From OE-Core rev: e73262ee888851e829df535ccf09d0da833f2061) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>wq Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/acpica/acpica_20170303.bb1
-rw-r--r--meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch31
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-extended/acpica/acpica_20170303.bb b/meta/recipes-extended/acpica/acpica_20170303.bb
index 8e914cd450..4c0f366abf 100644
--- a/meta/recipes-extended/acpica/acpica_20170303.bb
+++ b/meta/recipes-extended/acpica/acpica_20170303.bb
@@ -20,6 +20,7 @@ SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \
20 file://no-werror.patch \ 20 file://no-werror.patch \
21 file://rename-yy_scan_string-manually.patch \ 21 file://rename-yy_scan_string-manually.patch \
22 file://manipulate-fds-instead-of-FILE.patch;striplevel=2 \ 22 file://manipulate-fds-instead-of-FILE.patch;striplevel=2 \
23 file://0001-Linux-add-support-for-X32-ABI-compilation.patch \
23 " 24 "
24SRC_URI[md5sum] = "48ef4314fb4ffdd0c96f14dcf20544e1" 25SRC_URI[md5sum] = "48ef4314fb4ffdd0c96f14dcf20544e1"
25SRC_URI[sha256sum] = "b2d81e84107ac9a02be86ea43cbea7afa8fd4b4150270bc88c2d4c9fea0b8aad" 26SRC_URI[sha256sum] = "b2d81e84107ac9a02be86ea43cbea7afa8fd4b4150270bc88c2d4c9fea0b8aad"
diff --git a/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch b/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch
new file mode 100644
index 0000000000..df74200068
--- /dev/null
+++ b/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch
@@ -0,0 +1,31 @@
1From d22241efc0708c9799f17a20eabb52a48d6d6ea1 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 2 Jan 2018 12:35:32 +0800
4Subject: [PATCH] Linux: add support for X32 ABI compilation
5
6X32 follows ILP32 model. Check for ILP32 as well when checking for
7x86_64 to ensure the defines are correct for X32 ABI.
8
9Upstream-Status: Submitted [https://github.com/acpica/acpica/pull/348]
10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13 source/include/platform/aclinux.h | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/source/include/platform/aclinux.h b/source/include/platform/aclinux.h
17index 75b1d82..6b8ff73 100644
18--- a/source/include/platform/aclinux.h
19+++ b/source/include/platform/aclinux.h
20@@ -315,7 +315,7 @@
21 #define ACPI_FLUSH_CPU_CACHE()
22 #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))
23
24-#if defined(__ia64__) || defined(__x86_64__) ||\
25+#if defined(__ia64__) || (defined(__x86_64__) && !defined(__ILP32__)) ||\
26 defined(__aarch64__) || defined(__PPC64__) ||\
27 defined(__s390x__)
28 #define ACPI_MACHINE_WIDTH 64
29--
302.7.4
31