diff -Nru grpc-1.30.2/debian/changelog grpc-1.30.2/debian/changelog
--- grpc-1.30.2/debian/changelog	2021-02-04 09:44:30.000000000 +0000
+++ grpc-1.30.2/debian/changelog	2021-02-10 15:06:19.000000000 +0000
@@ -1,3 +1,10 @@
+grpc (1.30.2-3+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 1.30.2-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Sep 2020 17:29:12 +0000]
+  * Link with libatomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 10 Feb 2021 15:06:19 +0000
+
 grpc (1.30.2-3) unstable; urgency=medium
 
   * Backport upstream fixes for:
diff -Nru grpc-1.30.2/debian/rules grpc-1.30.2/debian/rules
--- grpc-1.30.2/debian/rules	2021-01-13 21:50:31.000000000 +0000
+++ grpc-1.30.2/debian/rules	2021-02-10 15:06:19.000000000 +0000
@@ -25,7 +25,7 @@
 # package maintainers to append LDFLAGS
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-ifneq (,$(filter $(DEB_HOST_ARCH), armel mips mipsel powerpc))
+ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf mips mipsel powerpc))
   export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif