From: Thomas Schwinge <tschwinge@baylibre.com>
Date: Mon, 12 May 2025 09:06:47 +0000 (+0200)
Subject: GCN, nvptx libstdc++: Force use of '__atomic' builtins: revert 'atomicity_dir=cpu... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1321df5bc05663021313c17f4af54b950aa05d01;p=thirdparty%2Fgcc.git

GCN, nvptx libstdc++: Force use of '__atomic' builtins: revert 'atomicity_dir=cpu/generic/atomicity_builtins' hard-coding [PR119645]"

Thanks to commit 86627faec10da53d7532805019e5296fcf15ac09
"libstdc++: Rewrite atomic builtin checks [PR70560]", for both GCN, nvptx
we now get:

    +configure:16060: checking for atomic builtins for _Atomic_word
    +[...]
    +configure:16073: result: yes

..., and thus may revert the 'atomicity_dir=cpu/generic/atomicity_builtins'
hard-coding added in commit 059b5509c14904b55c37f659170240ae0d2c1c8e
"GCN, nvptx libstdc++: Force use of '__atomic' builtins [PR119645]".

	PR target/119645
	libstdc++-v3/
	* configure.host [GCN, nvptx] (atomicity_dir): Don't set.
---

diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index 3cd1bb1c6ee..87a1822c661 100644
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -370,21 +370,10 @@ case "${host}" in
 	;;
     esac
     ;;
-  amdgcn-*-amdhsa)
-    # To avoid greater pain elsewhere, force use of '__atomic' builtins,
-    # regardless of the outcome of 'configure' checks; see PR119645
-    # "GCN, nvptx: libstdc++ 'checking for atomic builtins [...]... no'".
-    atomicity_dir=cpu/generic/atomicity_builtins
-    ;;
   arm*-*-freebsd*)
      port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
      ;;
   nvptx-*-none)
-    # To avoid greater pain elsewhere, force use of '__atomic' builtins,
-    # regardless of the outcome of 'configure' checks; see PR119645
-    # "GCN, nvptx: libstdc++ 'checking for atomic builtins [...]... no'".
-    atomicity_dir=cpu/generic/atomicity_builtins
-
     # For 'make all-target-libstdc++-v3', re 'alloca'/VLA usage:
     EXTRA_CFLAGS="${EXTRA_CFLAGS} -mfake-ptx-alloca"
     OPTIMIZE_CXXFLAGS="${OPTIMIZE_CXXFLAGS} -mfake-ptx-alloca"