atomic patch no longer necessary

similar solution implemented upstream in:
https://github.com/llvm/llvm-project/commit/1a14436c35b4738a22554cc4a7349bfcf3ceea78

diff --git a/atomic.patch b/atomic.patch
deleted file mode 100644 (file)
index 8ddd38e..0000000
--- a/atomic.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- llvm-15.0.2.src/cmake/modules/AddLLVM.cmake.orig   2022-10-04 11:29:17.000000000 +0200
-+++ llvm-15.0.2.src/cmake/modules/AddLLVM.cmake        2022-10-16 23:47:37.416529186 +0200
-@@ -657,6 +657,9 @@
-   elseif (NOT ARG_COMPONENT_LIB)
-     if (LLVM_LINK_LLVM_DYLIB AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB)
-       set(llvm_libs LLVM)
-+      if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB OR NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)  
-+        list(APPEND llvm_libs "atomic")
-+      endif()
-     else()
-       llvm_map_components_to_libnames(llvm_libs
-        ${ARG_LINK_COMPONENTS}
-@@ -993,6 +996,9 @@
-     # API for all shared libaries loaded by this executable.
-     target_link_libraries(${name} PRIVATE ${LLVM_PTHREAD_LIB})
-   endif()
-+  if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB OR NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)  
-+    target_link_libraries(${name} PRIVATE "atomic")
-+  endif()
- 
-   llvm_codesign(${name} ENTITLEMENTS ${ARG_ENTITLEMENTS} BUNDLE_PATH ${ARG_BUNDLE_PATH})
- endmacro(add_llvm_executable name)

diff --git a/llvm.spec b/llvm.spec
index 4b75492b9219faabc18fa48f45b168aab98f5d46..67545fa881c9abd7757c5753ba16463bf78d88f7 100644 (file)
--- a/llvm.spec
+++ b/llvm.spec
@@ -116,7 +116,6 @@ Patch9:             %{name}-libexecdir.patch
 Patch10:       compiler-rt-paths.patch
 Patch11:       cmake-utils-path-override.patch
 Patch12:       x32-compiler-rt.patch
-Patch13:       atomic.patch
 URL:           https://llvm.org/
 BuildRequires: bash
 BuildRequires: binutils-devel
@@ -714,7 +713,6 @@ Integracja narzędzi Clang do formatowania i zmiany nazw z Vimem.
 %patch12 -p1
 %endif
 %patch11 -p1
-%patch13 -p1
 
 grep -rl /usr/bin/env projects tools utils | xargs sed -i -e '1{
        s,^#!.*bin/env python3\?,#!%{__python3},