CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
Module Name:src
Committed By: macallan
Date: Fri Oct 9 17:01:29 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
build ppc_video.c etc. on hppa
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 \
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.47 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.48
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.47 Mon Dec 31 11:14:05 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Fri Oct 9 17:01:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2018/12/31 11:14:05 mrg Exp $
+# $NetBSD: Makefile,v 1.48 2020/10/09 17:01:29 macallan Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -35,7 +35,8 @@ CPPFLAGS.${_FN}+= -DPCVT_SUPPORT -DWSCON
.endfor
.endif
-.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc" || ${MACHINE} == "ibmnws"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc" || \
+ ${MACHINE} == "ibmnws" || ${MACHINE} == "hppa"
SRCS.bsd+= ppc_video.c pm_noop.c lnx_agp.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
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 \
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
Module Name:src
Committed By: joerg
Date: Sun Feb 28 15:15:42 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
Don't claim too much about empty loops, the SYSCALL macro is kind of
obnoxious like that...
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 \
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.40 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.41
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.40 Wed Nov 4 17:06:23 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Sun Feb 28 15:15:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2015/11/04 17:06:23 phx Exp $
+# $NetBSD: Makefile,v 1.41 2016/02/28 15:15:42 joerg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -168,5 +168,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
CPPFLAGS+= ${X11FLAGS.DRI}
.endif
+CWARNFLAGS.clang+= -Wno-error=empty-body
+
.include
.include
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
Module Name:src
Committed By: macallan
Date: Wed Nov 27 02:04:48 UTC 2013
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
Add (hopefully temporary) kludge to define PCI_MAGIC_IO_RANGE on shark and
make accelerated X work again.
This used to be defined in machine/param.h but lately the param.h from
arch/arm is installed in machine/ instead of the one from arch/shark, so the
Xserver didn't see PCI_MAGIC_IO_RANGE and couldn't figure out how to map its
IO space.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 \
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.35 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.36
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.35 Thu Feb 28 13:28:36 2013
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Wed Nov 27 02:04:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2013/02/28 13:28:36 macallan Exp $
+# $NetBSD: Makefile,v 1.36 2013/11/27 02:04:48 macallan Exp $
.include ../../../Makefile.serverlib
.include ../../../Makefile.servermod
@@ -77,6 +77,10 @@ CPPFLAGS.${_FN}=-DWSCONS_SUPPORT
.endfor
.endif
+.if ${MACHINE} == shark
+CPPFLAGS.ppc_video.c += -DPCI_MAGIC_IO_RANGE=0xf000
+.endif
+
.if ${MACHINE} == dreamcast || \
${MACHINE} == hpcsh
SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
Module Name:src
Committed By: macallan
Date: Thu Feb 28 13:28:36 UTC 2013
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
set PCVT_SUPPORT on MIPS
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 \
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.34 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.35
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.34 Thu Feb 14 16:16:25 2013
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Thu Feb 28 13:28:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2013/02/14 16:16:25 macallan Exp $
+# $NetBSD: Makefile,v 1.35 2013/02/28 13:28:36 macallan Exp $
.include ../../../Makefile.serverlib
.include ../../../Makefile.servermod
@@ -61,7 +61,7 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT
${MACHINE} == evbmips
SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
-CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
.endif
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
Module Name:src
Committed By: macallan
Date: Thu Feb 14 16:16:25 UTC 2013
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
set -DPCVT_SUPPORT on most hardware
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 \
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.33 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.34
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.33 Mon May 14 08:42:04 2012
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Thu Feb 14 16:16:25 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2012/05/14 08:42:04 abs Exp $
+# $NetBSD: Makefile,v 1.34 2013/02/14 16:16:25 macallan Exp $
.include ../../../Makefile.serverlib
.include ../../../Makefile.servermod
@@ -35,11 +35,8 @@ CPPFLAGS.${_FN}+= -DUSE_I386_IOPL -DPCVT
.if ${MACHINE} == macppc || ${MACHINE} == prep || ${MACHINE} == bebox || ${MACHINE} == ofppc
SRCS.bsd+= ppc_video.c pm_noop.c lnx_agp.c
.for _FN in ${SRCS.bsd}
-CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
-.if ${MACHINE} == ofppc
-CPPFLAGS.${_FN}+= -DPCVT_SUPPORT
-.endif
.endif
.if ${MACHINE_ARCH} == alpha
@@ -53,7 +50,7 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSES
SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
SRCS.bus+= netbsdSbus.c
.for _FN in ${SRCS.bsd}
-CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
.endif
@@ -76,10 +73,7 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSES
${MACHINE} == zaurus
SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
-CPPFLAGS.${_FN}=-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
-.if ${MACHINE} == cats
-CPPFLAGS.${_FN}+= -DPCVT_SUPPORT
-.endif
+CPPFLAGS.${_FN}=-DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
.endif
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
Module Name:src
Committed By: mrg
Date: Thu Aug 27 04:34:13 UTC 2009
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
bsdResource.c is now called stdResource.c.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
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.17 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.18
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.17 Tue Jul 7 07:58:46 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Thu Aug 27 04:34:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/07/07 07:58:46 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2009/08/27 04:34:13 mrg Exp $
.include ../../../Makefile.serverlib
.include ../../../Makefile.servermod
@@ -33,14 +33,14 @@
.endif
.if ${MACHINE} == macppc
-SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c lnx_agp.c
+SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c lnx_agp.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
.endif
.if ${MACHINE_ARCH} == alpha
-SRCS.bsd+= alpha_video.c bsd_ev56.c bsdResource.c pm_noop.c agp_noop.c
+SRCS.bsd+= alpha_video.c bsd_ev56.c stdResource.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC -DUSE_ALPHA_PIO
.endfor
@@ -55,7 +55,7 @@
.endif
.if ${MACHINE} == sgimips
-SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c agp_noop.c
+SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
@@ -64,7 +64,7 @@
.if ${MACHINE} == cats || \
${MACHINE} == shark || \
${MACHINE} == netwinder
-SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c agp_noop.c
+SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}=-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
Module Name:src
Committed By: mrg
Date: Tue Jul 7 07:58:46 UTC 2009
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
need to link stdResource.c now
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
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.16 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.17
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.16 Thu Jul 2 04:27:47 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Tue Jul 7 07:58:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/07/02 04:27:47 macallan Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/07 07:58:46 mrg Exp $
.include ../../../Makefile.serverlib
.include ../../../Makefile.servermod
@@ -47,7 +47,7 @@
.endif
.if ${MACHINE_ARCH} == sparc || ${MACHINE_ARCH} == sparc64
-SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c agp_noop.c
+SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c agp_noop.c
SRCS.bus+= netbsdSbus.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
Module Name:src
Committed By: macallan
Date: Thu Jul 2 04:27:47 UTC 2009
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
netbsdPci.c is no more
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
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.15 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.15 Fri Jun 12 01:59:07 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Thu Jul 2 04:27:47 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/06/12 01:59:07 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2009/07/02 04:27:47 macallan Exp $
.include ../../../Makefile.serverlib
.include ../../../Makefile.servermod
@@ -80,12 +80,12 @@
${MACHINE} == sgimips || ${MACHINE} == shark || \
${MACHINE} == netwinder || ${MACHINE_ARCH} == sparc || \
${MACHINE_ARCH} == sparc64 || ${MACHINE_ARCH} == alpha
-SRCS.bus+= netbsdPci.c
+#SRCS.bus+= netbsdPci.c
.endif
-.if ${MACHINE_ARCH} == sparc || ${MACHINE_ARCH} == sparc64 || \
-${MACHINE_ARCH} == powerpc
-CPPFLAGS.netbsdPci.c+= -DPCI_VIA_TTYE0
+.if ${MACHINE} == sparc || ${MACHINE} == sparc64 || \
+${MACHINE_ARCH} == powerpc || ${MACHINE} == netwinder
+#CPPFLAGS.netbsdPci.c+= -DPCI_VIA_TTYE0
.endif
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/misc
