diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a69540e8212..daf35749ce7 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -26,10 +26,6 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
-fi
-
 pre_build() {
 	export FORCE_GIT_VERSION="$version"
 }
diff --git a/srcpkgs/Carla/patches/fix-armv6l-build.patch b/srcpkgs/Carla/patches/fix-armv6l-build.patch
deleted file mode 100644
index 572f85b2011..00000000000
--- a/srcpkgs/Carla/patches/fix-armv6l-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/source/Makefile.deps.mk
-+++ b/source/Makefile.deps.mk
-@@ -526,6 +526,10 @@
- JUCE_GUI_EXTRA_LIBS        =
- endif
- 
-+ifneq (,$(findstring arm-,$(TARGET_MACHINE)))
-+JUCE_CORE_LIBS += -latomic
-+endif
-+
- endif
- 
- # ---------------------------------------------------------------------------------------------------------------------
diff --git a/srcpkgs/Clipboard/template b/srcpkgs/Clipboard/template
index c33fb45eb94..87a2ae7b992 100644
--- a/srcpkgs/Clipboard/template
+++ b/srcpkgs/Clipboard/template
@@ -13,10 +13,6 @@ changelog="https://github.com/Slackadays/Clipboard/releases"
 distfiles="https://github.com/Slackadays/Clipboard/archive/refs/tags/${version}.tar.gz"
 checksum=f7ceb2dbb76bc094ac8afbef97bdef0f1a9451ca7dd1a4a181f3b2a859a2f094
 
-if [ "${XBPS_TARGET_NO_ATOMIC8}" ]; then
-	CXXFLAGS+=" -latomic"
-fi
-
 post_install() {
 	vcompletion documentation/completions/cb.fish fish cb
 }
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index a35e73750e7..52aff144489 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -84,10 +84,6 @@ if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DWITH_TESTS=1 -DSYSTEM_GTEST=1"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
-fi
-
 post_extract() {
 	_builddir="${build_wrksrc:+$build_wrksrc/}${cmake_builddir:=build}"
 	vsrcextract --no-strip-components -C data/object objects.zip
diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index 1ee7eead6df..81e4fa926bd 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -20,10 +20,6 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DSTRINGIFY_LOCATION=/usr/bin/stringify"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
-fi
-
 
 OpenSubdiv-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 5e59fd8dffe..a63e271ef83 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -16,10 +16,6 @@ changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
 distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
 checksum=d4ec85d613e60ebb3cdd7a1a9797e139bac653964b3cdd699520253f22405c9b
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
-fi
-
 QMPlay2-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/abseil-cpp/template b/srcpkgs/abseil-cpp/template
index dacb83f3f4a..e538fee82f7 100644
--- a/srcpkgs/abseil-cpp/template
+++ b/srcpkgs/abseil-cpp/template
@@ -13,10 +13,6 @@ changelog="https://github.com/abseil/abseil-cpp/releases"
 distfiles="https://github.com/abseil/abseil-cpp/archive/${version}.tar.gz"
 checksum=59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5
 
-if [ $XBPS_TARGET_NO_ATOMIC8 ]; then
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
-fi
-
 abseil-cpp-devel_package() {
 	short_desc+=" (development files)"
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ahoviewer/template b/srcpkgs/ahoviewer/template
index ebe27060b42..cd1c9ad037d 100644
--- a/srcpkgs/ahoviewer/template
+++ b/srcpkgs/ahoviewer/template
@@ -17,12 +17,6 @@ distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=a14e32b4a8095c9f8b4b607c090a50cc8ac1076550e57b5a9303c54089068152
 nocross="https://travis-ci.org/void-linux/void-packages/jobs/490108528#L1022"
 
-post_patch() {
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		echo "ahoviewer_LDADD += -latomic" >> src/Makefile.am
-	fi
-}
-
 pre_configure() {
 	autoreconf -fi
 }
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 56804533e1d..cd82a74d087 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -22,10 +22,6 @@ checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS="-latomic"
-fi
-
 pre_configure() {
 	autoreconf -fi
 }
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 853e16fcad3..efd0afe1057 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -45,10 +45,6 @@ if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
 	build_options_default+=" luajit"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	CFLAGS="-latomic"
-fi
-
 post_extract() {
 	mv arcan-$version arcan
 	rm arcan/src/platform/cmake/modules/FindPkgConfig.cmake
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index ab16f26eedf..b4c610b5938 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -23,10 +23,6 @@ CXXFLAGS="-fpermissive"
 export PATH="/usr/libexec/chroot-git:$PATH"
 conf_files="/etc/ardour7/*"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS+=" -latomic"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*)  configure_args+=" --dist-target=x86_64" ;;
 	i686*)    configure_args+=" --dist-target=i686" ;;
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index 4aba1b03a8f..33778d556fa 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -7,8 +7,6 @@ _serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
 _settings_commit="04792d853c7f83c9d7ab4df00279442a658d3be3"
 _signals_commit="25e4ec3b8d6ea94a5e65a26e7cfcbbce3b87c5d6"
 _sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
-create_wrksrc=yes
-build_wrksrc="chatterino2-${version}"
 build_style=cmake
 configure_args="-DUSE_SYSTEM_QTKEYCHAIN=ON"
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -32,23 +30,20 @@ checksum="f1fff3523f5a3f633430d44f7ca6c6c718a515258d50004a855e69e4aa989b4e
  702e97d8f2fcaec65256e6f691c3ed055924430ce64b29ebe74f3769a9d50d71
  ae098841b0f33079366eff8bc44fe3f2f2f65e70259c1cc9ff8d727c4edf974c
  f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LIBS="-latomic"
-fi
-
-patch_args="-Np1 --directory=${build_wrksrc}"
+skip_extraction="
+ ${_libcommuni_commit}.tar.gz
+ ${_serialize_commit}.tar.gz
+ ${_settings_commit}.tar.gz
+ ${_signals_commit}.tar.gz
+ ${_sanitizers_cmake_commit}.tar.gz
+ "
 
 post_extract() {
-	rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \
-	      ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \
-	      ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \
-	      ${build_wrksrc}/cmake/sanitizers-cmake
-	mv "libcommuni-${_libcommuni_commit}" "${build_wrksrc}/lib/libcommuni"
-	mv "serialize-${_serialize_commit}" "${build_wrksrc}/lib/serialize"
-	mv "settings-${_settings_commit}" "${build_wrksrc}/lib/settings"
-	mv "signals-${_signals_commit}" "${build_wrksrc}/lib/signals"
-	mv "sanitizers-cmake-${_sanitizers_cmake_commit}" "${build_wrksrc}/cmake/sanitizers-cmake"
+	vsrcextract -C lib/libcommuni ${_libcommuni_commit}.tar.gz
+	vsrcextract -C lib/serialize ${_serialize_commit}.tar.gz
+	vsrcextract -C lib/settings ${_settings_commit}.tar.gz
+	vsrcextract -C lib/signals ${_signals_commit}.tar.gz
+	vsrcextract -C cmake/sanitizers-cmake ${_sanitizers_cmake_commit}.tar.gz
 }
 
 post_install() {
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index aa1362159cf..319bae6b2b1 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -16,10 +16,6 @@ distfiles="https://github.com/linuxmint/cjs/archive/refs/tags/${version}.tar.gz"
 checksum=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2
 make_check_pre="xvfb-run"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS+=" -latomic"
-fi
-
 pre_configure() {
 	# The deleted lines in meson.build try to build and run a simple program,
 	# and that does not work when cross-compiling.
diff --git a/srcpkgs/cmus/patches/pass-ldlibs.patch b/srcpkgs/cmus/patches/pass-ldlibs.patch
deleted file mode 100644
index 0330ae48455..00000000000
--- a/srcpkgs/cmus/patches/pass-ldlibs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Pass LDLIBS to the linker
- Needed to pass -latomic at the end so that we can fix a FTBFS on various
- architectures.
-Author: Ryan Kavanagh <rak@debian.org>
-Origin: Debian
-Bug-Debian: http://bugs.debian.org/935678
-Forwarded: no
-Reviewed-by: Ryan Kavanagh <rak@debian.org>
-Last-Update: 2019-09-07
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: cmus/Makefile
-===================================================================
---- a/Makefile	2019-09-07 10:02:00.152453147 -0400
-+++ b/Makefile	2019-09-07 10:24:55.009937454 -0400
-@@ -22,7 +22,7 @@
- FFMPEG_LIBS += $(shell pkg-config --libs libswresample)
- 
- CMUS_LIBS = $(PTHREAD_LIBS) $(NCURSES_LIBS) $(ICONV_LIBS) $(DL_LIBS) $(DISCID_LIBS) \
--			-lm $(COMPAT_LIBS) $(LIBSYSTEMD_LIBS)
-+			-lm $(COMPAT_LIBS) $(LIBSYSTEMD_LIBS) $(LDLIBS)
- 
- command_mode.o input.o main.o ui_curses.o op/pulse.lo: .version
- command_mode.o input.o main.o ui_curses.o op/pulse.lo: CFLAGS += -DVERSION=\"$(VERSION)\"
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 0fdcec461c2..dc8a5e5d434 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -20,10 +20,6 @@ build_options="elogind"
 build_options_default="elogind"
 desc_option_elogind="Support MPRIS interface via elogind"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	export LDLIBS+=" -latomic"
-fi
-
 cmus-libao_package() {
 	short_desc+=" - libao output plugin"
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/conduit/template b/srcpkgs/conduit/template
index e0e5177bf16..fa67edd2ceb 100644
--- a/srcpkgs/conduit/template
+++ b/srcpkgs/conduit/template
@@ -20,10 +20,6 @@ _conduit_homedir="/var/lib/conduit"
 make_dirs="/var/lib/conduit 0700 _conduit _conduit
  /etc/conduit 755 _conduit _conduit"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	XBPS_CROSS_RUSTFLAGS+=" -latomic"
-fi
-
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	# doctests fail on x86_64 -> i686 chroot, so run everything *but* them
 	make_check_args+=" --lib --bins --tests --benches --examples"
diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index 9a64d9b4e9f..c0e84089016 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -15,7 +15,3 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.com/corectrl/corectrl"
 distfiles="${homepage}/-/archive/v${version}/corectrl-v${version}.tar.gz"
 checksum=6b8817ce1bb09257148e6d3f6196546724a8ea185fedfff70f302621ce36cc12
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LIBS="-latomic"
-fi
diff --git a/srcpkgs/dhcp/patches/libatomic.patch b/srcpkgs/dhcp/patches/libatomic.patch
deleted file mode 100644
index 54f61b22851..00000000000
--- a/srcpkgs/dhcp/patches/libatomic.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-commit dd8fa93bf34a2e8a74d0e9687fe38793e1c0ca87
-Author: q66 <daniel@octaforge.org>
-Date:   Fri Feb 7 14:26:35 2020 +0100
-
-    Add libatomic templating
-    
-    This will be substituted from our build template on as-needed basis.
-
-diff --git client/Makefile.am client/Makefile.am
-index d177159..5793903 100644
---- a/client/Makefile.am
-+++ b/client/Makefile.am
-@@ -17,6 +17,6 @@ dhclient_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
- 		 @BINDLIBIRSDIR@/libirs.@A@ \
- 		 @BINDLIBDNSDIR@/libdns.@A@ \
- 		 @BINDLIBISCCFGDIR@/libisccfg.@A@ \
--		 @BINDLIBISCDIR@/libisc.@A@
-+		 @BINDLIBISCDIR@/libisc.@A@ @LIBATOMIC@
- man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
- EXTRA_DIST = $(man_MANS)
-diff --git client/tests/Makefile.am client/tests/Makefile.am
-index 8f1f058..fbf3e82 100644
---- a/client/tests/Makefile.am
-+++ b/client/tests/Makefile.am
-@@ -22,7 +22,7 @@ DHCPLIBS = $(top_builddir)/common/libdhcp.@A@ \
- 	  @BINDLIBIRSDIR@/libirs.@A@ \
- 	  @BINDLIBDNSDIR@/libdns.@A@ \
- 	  @BINDLIBISCCFGDIR@/libisccfg.@A@ \
--	  @BINDLIBISCDIR@/libisc.@A@
-+	  @BINDLIBISCDIR@/libisc.@A@ @LIBATOMIC@
- 
- ATF_TESTS =
- if HAVE_ATF
-diff --git common/tests/Makefile.am common/tests/Makefile.am
-index a515265..8bd616c 100644
---- a/common/tests/Makefile.am
-+++ b/common/tests/Makefile.am
-@@ -17,7 +17,7 @@ alloc_unittest_LDADD += ../libdhcp.@A@ ../../omapip/libomapi.@A@ \
- 	@BINDLIBIRSDIR@/libirs.@A@ \
- 	@BINDLIBDNSDIR@/libdns.@A@ \
- 	@BINDLIBISCCFGDIR@/libisccfg.@A@  \
--	@BINDLIBISCDIR@/libisc.@A@
-+	@BINDLIBISCDIR@/libisc.@A@ @LIBATOMIC@
- 
- dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
- dns_unittest_LDADD = $(ATF_LDFLAGS)
-@@ -25,7 +25,7 @@ dns_unittest_LDADD += ../libdhcp.@A@ ../../omapip/libomapi.@A@ \
- 	@BINDLIBIRSDIR@/libirs.@A@ \
- 	@BINDLIBDNSDIR@/libdns.@A@ \
- 	@BINDLIBISCCFGDIR@/libisccfg.@A@  \
--	@BINDLIBISCDIR@/libisc.@A@
-+	@BINDLIBISCDIR@/libisc.@A@ @LIBATOMIC@
- 
- misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
- misc_unittest_LDADD = $(ATF_LDFLAGS)
-@@ -33,7 +33,7 @@ misc_unittest_LDADD += ../libdhcp.@A@ ../../omapip/libomapi.@A@ \
- 	@BINDLIBIRSDIR@/libirs.@A@ \
- 	@BINDLIBDNSDIR@/libdns.@A@ \
- 	@BINDLIBISCCFGDIR@/libisccfg.@A@  \
--	@BINDLIBISCDIR@/libisc.@A@
-+	@BINDLIBISCDIR@/libisc.@A@ @LIBATOMIC@
- 
- ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c
- ns_name_unittest_LDADD = $(ATF_LDFLAGS)
-@@ -41,7 +41,7 @@ ns_name_unittest_LDADD += ../libdhcp.@A@ ../../omapip/libomapi.@A@ \
- 	@BINDLIBIRSDIR@/libirs.@A@ \
- 	@BINDLIBDNSDIR@/libdns.@A@ \
- 	@BINDLIBISCCFGDIR@/libisccfg.@A@  \
--	@BINDLIBISCDIR@/libisc.@A@
-+	@BINDLIBISCDIR@/libisc.@A@ @LIBATOMIC@
- 
- option_unittest_SOURCES = option_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
- option_unittest_LDADD = $(ATF_LDFLAGS)
-@@ -49,7 +49,7 @@ option_unittest_LDADD += ../libdhcp.@A@ ../../omapip/libomapi.@A@ \
- 	@BINDLIBIRSDIR@/libirs.@A@ \
- 	@BINDLIBDNSDIR@/libdns.@A@ \
- 	@BINDLIBISCCFGDIR@/libisccfg.@A@  \
--	@BINDLIBISCDIR@/libisc.@A@
-+	@BINDLIBISCDIR@/libisc.@A@ @LIBATOMIC@
- 
- domain_name_unittest_SOURCES = domain_name_test.c \
- 	$(top_srcdir)/tests/t_api_dhcp.c
-@@ -58,7 +58,7 @@ domain_name_unittest_LDADD += ../libdhcp.@A@ ../../omapip/libomapi.@A@ \
- 	@BINDLIBIRSDIR@/libirs.@A@ \
- 	@BINDLIBDNSDIR@/libdns.@A@ \
- 	@BINDLIBISCCFGDIR@/libisccfg.@A@  \
--	@BINDLIBISCDIR@/libisc.@A@
-+	@BINDLIBISCDIR@/libisc.@A@ @LIBATOMIC@
- 
- check: $(ATF_TESTS)
- 	@if test $(top_srcdir) != ${top_builddir}; then \
-diff --git configure.ac configure.ac
-index 3a583a5..453bbd5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -990,6 +990,9 @@ esac
- 
- AC_C_FLEXIBLE_ARRAY_MEMBER
- 
-+LIBATOMIC=
-+AC_SUBST(LIBATOMIC)
-+
- AC_CONFIG_FILES([
-   Makefile
-   client/Makefile
-diff --git dhcpctl/Makefile.am dhcpctl/Makefile.am
-index 0d66971..413ad25 100644
---- a/dhcpctl/Makefile.am
-+++ b/dhcpctl/Makefile.am
-@@ -14,7 +14,7 @@ omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
- 		$(BINDLIBIRSDIR)/libirs.a \
- 		$(BINDLIBDNSDIR)/libdns.a \
- 	        $(BINDLIBISCCFGDIR)/libisccfg.a \
--		$(BINDLIBISCDIR)/libisc.a
-+		$(BINDLIBISCDIR)/libisc.a @LIBATOMIC@
- 
- libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
- 
-@@ -23,4 +23,4 @@ cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
- 	       $(BINDLIBIRSDIR)/libirs.a \
- 	       $(BINDLIBDNSDIR)/libdns.a \
- 	       $(BINDLIBISCCFGDIR)/libisccfg.a \
--	       $(BINDLIBISCDIR)/libisc.a
-+	       $(BINDLIBISCDIR)/libisc.a @LIBATOMIC@
-diff --git omapip/Makefile.am omapip/Makefile.am
-index 5b61581..bd5664f 100644
---- a/omapip/Makefile.am
-+++ b/omapip/Makefile.am
-@@ -19,4 +19,4 @@ svtest_LDADD = libomapi.a \
- 	       $(BINDLIBIRSDIR)/libirs.a \
- 	       $(BINDLIBDNSDIR)/libdns.a \
- 	       $(BINDLIBISCCFGDIR)/libisccfg.a \
--	       $(BINDLIBISCDIR)/libisc.a
-+	       $(BINDLIBISCDIR)/libisc.a @LIBATOMIC@
-diff --git relay/Makefile.am relay/Makefile.am
-index 5562b69..8b788b7 100644
---- a/relay/Makefile.am
-+++ b/relay/Makefile.am
-@@ -8,6 +8,6 @@ dhcrelay_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
- 		 @BINDLIBIRSDIR@/libirs.@A@ \
- 		 @BINDLIBDNSDIR@/libdns.@A@ \
- 		 @BINDLIBISCCFGDIR@/libisccfg.@A@ \
--		 @BINDLIBISCDIR@/libisc.@A@
-+		 @BINDLIBISCDIR@/libisc.@A@ @LIBATOMIC@
- man_MANS = dhcrelay.8
- EXTRA_DIST = $(man_MANS)
-diff --git relay/tests/Makefile.am relay/tests/Makefile.am
-index fce3115..acbe68b 100644
---- a/relay/tests/Makefile.am
-+++ b/relay/tests/Makefile.am
-@@ -19,7 +19,7 @@ DHCPLIBS = $(top_builddir)/common/libdhcp.@A@ \
- 	  @BINDLIBIRSDIR@/libirs.@A@ \
- 	  @BINDLIBDNSDIR@/libdns.@A@ \
- 	  @BINDLIBISCCFGDIR@/libisccfg.@A@ \
--	  @BINDLIBISCDIR@/libisc.@A@
-+	  @BINDLIBISCDIR@/libisc.@A@ @LIBATOMIC@
- 
- ATF_TESTS =
- if HAVE_ATF
-diff --git server/Makefile.am server/Makefile.am
-index 787efca..f019d97 100644
---- a/server/Makefile.am
-+++ b/server/Makefile.am
-@@ -18,7 +18,7 @@ dhcpd_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
- 	      $(BINDLIBIRSDIR)/libirs.@A@ \
- 	      $(BINDLIBDNSDIR)/libdns.@A@ \
- 	      $(BINDLIBISCCFGDIR)/libisccfg.@A@ \
--	      $(BINDLIBISCDIR)/libisc.@A@ $(LDAP_LIBS)
-+	      $(BINDLIBISCDIR)/libisc.@A@ $(LDAP_LIBS) @LIBATOMIC@
- 
- man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
- EXTRA_DIST = $(man_MANS)
-diff --git server/tests/Makefile.am server/tests/Makefile.am
-index 699a0b6..3d97990 100644
---- a/server/tests/Makefile.am
-+++ b/server/tests/Makefile.am
-@@ -23,7 +23,7 @@ DHCPLIBS = $(top_builddir)/common/libdhcp.@A@ \
- 	  $(BINDLIBIRSDIR)/libirs.@A@ \
- 	  $(BINDLIBDNSDIR)/libdns.@A@ \
- 	  $(BINDLIBISCCFGDIR)/libisccfg.@A@ \
--	  $(BINDLIBISCDIR)/libisc.@A@
-+	  $(BINDLIBISCDIR)/libisc.@A@ @LIBATOMIC@
- 
- ATF_TESTS =
- if HAVE_ATF
diff --git a/srcpkgs/dhcp/template b/srcpkgs/dhcp/template
index dee0043b9e6..d644ac81a6c 100644
--- a/srcpkgs/dhcp/template
+++ b/srcpkgs/dhcp/template
@@ -3,7 +3,7 @@ pkgname=dhcp
 version=4.4.2P1
 revision=3
 build_style=gnu-configure
-hostmakedepends="perl tar automake libtool"
+hostmakedepends="perl tar pkg-config"
 short_desc="Server from the Internet Software Consortium's implementation of DHCP"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MPL-2.0"
@@ -18,12 +18,6 @@ make_dirs="/var/lib/dhcp 0755 root root"
 
 CFLAGS="-fcommon"
 
-post_patch() {
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		vsed -i "/LIBATOMIC=/s/$/-latomic/" configure.ac
-	fi
-}
-
 pre_configure() {
 	local _args=" --sbindir=/usr/bin --enable-paranoia
 		--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases
@@ -35,8 +29,6 @@ pre_configure() {
 
 	# set real configure_args
 	export configure_args+="${_args}"
-
-	autoreconf -if
 }
 post_install() {
 	mv ${DESTDIR}/etc/dhclient.conf.example ${DESTDIR}/etc/dhclient.conf
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 1cee24f3b60..206185f5654 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -34,11 +34,6 @@ if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 	fi
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS+=" -latomic"
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
-fi
-
 if [ -n "$CROSS_BUILD" ]; then
 	configure_args+=" -DSSE4_1_FOUND=OFF -DSSE2_FOUND=OFF"
 fi
diff --git a/srcpkgs/dosbox-staging/template b/srcpkgs/dosbox-staging/template
index f5483acab28..5a67b73e60e 100644
--- a/srcpkgs/dosbox-staging/template
+++ b/srcpkgs/dosbox-staging/template
@@ -16,7 +16,3 @@ homepage="https://dosbox-staging.github.io"
 distfiles="https://github.com/dosbox-staging/dosbox-staging/archive/v${version}.tar.gz"
 checksum=2ca69e65e6c181197b63388c60487a3bcea804232a28c44c37704e70d49a0392
 conflicts="dosbox"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS+=" -latomic"
-fi
diff --git a/srcpkgs/duperemove/template b/srcpkgs/duperemove/template
index 03e02859cf6..22d41bdf4ec 100644
--- a/srcpkgs/duperemove/template
+++ b/srcpkgs/duperemove/template
@@ -12,9 +12,6 @@ distfiles="https://github.com/markfasheh/duperemove/archive/v${version}.tar.gz"
 checksum=e162c2cf99c9d1e1e111cf84fa2615490a7d654173a3719651a962257bf8179e
 
 do_build() {
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		export LIBRARY_FLAGS=-latomic
-	fi
 	make CC=$CC CFLAGS="$CFLAGS $LDFLAGS -fcommon"
 }
 do_install() {
diff --git a/srcpkgs/edbrowse/template b/srcpkgs/edbrowse/template
index b6cbddf7003..fc39aa564b2 100644
--- a/srcpkgs/edbrowse/template
+++ b/srcpkgs/edbrowse/template
@@ -16,10 +16,6 @@ changelog="https://raw.githubusercontent.com/CMB/edbrowse/master/CHANGES"
 distfiles="https://github.com/CMB/edbrowse/archive/v${version}.tar.gz"
 checksum=2c7f6a07e5897060527b6cc5c19c45106444e2c4d8c9799434973c352d9ce4e6
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	make_build_args+=" QUICKJS_LDFLAGS+=-latomic"
-fi
-
 do_install() {
 	vbin src/edbrowse
 	vsconf doc/sample.ebrc
diff --git a/srcpkgs/fairy-stockfish/template b/srcpkgs/fairy-stockfish/template
index 7a3c512bc43..c6c1e1151ab 100644
--- a/srcpkgs/fairy-stockfish/template
+++ b/srcpkgs/fairy-stockfish/template
@@ -35,12 +35,8 @@ case $XBPS_TARGET_MACHINE in
 	*) broken="not supported" ;;
 esac
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS+=" -latomic"
-fi
-
 post_extract() {
-	cp $XBPS_SRCDISTDIR/${pkgname}-${version}/${_net_file} ./src
+	vsrccopy ${_net_file} src
 }
 
 do_install() {
diff --git a/srcpkgs/ffms2/template b/srcpkgs/ffms2/template
index 83482123111..365f64d10cb 100644
--- a/srcpkgs/ffms2/template
+++ b/srcpkgs/ffms2/template
@@ -13,10 +13,6 @@ homepage="https://github.com/FFMS/ffms2"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=82e95662946f3d6e1b529eadbd72bed196adfbc41368b2d50493efce6e716320
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS="-latomic"
-fi
-
 pre_configure() {
 	mkdir -p src/config
 	autoreconf -vfi
diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index 5ca1157055e..60d7ce66a56 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -19,10 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel"
 esac
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	export LIBS=-latomic
-fi
-
 do_configure() {
 	./configure --prefix=/usr --extra-cflags="$CFLAGS" --disable-native
 }
diff --git a/srcpkgs/fswatch/template b/srcpkgs/fswatch/template
index d2f0039c6c3..8d5da88814e 100644
--- a/srcpkgs/fswatch/template
+++ b/srcpkgs/fswatch/template
@@ -13,10 +13,6 @@ changelog="https://github.com/emcrisostomo/fswatch/raw/master/NEWS"
 distfiles="https://github.com/emcrisostomo/fswatch/releases/download/${version}/fswatch-${version}.tar.gz"
 checksum=c38e341c567f5f16bfa64b72fc48bba5e93873d8572522e670e6f320bbc2122f
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	export LIBS=-latomic
-fi
-
 post_install() {
 	rm -vr -- "${DESTDIR}/usr/share/doc"
 }
diff --git a/srcpkgs/geonkick/template b/srcpkgs/geonkick/template
index d7494a6ff50..853c24e7edc 100644
--- a/srcpkgs/geonkick/template
+++ b/srcpkgs/geonkick/template
@@ -17,7 +17,3 @@ checksum=30ee2a36a26cabb9af8f458bb12d7b0358b4d6abec67ab5f8df696390b5699b4
 if [ ${CROSS_BUILD} ]; then
 	configure_args+=" -DGKICK_ARCHITECTURE=$XBPS_TARGET_MACHINE"
 fi
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-latomic'"
-fi
diff --git a/srcpkgs/glog/template b/srcpkgs/glog/template
index 07d7137bc77..b25682a6c88 100644
--- a/srcpkgs/glog/template
+++ b/srcpkgs/glog/template
@@ -15,17 +15,9 @@ checksum=8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libucontext-devel"
 	configure_args+=" -DPRINT_UNSYMBOLIZED_STACK_TRACES=OFF"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES='-latomic'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc64*-musl) configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES='-lucontext'";;
-	ppc*-musl) configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES='-latomic -lucontext'";;
-esac
-
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index c7dda01f991..3fc680d5bec 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -34,10 +34,6 @@ if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
 	make_check=ci-skip  # See https://github.com/gnuradio/gnuradio/issues/5973
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
-fi
-
 post_install() {
 	rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \
 		${DESTDIR}/usr/share/gnuradio/examples/qt-gui/display_qt \
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 8991a8a415c..4c8fe9effc8 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -26,10 +26,6 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-fts-devel libexecinfo-devel"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
-fi
-
 post_extract() {
 	bsdtar xOf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 172b6400754..8ff6d96d672 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -23,14 +23,10 @@ system_accounts="haproxy"
 CFLAGS="-Wno-address-of-packed-member"
 do_build() {
 	local target="linux-${XBPS_TARGET_LIBC}"
-	local atomic
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		atomic="-latomic"
-	fi
 	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE2=1 USE_PCRE2_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
-		USE_PROMEX=1 ADDLIB="$atomic"
+		USE_PROMEX=1
 }
 
 do_check() {
diff --git a/srcpkgs/jack_capture/template b/srcpkgs/jack_capture/template
index b5c59179d8d..251aa7b15d0 100644
--- a/srcpkgs/jack_capture/template
+++ b/srcpkgs/jack_capture/template
@@ -13,10 +13,6 @@ distfiles="https://github.com/kmatheussen/${pkgname}/archive/${version}.tar.gz"
 checksum=21afb0257ed7437708cc9e5bec2f6299599461b7eec8bf66967d8ecadb0751de
 CFLAGS+=" -D__USE_GNU"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS+=" -latomic"
-fi
-
 pre_build() {
 	sed -i -e "s/^CC=gcc/CC=$CC/" -e "s/^CPP=g++/CPP=$CXX/" Makefile
 	sed -i -e "s/gcc/$CC/" gen_das_config_h.sh gen_setformat_c.sh
diff --git a/srcpkgs/kdiff3/template b/srcpkgs/kdiff3/template
index 439abb79083..858b8f73ebf 100644
--- a/srcpkgs/kdiff3/template
+++ b/srcpkgs/kdiff3/template
@@ -17,7 +17,3 @@ case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
 	armv6*|ppc*) broken="was failed to be built in the past";;
 esac
-
-if [ $XBPS_TARGET_NO_ATOMIC8 ]; then
-	configure_args=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
-fi
diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template
index da61b1ee606..411b6e3a932 100644
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@@ -19,10 +19,6 @@ distfiles="http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.xz"
 checksum=f08548e26ca65fa1e567b1debbea1ca4d0e7206bddb96a4f639c90171873e8f7
 system_groups="kismet"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	export LIBS="-latomic"
-fi
-
 post_install() {
 	vdoc "${FILESDIR}/README.voidlinux"
 }
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index e862f48a39f..192d8ea88fb 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -95,11 +95,6 @@ else
 	 libwaylandpp-devel"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-	LDFLAGS+=" -latomic"
-fi
-
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
 	find -type f | \
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index ada549cb23f..a0685c505b4 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -15,10 +15,6 @@ changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?v
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=2a8f57a06b52f6413b47d6a5dfbe7e9e31c84cc0784076f2f7e395232b0bd461
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS+=" -latomic"
-fi
-
 libfilezilla-devel_package() {
 	short_desc+=" - development files"
 	depends="libfilezilla>=${version}_${revision}"
diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template
index a32e13469a2..e04206eb780 100644
--- a/srcpkgs/libjxl/template
+++ b/srcpkgs/libjxl/template
@@ -25,10 +25,6 @@ checksum="c70916fb3ed43784eb840f82f05d390053a558e2da106e40863919238fa7b420
  @8feb1e33c38ca13f91a0d5bd8ce25f976eb239edf38f49e6db8895ae9f1e833c"
 skip_extraction="skcms-${_skcms_hash}.tar.gz"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LIBS="-latomic"
-fi
-
 if [ -z "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
diff --git a/srcpkgs/libopenshot-audio/template b/srcpkgs/libopenshot-audio/template
index 341f5d422f1..3a62ca9728c 100644
--- a/srcpkgs/libopenshot-audio/template
+++ b/srcpkgs/libopenshot-audio/template
@@ -13,10 +13,6 @@ homepage="https://github.com/OpenShot/libopenshot-audio"
 distfiles="https://github.com/OpenShot/libopenshot-audio/archive/v${version}.tar.gz"
 checksum=007ba6ee812a58506341dd66055dba575b3907e5274a0e7416f99c2fbb80021c
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	CXXFLAGS+=" -latomic "
-fi
-
 libopenshot-audio-devel_package() {
 	short_desc+=" - development files"
 	depends+=" ${sourcepkg}>=${version}_${revision} alsa-lib-devel zlib-devel"
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index 9f3414f10fe..061be8884a0 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -17,10 +17,6 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="Unsupported tl-schema version -1"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
-fi
-
 pre_configure() {
 	vsed -e 's/NOT CMAKE_CROSSCOMPILING/YES/g' -i CMakeLists.txt \
 		-i td/generate/CMakeLists.txt -i tdactor/CMakeLists.txt \
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index cb3ea5e58c8..39d34f62965 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -17,10 +17,6 @@ system_accounts="_lms"
 _lms_homedir="/var/lms"
 make_dirs="/var/lms 755 _lms _lms"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
-fi
-
 post_install() {
 	vconf conf/lms.conf
 	vmkdir /etc/pam.d
diff --git a/srcpkgs/mgba/template b/srcpkgs/mgba/template
index 4af085188bf..5513e3fd16f 100644
--- a/srcpkgs/mgba/template
+++ b/srcpkgs/mgba/template
@@ -14,10 +14,6 @@ changelog="https://raw.githubusercontent.com/mgba-emu/mgba/master/CHANGES"
 distfiles="https://github.com/mgba-emu/${pkgname}/archive/${version}.tar.gz"
 checksum="60afef8fb79ba1f7be565b737bae73c6604a790391c737f291482a7422d675ae"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
-fi
-
 libmgba_package() {
 	short_desc+=" - shared library"
 	pkg_install() {
diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index 3d0da42c595..0d242a182b7 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -38,7 +38,6 @@ conf_files="/etc/${pkgname}/*.conf"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	CFLAGS+=" -DLINK_ATOMIC"
-	export LIBS="-latomic"
 fi
 
 pre_configure() {
diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template
index 77038695442..57f5b34abd5 100644
--- a/srcpkgs/openmpi/template
+++ b/srcpkgs/openmpi/template
@@ -27,10 +27,6 @@ else
 	makedepends+=" libgfortran-devel"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	export LIBS="-latomic"
-fi
-
 post_patch() {
 	vsed -e 's,sys/unistd.h,unistd.h,g' -i opal/include/opal/sys/cma.h
 	vsed -e '1i#include <unistd.h>' -i opal/mca/pmix/pmix3x/pmix/include/pmix_server.h
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 1596120b26c..e79718ffffb 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -22,10 +22,6 @@ if [ "$XBPS_WORDSIZE" -eq 32 ]; then
 	nodebug=yes
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
-fi
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 530e0c28764..e2fb484b2cd 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -44,10 +44,6 @@ desc_option_ffado="Enable support for FireWire based audio devices"
 
 replaces="libpulseaudio-pipewire>=0"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS+=" -latomic"
-fi
-
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 	makedepends+=" ldacBT-devel"
 else
diff --git a/srcpkgs/plocate/template b/srcpkgs/plocate/template
index 32a64971a26..b6baf9aed62 100644
--- a/srcpkgs/plocate/template
+++ b/srcpkgs/plocate/template
@@ -25,10 +25,6 @@ alternatives="
  locate:updatedb:/usr/bin/pupdatedb
  locate:updatedb.conf.5:/usr/share/man/man5/pupdatedb.conf.5"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LIBS="-latomic"
-fi
-
 post_install() {
 	vinstall ${FILESDIR}/plocate.cron-daily 744 etc/cron.daily plocate-build
 	mv ${DESTDIR}/usr/share/man/man5/{,p}updatedb.conf.5
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index fc16c03f8ff..49e7efe9654 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -23,10 +23,6 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" WXRC=/usr/bin/wxrc --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	CXXFLAGS+=" -latomic "
-fi
-
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template
index 559702aa423..41ccd797de0 100644
--- a/srcpkgs/polybar/template
+++ b/srcpkgs/polybar/template
@@ -38,10 +38,6 @@ desc_option_i3="Enable support for i3"
 desc_option_mpd="Enable support for MPD"
 desc_option_network="Enable support for network"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES='-latomic'"
-fi
-
 post_install() {
 	rm -r ${DESTDIR}/usr/share/doc/polybar
 	vsconf doc/config.ini
diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index f6b2a8462ab..48745b02b2a 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -13,10 +13,6 @@ changelog="https://raw.githubusercontent.com/qpdf/qpdf/stable/manual/release-not
 distfiles="https://github.com/qpdf/qpdf/archive/refs/tags/v${version}.tar.gz"
 checksum=3bb6c2e9ed5b50a8bafecbfccb34d853fe1d46f59c4233e42cc9a9e1830d8eaf
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LIBS="-latomic"
-fi
-
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-DLL_FMT=%lld -DRANDOM_DEVICE=/dev/urandom"
 fi
diff --git a/srcpkgs/redis/template b/srcpkgs/redis/template
index 39c45c443d3..eb7c63364b0 100644
--- a/srcpkgs/redis/template
+++ b/srcpkgs/redis/template
@@ -34,10 +34,6 @@ post_patch() {
 		-e "s|^# bind 127.0.0.1|bind 127.0.0.1|" \
 		-e "s|^dir .*|dir ${redis_homedir}|" \
 		-e "s|^pidfile .*|pidfile /run/redis/redis.pid|" redis.conf
-
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		vsed -i -e "s|^FINAL_LIBS=.*|& -latomic|" src/Makefile
-	fi
 }
 
 do_install() {
diff --git a/srcpkgs/rubberband/template b/srcpkgs/rubberband/template
index 66625239d62..002980063f9 100644
--- a/srcpkgs/rubberband/template
+++ b/srcpkgs/rubberband/template
@@ -16,10 +16,6 @@ changelog="https://raw.githubusercontent.com/breakfastquay/rubberband/default/CH
 distfiles="https://breakfastquay.com/files/releases/rubberband-${version}.tar.bz2"
 checksum=d9ef89e2b8ef9f85b13ac3c2faec30e20acf2c9f3a9c8c45ce637f2bc95e576c
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS="-latomic"
-fi
-
 _dev_depends="fftw-devel"
 
 # On 32-bit targets, the built-in resampler is much slower than libsamplerate.
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 3a7a68fc13b..8fbfc861319 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -21,10 +21,6 @@ checksum="ab4b3a5fecb1800f8eab82a92138a70227e869d2066ee881441b1e13035786dc
  448ac898c72468c4f632a0818cc4b8ec83a4669402ee059d74df35f94f3e2f34"
 nocross="https://travis-ci.org/bobertlo/void-packages/jobs/487251265"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args=" -DCMAKE_CXX_STANDARD_LIBRARIES='-latomic'"
-fi
-
 post_extract() {
 	mv solvespace-${version}/* .
 	rmdir "${wrksrc}/extlib/libdxfrw"
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index f563ad3d40a..b047a35fe53 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -15,9 +15,3 @@ homepage="https://www.sonicvisualiser.org/"
 changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG"
 distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz"
 checksum=0816e1ba9e3f97af495ece2554186bccad1cf47090ff8a13f1d08322212db487
-
-post_extract() {
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		vsed -i "s/^general_link_args = \[\]/general_link_args = \['-latomic'\]/" meson.build
-	fi
-}
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 7bbe58e719c..754a5d9e9b0 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -59,10 +59,6 @@ system_accounts="squid"
 # squid-conf-tests requires a squid user in the system
 make_check=no
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS+=" -latomic"
-fi
-
 pre_configure() {
 	export BUILDCXX="${CXX_host}"
 	export BUILDCXXFLAGS="-O2"
diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index 5203abfa667..0d2b2e1145c 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -34,10 +34,6 @@ case $XBPS_TARGET_MACHINE in
 	*) broken="not supported" ;;
 esac
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS+=" -latomic"
-fi
-
 post_extract() {
 	cp $XBPS_SRCDISTDIR/${pkgname}-${version}/${_net_file} ./src
 }
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index b8c056ce5c3..fb647993ba1 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -18,10 +18,6 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
-fi
-
 post_install() {
 if [ -z "$CROSS_BUILD" ]; then
 	# internal tool needed for cross-building
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 45e6ab6adb0..872c2692f26 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -20,7 +20,4 @@ checksum=e8ee79b1f399b2d167e6a90de52ccc90e52408f7ade1b9b7135727efe181347f
 
 pre_configure() {
 	autoreconf -fi
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		export LIBS="-latomic"
-	fi
 }
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index cfc7d3857ff..9cf953a214e 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -23,15 +23,6 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
 fi
 
-post_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		ppc64*) ;;
-		ppc*)
-			vsed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
-			;;
-	esac
-}
-
 thrift-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template
index 5f12bf2d091..8414bde1d46 100644
--- a/srcpkgs/vapoursynth/template
+++ b/srcpkgs/vapoursynth/template
@@ -13,10 +13,6 @@ changelog="https://raw.githubusercontent.com/vapoursynth/vapoursynth/master/Chan
 distfiles="https://github.com/vapoursynth/vapoursynth/archive/${version}.tar.gz"
 checksum=ed909b3c58e79bcbb056d07c5d301222ba8001222b4b40d5c1123be35fea9ae2
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS="-latomic"
-fi
-
 pre_configure() {
 	./autogen.sh
 }
diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template
index 876281c0790..426608850b1 100644
--- a/srcpkgs/vkQuake/template
+++ b/srcpkgs/vkQuake/template
@@ -13,10 +13,6 @@ homepage="https://github.com/Novum/vkQuake"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=b88d3dfc869d89820766e2dd18bdadb9681adfc4c9d05e09cbbebcc17ef1d150
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	LDFLAGS+=" -latomic"
-fi
-
 do_install() {
 	vbin build/vkquake
 	vinstall Misc/vkQuake_512.png 644 usr/share/pixmaps vkquake.png
diff --git a/srcpkgs/wt/template b/srcpkgs/wt/template
index cad0482b15a..d825acae888 100644
--- a/srcpkgs/wt/template
+++ b/srcpkgs/wt/template
@@ -12,10 +12,6 @@ changelog="https://webtoolkit.eu/wt/doc/reference/html/Releasenotes.html"
 distfiles="https://github.com/emweb/wt/archive/refs/tags/${version}.tar.gz"
 checksum=7090023d4fc4b6594bf4cb11072d9d3d775269327aece9a8993c7bbe46decb9d
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
-fi
-
 wt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/xrootd/template b/srcpkgs/xrootd/template
index 2f6a1a13720..ceff8fe1823 100644
--- a/srcpkgs/xrootd/template
+++ b/srcpkgs/xrootd/template
@@ -19,6 +19,3 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
 	makedepends+=" libexecinfo-devel"
 fi
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-fi