frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86/bsd: fix build on NetBSD/amd64. 

The IOPL function for 64 bit systems is x86_64_iopl() there
This commit is contained in:
Matthieu Herrb 2024-02-17 16:34:11 +01:00 committed by Peter Hutterer
parent 59dac6af45
commit 238f8edcaf
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/os-support/bsd/i386_video.c
View File

@ -202,6 +202,9 @@ xf86DisableIO(void)
#endif /* USE_I386_IOPL */ #endif /* USE_I386_IOPL */
#ifdef USE_AMD64_IOPL #ifdef USE_AMD64_IOPL
#ifdef __NetBSD__
#define amd64_iopl(x) x86_64_iopl(x)
#endif
/***************************************************************************/ /***************************************************************************/
/* I/O Permissions section */ /* I/O Permissions section */
/***************************************************************************/ /***************************************************************************/

6
include/meson.build
View File

@ -384,11 +384,7 @@ if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonfly'
if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64' or host_machine.cpu_family() == 'aarch64' if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64' or host_machine.cpu_family() == 'aarch64'
xorg_data.set('USE_DEV_IO', '1') xorg_data.set('USE_DEV_IO', '1')
endif endif
elif host_machine.system() == 'netbsd' elif host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd'
if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'
xorg_data.set('USE_I386_IOPL', '1')
endif
elif host_machine.system() == 'openbsd'
if host_machine.cpu_family() == 'x86' if host_machine.cpu_family() == 'x86'
xorg_data.set('USE_I386_IOPL', '1') xorg_data.set('USE_I386_IOPL', '1')
endif endif