diff -Nru openjdk-8-8u212-b01/debian/changelog openjdk-8-8u212-b01/debian/changelog
--- openjdk-8-8u212-b01/debian/changelog	2019-03-19 07:26:02.000000000 +0000
+++ openjdk-8-8u212-b01/debian/changelog	2019-03-29 13:54:02.000000000 +0000
@@ -1,3 +1,10 @@
+openjdk-8 (8u212-b01-1+rpi1) buster-staging; urgency=medium
+
+  * Add latomic to ldflags
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 29 Mar 2019 13:54:02 +0000
+
 openjdk-8 (8u212-b01-1) unstable; urgency=medium
 
   * Update to 8u212-b01.
diff -Nru openjdk-8-8u212-b01/debian/rules openjdk-8-8u212-b01/debian/rules
--- openjdk-8-8u212-b01/debian/rules	2019-03-18 13:24:20.000000000 +0000
+++ openjdk-8-8u212-b01/debian/rules	2019-03-29 13:54:02.000000000 +0000
@@ -125,7 +125,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
 
@@ -211,7 +211,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)