diff -Nru sentencepiece-0.1.94/debian/changelog sentencepiece-0.1.94/debian/changelog
--- sentencepiece-0.1.94/debian/changelog	2020-12-16 12:18:15.000000000 +0000
+++ sentencepiece-0.1.94/debian/changelog	2021-01-07 23:00:06.000000000 +0000
@@ -1,3 +1,10 @@
+sentencepiece (0.1.94-2+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 0.1.94-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 13 Dec 2020 09:25:55 +0000]
+  * Link with libatomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 07 Jan 2021 23:00:06 +0000
+
 sentencepiece (0.1.94-2) unstable; urgency=medium
 
   * Fix FTBFS on armel/mipsel (Closes: #977235)
diff -Nru sentencepiece-0.1.94/debian/rules sentencepiece-0.1.94/debian/rules
--- sentencepiece-0.1.94/debian/rules	2020-12-16 12:17:12.000000000 +0000
+++ sentencepiece-0.1.94/debian/rules	2021-01-07 23:00:06.000000000 +0000
@@ -12,7 +12,7 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-ifneq (,$(filter $(DEB_HOST_ARCH), armel mipsel m68k powerpc sh4))
+ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf mipsel m68k powerpc sh4))
   export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif