From 238f8edcaf83c66a65c1617bc9b86617c984e25f Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sat, 17 Feb 2024 16:34:11 +0100 Subject: [PATCH] xfree86/bsd: fix build on NetBSD/amd64. The IOPL function for 64 bit systems is x86_64_iopl() there --- hw/xfree86/os-support/bsd/i386_video.c | 3 +++ include/meson.build | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index f25400714..55b5819b7 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -202,6 +202,9 @@ xf86DisableIO(void) #endif /* USE_I386_IOPL */ #ifdef USE_AMD64_IOPL +#ifdef __NetBSD__ +#define amd64_iopl(x) x86_64_iopl(x) +#endif /***************************************************************************/ /* I/O Permissions section */ /***************************************************************************/ diff --git a/include/meson.build b/include/meson.build index 236b95363..7799c61bc 100644 --- a/include/meson.build +++ b/include/meson.build @@ -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' xorg_data.set('USE_DEV_IO', '1') endif -elif host_machine.system() == 'netbsd' - 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' +elif host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd' if host_machine.cpu_family() == 'x86' xorg_data.set('USE_I386_IOPL', '1') endif