? config/imake/bootstrap
Index: config/cf/Imake.cf
===================================================================
RCS file: /home/eich/cvs/xc/config/cf/Imake.cf,v
retrieving revision 1.1.1.38
diff -u -r1.1.1.38 Imake.cf
--- config/cf/Imake.cf	26 Aug 2004 12:05:21 -0000	1.1.1.38
+++ config/cf/Imake.cf	14 Oct 2004 12:27:58 -0000
@@ -825,11 +825,11 @@
 #  define Mc68020Architecture
 #  undef mc68000
 # endif /* mc68000 */
-# ifdef powerpc
+# if defined (powerpc) && !defined(__powerpc64__) && !defined (powerpc64)
 #  define PpcArchitecture
 #  undef powerpc
 # endif
-# ifdef __powerpc__
+# if defined (__powerpc__) && !defined(__powerpc64__) && !defined (powerpc64)
 #  ifndef PpcArchitecture
 #   define PpcArchitecture
 #  endif
Index: config/cf/linux.cf
===================================================================
RCS file: /home/eich/cvs/xc/config/cf/linux.cf,v
retrieving revision 1.1.1.58
diff -u -r1.1.1.58 linux.cf
--- config/cf/linux.cf	26 Aug 2004 12:05:27 -0000	1.1.1.58
+++ config/cf/linux.cf	14 Oct 2004 12:27:59 -0000
@@ -575,7 +575,15 @@
 #    define CcCmd		gcc -m32
 #   endif
 #   ifndef CplusplusCmd
-#    define CplusplusCmd		c++ -m32
+#    define CplusplusCmd	c++ -m32
+#   endif
+#  endif
+#  if defined (Ppc64Architecture)
+#   ifndef CcCmd
+#    define CcCmd		gcc -m64
+#   endif
+#   ifndef CplusplusCmd
+#    define CplusplusCmd	c++ -m64
 #   endif
 #  endif
 #  ifndef CcCmd
@@ -619,7 +627,7 @@
 #    endif
 #   endif
 #  endif
-# else
+# else /* UseElfFormat */
 #  ifdef AlphaArchitecture
 #   define CcCmd		gcc -b alpha-linuxecoff
 #   define CplusplusCmd		g++ -b alpha-linuxecoff
Index: config/cf/xfree86.cf
===================================================================
RCS file: /home/eich/cvs/xc/config/cf/xfree86.cf,v
retrieving revision 1.1.1.71
diff -u -r1.1.1.71 xfree86.cf
--- config/cf/xfree86.cf	30 Jul 2004 19:21:50 -0000	1.1.1.71
+++ config/cf/xfree86.cf	14 Oct 2004 12:27:59 -0000
@@ -1106,6 +1106,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
@@ -1906,6 +1999,12 @@
 #if HasGcc2 && defined(AlphaArchitecture)
 # ifndef DefaultGcc2AxpOpt
 #  define DefaultGcc2AxpOpt -O2 GccAliasingArgs
+# endif
+#endif
+
+#if HasGcc2 && defined(Ppc64Architecture)
+# ifndef DefaultGcc2Ppc64Opt
+#  define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs
 # endif
 #endif
 
Index: config/cf/xorg.cf
===================================================================
RCS file: /home/eich/cvs/xc/config/cf/xorg.cf,v
retrieving revision 1.1.1.4
diff -u -r1.1.1.4 xorg.cf
--- config/cf/xorg.cf	14 Sep 2004 10:53:11 -0000	1.1.1.4
+++ config/cf/xorg.cf	14 Oct 2004 12:27:59 -0000
@@ -748,11 +748,7 @@
 				DevelDrivers \
 				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
-# if HasGlide3
-#  define TdfxDriDriver		
-# else
-#  define TdfxDriDriver		/**/
-# endif
+# define TdfxDriDriver		/**/
 # ifndef DriDrivers
 #  define DriDrivers		gamma r128
 # endif
Index: config/imake/imakemdep.h
===================================================================
RCS file: /home/eich/cvs/xc/config/imake/imakemdep.h,v
retrieving revision 1.1.1.35
diff -u -r1.1.1.35 imakemdep.h
--- config/imake/imakemdep.h	26 Aug 2004 12:05:28 -0000	1.1.1.35
+++ config/imake/imakemdep.h	14 Oct 2004 12:28:00 -0000
@@ -679,15 +679,15 @@
 # ifdef SVR4
 	"-DSVR4",
 # endif
-# ifdef __powerpc__
+#endif
+#ifdef __powerpc__
 	"-D__powerpc__",
-# endif
-# ifdef __powerpc64__
+#endif
+#ifdef __powerpc64__
 	"-D__powerpc64__",
-# endif
-# ifdef PowerMAX_OS
+#endif
+#ifdef PowerMAX_OS
 	"-DPowerMAX_OS",
-# endif
 #endif
 #if defined (__QNX__) && !defined(__QNXNTO__)
         "-traditional",