Index: projects/mips64-clang/sys/boot/mips/Makefile
===================================================================
--- projects/mips64-clang/sys/boot/mips/Makefile	(revision 299549)
+++ projects/mips64-clang/sys/boot/mips/Makefile	(revision 299550)
@@ -1,17 +1,19 @@
 # $FreeBSD$
 .include <src.opts.mk>
 
-SUBDIR= 	uboot
-
 #
 # The BERI boot loader port works only on 64-bit MIPS; not a hard port to
 # 32-bit if someone is interested.  Build on all 64-bit MIPS platforms to
 # ensure it gets adequate build-test coverage.
 #
 .if ${MACHINE_ARCH} == "mips64" 
-.if ${COMPILER_TYPE} == "gcc"
 SUBDIR+=	beri
 .endif
+
+#
+# clang is unable to compile this uboot code at this time
+.if ${COMPILER_TYPE} == "gcc"
+SUBDIR+=	uboot
 .endif
 
 .include <bsd.subdir.mk>
Index: projects/mips64-clang/sys/boot/mips/beri/boot2/Makefile
===================================================================
--- projects/mips64-clang/sys/boot/mips/beri/boot2/Makefile	(revision 299549)
+++ projects/mips64-clang/sys/boot/mips/beri/boot2/Makefile	(revision 299550)
@@ -1,89 +1,95 @@
 #-
 # Copyright (c) 2013-2014 Robert N. M. Watson
 # All rights reserved.
 #
 # This software was developed by SRI International and the University of
 # Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
 # ("CTSRD"), as part of the DARPA CRASH research programme.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 
 BINDIR?=	/boot
 INSTALLFLAGS=	-b
 
 LOADERS=	flashboot jtagboot
 FILES=		${LOADERS} ${LOADERS:S/$/.md5/}
 
 SRCS=		relocate.S		\
 		start.S			\
 		boot2.c			\
 		altera_jtag_uart.c	\
 		cfi.c			\
 		sdcard.c
 
 MAN=
 
 AFLAGS=		-G0
 
+CFLAGS.gcc+=	-Xassembler -G0
+
 CFLAGS=		-ffreestanding			\
 		-I${.CURDIR}			\
 		-I${.CURDIR}/../../../common	\
 		-I${.CURDIR}/../../../..	\
 		-D_KERNEL			\
 		-Wall				\
-		-G0 -Xassembler -G0		\
+		-G0				\
 		-fno-pic -mno-abicalls		\
 		-msoft-float			\
 		-g
 
 # where to get libstand from
 CFLAGS+=	-I${.CURDIR}/../../../../../lib/libstand/
 LIBSTAND=	${.OBJDIR}/../../../../../lib/libstand/libstand.a
 
 LDFLAGS=	-nostdlib			\
 		-static				\
 		-N				\
 		-G0				\
 		-L${.CURDIR}
 
 .PATH:		${.CURDIR}/../common
 CFLAGS+=	-I${.CURDIR}/../common
 
 flashboot.elf: relocate.o start.o boot2.o altera_jtag_uart.o cfi.o sdcard.o
 	${LD} ${_LDFLAGS} -T ${.CURDIR}/flashboot.ldscript -o ${.TARGET}	\
 	    ${.ALLSRC} ${LIBSTAND}
 flashboot: flashboot.elf
 	${OBJCOPY} -S -O binary ${.TARGET}.elf ${.TARGET}
 flashboot.md5: flashboot
 	md5 flashboot > flashboot.md5
 
 jtagboot: start.o boot2.o altera_jtag_uart.o cfi.o sdcard.o
 	${LD} ${_LDFLAGS} -T ${.CURDIR}/jtagboot.ldscript -o ${.TARGET}	\
 	    ${.ALLSRC} ${LIBSTAND}
 jtagboot.md5: jtagboot
 	md5 jtagboot > jtagboot.md5
 
 CLEANFILES+=	flashboot.elf
 
-.include <bsd.prog.mk>
+.include <bsd.lib.mk>
+
+# XXX: clang integrated-as doesn't grok the use of dla in these files
+CFLAGS.relocate.S=       ${CLANG_NO_IAS}
+CFLAGS.start.S=       ${CLANG_NO_IAS}