Index: config/cf/sco5.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sco5.cf,v
retrieving revision 1.8
diff -u -3 -p -r1.8 sco5.cf
--- config/cf/sco5.cf	21 Nov 2005 01:16:18 -0000	1.8
+++ config/cf/sco5.cf	19 Dec 2005 23:12:02 -0000
@@ -310,7 +310,7 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1
 #define ConnectionFlags		-DLOCALCONN -DTCPCONN -DUNIXCONN 
 
 #define ExportListGenSource	elistgen.usl
-#define ShlibExportListOpt(filename)	Concat(-Bexport:,filename)
+#define ShlibExportListOpt(filename)	Concat3(-Wl,-Bexport:,filename)
 
 /*
  * These settings control the interdependence of the shared libraries.
Index: config/cf/usl.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/usl.cf,v
retrieving revision 1.4
diff -u -3 -p -r1.4 usl.cf
--- config/cf/usl.cf	21 Nov 2005 01:16:18 -0000	1.4
+++ config/cf/usl.cf	19 Dec 2005 23:12:02 -0000
@@ -246,7 +246,7 @@ XCOMM operating system: OSName (OSMajorV
 #define ArchitectureDefines	-DUSL_ARCHITECTURE
 
 #define ExportListGenSource	elistgen.usl
-#define ShlibExportListOpt(filename)	Concat(-Bexport:,filename)
+#define ShlibExportListOpt(filename)	Concat3(-Wl,-Bexport:,filename)
 
 /* <X11/Xos_r.h> requires process locking for missing _r functions */
 #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
Index: config/util/elistgen.usl
===================================================================
RCS file: /cvs/xorg/xc/config/util/elistgen.usl,v
retrieving revision 1.2
diff -u -3 -p -r1.2 elistgen.usl
--- config/util/elistgen.usl	23 Apr 2004 18:42:00 -0000	1.2
+++ config/util/elistgen.usl	19 Dec 2005 23:12:02 -0000
@@ -30,7 +30,7 @@ FILTER=CXXFILT			# C++ symbol demangler
 AWK=awk				# awk
 
 XCOMM For nm, cat, pr, sed, awk, c++filt
-PATH=/usr/bin:/bin:/usr/ucb:/usr/ccs/bin
+PATH=/usr/bin:/bin:/usr/ccs/bin:/usr/gnu/bin:/usr/local/bin
 
 XCOMM Temporary files
 EXPORTLIST=/tmp/elistgen1.$$	# list of export symbols from "libfoo.elist"
Index: extras/Mesa/src/mesa/swrast/s_tritemp.h
===================================================================
RCS file: /cvs/xorg/xc/extras/Mesa/src/mesa/swrast/s_tritemp.h,v
retrieving revision 1.1.1.5
diff -u -3 -p -r1.1.1.5 s_tritemp.h
--- extras/Mesa/src/mesa/swrast/s_tritemp.h	1 Dec 2005 03:13:01 -0000	1.1.1.5
+++ extras/Mesa/src/mesa/swrast/s_tritemp.h	19 Dec 2005 23:12:04 -0000
@@ -1156,7 +1156,7 @@ static void NAME(GLcontext *ctx, const S
 #ifdef INTERP_INDEX
                   CLAMP_INTERPOLANT(index, indexStep, len);
 #endif
-                  RENDER_SPAN( span );
+                  { RENDER_SPAN( span ); }
                }
 
                /*
