pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lldb-git: Drop local patch, issue fixed upstream
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Fri Aug 26 20:15:41 2016 +0200
Changeset: 8624f90a15abe89d79e23f8aa4a7e375b7619587
Modified Files:
lldb-git/distinfo
Removed Files:
lldb-git/patches/patch-cmake_modules_CheckAtomic.cmake
lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
Log Message:
lldb-git: Drop local patch, issue fixed upstream
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8624f90a15abe89d79e23f8aa4a7e375b7619587
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
lldb-git/distinfo | 2 -
.../patches/patch-cmake_modules_CheckAtomic.cmake | 111 ---------------------
.../patch-cmake_modules_LLDBStandalone.cmake | 13 ---
3 files changed, 126 deletions(-)
diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index 825d181..6547086 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -12,8 +12,6 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
-SHA1 (patch-cmake_modules_CheckAtomic.cmake) = cc1e9adb624d7002d1f8cdf4c2fa7e009dcce854
-SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 695942625d356e5b4893c9da23a414d438e96ec8
SHA1 (patch-include_lldb_Utility_regcclass.h) = 9ed649e8deb5924feaf82a6e675f5c596367b3d6
SHA1 (patch-include_lldb_Utility_regcname.h) = b67145f0437d3c09adc33a925d49267cd9ba4fd7
SHA1 (patch-include_lldb_Utility_regengine.inc) = a031c43a63acab80a97cfb7727326d610d4ad9ab
diff --git a/lldb-git/patches/patch-cmake_modules_CheckAtomic.cmake b/lldb-git/patches/patch-cmake_modules_CheckAtomic.cmake
deleted file mode 100644
index 0e10cad..0000000
--- a/lldb-git/patches/patch-cmake_modules_CheckAtomic.cmake
+++ /dev/null
@@ -1,111 +0,0 @@
-$NetBSD$
-
---- cmake/modules/CheckAtomic.cmake.orig 2016-07-31 15:05:59.075763243 +0000
-+++ cmake/modules/CheckAtomic.cmake
-@@ -0,0 +1,106 @@
-+# atomic builtins are required for threading support.
-+
-+INCLUDE(CheckCXXSourceCompiles)
-+
-+# Sometimes linking against libatomic is required for atomic ops, if
-+# the platform doesn't support lock-free atomics.
-+
-+function(check_working_cxx_atomics varname)
-+ set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-+ set(CMAKE_REQUIRED_FLAGS "-std=c++11")
-+ CHECK_CXX_SOURCE_COMPILES("
-+#include <atomic>
-+std::atomic<int> x;
-+int main() {
-+ return x;
-+}
-+" ${varname})
-+ set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-+endfunction(check_working_cxx_atomics)
-+
-+function(check_working_cxx_atomics64 varname)
-+ set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-+ set(CMAKE_REQUIRED_FLAGS "-std=c++11 ${CMAKE_REQUIRED_FLAGS}")
-+ CHECK_CXX_SOURCE_COMPILES("
-+#include <atomic>
-+#include <cstdint>
-+std::atomic<uint64_t> x (0);
-+int main() {
-+ uint64_t i = x.load(std::memory_order_relaxed);
-+ return 0;
-+}
-+" ${varname})
-+ set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-+endfunction(check_working_cxx_atomics64)
-+
-+
-+# This isn't necessary on MSVC, so avoid command-line switch annoyance
-+# by only running on GCC-like hosts.
-+if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
-+ # First check if atomics work without the library.
-+ check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB)
-+ # If not, check if the library exists, and atomics work with it.
-+ if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
-+ check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC)
-+ if( HAVE_LIBATOMIC )
-+ list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+ check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB)
-+ if (NOT HAVE_CXX_ATOMICS_WITH_LIB)
-+ message(FATAL_ERROR "Host compiler must support std::atomic!")
-+ endif()
-+ else()
-+ message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
-+ endif()
-+ endif()
-+endif()
-+
-+# Check for 64 bit atomic operations.
-+if(MSVC)
-+ set(HAVE_CXX_ATOMICS64_WITHOUT_LIB True)
-+else()
-+ check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-+endif()
-+
-+# If not, check if the library exists, and atomics work with it.
-+if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-+ check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
-+ if(HAVE_CXX_LIBATOMICS64)
-+ list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+ check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
-+ if (NOT HAVE_CXX_ATOMICS64_WITH_LIB)
-+ message(FATAL_ERROR "Host compiler must support std::atomic!")
-+ endif()
-+ else()
-+ message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
-+ endif()
-+endif()
-+
-+## TODO: This define is only used for the legacy atomic operations in
-+## llvm's Atomic.h, which should be replaced. Other code simply
-+## assumes C++11 <atomic> works.
-+CHECK_CXX_SOURCE_COMPILES("
-+#ifdef _MSC_VER
-+#include <Intrin.h> /* Workaround for PR19898. */
-+#include <windows.h>
-+#endif
-+int main() {
-+#ifdef _MSC_VER
-+ volatile LONG val = 1;
-+ MemoryBarrier();
-+ InterlockedCompareExchange(&val, 0, 1);
-+ InterlockedIncrement(&val);
-+ InterlockedDecrement(&val);
-+#else
-+ volatile unsigned long val = 1;
-+ __sync_synchronize();
-+ __sync_val_compare_and_swap(&val, 1, 0);
-+ __sync_add_and_fetch(&val, 1);
-+ __sync_sub_and_fetch(&val, 1);
-+#endif
-+ return 0;
-+ }
-+" LLVM_HAS_ATOMICS)
-+
-+if( NOT LLVM_HAS_ATOMICS )
-+ message(STATUS "Warning: LLVM will be built thread-unsafe because atomic builtins are missing")
-+endif()
diff --git a/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake b/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
deleted file mode 100644
index 879f39e..0000000
--- a/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- cmake/modules/LLDBStandalone.cmake.orig 2016-07-31 14:13:19.000000000 +0000
-+++ cmake/modules/LLDBStandalone.cmake
-@@ -86,7 +86,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
-
- include(AddLLVM)
- include(HandleLLVMOptions)
-- include(CheckAtomic)
-+ include(cmake/modules/CheckAtomic.cmake)
-
- if (PYTHON_EXECUTABLE STREQUAL "")
- set(Python_ADDITIONAL_VERSIONS 3.5 3.4 3.3 3.2 3.1 3.0 2.7 2.6 2.5)
Home |
Main Index |
Thread Index |
Old Index