From a026a8588929b923a5ec0a99edae311ab51b99e9 Mon Sep 17 00:00:00 2001 From: rtr Date: Sat, 9 Aug 2008 01:18:20 +0000 Subject: [PATCH] don't build .S versions right now. xorg auto doesn't build them either as far as I can tell. the .S versions don't even seem to have the syms we need anyway --- .../xorg/server/xorg-server/hw/xfree86/os-support/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/os-support/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/os-support/Makefile index 336a8aa12d62..ce18d9397cc2 100644 --- a/external/mit/xorg/server/xorg-server/hw/xfree86/os-support/Makefile +++ b/external/mit/xorg/server/xorg-server/hw/xfree86/os-support/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2008/08/04 01:03:34 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2008/08/09 01:18:20 rtr Exp $ .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" @@ -68,8 +68,10 @@ SRCS.bus+= netbsdPci.c .PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/misc SRCS.misc= xf86_Util.c Delay.c +# XXX these seem to not have all symbols we need right now .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" -SRCS.misc+= BUSmemcpy.S IODelay.S SlowBcopy.S +#SRCS.misc+= BUSmemcpy.S IODelay.S SlowBcopy.S +SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c CPPFLAGS.BUSmemcpy.S= -DUSE_GAS CPPFLAGS.IODelay.S= -DUSE_GAS CPPFLAGS.SlowBcopy.S= -DUSE_GAS