Index: head/lib/libcompiler_rt/Makefile
===================================================================
--- head/lib/libcompiler_rt/Makefile	(revision 276894)
+++ head/lib/libcompiler_rt/Makefile	(revision 276895)
@@ -1,255 +1,218 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 LIB=	compiler_rt
 NO_PIC=
 WARNS?=	2
 
 CFLAGS+=${PICFLAG} -fvisibility=hidden -DVISIBILITY_HIDDEN
 
 .if ${MACHINE_CPUARCH} == "amd64"
 CRTARCH=x86_64
 .else
 CRTARCH=${MACHINE_CPUARCH}
 .endif
 
 CRTSRC=${.CURDIR}/../../contrib/compiler-rt/lib/builtins
 
 .PATH: ${CRTSRC}/${CRTARCH} ${CRTSRC}
 
 SRCF=	absvdi2 \
 	absvsi2 \
 	absvti2 \
 	addtf3 \
 	addvdi3 \
 	addvsi3 \
 	addvti3 \
 	apple_versioning \
 	ashldi3 \
 	ashlti3 \
 	ashrdi3 \
 	ashrti3 \
 	clear_cache \
 	clzdi2 \
 	clzsi2 \
 	clzti2 \
 	cmpdi2 \
 	cmpti2 \
-	comparedf2 \
-	comparesf2 \
 	ctzdi2 \
 	ctzsi2 \
 	ctzti2 \
 	divdc3 \
 	divdi3 \
 	divmoddi4 \
 	divmodsi4 \
 	divsc3 \
 	divtf3 \
 	divti3 \
 	divxc3 \
 	enable_execute_stack \
 	eprintf \
 	ffsdi2 \
 	ffsti2 \
 	fixdfdi \
 	fixdfti \
 	fixsfdi \
 	fixsfti \
 	fixunsdfdi \
 	fixunsdfsi \
 	fixunsdfti \
 	fixunssfdi \
 	fixunssfsi \
 	fixunssfti \
 	fixunsxfdi \
 	fixunsxfsi \
 	fixunsxfti \
 	fixxfdi \
 	fixxfti \
 	floatdidf \
 	floatdisf \
 	floatdixf \
 	floattidf \
 	floattisf \
 	floattixf \
 	floatundidf \
 	floatundisf \
 	floatundixf \
 	floatunsidf \
 	floatunsisf \
 	floatuntidf \
 	floatuntisf \
 	floatuntixf \
 	gcc_personality_v0 \
 	int_util \
 	lshrdi3 \
 	lshrti3 \
 	moddi3 \
 	modti3 \
 	muldc3 \
 	muldi3 \
 	mulodi4 \
 	mulosi4 \
 	muloti4 \
 	mulsc3 \
 	multf3 \
 	multi3 \
 	mulvdi3 \
 	mulvsi3 \
 	mulvti3 \
 	mulxc3 \
 	negdf2 \
 	negdi2 \
 	negsf2 \
 	negti2 \
 	negvdi2 \
 	negvsi2 \
 	negvti2 \
 	paritydi2 \
 	paritysi2 \
 	parityti2 \
 	popcountdi2 \
 	popcountsi2 \
 	popcountti2 \
 	powidf2 \
 	powisf2 \
 	powitf2 \
 	powixf2 \
 	subtf3 \
 	subvdi3 \
 	subvsi3 \
 	subvti3 \
 	trampoline_setup \
 	ucmpdi2 \
 	ucmpti2 \
 	udivdi3 \
 	udivmoddi4 \
 	udivmodsi4 \
 	udivmodti4 \
 	udivti3 \
 	umoddi3 \
 	umodti3
 
 # These are already shipped by libc.a on arm and mips
 .if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
 SRCF+=	adddf3 \
 	addsf3 \
 	divdf3 \
 	divsf3 \
 	extendsfdf2 \
 	fixdfsi \
 	fixsfsi \
 	floatsidf \
 	floatsisf \
 	muldf3 \
 	mulsf3 \
 	subdf3 \
 	subsf3 \
 	truncdfsf2
 .endif
 
+.if ${MACHINE_CPUARCH} != "arm"
+SRCF+=	comparedf2 \
+	comparesf2
+.endif
+
 .if ${MACHINE_CPUARCH} != "mips"
 SRCF+=	divsi3 \
 	modsi3 \
 	udivsi3 \
 	umodsi3
 .endif
 
 # FreeBSD-specific atomic intrinsics.
 .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "armv6"
 .PATH: ${.CURDIR}/../../sys/arm/arm
 
 SRCF+=	stdatomic
 CFLAGS+=	-DEMIT_SYNC_ATOMICS
 .elif ${MACHINE_CPUARCH} == "mips"
 .PATH: ${.CURDIR}/../../sys/mips/mips
 
 SRCF+=	stdatomic
 .endif
 
 .for file in ${SRCF}
 . if ${MACHINE_ARCH:Marm*hf*} != "" && exists(${CRTSRC}/${CRTARCH}/${file}vfp.S)
 SRCS+= ${file}vfp.S
 . elif !(${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH:Marm*hf*} == "") && exists(${CRTSRC}/${CRTARCH}/${file}.S)
 SRCS+=	${file}.S
 . else
 SRCS+=	${file}.c
 . endif
 .endfor
 
 .if ${MACHINE_CPUARCH} == "arm"
-SRCS+=	aeabi_dcmp.S \
-	aeabi_div0.S \
-	aeabi_fcmp.S \
+SRCS+=	aeabi_div0.c \
 	aeabi_idivmod.S \
 	aeabi_ldivmod.S \
 	aeabi_memcmp.S \
 	aeabi_memcpy.S \
 	aeabi_memmove.S \
 	aeabi_memset.S \
 	aeabi_uidivmod.S \
 	aeabi_uldivmod.S \
 	bswapdi2.S \
 	bswapsi2.S \
-	eqdf2.S \
-	eqsf2.S \
-	floatunssidf.S \
-	floatunssisf.S \
-	gedf2.S \
-	gesf2.S \
-	gtdf2.S \
-	gtsf2.S \
-	ledf2.S \
-	lesf2.S \
-	ltdf2.S \
-	ltsf2.S \
-	nedf2.S \
-	nesf2.S \
-	restore_vfp_d8_d15_regs.S \
-	save_vfp_d8_d15_regs.S \
 	switch16.S \
 	switch32.S \
 	switch8.S \
 	switchu8.S \
-	sync_fetch_and_add_4.S \
-	sync_fetch_and_add_8.S \
-	sync_fetch_and_and_4.S \
-	sync_fetch_and_and_8.S \
-	sync_fetch_and_max_4.S \
-	sync_fetch_and_max_8.S \
-	sync_fetch_and_min_4.S \
-	sync_fetch_and_min_8.S \
-	sync_fetch_and_nand_4.S \
-	sync_fetch_and_nand_8.S \
-	sync_fetch_and_or_4.S \
-	sync_fetch_and_or_8.S \
-	sync_fetch_and_sub_4.S \
-	sync_fetch_and_sub_8.S \
-	sync_fetch_and_umax_4.S \
-	sync_fetch_and_umax_8.S \
-	sync_fetch_and_umin_4.S \
-	sync_fetch_and_umin_8.S \
-	sync_fetch_and_xor_4.S \
-	sync_fetch_and_xor_8.S \
-	sync_synchronize.S \
-	unorddf2.S \
-	unordsf2.S
+	sync_synchronize.S
 .endif
 
 .if ${MK_INSTALLLIB} != "no"
 SYMLINKS+=libcompiler_rt.a ${LIBDIR}/libgcc.a
 .endif
 .if ${MK_PROFILE} != "no"
 SYMLINKS+=libcompiler_rt_p.a ${LIBDIR}/libgcc_p.a
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
     ${MACHINE_CPUARCH} == "powerpc"
 AFLAGS+=--noexecstack
 ACFLAGS+=-Wa,--noexecstack
 .endif
 
 
 .include <bsd.lib.mk>