Index: projects/runtime-coverage/lib/libclang_rt/Makefile
===================================================================
--- projects/runtime-coverage/lib/libclang_rt/Makefile	(revision 325502)
+++ projects/runtime-coverage/lib/libclang_rt/Makefile	(revision 325503)
@@ -1,23 +1,21 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 SUBDIR+=	include
 SUBDIR+=	asan
 SUBDIR+=	asan-preinit
 SUBDIR+=	asan_dynamic
 SUBDIR+=	asan_cxx
 SUBDIR+=	safestack
 SUBDIR+=	stats
 SUBDIR+=	stats_client
 SUBDIR+=	ubsan_standalone
 SUBDIR+=	ubsan_standalone_cxx
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \
     (${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb")
 SUBDIR+=	profile
 .endif
 
 .include <bsd.subdir.mk>
Index: projects/runtime-coverage/lib/libclang_rt/Makefile.inc
===================================================================
--- projects/runtime-coverage/lib/libclang_rt/Makefile.inc	(revision 325502)
+++ projects/runtime-coverage/lib/libclang_rt/Makefile.inc	(revision 325503)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.compiler.mk>
 
 .if ${MACHINE} == "arm"
-.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:M*soft*} == ""
+.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:U:M*soft*} == ""
 CRTARCH=	armhf
 .endif
 .endif
 CRTARCH?=	${MACHINE_CPUARCH:C/amd64/x86_64/}
 CRTSRC=		${SRCTOP}/contrib/compiler-rt
 
 .PATH:		${CRTSRC}/lib
 
 CLANGDIR=	/usr/lib/clang/5.0.0
 LIBDIR=		${CLANGDIR}/lib/freebsd
 
 NO_PIC=
 MK_PROFILE=	no
 
 WARNS?=		0
 
 SSP_CFLAGS=
 CFLAGS+=	-DNDEBUG
 CFLAGS+=	${PICFLAG}
 CFLAGS+=	-fno-builtin
 CFLAGS+=	-fno-exceptions
 CXXFLAGS+=	-fno-rtti
 .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 30700
 CFLAGS+=	-fno-sanitize=safe-stack
 .endif
 CFLAGS+=	-fno-stack-protector
 CFLAGS+=	-funwind-tables
 CXXFLAGS+=	-fvisibility-inlines-hidden
 CXXFLAGS+=	-fvisibility=hidden
 CFLAGS+=	-I${CRTSRC}/lib
 CXXFLAGS+=	-std=c++11
Index: projects/runtime-coverage
===================================================================
--- projects/runtime-coverage	(revision 325502)
+++ projects/runtime-coverage	(revision 325503)

Property changes on: projects/runtime-coverage
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r325499-325502