diff options
| author |   Anuj Mittal <anuj.mittal@intel.com> | 2018-01-02 14:12:59 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-06 10:11:42 +0000 |
| commit | 179112b8f2500da81ec3755296bc1ab268eb9221 (patch) | |
| tree | 71647857989361874790defc3be20b0b4a75f4d3 | |
| parent | 44257253e6b98c74c539edd2dee7fed3f856fa44 (diff) | |
| download | openembedded-core-contrib-179112b8f2500da81ec3755296bc1ab268eb9221.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]
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>wq
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e73262ee888851e829df535ccf09d0da833f2061)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/recipes-extended/acpica/acpica_20170303.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch | 31 |
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 e712ca008d..868505b7d8 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 \ file://no-werror.patch \ file://rename-yy_scan_string-manually.patch \ file://manipulate-fds-instead-of-FILE.patch;striplevel=2 \ + file://0001-Linux-add-support-for-X32-ABI-compilation.patch \ " SRC_URI[md5sum] = "48ef4314fb4ffdd0c96f14dcf20544e1" SRC_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 @@ +From d22241efc0708c9799f17a20eabb52a48d6d6ea1 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Tue, 2 Jan 2018 12:35:32 +0800 +Subject: [PATCH] Linux: add support for X32 ABI compilation + +X32 follows ILP32 model. Check for ILP32 as well when checking for +x86_64 to ensure the defines are correct for X32 ABI. + +Upstream-Status: Submitted [https://github.com/acpica/acpica/pull/348] + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + source/include/platform/aclinux.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/include/platform/aclinux.h b/source/include/platform/aclinux.h +index 75b1d82..6b8ff73 100644 +--- a/source/include/platform/aclinux.h ++++ b/source/include/platform/aclinux.h +@@ -315,7 +315,7 @@ + #define ACPI_FLUSH_CPU_CACHE() + #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread)) + +-#if defined(__ia64__) || defined(__x86_64__) ||\ ++#if defined(__ia64__) || (defined(__x86_64__) && !defined(__ILP32__)) ||\ + defined(__aarch64__) || defined(__PPC64__) ||\ + defined(__s390x__) + #define ACPI_MACHINE_WIDTH 64 +-- +2.7.4 + |