Index: Imake.rules
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imake.rules,v
retrieving revision 1.7
diff -u -d -r1.7 Imake.rules
--- Imake.rules	12 Dec 2004 21:00:44 -0000	1.7
+++ Imake.rules	31 Jan 2005 16:22:06 -0000
@@ -3502,7 +3502,7 @@
 									@@\
 module: modlist								@@\
 	RemoveFile($@)							@@\
-	$(CC) -o $@ $(SHLIBLDFLAGS) $(NOSTDLIB) modlist			@@\
+	$(CC) -o $@ $(SHLIBLDFLAGS) $(NOSTDLIB) modlist $(POSTNOSTDLIB) @@\
 									@@\
 clean::									@@\
 	RemoveFile(module)
@@ -3517,7 +3517,7 @@
 									@@\
 module: deplist								@@\
 	RemoveFile($@)							@@\
-	$(CC) -o $@ $(SHLIBLDFLAGS) $(NOSTDLIB) modlist			@@\
+	$(CC) -o $@ $(SHLIBLDFLAGS) $(NOSTDLIB) modlist $(POSTNOSTDLIB) @@\
 									@@\
 clean::									@@\
 	RemoveFile(module)
Index: Imake.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imake.tmpl,v
retrieving revision 1.9
diff -u -d -r1.9 Imake.tmpl
--- Imake.tmpl	24 Jan 2005 06:37:31 -0000	1.9
+++ Imake.tmpl	31 Jan 2005 16:22:07 -0000
@@ -1950,10 +1950,15 @@
          SHLIBDEF = SharedLibraryDef
 #ifdef SharedLibraryLoadFlags
      SHLIBLDFLAGS = SharedLibraryLoadFlags $(SHLIBGLOBALSFLAGS)
-#if HasGcc || HasIntelC
+#if HasGcc
          NOSTDLIB = -nostdlib
+     POSTNOSTDLIB = -Bstatic -lgcc   
+#elif HasIntelC
+         NOSTDLIB = -nostdlib
+     POSTNOSTDLIB =
 #elif HasSunC
          NOSTDLIB = -xnolib
+     POSTNOSTDLIB =
 #endif
 #endif
 /*