diff -Nru haproxy-2.2.6/debian/changelog haproxy-2.2.6/debian/changelog
--- haproxy-2.2.6/debian/changelog	2021-01-07 06:56:14.000000000 +0000
+++ haproxy-2.2.6/debian/changelog	2021-01-10 09:59:21.000000000 +0000
@@ -1,3 +1,10 @@
+haproxy (2.2.6-2+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 1.8.19-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 14 Mar 2019 20:25:01 +0000]
+  * Link with libatomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sun, 10 Jan 2021 09:59:21 +0000
+
 haproxy (2.2.6-2) unstable; urgency=medium
 
   * d/tests: sleep before test to let Apache2 start.
diff -Nru haproxy-2.2.6/debian/rules haproxy-2.2.6/debian/rules
--- haproxy-2.2.6/debian/rules	2021-01-07 06:56:14.000000000 +0000
+++ haproxy-2.2.6/debian/rules	2021-01-10 09:59:21.000000000 +0000
@@ -33,7 +33,7 @@
 	MAKEARGS+= USE_REGPARM=1
 endif
 
-ifneq ($(filter armel mips mipsel m68k powerpc powerpcspe sh4 riscv64,$(DEB_HOST_ARCH)),)
+ifneq ($(filter armel armhf mips mipsel m68k powerpc powerpcspe sh4 riscv64,$(DEB_HOST_ARCH)),)
 	MAKEARGS+= ADDLIB="-latomic -Wl,--no-as-needed -lgcc_s -Wl,--as-needed"
 else
 	MAKEARGS+= ADDLIB="-Wl,--no-as-needed -lgcc_s -Wl,--as-needed"