From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Cc: Khem Raj <raj.khem@gmail.com>
Subject: [meta-oe][PATCH 1/2] libx86-1: Fix build on 32bit x86
Date: Sun, 5 Mar 2023 14:34:19 -0800 [thread overview]
Message-ID: <20230305223420.2324783-1-raj.khem@gmail.com> (raw)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...efine-CARD32-as-uint-as-it-is-32-bit.patch | 20 +++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch b/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch
index cc4ee7eefb..aef521bc5d 100644
--- a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch
+++ b/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch
@@ -3,7 +3,8 @@ From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 2 Mar 2023 18:47:40 -0800
Subject: [PATCH] Define CARD32 as uint as it is 32-bit
-long can be 64bit on LP64 systems
+long can be 64bit on LP64 systems and none of systems we support need int < 32-bits
+therefore use NUM32 to be int always if the system is linux
Fixes build with clang-16
thunk.c:147:3: error: incompatible function pointer types initializing 'x86emuu32 (*)(X86EMU_pioAddr)' (aka 'unsigned int (*)(unsigned short)') with an expression of type 'unsigned long (*)(unsigned short)' [-Wincompatible-function-pointer-types]
@@ -16,8 +17,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
x86emu/include/xf86int10.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/x86emu/include/xf86int10.h b/x86emu/include/xf86int10.h
-index 9c131dd..acd5114 100644
--- a/x86emu/include/xf86int10.h
+++ b/x86emu/include/xf86int10.h
@@ -18,7 +18,7 @@
@@ -29,6 +28,15 @@ index 9c131dd..acd5114 100644
#define pointer void *
#define IOADDRESS void *
#define Bool int
---
-2.39.2
-
+--- a/x86emu/include/types.h
++++ b/x86emu/include/types.h
+@@ -77,7 +77,8 @@
+ defined(__s390x__) || \
+ (defined(__hppa__) && defined(__LP64)) || \
+ defined(__amd64__) || defined(amd64) || \
+- (defined(__sgi) && (_MIPS_SZLONG == 64))
++ (defined(__sgi) && (_MIPS_SZLONG == 64)) || \
++ defined(__linux__)
+ #define NUM32 int
+ #else
+ #define NUM32 long
--
2.39.2
next reply other threads:[~2023-03-05 22:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-05 22:34 Khem Raj [this message]
2023-03-05 22:34 ` [meta-multimedia][PATCH 2/2] vlc: Upgrade to 3.0.18 Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230305223420.2324783-1-raj.khem@gmail.com \
--to=raj.khem@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox