libx86-1: Fix build with clang16

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2023-03-02 18:50:11 -08:00
parent 9118fa842a
commit e9a51a1196
2 changed files with 35 additions and 0 deletions
@@ -0,0 +1,34 @@
From 592c915df252932961a4151c891da58c48a8db90 Mon Sep 17 00:00:00 2001
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
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]
(&x_inl),
^~~~~~~~
Upstream-Status: Pending
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 @@
#define CARD8 unsigned char
#define CARD16 unsigned short
-#define CARD32 unsigned long
+#define CARD32 unsigned int
#define pointer void *
#define IOADDRESS void *
#define Bool int
--
2.39.2
@@ -12,6 +12,7 @@ SRC_URI = "http://www.codon.org.uk/~mjg59/libx86/downloads/${BPN}-${PV}.tar.gz \
file://0001-assume-zero-is-valid-address.patch \ file://0001-assume-zero-is-valid-address.patch \
file://makefile-add-ldflags.patch \ file://makefile-add-ldflags.patch \
file://0001-Fix-type-of-the-void-pointer-assignment.patch \ file://0001-Fix-type-of-the-void-pointer-assignment.patch \
file://0001-Define-CARD32-as-uint-as-it-is-32-bit.patch \
" "
SRC_URI[md5sum] = "41bee1f8e22b82d82b5f7d7ba51abc2a" SRC_URI[md5sum] = "41bee1f8e22b82d82b5f7d7ba51abc2a"