mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-08 17:02:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

acpica: fix build with x32

Browse Source 
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>
This commit is contained in:
Anuj Mittal
2018-01-02 14:12:59 +08:00
committed by Richard Purdie
parent a9dd130009
commit 5ccae89a4a
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-extended/acpica/acpica_20170303.bb
View File

@@ -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"

31
meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch Normal file
View File

@@ -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