svn merge file:///D:/svnrepos/vcxsrv/branches/released .

11 files changed, 47 insertions, 865 deletions

diff --git a/xorg-server/hw/xfree86/os-support/misc/BUSmemcpy.S b/xorg-server/hw/xfree86/os-support/misc/BUSmemcpy.S
deleted file mode 100644
index 373723c7d..000000000
--- a/xorg-server/hw/xfree86/os-support/misc/BUSmemcpy.S
+++ /dev/null
@@ -1,153 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.s,v 1.2 1998/07/25 16:56:49 dawes Exp $ */
-/******************************************************************************
-                        Copyright 1993 by Glenn G. Lai
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Glenn G. Lai not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-Glenn G. Lai DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-Glenn G. Lai
-P.O. Box 4314
-Austin, Tx 78765
-(glenn@cs.utexas.edu)
-8/9/93
-******************************************************************************/
-/* $XConsortium: BUSmemcpy.s /main/4 1996/02/21 17:39:34 kaleb $ */
-
-/*
- * Modified to use long-alignment of video memory rather than word-alignment
- * to improve performance for LocalBus video cards.  Function names changed
- * from ISAToMem and MemToISA to BusToMem and MemToBus.
- *
- * David Dawes <dawes@XFree86.org>, 25 August 1993.
- */
-
-
-#include "assyntax.h"
-
-	FILE("BUSmemcpy.s")
-
-	AS_BEGIN
-
-/* BusToMem copies from video memory to main memory
-   MemToBus copies from main memory to video memory
-
-	void xf86BusToMem(unsigned char *dst, unsigned char *src, int len);
-	void xf86MemToBus(unsigned char *dst, unsigned char *src, int len);
-*/
-
-#define dst     REGOFF(4,ESP)
-#define src     REGOFF(8,ESP)
-#define len     REGOFF(12,ESP)
-
-	GLOBL	GLNAME(xf86BusToMem)
-	GLOBL	GLNAME(xf86MemToBus)
-
-	SEG_DATA
-copyright:
-	STRING("Copyright 8/9/1993 by Glenn G. Lai")
-
-	SEG_TEXT
-	ALIGNTEXT4
-GLNAME(xf86BusToMem):
-	CLD
-	PUSH_L	(ESI)
-	MOV_L	(EDI, EDX)
-	
-	MOV_L	(src, ESI)
-	MOV_L	(dst, EDI)
-	MOV_L	(len, ECX)
-	
-	CMP_L	(CONST(7), ECX)
-	JC	(quickBM)
-
-	TEST_L	(CONST(1), ESI)
-	JZ	(BwM)
-
-	MOVS_B
-	DEC_L	(ECX)
-
-BwM:	
-	TEST_L	(CONST(2), ESI)
-	JZ	(BlM)
-
-	MOVS_W
-	DEC_L	(ECX)
-	DEC_L	(ECX)
-
-BlM:
-	MOV_L	(ECX, EAX)
-	AND_L	(CONST(3), EAX)
-	SHR_L	(CONST(2), ECX)
-	REP
-	MOVS_L
-	MOV_L	(EAX, ECX)
-quickBM:
-	OR_L	(ECX, ECX)
-	JZ	(return)
-	REP
-	MOVS_B
-return:
-	POP_L	(ESI)
-	MOV_L	(EDX, EDI)
-	RET
-/************************/
-
-	ALIGNTEXT4
-GLNAME(xf86MemToBus):
-	CLD
-	PUSH_L	(ESI)
-	MOV_L	(EDI, EDX)
-	
-	MOV_L	(src, ESI)
-	MOV_L	(dst, EDI)
-	MOV_L	(len, ECX)
-	
-	CMP_L	(CONST(7), ECX)
-	JC	(quickMB)
-
-	TEST_L	(CONST(1), EDI)
-	JZ	(MwB)
-
-	MOVS_B
-	DEC_L	(ECX)
-
-MwB:	
-	TEST_L	(CONST(2), EDI)
-	JZ	(MlB)
-
-	MOVS_W
-	DEC_L	(ECX)
-	DEC_L	(ECX)
-
-MlB:
-	MOV_L	(ECX, EAX)
-	AND_L	(CONST(3), EAX)
-	SHR_L	(CONST(2), ECX)
-	REP
-	MOVS_L
-	MOV_L	(EAX, ECX)
-quickMB:
-	OR_L	(ECX, ECX)
-	JZ	(return)
-	REP
-	MOVS_B
-
-	POP_L	(ESI)
-	MOV_L	(EDX, EDI)
-	RET
-
diff --git a/xorg-server/hw/xfree86/os-support/misc/BUSmemcpy.c b/xorg-server/hw/xfree86/os-support/misc/BUSmemcpy.c
index b482b867a..0500bf6c1 100644
--- a/xorg-server/hw/xfree86/os-support/misc/BUSmemcpy.c
+++ b/xorg-server/hw/xfree86/os-support/misc/BUSmemcpy.c
@@ -26,233 +26,8 @@ Thanks to Linus Torvalds for contributing this code.
 
 #include "compiler.h"
 
-/*
- * The Jensen lacks dense memory, thus we have to address the bus via
- * the sparse addressing scheme. These routines are only used in s3im.c
- * Non time critical code uses SlowBCopy_{from/to} bus.
- *
- * Martin Ostermann (ost@comnets.rwth-aachen.de) - Apr.-Sep. 1996
- */
-
-#ifdef TEST_JENSEN_CODE /* define to test the Sparse addressing on a non-Jensen */
-#define LWORD_CODING (0x18)
-#define SPARSE (5)
-#else
 #define LWORD_CODING (0x60)
 #define SPARSE (7)
-#endif
-
-void
-xf86JensenMemToBus(char *Base, long dst, long src, int count)
-{
-    if( ((long)src^((long)dst)) & 3) {  
-                               /* src & dst are NOT aligned to each other */
-	unsigned long addr;
-	unsigned long low_word, high_word,last_read;
-	long  rm,loop;
-	unsigned long tmp,org,org2,mask,src_org,count_org;
-	
-	src_org=src;
-	count_org=count;
-    
-	/* add EISA longword coding and round off*/
-	addr = (long)(Base+(dst<<SPARSE) + LWORD_CODING) & ~(3<<SPARSE);
-	rm = (long)dst & 3;
-	count += rm;
-	
-	count = count_org + rm;
-	org = *(volatile unsigned int *)addr;
-	__asm__("ldq_u %0,%1"
-		:"=r" (low_word):"m" (*(unsigned long *)(src_org)));
-	src = src_org - rm;
-	if( count > 4  ) {
-	    last_read = src_org+count_org - 1;
-	    __asm__("ldq_u %0,%1"
-		    :"=r" (high_word):"m" (*(unsigned long *)(src+4)));
-	    __asm__("extll %1,%2,%0"
-		    :"=r" (low_word)
-		    :"r" (low_word), "r" ((unsigned long)(src)));
-	    __asm__("extlh %1,%2,%0"
-		    :"=r" (tmp)
-		    :"r" (high_word), "r" ((unsigned long)(src)));
-	    tmp |= low_word;
-	    src += 4;
-	    __asm__("mskqh %1,%2,%0"
-		    :"=r" (tmp)
-		    :"r" (tmp), "r" (rm));
-	    __asm__("mskql %1,%2,%0"
-		    :"=r" (org2)
-		    :"r" (org), "r" (rm));
-	    tmp |= org2;
-      
-	    loop = (count-4) >> 2; /* loop eqv. count>=4 ; count -= 4 */
-	    while (loop) {
-                     /* tmp to be stored completly -- need to read next word*/
-		low_word = high_word;
-		*(volatile unsigned int *) (addr) = tmp;
-		__asm__("ldq_u %0,%1"
-			:"=r" (high_word):"m" (*(unsigned long*)(src+4)));
-		loop --;
-		__asm__("extll %1,%2,%0"
-			:"=r" (low_word)
-			:"r" (low_word), "r" ((unsigned long)src));
-		__asm__("extlh %1,%2,%0"
-			:"=r" (tmp)
-			:"r" (high_word), "r" ((unsigned long)src));
-		src += 4;
-		tmp |= low_word;
-		addr += 4<<SPARSE;
-	    }
-	    if ( count & 3 ) {
-                     /* Store tmp completly, and possibly read one more word.*/
-		*(volatile unsigned int *) (addr) = tmp;
-		__asm__("ldq_u %0,%1"
-			:"=r" (tmp):"m" (*((unsigned long *)(last_read)) ));
-		addr += 4<<SPARSE;
-		__asm__("extll %1,%2,%0"
-			:"=r" (low_word)
-			:"r" (high_word), "r" ((unsigned long)src));
-		__asm__("extlh %1,%2,%0"
-			:"=r" (tmp)
-			:"r" (tmp), "r" ((unsigned long)src));
-		tmp |= low_word;
-		org = *(volatile unsigned int *)addr;
-		
-		__asm__("mskql %1,%2,%0"
-			:"=r" (tmp)
-			:"r" (tmp), "r" (count&3));
-		__asm__("mskqh %1,%2,%0"
-			:"=r" (org)
-			:"r" (org), "r" (count&3));
-		
-		tmp |= org;
-	    } 
-	    *(volatile unsigned int *) (addr) = tmp;
-	    return;
-	} else {         /* count > 4  */
-	    __asm__("ldq_u %0,%1"
-		    :"=r" (high_word):"m" (*(unsigned long *)(src+4)));
-	    __asm__("extll %1,%2,%0"
-		    :"=r" (low_word)
-		    :"r" (low_word), "r" ((unsigned long)(src)));
-	    __asm__("extlh %1,%2,%0"
-		    :"=r" (tmp)
-		    :"r" (high_word), "r" ((unsigned long)(src)));
-	    tmp |= low_word;
-	    if( count < 4 ) {
-		
-		mask = -1;
-		__asm__("mskqh %1,%2,%0"
-			:"=r" (mask)
-			:"r" (mask), "r" (rm));
-		__asm__("mskql %1,%2,%0"
-			:"=r" (mask)
-			:"r" (mask), "r" (count));
-		tmp = (tmp & mask) | (org & ~mask);
-		*(volatile unsigned int *) (addr) = tmp;
-		return;
-	    }  else {
-		__asm__("mskqh %1,%2,%0"
-			:"=r" (tmp)
-			:"r" (tmp), "r" (rm));
-		__asm__("mskql %1,%2,%0"
-			:"=r" (org2)
-			:"r" (org), "r" (rm));
-		
-		tmp |= org2;
-		*(volatile unsigned int *) (addr) = tmp;
-		return;
-	    }
-	}
-    } else {          /* src & dst are aligned to each other */
-	unsigned long addr;
-	unsigned int tmp,org,rm;
-	unsigned int *src_r;
-	
-	/* add EISA longword coding and round off*/
-	addr = (long)(Base+(dst<<SPARSE) + LWORD_CODING) & ~(3<<SPARSE);
-	
-	src_r = (unsigned int*)((long)src & ~3L);
-	rm=(long)src & 3;
-	count += rm;
-	
-	tmp = *src_r;
-	org = *(volatile unsigned int *)addr;
-	
-	__asm__("mskqh %1,%2,%0"
-		:"=r" (tmp)
-		:"r" (tmp), "r" (rm));
-	__asm__("mskql %1,%2,%0"
-		:"=r" (org)
-		:"r" (org), "r" (rm));
-	
-	tmp |= org;
-	
-	while (count > 4) {
-	    *(volatile unsigned int *) addr = tmp;
-	    addr += 4<<SPARSE;
-	    src_r += 1;
-	    tmp = *src_r;
-	    count -= 4;
-	}
-	
-	org = *(volatile unsigned int *)addr;
-	__asm__("mskql %1,%2,%0"
-		:"=r" (tmp)
-		:"r" (tmp), "r" (count));
-	__asm__("mskqh %1,%2,%0"
-		:"=r" (org)
-		:"r" (org), "r" (count));
-	tmp |= org;
-	*(volatile unsigned int *) (addr) = tmp;
-    }
-}
-
-void
-xf86JensenBusToMem(char *Base, char *dst, unsigned long src, int count)
-{
-#if 0
-  /* Optimization of BusToMem() is left as an exercise to the reader ;-)    
-   * Consider that ldq_u/extlh/extll won't work because of the bus being
-   * only 4 bytes wide! 
-   */
-#else
-  unsigned long addr;
-  long result;
-
-  addr = (unsigned long)(Base+(src<<SPARSE)) ;
-  while( addr & (3<<SPARSE) ){
-    if(count <= 0) return;
-    result = *(volatile int *) addr;
-    result >>= ((addr>>SPARSE) & 3) * 8;
-    *dst++ = (char) result;
-    addr += 1<<SPARSE;
-    count--;
-  }
-  count -=4;
-  while(count >= 0){
-    int i;
-
-    result = *(volatile int *) (addr+LWORD_CODING);
-    for(i=4;i--;) {
-      *dst++ = (char) result;
-      result >>= 8;
-    }
-    addr += 4<<SPARSE;
-    count -= 4;
-  }
-  count +=4;
-  
-  while( count ){
-    result = *(volatile int *) addr;
-    result >>= ((addr>>SPARSE) & 3) * 8;
-    *dst++ = (char) result;
-    addr += 1<<SPARSE;
-    count--;
-  }
-#endif  
-}
-
 
 static unsigned long __memcpy(unsigned long dest, unsigned long src, int n);
 
diff --git a/xorg-server/hw/xfree86/os-support/misc/IODelay.S b/xorg-server/hw/xfree86/os-support/misc/IODelay.S
deleted file mode 100644
index 4c6e32f3f..000000000
--- a/xorg-server/hw/xfree86/os-support/misc/IODelay.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.S,v 1.1 1999/07/10 07:24:50 dawes Exp $ */
-/*******************************************************************************
-                        Copyright 1994 by Glenn G. Lai
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyr notice appear in all copies and that
-both that copyr notice and this permission notice appear in
-supporting documentation, and that the name of Glenn G. Lai not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-Glenn G. Lai DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-Glenn G. Lai
-P.O. Box 4314
-Austin, Tx 78765
-glenn@cs.utexas.edu)
-7/21/94
-*******************************************************************************/
-/* $XConsortium: IODelay.s /main/4 1996/02/21 17:40:21 kaleb $ */
- 
-/* 
- *   All we really need is a delay of about 40ns for I/O recovery for just
- *   about any occasion, but we'll be more conservative here:  On a
- *   100-MHz CPU, produce at least a delay of 1,000ns.
- */ 
-
-#include "assyntax.h"
-
-	FILE("DACDelay.s")
-
-	AS_BEGIN
-
-	GLOBL	GLNAME(xf86IODelay)
-
-	SEG_TEXT
-	ALIGNTEXT4
-GLNAME(xf86IODelay):
-	MOV_L 	(CONST(100), EAX)
-delay_it:
-	DEC_L	(EAX)
-	JNE	(delay_it)
-	RET
-
diff --git a/xorg-server/hw/xfree86/os-support/misc/IODelay.c b/xorg-server/hw/xfree86/os-support/misc/IODelay.c
deleted file mode 100644
index e4422f234..000000000
--- a/xorg-server/hw/xfree86/os-support/misc/IODelay.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
-  Stub for Alpha Linux
-*******************************************************************************/
- 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <X11/X.h>
-#include "xf86.h"
-#include "xf86Priv.h"
-#include "xf86_OSlib.h"
-
-/* 
- *   All we really need is a delay of about 40ns for I/O recovery for just
- *   about any occasion, but we'll be more conservative here:  On a
- *   100-MHz CPU, produce at least a delay of 1,000ns.
- */ 
-_X_EXPORT void
-xf86IODelay()
-{
-	xf86UDelay(1);
-}
-
diff --git a/xorg-server/hw/xfree86/os-support/misc/Makefile.am b/xorg-server/hw/xfree86/os-support/misc/Makefile.am
index 65fbe92b4..3d4b8ff0e 100644
--- a/xorg-server/hw/xfree86/os-support/misc/Makefile.am
+++ b/xorg-server/hw/xfree86/os-support/misc/Makefile.am
@@ -1,18 +1,7 @@
-# FIXME: Add the *.S files to build when applicable
-I386_SRCS = BUSmemcpy.S IODelay.S SlowBcopy.S
-OTHER_SRCS = BUSmemcpy.c IODelay.c SlowBcopy.c
-
-ARCH_SRCS = $(OTHER_SRCS)
-
-# FIXME: Add to the build (NeedPortIO)
-PORTIO_SRCS = PortIO.S
-
-# FIXME: Add to the build (if HasGcc || HasGcc2)
-ILHACK_SRCS = xf86_IlHack.c
 
 noinst_LTLIBRARIES = libmisc.la
 
-libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SRCS)
+libmisc_la_SOURCES = Delay.c BUSmemcpy.c SlowBcopy.c
 
 #AM_LDFLAGS = -r
 
@@ -20,4 +9,4 @@ INCLUDES = $(XORG_INCS)
 
 AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
 
-EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS) $(ILHACK_SRCS)
+EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS)
diff --git a/xorg-server/hw/xfree86/os-support/misc/Makefile.in b/xorg-server/hw/xfree86/os-support/misc/Makefile.in
index 19a94d7cc..a641ebf57 100644
--- a/xorg-server/hw/xfree86/os-support/misc/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/misc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43,7 +43,6 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
 	$(top_builddir)/include/xorg-server.h \
 	$(top_builddir)/include/dix-config.h \
-	$(top_builddir)/include/xgl-config.h \
 	$(top_builddir)/include/xorg-config.h \
 	$(top_builddir)/include/xkb-config.h \
 	$(top_builddir)/include/xwin-config.h \
@@ -51,18 +50,13 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libmisc_la_LIBADD =
-am__objects_1 = BUSmemcpy.lo IODelay.lo SlowBcopy.lo
-am__objects_2 = $(am__objects_1)
-am_libmisc_la_OBJECTS = xf86_Util.lo Delay.lo $(am__objects_2)
+am_libmisc_la_OBJECTS = Delay.lo BUSmemcpy.lo SlowBcopy.lo
 libmisc_la_OBJECTS = $(am_libmisc_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -77,8 +71,9 @@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
-APPDEFAULTDIR = @APPDEFAULTDIR@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
+APPLE_APPLICATION_ID = @APPLE_APPLICATION_ID@
+APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -99,10 +94,6 @@ CFLAGS = @CFLAGS@
 COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -124,6 +115,7 @@ DMXXIEXAMPLES_DEP_CFLAGS = @DMXXIEXAMPLES_DEP_CFLAGS@
 DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
+DOLT_BASH = @DOLT_BASH@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -133,18 +125,15 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRI_DRIVER_PATH = @DRI_DRIVER_PATH@
 DSYMUTIL = @DSYMUTIL@
 DTRACE = @DTRACE@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
 GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
 GLX_DEFINES = @GLX_DEFINES@
 GL_CFLAGS = @GL_CFLAGS@
@@ -163,7 +152,7 @@ KDRIVE_LIBS = @KDRIVE_LIBS@
 KDRIVE_LOCAL_LIBS = @KDRIVE_LOCAL_LIBS@
 KDRIVE_PURE_INCS = @KDRIVE_PURE_INCS@
 KDRIVE_PURE_LIBS = @KDRIVE_PURE_LIBS@
-LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LD_EXPORT_SYMBOLS_FLAG = @LD_EXPORT_SYMBOLS_FLAG@
 LEX = @LEX@
@@ -177,7 +166,10 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINUXDOC = @LINUXDOC@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -189,8 +181,7 @@ MESA_SOURCE = @MESA_SOURCE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
-MKFONTDIR = @MKFONTDIR@
-MKFONTSCALE = @MKFONTSCALE@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJC = @OBJC@
 OBJCCLD = @OBJCCLD@
@@ -199,8 +190,8 @@ OBJCFLAGS = @OBJCFLAGS@
 OBJCLINK = @OBJCLINK@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
-OPENSSL_LIBS = @OPENSSL_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -233,7 +224,6 @@ VENDOR_NAME = @VENDOR_NAME@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VENDOR_RELEASE = @VENDOR_RELEASE@
 VERSION = @VERSION@
-X11APP_ARCHS = @X11APP_ARCHS@
 X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
 X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
 XDMCP_CFLAGS = @XDMCP_CFLAGS@
@@ -243,27 +233,12 @@ XDMXCONFIG_DEP_LIBS = @XDMXCONFIG_DEP_LIBS@
 XDMX_CFLAGS = @XDMX_CFLAGS@
 XDMX_LIBS = @XDMX_LIBS@
 XDMX_SYS_LIBS = @XDMX_SYS_LIBS@
-XEGLMODULES_CFLAGS = @XEGLMODULES_CFLAGS@
-XEGL_LIBS = @XEGL_LIBS@
-XEGL_SYS_LIBS = @XEGL_SYS_LIBS@
 XEPHYR_CFLAGS = @XEPHYR_CFLAGS@
-XEPHYR_DRI_LIBS = @XEPHYR_DRI_LIBS@
 XEPHYR_INCS = @XEPHYR_INCS@
 XEPHYR_LIBS = @XEPHYR_LIBS@
 XF86CONFIGFILE = @XF86CONFIGFILE@
-XF86MISC_CFLAGS = @XF86MISC_CFLAGS@
-XF86MISC_LIBS = @XF86MISC_LIBS@
 XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@
 XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@
-XGLMODULES_CFLAGS = @XGLMODULES_CFLAGS@
-XGLMODULES_LIBS = @XGLMODULES_LIBS@
-XGLXMODULES_CFLAGS = @XGLXMODULES_CFLAGS@
-XGLXMODULES_LIBS = @XGLXMODULES_LIBS@
-XGLX_LIBS = @XGLX_LIBS@
-XGLX_SYS_LIBS = @XGLX_SYS_LIBS@
-XGL_LIBS = @XGL_LIBS@
-XGL_MODULE_PATH = @XGL_MODULE_PATH@
-XGL_SYS_LIBS = @XGL_SYS_LIBS@
 XKB_BASE_DIRECTORY = @XKB_BASE_DIRECTORY@
 XKB_BIN_DIRECTORY = @XKB_BIN_DIRECTORY@
 XKB_COMPILED_DIR = @XKB_COMPILED_DIR@
@@ -274,10 +249,6 @@ XNESTMODULES_CFLAGS = @XNESTMODULES_CFLAGS@
 XNESTMODULES_LIBS = @XNESTMODULES_LIBS@
 XNEST_LIBS = @XNEST_LIBS@
 XNEST_SYS_LIBS = @XNEST_SYS_LIBS@
-XORGCFG_DEP_CFLAGS = @XORGCFG_DEP_CFLAGS@
-XORGCFG_DEP_LIBS = @XORGCFG_DEP_LIBS@
-XORGCONFIG_DEP_CFLAGS = @XORGCONFIG_DEP_CFLAGS@
-XORGCONFIG_DEP_LIBS = @XORGCONFIG_DEP_LIBS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_INCS = @XORG_INCS@
 XORG_LIBS = @XORG_LIBS@
@@ -286,13 +257,8 @@ XORG_MODULES_LIBS = @XORG_MODULES_LIBS@
 XORG_OS = @XORG_OS@
 XORG_OS_SUBDIR = @XORG_OS_SUBDIR@
 XORG_SYS_LIBS = @XORG_SYS_LIBS@
-XPRINTMODULES_CFLAGS = @XPRINTMODULES_CFLAGS@
-XPRINTMODULES_LIBS = @XPRINTMODULES_LIBS@
-XPRINTPROTO_CFLAGS = @XPRINTPROTO_CFLAGS@
-XPRINTPROTO_LIBS = @XPRINTPROTO_LIBS@
-XPRINT_CFLAGS = @XPRINT_CFLAGS@
-XPRINT_LIBS = @XPRINT_LIBS@
-XPRINT_SYS_LIBS = @XPRINT_SYS_LIBS@
+XPBPROXY_CFLAGS = @XPBPROXY_CFLAGS@
+XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
 XSDL_INCS = @XSDL_INCS@
@@ -325,8 +291,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -346,7 +311,6 @@ driverdir = @driverdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 extdir = @extdir@
-ft_config = @ft_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -356,12 +320,12 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-launchagentsdir = @launchagentsdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 logdir = @logdir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
@@ -379,26 +343,13 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-xglmoduledir = @xglmoduledir@
-xpconfigdir = @xpconfigdir@
-
-# FIXME: Add the *.S files to build when applicable
-I386_SRCS = BUSmemcpy.S IODelay.S SlowBcopy.S
-OTHER_SRCS = BUSmemcpy.c IODelay.c SlowBcopy.c
-ARCH_SRCS = $(OTHER_SRCS)
-
-# FIXME: Add to the build (NeedPortIO)
-PORTIO_SRCS = PortIO.S
-
-# FIXME: Add to the build (if HasGcc || HasGcc2)
-ILHACK_SRCS = xf86_IlHack.c
 noinst_LTLIBRARIES = libmisc.la
-libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SRCS)
+libmisc_la_SOURCES = Delay.c BUSmemcpy.c SlowBcopy.c
 
 #AM_LDFLAGS = -r
 INCLUDES = $(XORG_INCS)
 AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
-EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS) $(ILHACK_SRCS)
+EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS)
 all: all-am
 
 .SUFFIXES:
@@ -407,8 +358,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -452,9 +403,7 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BUSmemcpy.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Delay.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IODelay.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SlowBcopy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86_Util.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -488,7 +437,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/xorg-server/hw/xfree86/os-support/misc/PortIO.S b/xorg-server/hw/xfree86/os-support/misc/PortIO.S
deleted file mode 100644
index 75db31156..000000000
--- a/xorg-server/hw/xfree86/os-support/misc/PortIO.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $XFree86$ */
-
-/* Port I/O functions for platforms with no inlining. */
-
-#include "assyntax.h"
-
-	FILE("PortIO.s")
-
-	AS_BEGIN
-
-	GLOBL	GLNAME(outb)
-	GLOBL	GLNAME(outw)
-	GLOBL	GLNAME(outl)
-	GLOBL	GLNAME(inb)
-	GLOBL	GLNAME(inw)
-	GLOBL	GLNAME(inl)
-
-	SEG_TEXT
-	ALIGNTEXT4
-GLNAME(outb):
-	MOV_L	(REGOFF(4,ESP), EDX)
-	MOV_L	(REGOFF(8,ESP), EAX)
-	OUT_B
-	RET
-
-	ALIGNTEXT4
-GLNAME(outw):
-	MOV_L	(REGOFF(4,ESP), EDX)
-	MOV_L	(REGOFF(8,ESP), EAX)
-	OUT_W
-	RET
-
-	ALIGNTEXT4
-GLNAME(outl):
-	MOV_L	(REGOFF(4,ESP), EDX)
-	MOV_L	(REGOFF(8,ESP), EAX)
-	OUT_L
-	RET
-
-	ALIGNTEXT4
-GLNAME(inb):
-	MOV_L	(REGOFF(4,ESP), EDX)
-	IN_B
-	RET
-
-	ALIGNTEXT4
-GLNAME(inw):
-	MOV_L	(REGOFF(4,ESP), EDX)
-	IN_L
-	RET
-
-	ALIGNTEXT4
-GLNAME(inl):
-	MOV_L	(REGOFF(4,ESP), EDX)
-	IN_L
-	RET
-
diff --git a/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.S b/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.S
deleted file mode 100644
index 9b6af1d69..000000000
--- a/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.S
+++ /dev/null
@@ -1,108 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.S,v 1.1 1999/07/10 07:24:51 dawes Exp $ */
-/*******************************************************************************
-                        Copyright 1994 by Glenn G. Lai
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyr notice appear in all copies and that
-both that copyr notice and this permission notice appear in
-supporting documentation, and that the name of Glenn G. Lai not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-Glenn G. Lai DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-Glenn G. Lai
-P.O. Box 4314
-Austin, Tx 78765
-glenn@cs.utexas.edu)
-7/21/94
-*******************************************************************************/
-/* $XConsortium: SlowBcopy.s /main/4 1996/02/21 17:40:52 kaleb $ */
- 
-/* 
- *   Modified from the output generated by GCC
- *
- *   Create a dependency that should be immune from the effect of register
- *   renaming as is commonly seen in superscalar processors.  This should
- *   insert a minimum of 100-ns delays between reads/writes at clock rates
- *   up to 100 MHz---GGL
- *   
- *   Slowbcopy(char *src, char *dst, int count)   
- *   
- */ 
-
-#include "assyntax.h"
-
-	FILE("SlowBcopy.s")
-
-	AS_BEGIN
-
-gcc2_compiled.:
-___gnu_compiled_c:
-
-	GLOBL	GLNAME(xf86SlowBcopy)
-
-	SEG_TEXT
-	ALIGNTEXT4
-GLNAME(xf86SlowBcopy):
-	PUSH_L	(EBP)
-	MOV_L	(ESP,EBP)
-	PUSH_L	(ESI)
-	PUSH_L	(EBX)
-	MOV_L	(REGOFF(8,EBP),ECX)
-	MOV_L	(REGOFF(12,EBP),EDX)
-	MOV_L	(REGOFF(16,EBP),ESI)
-	XOR_L	(EAX,EAX)
-	CMP_L	(ESI,EAX)
-	JGE	(L3)
-
-	ALIGNTEXT4
-L5:
-	MOV_B	(REGIND(ECX),BL)
-
-	MOV_B	(BL, BH)
-	MOV_B	(BH, BL)
-	MOV_B	(BL, BH)
-	MOV_B	(BH, BL)
-	MOV_B	(BL, BH)
-	MOV_B	(BH, BL)
-	MOV_B	(BL, BH)
-	MOV_B	(BH, BL)
-	MOV_B	(BL, BH)
-	MOV_B	(BH, BL)
-
-	MOV_B	(BL,REGIND(EDX))
-
-	INC_L	(ECX)
-	DEC_L	(ECX)
-	INC_L	(ECX)
-	DEC_L	(ECX)
-	INC_L	(ECX)
-	DEC_L	(ECX)
-	INC_L	(ECX)
-	DEC_L	(ECX)
-	INC_L	(ECX)
-	DEC_L	(ECX)
-
-	INC_L	(ECX)
-	INC_L	(EDX)
-	INC_L	(EAX)
-	CMP_L	(ESI,EAX)
-	JL	(L5)
-L3:
-	LEA_L	(REGOFF(-8,EBP),ESP)
-	POP_L	(EBX)
-	POP_L	(ESI)
-	MOV_L	(EBP,ESP)
-	POP_L	(EBP)
-	RET
-
diff --git a/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c b/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c
index 5cd716823..be69b9dd1 100644
--- a/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c
+++ b/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c
@@ -30,7 +30,7 @@ xf86SetReallySlowBcopy(void)
 	really_slow_bcopy = 1;
 }
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__amd64__)
 static void xf86_really_slow_bcopy(unsigned char *src, unsigned char *dst, int len)
 {
     while(len--)
@@ -45,7 +45,7 @@ static void xf86_really_slow_bcopy(unsigned char *src, unsigned char *dst, int l
 _X_EXPORT void
 xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len)
 {
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__amd64__)
     if (really_slow_bcopy) {
 	xf86_really_slow_bcopy(src, dst, len);
 	return;
@@ -56,29 +56,13 @@ xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len)
 }
 
 #ifdef __alpha__
-/*
- * The Jensen lacks dense memory, thus we have to address the bus via
- * the sparse addressing scheme. Time critical code uses routines from
- * BUSmemcpy.c
- *
- * Martin Ostermann (ost@comnets.rwth-aachen.de) - Apr.-Sep. 1996
- */
 
 #ifdef linux
 
-unsigned long _bus_base(void);
-
-#ifdef TEST_JENSEN_CODE /* define to test the Sparse addressing on a non-Jensen */
-#define SPARSE (5)
-#else
 #define SPARSE (7)
-#endif
-
-#define isJensen() (!_bus_base())
 
 #else
 
-#define isJensen() 0
 #define SPARSE 0
 
 #endif
@@ -86,42 +70,32 @@ unsigned long _bus_base(void);
 _X_EXPORT void
 xf86SlowBCopyFromBus(unsigned char *src, unsigned char *dst, int count)
 {
-    if (isJensen())
-    {
-	unsigned long addr;
-	long result;
-
-	addr = (unsigned long) src;
-	while( count ){
-	    result = *(volatile int *) addr;
-	    result >>= ((addr>>SPARSE) & 3) * 8;
-	    *dst++ = (unsigned char) (0xffUL & result);
-	    addr += 1<<SPARSE;
-	    count--;
-	    outb(0x80, 0x00);
-	}
+    unsigned long addr;
+    long result;
+
+    addr = (unsigned long) src;
+    while( count ){
+	result = *(volatile int *) addr;
+	result >>= ((addr>>SPARSE) & 3) * 8;
+	*dst++ = (unsigned char) (0xffUL & result);
+	addr += 1<<SPARSE;
+	count--;
+	outb(0x80, 0x00);
     }
-    else
-	xf86SlowBcopy(src,dst,count);
 }
   
 _X_EXPORT void
 xf86SlowBCopyToBus(unsigned char *src, unsigned char *dst, int count)
 {
-    if (isJensen())
-    {
-	unsigned long addr;
-
-	addr = (unsigned long) dst;
-	while(count) {
-	    *(volatile unsigned int *) addr = (unsigned short)(*src) * 0x01010101;
-	    src++;
-	    addr += 1<<SPARSE;
-	    count--;
-	    outb(0x80, 0x00);
-	}
+    unsigned long addr;
+
+    addr = (unsigned long) dst;
+    while(count) {
+	*(volatile unsigned int *) addr = (unsigned short)(*src) * 0x01010101;
+	src++;
+	addr += 1<<SPARSE;
+	count--;
+	outb(0x80, 0x00);
     }
-    else
-	xf86SlowBcopy(src,dst,count);    
 }
 #endif
diff --git a/xorg-server/hw/xfree86/os-support/misc/xf86_IlHack.c b/xorg-server/hw/xfree86/os-support/misc/xf86_IlHack.c
deleted file mode 100644
index 6c9871d93..000000000
--- a/xorg-server/hw/xfree86/os-support/misc/xf86_IlHack.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * This file is an incredible crock to get the normally-inline functions
- * built into the server so that things can be debugged properly.
- *
- * Note: this doesn't work when using a compiler other than GCC.
- */
-
-#define static /**/
-#define __inline__ /**/
-#undef NO_INLINE
-#define DO_PROTOTYPES
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "compiler.h"
diff --git a/xorg-server/hw/xfree86/os-support/misc/xf86_Util.c b/xorg-server/hw/xfree86/os-support/misc/xf86_Util.c
deleted file mode 100644
index 9e690591d..000000000
--- a/xorg-server/hw/xfree86/os-support/misc/xf86_Util.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 1993 by David Wexelblat <dwex@goblin.org>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of David Wexelblat not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  David Wexelblat makes no representations
- * about the suitability of this software for any purpose.  It is provided
- * "as is" without express or implied warranty.
- *
- * DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-/*
- * This file is for utility functions that will be shared by other pieces
- * of the system.  Putting things here ensure that all the linking order
- * dependencies are dealt with, as this library will be linked in last.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <ctype.h>
-
-/* To prevent empty source file warnings */
-int _xf86misc;
-
-#if 0
-/* For use only with gcc */
-#ifdef __GNUC__
-
-#include "os.h"
-
-char *
-debug_alloca(char *file, int line, int size)
-{
-	char *ptr;
-
-	ptr = Xalloc(size);
-	ErrorF("Alloc: %s line %d; ptr = 0x%x, length = %d\n", file, line,
-	       ptr, size);
-	return ptr;
-}
-
-void
-debug_dealloca(char *file, int line, char *ptr)
-{
-	ErrorF("Dealloc: %s line %d; ptr = 0x%x\n", file, line, ptr);
-	Xfree(ptr);
-}
-#endif
-#endif
-
-#if defined(ISC) || defined(Lynx)
-
-#include <math.h>
-
-/* Needed for apm_driver.c */
-/* These functions are modeled after the functions inside gnu's libc */
-
-static double
-copysign(double x, double y)
-{
-	x = fabs(x);
-	return y < 0 ? - x : x;
-}
-
-double
-RInt(double x)
-{
-	double s,t;
-	const double one = 1.0;
-	const static double L = 4503599627370496.0E0;
-
-	if (x!=x)
-		return(x);
-	if (copysign(x,one) >= L)
-		return(x);
-	s = copysign(L,x);
-	t = x + s;
-	return (t - s);
-}
-#endif