mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 21:49:33 +02:00
lzop: Fix build using x32 ABI
When tries to build lzop using x32 ABI fails trying to get FLAGS register that is 64-bit and destination variable is 32-bit size_t. [YOCTO #7424] (From OE-Core rev: 6122c5e02b96ab786204d08b470177d824004d24) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
c3991d27a2
commit
904e73f7b2
36
meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch
Normal file
36
meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
Fix get of FLAGS register in x32 ABI,
|
||||||
|
|
||||||
|
x32 ABI requires to have 64-bit variable to store FLAGS register
|
||||||
|
instead of size_t that is 32-bit variable, this fix operand
|
||||||
|
type mismatch when try to pop previous pushf value.
|
||||||
|
|
||||||
|
Upstream-status: Submitted
|
||||||
|
|
||||||
|
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
|
||||||
|
|
||||||
|
Index: lzop-1.03/src/miniacc.h
|
||||||
|
===================================================================
|
||||||
|
--- lzop-1.03.orig/src/miniacc.h
|
||||||
|
+++ lzop-1.03/src/miniacc.h
|
||||||
|
@@ -754,6 +754,9 @@
|
||||||
|
#elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
|
||||||
|
# define ACC_ARCH_AMD64 1
|
||||||
|
# define ACC_INFO_ARCH "amd64"
|
||||||
|
+# if defined(__ILP32__)
|
||||||
|
+# define ACC_ARCH_AMD64_X32 1
|
||||||
|
+# endif
|
||||||
|
#elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB))
|
||||||
|
# define ACC_ARCH_ARM 1
|
||||||
|
# define ACC_ARCH_ARM_THUMB 1
|
||||||
|
@@ -6787,7 +6790,11 @@ ACCLIB_PUBLIC_NOINLINE(void, acc_debug_n
|
||||||
|
ACCLIB_PUBLIC_NOINLINE(int, acc_debug_align_check_query) (void)
|
||||||
|
{
|
||||||
|
#if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC)
|
||||||
|
+# if defined(ACC_ARCH_AMD64_X32)
|
||||||
|
+ unsigned long long r;
|
||||||
|
+# else
|
||||||
|
size_t r;
|
||||||
|
+# endif
|
||||||
|
__asm__ __volatile__("pushf\n pop %0\n" : "=a" (r) : : __ACC_ASM_CLOBBER);
|
||||||
|
return (int)(r >> 18) & 1;
|
||||||
|
#elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC)
|
||||||
@@ -12,7 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dfeaf3dc4beef4f5a7bdbc35b197f39e \
|
|||||||
file://src/lzop.c;beginline=5;endline=21;md5=6797bd3ed0a1a49327b7ebf9366ebd86"
|
file://src/lzop.c;beginline=5;endline=21;md5=6797bd3ed0a1a49327b7ebf9366ebd86"
|
||||||
|
|
||||||
SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz \
|
SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz \
|
||||||
file://acinclude.m4"
|
file://acinclude.m4 \
|
||||||
|
file://x32_abi_miniacc_h.patch "
|
||||||
SRC_URI[md5sum] = "006c5e27fb78cdd14a628fdfa5aa1905"
|
SRC_URI[md5sum] = "006c5e27fb78cdd14a628fdfa5aa1905"
|
||||||
SRC_URI[sha256sum] = "c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9"
|
SRC_URI[sha256sum] = "c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user