Index: sys/external/bsd/compiler_rt/abi.mk
===================================================================
RCS file: sys/external/bsd/compiler_rt/abi.mk
diff -N sys/external/bsd/compiler_rt/abi.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sys/external/bsd/compiler_rt/abi.mk	11 May 2021 23:53:21 -0000
@@ -0,0 +1,5 @@
+# $NetBSD$
+
+.if !empty(MACHINE_ARCH:Mearm*hf*)
+CPPFLAGS+=	-DCOMPILER_RT_ARMHF_TARGET
+.endif
Index: lib/libc/compiler_rt/Makefile.inc
===================================================================
RCS file: /home/netbsd/src/lib/libc/compiler_rt/Makefile.inc,v
retrieving revision 1.39
diff -p -u -r1.39 Makefile.inc
--- lib/libc/compiler_rt/Makefile.inc	2 Sep 2020 16:22:45 -0000	1.39
+++ lib/libc/compiler_rt/Makefile.inc	11 May 2021 23:50:04 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile.inc,v 1.39 2020/09/02 16:22:45 jakllsch Exp $
 
-COMPILER_RT_SRCDIR=	${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
+COMPILER_RT_DIR=	${NETBSDSRCDIR}/sys/external/bsd/compiler_rt
+COMPILER_RT_SRCDIR=	${COMPILER_RT_DIR}/dist
 
 .if ${LIBC_MACHINE_ARCH} == "powerpc" || ${LIBC_MACHINE_ARCH} == "powerpc64"
 COMPILER_RT_CPU_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/ppc
@@ -299,3 +300,5 @@ COPTS.${src}+=	-Wno-missing-prototypes \
 COPTS.${src}+=	-D__SOFT_FP__
 .endif
 .endfor
+
+.include "${COMPILER_RT_DIR}/abi.mk"
Index: lib/libm/compiler_rt/Makefile.inc
===================================================================
RCS file: /home/netbsd/src/lib/libm/compiler_rt/Makefile.inc,v
retrieving revision 1.10
diff -p -u -r1.10 Makefile.inc
--- lib/libm/compiler_rt/Makefile.inc	27 Feb 2016 19:06:56 -0000	1.10
+++ lib/libm/compiler_rt/Makefile.inc	11 May 2021 23:50:52 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile.inc,v 1.10 2016/02/27 19:06:56 joerg Exp $
 
-COMPILER_RT_SRCDIR=	${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
+COMPILER_RT_DIR=	${NETBSDSRCDIR}/sys/external/bsd/compiler_rt
+COMPILER_RT_SRCDIR=	${COMPILER_RT_DIR}/dist
 
 .if ${MACHINE_CPU} == "powerpc"
 COMPILER_RT_CPU_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/ppc
@@ -38,3 +39,5 @@ SRCS+=	${src}
 COPTS.${src}+=	-Wno-error=missing-prototypes
 .  endif
 .endfor
+
+.include "${COMPILER_RT_DIR}/abi.mk"
Index: sys/lib/libkern/Makefile.compiler-rt
===================================================================
RCS file: /home/netbsd/src/sys/lib/libkern/Makefile.compiler-rt,v
retrieving revision 1.12
diff -p -u -r1.12 Makefile.compiler-rt
--- sys/lib/libkern/Makefile.compiler-rt	24 Apr 2020 00:22:57 -0000	1.12
+++ sys/lib/libkern/Makefile.compiler-rt	12 May 2021 00:06:33 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile.compiler-rt,v 1.12 2020/04/24 00:22:57 rin Exp $
 
-COMPILER_RT_SRCDIR=	${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
+COMPILER_RT_DIR=	${NETBSDSRCDIR}/sys/external/bsd/compiler_rt
+COMPILER_RT_SRCDIR=	${COMPILER_RT_DIR}/dist
 
 .if ${MACHINE_ARCH} == "powerpc"
 COMPILER_RT_CPU_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/ppc
@@ -134,3 +135,6 @@ CPPFLAGS.int_util.c+=	-DKERNEL_USE
 COPTS.udivmoddi4.c+=	-fnon-call-exceptions
 . endif
 .endif
+
+# XXX This makes no binary changes at the moment.
+.include "${COMPILER_RT_DIR}/abi.mk"