--- xc/config/cf/Imake.cf.ppc64-support-updates	2004-03-15 19:27:08.000000000 -0500
+++ xc/config/cf/Imake.cf	2004-04-06 16:03:36.000000000 -0400
@@ -819,6 +819,13 @@
 #  define Mc68020Architecture
 #  undef mc68000
 # endif /* mc68000 */
+# ifdef __powerpc64__
+#  ifndef Ppc64Architecture
+#   define Ppc64Architecture
+#  endif
+#  undef __powerpc64__
+#  undef __powerpc__
+# endif
 # ifdef powerpc
 #  define PpcArchitecture
 #  undef powerpc
--- xc/config/cf/linux.cf.ppc64-support-updates	2004-03-15 19:27:08.000000000 -0500
+++ xc/config/cf/linux.cf	2004-04-06 16:03:36.000000000 -0400
@@ -329,6 +329,8 @@
 #    define BuildXF86DRI	NO
 #  elif defined(PpcArchitecture)
 #    define BuildXF86DRI	YES
+#  elif defined(Ppc64Architecture)
+#    define BuildXF86DRI	NO
 #  elif defined(s390Architecture) || defined(s390xArchitecture)
 #    define BuildXF86DRI	NO
 #  elif defined(SparcArchitecture)
@@ -527,7 +529,7 @@
 #define MkdirHierCmd		mkdir -p
 
 #ifndef HaveLib64
-# if defined (AMD64Architecture) || defined (s390xArchitecture)
+# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture)
 #  define HaveLib64	YES
 # else
 #  define HaveLib64	NO
@@ -834,6 +836,16 @@
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 #endif
 
+#ifdef Ppc64Architecture
+# define DefaultCCOptions	-fsigned-char -mminimal-toc
+# ifndef OptimizedCDebugFlags
+#  define OptimizedCDebugFlags	DefaultGcc2Ppc64Opt
+# endif
+# define LinuxMachineDefines	-D__powerpc64__ -D__powerpc__
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+#endif /* Ppc64Architecture */
+
 #ifdef PpcArchitecture
 # define DefaultCCOptions	-fsigned-char
 # ifndef OptimizedCDebugFlags
--- xc/config/cf/xorg.cf.ppc64-support-updates	2004-04-06 16:03:36.000000000 -0400
+++ xc/config/cf/xorg.cf	2004-04-06 16:03:36.000000000 -0400
@@ -1102,6 +1102,99 @@
 # endif
 #endif
 
+/*
+ * For PowerPC 64bit systems
+ * only libraries are strictly needed
+ */
+#if defined(Ppc64Architecture)
+# ifndef XF86Server
+#  define XF86Server		YES
+# endif
+/* Amiga framebuffer module */
+# ifndef XF86AFB
+#  define XF86AFB		NO
+# endif
+/* 1bpp module */
+# ifndef XF1Bpp
+#  define XF1Bpp		NO
+# endif
+/* 4bpp module */
+# ifndef XF4Bpp
+#  define XF4Bpp		NO
+# endif
+/* 8/32bpp overlay module */
+# ifndef XF8_32Bpp
+#  define XF8_32Bpp		YES
+# endif
+/* 8/16bpp dual fb module */
+# ifndef XF8_16Bpp
+#  define XF8_16Bpp		YES
+# endif
+/* 24/32bpp conversion module */
+# ifndef XF24_32Bpp
+#  define XF24_32Bpp		YES
+# endif
+/* shadow fb module */
+# ifndef XFShadowFB
+#  define XFShadowFB		YES
+# endif
+/* vgahw module */
+# ifndef XF86VgaHw
+#  define XF86VgaHw		NO
+# endif
+/* fbdevhw module */
+# ifndef XF86FBDevHw
+#  define XF86FBDevHw		YES
+# endif
+/* XAA module */
+# ifndef XF86XAA
+#  define XF86XAA		YES
+# endif
+/* ramdac module */
+# ifndef XF86Ramdac
+#  define XF86Ramdac		YES
+# endif
+/* I2C module */
+# ifndef XF86I2C
+#  define XF86I2C		YES
+# endif
+/* DDC module */
+# ifndef XF86DDC
+#  define XF86DDC		YES
+# endif
+/* RAC (Resource Access Control) module */
+# ifndef XF86RAC
+#  define XF86RAC		YES
+# endif
+
+/* int10 module */
+# ifndef XF86Int10
+#  define XF86Int10		YES
+# endif
+
+# ifndef DevelDrivers
+#  if XFree86Devel
+#   define DevelDrivers		
+#  else
+#   define DevelDrivers		/* */
+#  endif
+# endif
+
+/* Pure PCI drivers should go first */
+# ifndef XF86CardDrivers
+#  define XF86CardDrivers	ati mga \
+				DevelDrivers \
+				XF86OSCardDrivers XF86ExtraCardDrivers
+# endif
+# if HasGlide3
+#  define TdfxDriDriver		
+# else
+#  define TdfxDriDriver		/**/
+# endif
+# ifndef DriDrivers
+#  define DriDrivers		gamma r128
+# endif
+#endif
 
 /*
  * For Mips/Arc platforms, the default is to build all modules which
@@ -1913,6 +2006,12 @@
 # endif
 #endif
 
+#if HasGcc2 && defined(Ppc64Architecture)
+# ifndef DefaultGcc2Ppc64Opt
+#  define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs
+# endif
+#endif
+
 #if HasGcc2 && defined(PpcArchitecture)
 # ifndef DefaultGcc2PpcOpt
 #  define DefaultGcc2PpcOpt -O2 GccAliasingArgs
--- xc/config/cf/Imake.tmpl.ppc64-support-updates	2004-04-06 16:03:36.000000000 -0400
+++ xc/config/cf/Imake.tmpl	2004-04-06 16:03:36.000000000 -0400
@@ -506,7 +506,7 @@
 #define ByteOrder		X_LITTLE_ENDIAN
 #elif defined(RsArchitecture)
 #define ByteOrder		X_BIG_ENDIAN
-#elif defined(PpcArchitecture)
+#elif defined(PpcArchitecture) || defined(Ppc64Architecture)
 #define ByteOrder		X_BIG_ENDIAN
 #elif defined(HPArchitecture)
 #define ByteOrder		X_BIG_ENDIAN
--- xc/config/imake/imakemdep.h.ppc64-support-updates	2004-03-15 19:27:09.000000000 -0500
+++ xc/config/imake/imakemdep.h	2004-04-06 16:08:24.000000000 -0400
@@ -618,6 +618,9 @@
 # ifdef ppc
 	"-Dppc",
 # endif
+# ifdef ppc64
+	"-Dppc64",
+# endif
 # if defined(m68k)  || defined(M68k) || defined(m68040)
 	"-Dm68k",
 	"-DM68k",
@@ -679,6 +682,9 @@
 # ifdef __powerpc__
 	"-D__powerpc__",
 # endif
+# ifdef __powerpc64__
+	"-D__powerpc64__",
+# endif
 # ifdef PowerMAX_OS
 	"-DPowerMAX_OS",
 # endif
@@ -711,6 +717,9 @@
 # ifdef __ppc__
         "-D__ppc__",
 # endif
+# ifdef __ppc64__
+        "-D__ppc64__",
+# endif
 # ifdef __i386__
         "-D__i386__",
 # endif
@@ -1255,6 +1264,9 @@
 # ifdef __powerpc__
 	{"__powerpc__", "1"},
 # endif
+# ifdef __powerpc64__
+	{"__powerpc64__", "1"},
+# endif
 # ifdef PowerMAX_OS
 	{"PowerMAX_OS", "1"},
 # endif
@@ -1332,6 +1344,9 @@
 #if defined(__ppc__)
         {"__ppc__", "1"},
 #endif
+#if defined(__ppc64__)
+        {"__ppc64__", "1"},
+#endif
 #if defined(__BIG_ENDIAN__)
       {"__BIG_ENDIAN__", "1"},
 #endif
--- xc/include/Xmd.h.ppc64-support-updates	2004-03-15 19:27:18.000000000 -0500
+++ xc/include/Xmd.h	2004-04-06 16:03:36.000000000 -0400
@@ -65,6 +65,7 @@
     defined(__s390x__) || \
     (defined(__hppa__) && defined(__LP64__)) || \
     defined(__amd64__) || defined(amd64) || \
+    defined(__powerpc64__) || \
     (defined(sgi) && (_MIPS_SZLONG == 64))
 #define LONG64				/* 32/64-bit architecture */
 #endif
--- xc/lib/Xt/Xtos.h.ppc64-support-updates	2004-03-15 19:27:23.000000000 -0500
+++ xc/lib/Xt/Xtos.h	2004-04-06 16:03:36.000000000 -0400
@@ -68,6 +68,7 @@
     defined(__s390x__) || \
     (defined(__hppa__) && defined(__LP64__)) || \
     defined(__amd64__) || defined(amd64) || \
+    defined(__powerpc64__) || \
     (defined(sgi) && (_MIPS_SZLONG == 64))
 #define LONG64
 #endif
--- xc/programs/Xserver/fb/fb.h.ppc64-support-updates	2004-03-15 19:27:24.000000000 -0500
+++ xc/programs/Xserver/fb/fb.h	2004-04-06 16:03:36.000000000 -0400
@@ -106,6 +106,7 @@
       defined(__sparc64__) || \
       defined(__s390x__) || \
       defined(amd64) || defined (__amd64__) || \
+      defined (__powerpc64__) || \
       (defined(sgi) && (_MIPS_SZLONG == 64))
 typedef unsigned long	    FbBits;
 #  else
--- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h.ppc64-support-updates	2004-03-15 19:27:33.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h	2004-04-06 16:03:36.000000000 -0400
@@ -280,7 +280,7 @@
 #  define INCLUDE_XF86_MAP_PCI_MEM
 #  define INCLUDE_XF86_NO_DOMAIN
 # endif
-#elif defined(__powerpc__)
+#elif defined(__powerpc__) || defined(__powerpc64__)
 # if defined(linux)
 #  define ARCH_PCI_INIT linuxPciInit
 #  define INCLUDE_XF86_MAP_PCI_MEM
--- xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile.ppc64-support-updates	2004-03-15 19:27:33.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile	2004-04-06 16:03:36.000000000 -0400
@@ -34,6 +34,7 @@
 
 #elif defined(LinuxArchitecture) && \
       (defined(PpcArchitecture) || \
+       defined(Ppc64Architecture) || \
        defined(MipsArchitecture) || \
        defined(ia64Architecture) || \
        defined(Mc68020Architecture) || \
--- xc/programs/Xserver/os/xalloc.c.ppc64-support-updates	2004-03-15 19:27:34.000000000 -0500
+++ xc/programs/Xserver/os/xalloc.c	2004-04-06 16:03:36.000000000 -0400
@@ -185,6 +185,7 @@
     defined(__sparc64__) || \
     defined(__s390x__) || \
     defined(__amd64__) || defined(amd64) || \
+    defined(__powerpc64__) || \
     (defined(sgi) && _MIPS_SZLONG == 64))
 #define MAGIC			0x1404196414071968
 #define MAGIC_FREE              0x1506196615061966