Index: config/cf/Imake.rules
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imake.rules,v
retrieving revision 1.6
diff -u -r1.6 Imake.rules
--- config/cf/Imake.rules	13 Aug 2004 17:21:43 -0000	1.6
+++ config/cf/Imake.rules	29 Sep 2004 00:22:42 -0000
@@ -3493,6 +3493,10 @@
 #endif
 #endif
 
+#if defined(HardenedGccSpecs) && HardenedGccSpecs
+LDBIND_FLAGS = -nonow
+#endif
+
 /*
  * DynamicModuleTarget - build a module to be dynamically loaded
  */
@@ -3502,7 +3506,7 @@
 									@@\
 module: modlist								@@\
 	RemoveFile($@)							@@\
-	$(CC) -o $@ $(SHLIBLDFLAGS) modlist				@@\
+	$(CC) -o $@ $(SHLIBLDFLAGS) -nostdlib $(LDBIND_FLAGS) modlist	@@\
 									@@\
 clean::									@@\
 	RemoveFile(module)
@@ -3517,7 +3521,7 @@
 									@@\
 module: deplist								@@\
 	RemoveFile($@)							@@\
-	$(CC) -o $@ $(SHLIBLDFLAGS) modlist				@@\
+	$(CC) -o $@ $(SHLIBLDFLAGS) -nostdlib $(LDBIND_FLAGS) modlist	@@\
 									@@\
 clean::									@@\
 	RemoveFile(module)
Index: programs/Xserver/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Imakefile,v
retrieving revision 1.19
diff -u -r1.19 Imakefile
--- programs/Xserver/Imakefile	1 Sep 2004 00:59:17 -0000	1.19
+++ programs/Xserver/Imakefile	29 Sep 2004 00:22:42 -0000
@@ -678,6 +678,9 @@
 XCOMM
 XCOMM Xorg Server
 XCOMM
+#if defined(HardenedGccSpecs) && HardenedGccSpecs
+LOCAL_LDFLAGS += -nonow
+#endif
 FBSUBDIR = fb
 MFBSUBDIR  = mfb
 CFB8SUBDIR = cfb