diff -Naurp xc.orig/extras/Mesa/src/mesa/Makefile.DJ xc/extras/Mesa/src/mesa/Makefile.DJ
--- xc.orig/extras/Mesa/src/mesa/Makefile.DJ	2004-07-21 23:51:14.000000000 -0700
+++ xc/extras/Mesa/src/mesa/Makefile.DJ	2005-03-19 13:37:39.000000000 -0800
@@ -124,7 +124,8 @@ X86_OBJECTS = $(addsuffix .o,$(basename 
 .S.o:
 	$(CC) -o $@ $(CFLAGS) -c $<
 .s.o:
-	$(CC) -o $@ $(CFLAGS) -x assembler-with-cpp -c $<
+	$(CC) -o $<.cpp.s $(CFLAGS) -x assembler-with-cpp -c $<
+	$(AS) -o $@ $<.cpp.s
 
 all: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GL_DXE) $(LIBDIR)/$(GL_IMP)
 
diff -Naurp xc.orig/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile
--- xc.orig/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile	2005-03-19 13:19:25.000000000 -0800
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile	2005-03-19 13:33:01.000000000 -0800
@@ -50,7 +50,8 @@ name.o: name.s								@@\
 #define FFBsObjectRule(name)						@@\
 name.o: name.s								@@\
 	$(RM) $@							@@\
-	$(CC) -c -x assembler-with-cpp $(GCCVISOPTION) $*.s -o $@
+	$(CC) -c -E -x assembler-with-cpp $(GCCVISOPTION) $*.s -o $*.cpp.s @@\
+	$(AS) $*.cpp.s $(ASVISOPTION) -o $@
 #endif
 #else
 VISOBJS =