summaryrefslogtreecommitdiff
path: root/extra/llvm-libunwind
diff options
context:
space:
mode:
authordavidovski <david@davidovski.xyz>2022-05-04 23:52:30 +0100
committerdavidovski <david@davidovski.xyz>2022-05-04 23:52:30 +0100
commit739c65c54cb0e957df5e9b76f93fb02554e5cac3 (patch)
tree09ddfa0a342f3ea9de136cb50abdd79821bf1b53 /extra/llvm-libunwind
parent4c585ad54388285500fd18a6aaa516894e0f2c16 (diff)
moved everything to new file formatting
Diffstat (limited to 'extra/llvm-libunwind')
-rw-r--r--extra/llvm-libunwind/libcxx-musl.patch28
-rw-r--r--extra/llvm-libunwind/libunwind-link-libssp.patch20
2 files changed, 0 insertions, 48 deletions
diff --git a/extra/llvm-libunwind/libcxx-musl.patch b/extra/llvm-libunwind/libcxx-musl.patch
deleted file mode 100644
index 358d4a3..0000000
--- a/extra/llvm-libunwind/libcxx-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Patch-Source: https://github.com/void-linux/void-packages/blob/74f16232621ca8dfb6d244beff1df35a6df1647f/srcpkgs/llvm12/patches/libcxx-musl.patch
-
---- a/libcxx/include/locale
-+++ b/libcxx/include/locale
-@@ -742,7 +742,11 @@ __num_get_signed_integral(const char* __a, const char* __a_end,
- typename remove_reference<decltype(errno)>::type __save_errno = errno;
- errno = 0;
- char *__p2;
-+#if defined(__linux__) && !defined(__GLIBC__)
-+ long long __ll = strtoll(__a, &__p2, __base);
-+#else
- long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
-+#endif
- typename remove_reference<decltype(errno)>::type __current_errno = errno;
- if (__current_errno == 0)
- errno = __save_errno;
-@@ -782,7 +786,11 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end,
- typename remove_reference<decltype(errno)>::type __save_errno = errno;
- errno = 0;
- char *__p2;
-+#if defined(__linux__) && !defined(__GLIBC__)
-+ unsigned long long __ll = strtoull(__a, &__p2, __base);
-+#else
- unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
-+#endif
- typename remove_reference<decltype(errno)>::type __current_errno = errno;
- if (__current_errno == 0)
- errno = __save_errno;
diff --git a/extra/llvm-libunwind/libunwind-link-libssp.patch b/extra/llvm-libunwind/libunwind-link-libssp.patch
deleted file mode 100644
index ae819fe..0000000
--- a/extra/llvm-libunwind/libunwind-link-libssp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/libunwind/src/CMakeLists.txt
-+++ b/libunwind/src/CMakeLists.txt
-@@ -129,7 +129,7 @@
- else()
- target_compile_options(unwind_shared PRIVATE -fno-rtti)
- endif()
-- target_link_libraries(unwind_shared PRIVATE ${LIBUNWIND_LIBRARIES})
-+ target_link_libraries(unwind_shared PRIVATE ${LIBUNWIND_LIBRARIES} -lssp_nonshared)
- set_target_properties(unwind_shared
- PROPERTIES
- CXX_EXTENSIONS OFF
-@@ -157,7 +157,7 @@
- else()
- target_compile_options(unwind_static PRIVATE -fno-rtti)
- endif()
-- target_link_libraries(unwind_static PRIVATE ${LIBUNWIND_LIBRARIES})
-+ target_link_libraries(unwind_static PRIVATE ${LIBUNWIND_LIBRARIES} -lssp_nonshared)
- set_target_properties(unwind_static
- PROPERTIES
- CXX_EXTENSIONS OFF