[src/trunk]: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos remov...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/083e0177b4fc
branches:  trunk
changeset: 817322:083e0177b4fc
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Aug 16 19:09:48 2016 +0000

description:
remove obsolete code, and adjust for new amd64 iopl usage.

diffstat:

 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile |  20 ++-------
 1 files changed, 5 insertions(+), 15 deletions(-)

diffs (49 lines):

diff -r 423cdd6c6123 -r 083e0177b4fc external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Tue Aug 16 19:04:41 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Tue Aug 16 19:09:48 2016 +0000
@@ -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 @@
 .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 @@
 #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 @@
 .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 \