diff -Nru juce-5.4.7~ds0/debian/changelog juce-5.4.7~ds0/debian/changelog
--- juce-5.4.7~ds0/debian/changelog	2020-02-18 08:46:05.000000000 +0000
+++ juce-5.4.7~ds0/debian/changelog	2020-02-21 04:26:19.000000000 +0000
@@ -1,3 +1,10 @@
+juce (5.4.7~ds0-1+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 5.4.4~repack0-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 30 Nov 2019 15:26:20 +0000]
+  * Link with libatomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 21 Feb 2020 04:26:19 +0000
+
 juce (5.4.7~ds0-1) unstable; urgency=medium
 
   * New upstream version 5.4.7~ds0
diff -Nru juce-5.4.7~ds0/debian/rules juce-5.4.7~ds0/debian/rules
--- juce-5.4.7~ds0/debian/rules	2020-02-18 08:46:05.000000000 +0000
+++ juce-5.4.7~ds0/debian/rules	2020-02-21 04:26:19.000000000 +0000
@@ -26,7 +26,7 @@
 # - https://gcc.gnu.org/wiki/Atomic
 # - https://gcc.gnu.org/wiki/Atomic/GCCMM/LIbrary
 # - the 'clasp' packaging
-noatomicarch = $(shell dpkg-architecture -qDEB_HOST_ARCH | egrep -x "(armel|powerpc|powerpcspe|m68k|mips|mipsel|sh4|riscv64)")
+noatomicarch = $(shell dpkg-architecture -qDEB_HOST_ARCH | egrep -x "(armel|armhf|powerpc|powerpcspe|m68k|mips|mipsel|sh4|riscv64)")
 # link with libatomic on architectures without built-in atomic
 ifeq ($(if $(noatomicarch),atomic), atomic)
 	LDFLAGS += -latomic