diff -ur work.orig/xc/config/cf/xf86.tmpl work/xc/config/cf/xf86.tmpl
--- work.orig/xc/config/cf/xf86.tmpl	2004-09-18 15:17:49.559178976 +0200
+++ work/xc/config/cf/xf86.tmpl	2004-09-18 15:17:59.384685272 +0200
@@ -61,7 +61,11 @@
 MODULE_GCC_FLAGS2 = -fno-merge-constants
 #endif
 
-MODULE_GCC_FLAGS = $(MODULE_GCC_FLAGS1) $(MODULE_GCC_FLAGS2)
+#if HasGcc
+MODULE_GCC_FLAGS3 = -fno-pie
+#endif
+
+MODULE_GCC_FLAGS = $(MODULE_GCC_FLAGS1) $(MODULE_GCC_FLAGS2) $(MODULE_GCC_FLAGS3)
 
 #if defined(IHaveModules) && MakeDllModules
 MODULE_PIC_FLAGS = $(PICFLAGS)
diff -ur work.orig/xc/config/cf/xorg.tmpl work/xc/config/cf/xorg.tmpl
--- work.orig/xc/config/cf/xorg.tmpl	2004-09-18 15:17:49.567177760 +0200
+++ work/xc/config/cf/xorg.tmpl	2004-09-18 15:17:59.386684968 +0200
@@ -75,7 +75,11 @@
 MODULE_GCC_FLAGS2 = -fno-merge-constants
 #endif
 
-MODULE_GCC_FLAGS = $(MODULE_GCC_FLAGS1) $(MODULE_GCC_FLAGS2)
+#if HasGcc
+MODULE_GCC_FLAGS3 = -fno-pie
+#endif
+
+MODULE_GCC_FLAGS = $(MODULE_GCC_FLAGS1) $(MODULE_GCC_FLAGS2) $(MODULE_GCC_FLAGS3)
 
 #if defined(IHaveModules) && MakeDllModules
 MODULE_PIC_FLAGS = $(PICFLAGS)