? config/imake/bootstrap
Index: config/cf/linux.cf
===================================================================
RCS file: /home/eich/cvs/xc/config/cf/linux.cf,v
retrieving revision 1.1.1.58.6.1
diff -u -r1.1.1.58.6.1 linux.cf
--- config/cf/linux.cf	18 Oct 2004 16:03:25 -0000	1.1.1.58.6.1
+++ config/cf/linux.cf	18 Oct 2004 17:02:09 -0000
@@ -332,7 +332,7 @@
 #  elif defined(Arm32Architecture)
 #    define BuildXF86DRI	NO
 #  elif defined(HPArchitecture)
-#    define BuildXF86DRI	NO
+#    define BuildXF86DRI	YES
 #  elif defined(i386Architecture)
 #    if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
 #      define BuildXF86DRI	YES
@@ -550,7 +550,7 @@
 
 #if UseElfFormat
 # ifndef DoLoadableServer
-#  if defined(HPArchitecture) || defined(MipsArchitecture) || defined(SuperHArchitecture)
+#  if defined(MipsArchitecture) || defined(SuperHArchitecture)
 #   define DoLoadableServer	NO
 #  else
 #   define DoLoadableServer	YES
@@ -721,16 +721,6 @@
 #  define AsCmd			CcCmd -c -x assembler
 #  define LdCmd			CcCmd -nostdlib
 #  define AsmDefines		-DUSE_GAS
-# endif
-#endif
-
-#if UseElfFormat
-# ifndef DoLoadableServer
-#  ifdef HPArchitecture
-#   define DoLoadableServer	NO
-#  else
-#   define DoLoadableServer	YES
-#  endif
 # endif
 #endif
 
Index: config/imake/imakemdep.h
===================================================================
RCS file: /home/eich/cvs/xc/config/imake/imakemdep.h,v
retrieving revision 1.1.1.35.6.1
diff -u -r1.1.1.35.6.1 imakemdep.h
--- config/imake/imakemdep.h	18 Oct 2004 16:03:25 -0000	1.1.1.35.6.1
+++ config/imake/imakemdep.h	18 Oct 2004 17:02:10 -0000
@@ -395,6 +395,9 @@
 # ifdef __m68k__
 	"-D__m68k__",
 # endif
+# ifdef __hppa__
+	"-D__hppa__",
+# endif
 # ifdef __sh__
 	"-D__sh__",
 # endif
@@ -1325,6 +1328,9 @@
 # endif
 # ifdef __s390__
 	{"__s390__", "1"},
+# endif
+# ifdef __hppa__
+	{"__hppa__", "1"},
 # endif
 # ifdef __sh__
 	{"__sh__", "1"},
Index: programs/Xserver/os/Imakefile
===================================================================
RCS file: /home/eich/cvs/xc/programs/Xserver/os/Imakefile,v
retrieving revision 1.1.1.17
diff -u -r1.1.1.17 Imakefile
--- programs/Xserver/os/Imakefile	14 Sep 2004 10:58:03 -0000	1.1.1.17
+++ programs/Xserver/os/Imakefile	18 Oct 2004 17:02:29 -0000
@@ -11,11 +11,6 @@
  * If you have any extra files to be put into the library, define them here.
  */
 
-#ifdef HPArchitecture
-#define OtherSources hpsocket.c 
-#define OtherObjects hpsocket.o
-#endif
-
 /*
  * do not modify the following two definitions
  */
Index: programs/Xserver/os/hpsocket.c
===================================================================
RCS file: programs/Xserver/os/hpsocket.c
diff -N programs/Xserver/os/hpsocket.c
--- programs/Xserver/os/hpsocket.c	20 Dec 2001 12:45:45 -0000	1.1.1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,66 +0,0 @@
-/* $Xorg: hpsocket.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
-/*
-
-Copyright 1988, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-/*
- * special socket routine for hp
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int
-set_socket_option (socket_id, option)
-int socket_id;
-char option;
-{
-	int optlen = 1;
-	char optval = 0x0;
-
-	getsockopt (socket_id, SOL_SOCKET, option, &optval, &optlen);
-
-	optval |= option;
-
-	setsockopt (socket_id, SOL_SOCKET, option, &optval, 1);
-}
-
-
-int
-unset_socket_option (socket_id, option)
-int socket_id;
-char option;
-{
-	int optlen = 1;
-	char optval = 0x0;
-
-	getsockopt (socket_id, SOL_SOCKET, option, &optval, &optlen);
-
-	optval &= ~option;
-
-	setsockopt (socket_id, SOL_SOCKET, option, &optval, 1);
-}