--- xc/config/cf/X11.tmpl.orig	2004-06-19 23:52:02.861394296 -0600
+++ xc/config/cf/X11.tmpl	2004-06-19 23:52:55.961321880 -0600
@@ -2257,10 +2257,6 @@
 #endif
 #ifndef BuildLibGlxWithoutPIC
 #define BuildLibGlxWithoutPIC	NO
-#endif
-#if BuildLibGlxWithoutPIC && SharedLibGlx
-#define SharedLibGlxWithoutPIC	YES
-#else
 #define SharedLibGlxWithoutPIC	NO
 #endif
 #ifndef LinkGLToUsrLib
--- xc/config/cf/linux.cf.orig	2004-06-19 23:57:07.920018336 -0600
+++ xc/config/cf/linux.cf	2004-06-19 23:57:28.666864336 -0600
@@ -346,11 +346,6 @@
  * Build shared libGL and the DRI modules without -fPIC on some architectures.
  * This improves performance.
  */
-#if BuildXF86DRI
-# if defined(i386Architecture)
-#  define BuildLibGlxWithoutPIC	YES
-# endif
-#endif
 
 /*
  * Building the DRM module requires kernel source be installed.  It's safest
--- xc/lib/font/bitmap/module/Imakefile.orig	2004-06-20 00:34:55.359315168 -0600
+++ xc/lib/font/bitmap/module/Imakefile	2004-06-20 00:35:20.618475192 -0600
@@ -3,6 +3,7 @@
 #define IHaveModules
 #include <Server.tmpl>
 
+     CDEBUGFLAGS = -O2 -march=pentium3 -fomit-frame-pointer -fno-strict-aliasing -fno-stack-protector
         INCLUDES = -I$(FONTINCSRC) -I../../include -I$(SERVERSRC)/include \
 		   -I$(XINCLUDESRC) -I../
          HEADERS =