Index: head/gnu/lib/csu/Makefile
===================================================================
--- head/gnu/lib/csu/Makefile	(revision 68018)
+++ head/gnu/lib/csu/Makefile	(revision 68019)
@@ -1,56 +1,77 @@
 # $FreeBSD$
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc.295
-.PATH: ${GCCDIR}
 
+TARGET_ARCH?=	${MACHINE_ARCH}
+
+.if ${TARGET_ARCH} == "alpha"
+.PATH: ${GCCDIR}/config/alpha
+SRCS=		crtbegin.s crtend.s
+UGLYHACK=	-x assembler
+.else
+.PATH: ${GCCDIR}
 SRCS=		crtstuff.c tm.h
+.endif
+
 OBJS=		crtbegin.o crtend.o
 SOBJS=		crtbegin.So crtend.So
 CFLAGS+=	-I${GCCDIR}/config -I. -DIN_GCC \
 		-finhibit-size-directive -fno-inline-functions \
 		-fno-exceptions -fno-omit-frame-pointer
 NOMAN=		true
 NOPIC=		true
 NOPROFILE=	true
 INTERNALLIB=	true
 CLEANFILES+=	tm.h
 
 CRTS_CFLAGS=	-DCRTSTUFFS_O ${PICFLAG}
 
 all: ${OBJS} ${SOBJS}
 
-crtbegin.o:	crtstuff.c tm.h
+.if ${TARGET_ARCH} == "alpha"
+crtbegin.o crtbegin.So:	crtbegin.s
+crtend.o crtend.So:	crtend.s
+.for PART in begin end
+CLEANFILES+=	crt${PART}.s
+crt${PART}.s:  crt${PART}.asm
+	ln -sf ${.ALLSRC} ${.TARGET}
+.endfor
+.else
+crtbegin.o crtbegin.So crtend.o crtend.So:	crtstuff.c tm.h
+.endif
+
+crtbegin.o:
 	${CC} ${CFLAGS} -g0 -DCRT_BEGIN \
-		-c -o ${.TARGET} ${GCCDIR}/crtstuff.c
+		-c -o ${.TARGET} ${UGLYHACK} ${.ALLSRC:N*.h}
 
-crtbegin.So:	crtstuff.c tm.h
+crtbegin.So:
 	${CC} ${CFLAGS} -g0 -DCRT_BEGIN ${CRTS_CFLAGS} \
-		-c -o ${.TARGET} ${GCCDIR}/crtstuff.c
+		-c -o ${.TARGET} ${UGLYHACK} ${.ALLSRC:N*.h}
 
-crtend.o:	crtstuff.c tm.h
+crtend.o:
 	${CC} ${CFLAGS} -g0 -DCRT_END \
-		-c -o ${.TARGET} ${GCCDIR}/crtstuff.c
+		-c -o ${.TARGET} ${UGLYHACK} ${.ALLSRC:N*.h}
 
-crtend.So:	crtstuff.c tm.h
+crtend.So:
 	${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \
-		-c -o ${.TARGET} ${GCCDIR}/crtstuff.c
+		-c -o ${.TARGET} ${UGLYHACK} ${.ALLSRC:N*.h}
 
 #	KEEP THIS IN SYNC with src/gnu/usr.bin/cc/cc_tools/Makefile !!
 tm.h:
 	echo '#include "${MACHINE_ARCH}/${MACHINE_ARCH}.h"'	> ${.TARGET}
 .if ${MACHINE_ARCH} == "i386"
 	echo '#include "${MACHINE_ARCH}/att.h"'			>> ${.TARGET}
 .endif
 	echo '#include <freebsd.h>'				>> ${.TARGET}
 	echo '#include "${MACHINE_ARCH}/freebsd.h"'		>> ${.TARGET}
 .if ${MACHINE_ARCH} == "i386"
 	echo '#include "${MACHINE_ARCH}/perform.h"'		>> ${.TARGET}
 .endif
 
 realinstall:
 .for file in ${OBJS} ${SOBJS}
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${file} ${DESTDIR}${LIBDIR}/${file:S/.So$/S.o/}
 .endfor
 
 .include <bsd.lib.mk>