Update to LLVM 14.0.0

This commit is contained in:
serge-sans-paille 2022-08-29 09:53:41 +02:00
parent 81000dc6e7
commit 10cf9fb5d6
4 changed files with 21 additions and 16 deletions

2
.gitignore vendored
View File

@ -8,3 +8,5 @@
/libunwind-13.0.1rc3.src.tar.xz.sig
/libunwind-13.0.1.src.tar.xz
/libunwind-13.0.1.src.tar.xz.sig
/libunwind-14.0.0.src.tar.xz
/libunwind-14.0.0.src.tar.xz.sig

View File

@ -1,6 +1,6 @@
%global maj_ver 13
%global maj_ver 14
%global min_ver 0
%global patch_ver 1
%global patch_ver 0
#global rc_ver 3
%global libunwind_version %{maj_ver}.%{min_ver}.%{patch_ver}
@ -8,7 +8,7 @@
Name: llvm-libunwind
Version: %{libunwind_version}%{?rc_ver:~rc%{rc_ver}}
Release: 2%{?dist}
Release: 1%{?dist}
Summary: LLVM libunwind
License: ASL 2.0 or NCSA or MIT
@ -89,9 +89,8 @@ Documentation for LLVM libunwind
mkdir -p %{buildroot}/%{_libdir}/llvm-unwind/
mv %{buildroot}%{_libdir}/libunwind* %{buildroot}/%{_libdir}/llvm-unwind/
rm %{buildroot}%{_docdir}/libunwind/html/.buildinfo
# Same applies to the documentation
mv %{buildroot}%{_docdir}/libunwind %{buildroot}%{_docdir}/llvm-libunwind
mv %{buildroot}%{_docdir}/libunwind/libunwind %{buildroot}%{_docdir}/llvm-libunwind
%check
@ -113,6 +112,9 @@ mv %{buildroot}%{_docdir}/libunwind %{buildroot}%{_docdir}/llvm-libunwind
%doc %{_docdir}/llvm-libunwind/html
%changelog
* Mon Aug 29 2022 sguelton@redhat.com - 14.0.0-1
- Update to LLVM 14.0.0
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 13.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View File

@ -1,2 +1,2 @@
SHA512 (libunwind-13.0.1.src.tar.xz) = 982d36d187db8a38bae0bfb1ecb56941a341002a93ac8d229da74f1e213310104879ce5151935521d24a5b490f9bf2f112453c54ae780d60f5e21df88d541ca6
SHA512 (libunwind-13.0.1.src.tar.xz.sig) = 4a89d9e165e2bc7cd50aea464aee6279f014b1a4ac57a144f24dad992d21c2e9be39525ce8dd66707d259a7eb72fd6a4bb259a842cfb1227eb733521a4b17022
SHA512 (libunwind-14.0.0.src.tar.xz) = f7260226f85064139038ff55fa1325b3371382cb38b72ec6d96197eea090f938b84ec2e480c50916d56f6ac78a679fc483475f8564634ca05d6672c6d4a9ea5a
SHA512 (libunwind-14.0.0.src.tar.xz.sig) = 87cbebd240608b99bfe7cf3b512235338cc864d18b9e19b883fc3fd3f9ff24d4205060b22d03db602e624c5f922a71788ff507521b0434f953969fec5d56056e

View File

@ -1,17 +1,18 @@
diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt
index f32fe9d..e9da8477 100644
index 0a39d31..1198d7a 100644
--- a/libunwind/CMakeLists.txt
+++ b/libunwind/CMakeLists.txt
@@ -1,6 +1,3 @@
@@ -1,7 +1,3 @@
-if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxx")
- message(FATAL_ERROR "libunwind requires being built in a monorepo layout with libcxx available")
-endif()
-
#===============================================================================
# Setup Project
@@ -38,8 +35,37 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_B
set(LIBUNWIND_STANDALONE_BUILD 1)
set(LLVM_LIT_OUTPUT_DIR "${LIBUNWIND_BINARY_DIR}/bin")
#===============================================================================
@@ -46,8 +42,37 @@ include(GNUInstallDirs)
if(LIBUNWIND_STANDALONE_BUILD)
llvm_enable_language_nolink(C CXX ASM)
- # Find the LLVM sources and simulate LLVM CMake options.
- include(HandleOutOfTreeLLVM)
@ -46,9 +47,9 @@ index f32fe9d..e9da8477 100644
+
+ list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")
+
else()
set(LLVM_LIT "${CMAKE_SOURCE_DIR}/utils/lit/lit.py")
endif()
# In a standalone build, we don't have llvm to automatically generate the
# llvm-lit script for us. So we need to provide an explicit directory that
diff --git a/libunwind/docs/CMakeLists.txt b/libunwind/docs/CMakeLists.txt
index 79b87eb..eaf6f3d 100644
--- a/libunwind/docs/CMakeLists.txt