diff -Nru fplll-5.4.0/debian/changelog fplll-5.4.0/debian/changelog
--- fplll-5.4.0/debian/changelog	2020-12-19 11:20:06.000000000 +0000
+++ fplll-5.4.0/debian/changelog	2020-12-25 02:34:07.000000000 +0000
@@ -1,3 +1,10 @@
+fplll (5.4.0-2+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 5.3.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 11 Jan 2020 01:35:53 +0000]
+  * Use -latomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 25 Dec 2020 02:34:07 +0000
+
 fplll (5.4.0-2) unstable; urgency=medium
 
   * Source-only upload to allow testing migration.
diff -Nru fplll-5.4.0/debian/rules fplll-5.4.0/debian/rules
--- fplll-5.4.0/debian/rules	2020-12-19 11:20:06.000000000 +0000
+++ fplll-5.4.0/debian/rules	2020-12-25 02:34:07.000000000 +0000
@@ -5,7 +5,7 @@
 # for which I thank:
 # - ARM Ltd for hosting
 # - Marvell Technology Group Ltd for the hardware
-ifneq (,$(findstring $(DEB_HOST_ARCH),armel mipsel m68k powerpc sh4))
+ifneq (,$(findstring $(DEB_HOST_ARCH),armel armhf mipsel m68k powerpc sh4))
 export DEB_LDFLAGS_MAINT_APPEND=-latomic
 endif