diff -Nru giada-0.21.0/debian/changelog giada-0.21.0/debian/changelog
--- giada-0.21.0/debian/changelog	2022-05-15 16:50:55.000000000 +0000
+++ giada-0.21.0/debian/changelog	2022-05-21 03:12:03.000000000 +0000
@@ -1,3 +1,13 @@
+giada (0.21.0-1+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 0.15.2+ds1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 17 Mar 2019 13:18:55 +0000]
+  * Link against libatomic on armhf too for raspbian.
+
+  [changes introduced in 0.20.1+ds1-1+rpi1 by Peter Michael Green]
+  * Use no-as-needed when linking with libatomic to workaround library ordering issue.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 21 May 2022 03:12:03 +0000
+
 giada (0.21.0-1) unstable; urgency=medium
 
   * New upstream version 0.21.0
diff -Nru giada-0.21.0/debian/rules giada-0.21.0/debian/rules
--- giada-0.21.0/debian/rules	2022-05-04 15:25:13.000000000 +0000
+++ giada-0.21.0/debian/rules	2022-05-21 03:12:03.000000000 +0000
@@ -30,10 +30,10 @@
 # - 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)
-	LIBS += -latomic
+	LIBS += -Wl,-push-state -Wl,-no-as-needed -latomic -Wl,-pop-state
 endif
 
 DEB_LDFLAGS_MAINT_APPEND += $(LIBS)