diff -Nru openjdk-8-8u312-b07/debian/changelog openjdk-8-8u312-b07/debian/changelog
--- openjdk-8-8u312-b07/debian/changelog	2021-11-05 23:57:58.000000000 +0000
+++ openjdk-8-8u312-b07/debian/changelog	2021-12-28 19:27:54.000000000 +0000
@@ -1,3 +1,11 @@
+openjdk-8 (8u312-b07-1+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 8u212-b01-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 29 Mar 2019 13:54:02 +0000]
+  * Add latomic to ldflags
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 28 Dec 2021 19:27:54 +0000
+
 openjdk-8 (8u312-b07-1) unstable; urgency=medium
 
   * New upstream release (GA)
diff -Nru openjdk-8-8u312-b07/debian/patches/force-link-jvm-libatomic.diff openjdk-8-8u312-b07/debian/patches/force-link-jvm-libatomic.diff
--- openjdk-8-8u312-b07/debian/patches/force-link-jvm-libatomic.diff	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-8-8u312-b07/debian/patches/force-link-jvm-libatomic.diff	2021-12-28 19:27:54.000000000 +0000
@@ -0,0 +1,11 @@
+--- src/hotspot/make/linux/makefiles/vm.make	2021-12-28 21:36:34.345398333 +0000
++++ src/hotspot/make/linux/makefiles/vm.make	2021-12-28 21:35:31.840690120 +0000
+@@ -308,6 +308,8 @@
+   LFLAGS_VM += $(LLVM_LDFLAGS)
+ endif
+ 
++LIBS_VM += -latomic
++
+ LINK_VM = $(LINK_LIB.CC)
+ 
+ # rule for building precompiled header
diff -Nru openjdk-8-8u312-b07/debian/rules openjdk-8-8u312-b07/debian/rules
--- openjdk-8-8u312-b07/debian/rules	2021-11-05 23:50:02.000000000 +0000
+++ openjdk-8-8u312-b07/debian/rules	2021-12-28 19:27:54.000000000 +0000
@@ -131,7 +131,7 @@
 endif
 
 with_check = $(if $(findstring nocheck, $(DEB_BUILD_OPTIONS)),,yes)
-ifneq (,$(filter $(DEB_HOST_ARCH), armel))
+ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf))
   with_check = disabled running check on $(DEB_HOST_ARCH)
 endif
 #with_check = disabled for this build
@@ -217,7 +217,7 @@
 # jdk/make/CompileDemos.gmk (SetupJVMTIDemo) doesn't like commas in flags
 dpkg_buildflags_hs += \
 	DEB_LDFLAGS_MAINT_STRIP="-Wl,-z,relro -Wl,-Bsymbolic-functions" \
-	DEB_LDFLAGS_MAINT_APPEND="-Xlinker -z -Xlinker relro -Xlinker -Bsymbolic-functions"
+	DEB_LDFLAGS_MAINT_APPEND="-Xlinker -z -Xlinker relro -Xlinker -Bsymbolic-functions -latomic"
 dpkg_buildflags_hs += dpkg-buildflags
 export EXTRA_CPPFLAGS_HS := $(shell $(dpkg_buildflags_hs) --get CPPFLAGS)
 export EXTRA_CFLAGS_HS   := $(shell $(dpkg_buildflags_hs) --get CFLAGS) $(shell $(dpkg_buildflags_hs) --get CPPFLAGS)
@@ -407,6 +407,8 @@
 	aarch32.diff
 endif
 
+COMMON_PATCHES += force-link-jvm-libatomic.diff
+
 DEFAULT_PATCHES = \
 	$(COMMON_PATCHES) \
 	hotspot-libpath-$(hotspot_version).diff