From d3ae139a176ad28c0d1854ab0578ad34eb55218f Mon Sep 17 00:00:00 2001 From: rtr Date: Thu, 18 Sep 2008 10:57:03 +0000 Subject: [PATCH] switch back to using USE_I386_IOPL for amd64 since it gets us x86_64_iopl if __x86_64__ is defined. this should fix libxorgos.a build on amd64. USE_AMD64_IOPL is for openbsd if the configure.ac is to be believed. XXX we may also want to enable PCCONS_SUPPORT and HAS_APERTURE_DRV for amd64 as well? --- .../xorg/server/xorg-server/hw/xfree86/xorgos/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile index cd93967d2332..603b4c0d0578 100644 --- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile +++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/09/12 07:47:39 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2008/09/18 10:57:03 rtr Exp $ .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" @@ -24,12 +24,9 @@ SRCS.bsd+= bsd_apm.c SRCS.bsd+= i386_video.c stdResource.c lnx_agp.c .for _FN in ${SRCS.bsd} .if ${MACHINE} == "i386" -CPPFLAGS.${_FN}+= -DPCCONS_SUPPORT -DHAS_APERTURE_DRV \ - -DUSE_I386_IOPL -.else -CPPFLAGS.${_FN}+= -DUSE_AMD64_IOPL +CPPFLAGS.${_FN}+= -DPCCONS_SUPPORT -DHAS_APERTURE_DRV .endif -CPPFLAGS.${_FN}+= -DPCVT_SUPPORT -DWSCONS_SUPPORT \ +CPPFLAGS.${_FN}+= -DUSE_I386_IOPL -DPCVT_SUPPORT -DWSCONS_SUPPORT \ -DUSESTDRES -DHAVE_SYSV_IPC \ -DHAS_MTRR_BUILTIN .endfor