Module Name: src
Committed By: mrg
Date: Tue Aug 16 19:09:48 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
remove obsolete code, and adjust for new amd64 iopl usage.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.44 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.45
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.44 Sun Aug 14 03:43:05 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Tue Aug 16 19:09:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2016/08/14 03:43:05 mrg Exp $
+# $NetBSD: Makefile,v 1.45 2016/08/16 19:09:48 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -25,8 +25,11 @@ SRCS.bsd+= i386_video.c lnx_agp.c
.for _FN in ${SRCS.bsd}
.if ${MACHINE_ARCH} == "i386"
CPPFLAGS.${_FN}+= -DPCCONS_SUPPORT -DHAS_APERTURE_DRV
+CPPFLAGS.${_FN}+= -DUSE_I386_IOPL
+.else
+CPPFLAGS.${_FN}+= -DUSE_AMD64_IOPL
.endif
-CPPFLAGS.${_FN}+= -DUSE_I386_IOPL -DPCVT_SUPPORT -DWSCONS_SUPPORT \
+CPPFLAGS.${_FN}+= -DPCVT_SUPPORT -DWSCONS_SUPPORT \
-DUSESTDRES -DHAVE_SYSV_IPC \
-DHAS_MTRR_BUILTIN
.endfor
@@ -125,14 +128,6 @@ SRCS.bus+= Pci.c
#CPPFLAGS.netbsdPci.c+= -DPCI_VIA_TTYE0
.endif
-# XXX .S not built from automake either
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-#SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
-#CPPFLAGS.BUSmemcpy.S= -DUSE_GAS
-#CPPFLAGS.IODelay.S= -DUSE_GAS
-#CPPFLAGS.SlowBcopy.S= -DUSE_GAS
-.endif
-
.if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
${MACHINE} == "sgimips" || ${MACHINE_ARCH} == "sparc64" || \
${MACHINE_ARCH} == "sparc" || ${MACHINE} == "netwinder" || \
@@ -148,11 +143,6 @@ SRCS.bus+= nobus.c
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/misc
SRCS.misc+= SlowBcopy.c
-# XXX namespace collision so avoid it, only has to be done for non-i386.
-#BUILDSYMLINKS= BUSmemcpy.c CBUSmemcpy.c \
-# IODelay.c CIODelay.c \
-# SlowBcopy.c CSlowBcopy.c
-
SRCS= ${SRCS.bsd} ${SRCS.bus} ${SRCS.misc}
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
