diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2e11e47 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/lld-8.0.0.src.tar.xz diff --git a/.lld.metadata b/.lld.metadata new file mode 100644 index 0000000..7e77452 --- /dev/null +++ b/.lld.metadata @@ -0,0 +1 @@ +b9062249ef61316e3450fc26e7238432673036bb SOURCES/lld-8.0.0.src.tar.xz diff --git a/SOURCES/0001-CMake-Check-for-gtest-headers-even-if-lit.py-is-not-.patch b/SOURCES/0001-CMake-Check-for-gtest-headers-even-if-lit.py-is-not-.patch new file mode 100644 index 0000000..c4af14d --- /dev/null +++ b/SOURCES/0001-CMake-Check-for-gtest-headers-even-if-lit.py-is-not-.patch @@ -0,0 +1,47 @@ +From e5bdf4580677da063abe8d3880fbab9eaa7a7efe Mon Sep 17 00:00:00 2001 +From: Tom Stellard +Date: Thu, 30 Aug 2018 08:53:56 -0700 +Subject: [PATCH] CMake: Check for gtest headers even if lit.py is not present + +This makes it possible to build the unittests even withotu a full +checkout of the llvm source tree. +--- + CMakeLists.txt | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e2fbdbf..c9b2927 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,6 +75,15 @@ Please install Python or specify the PYTHON_EXECUTABLE CMake variable.") + set(LLVM_UTILS_PROVIDED ON) + endif() + ++ # Check for gtest ++ set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest) ++ if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h ++ AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX} ++ AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt) ++ add_subdirectory(${UNITTEST_DIR} utils/unittest) ++ endif() ++ ++ # Check for lit + if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) + # Note: path not really used, except for checking if lit was found + set(LLVM_LIT ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) +@@ -84,12 +93,6 @@ Please install Python or specify the PYTHON_EXECUTABLE CMake variable.") + set(LLVM_UTILS_PROVIDED ON) + set(LLD_TEST_DEPS FileCheck not) + endif() +- set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest) +- if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h +- AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX} +- AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt) +- add_subdirectory(${UNITTEST_DIR} utils/unittest) +- endif() + else() + # Seek installed Lit. + find_program(LLVM_LIT +-- +1.8.3.1 + diff --git a/SOURCES/0001-lld-Prefer-using-the-newest-installed-python-version.patch b/SOURCES/0001-lld-Prefer-using-the-newest-installed-python-version.patch new file mode 100644 index 0000000..c8499d2 --- /dev/null +++ b/SOURCES/0001-lld-Prefer-using-the-newest-installed-python-version.patch @@ -0,0 +1,26 @@ +From 39ce39a20a0854380997df7912e739b6c348f8a1 Mon Sep 17 00:00:00 2001 +From: Tom Stellard +Date: Thu, 30 Aug 2018 14:59:06 -0700 +Subject: [PATCH] [lld] Prefer using the newest installed python version rather + than 2.7 + +This only affects the lit tests, which seem to pass fine with python3. +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 087377d..6e5f2a7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -56,7 +56,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + include(HandleLLVMOptions) + + if(LLVM_INCLUDE_TESTS) +- set(Python_ADDITIONAL_VERSIONS 2.7) + include(FindPythonInterp) + if(NOT PYTHONINTERP_FOUND) + message(FATAL_ERROR +-- +1.8.3.1 + diff --git a/SPECS/lld.spec b/SPECS/lld.spec new file mode 100644 index 0000000..03ca388 --- /dev/null +++ b/SPECS/lld.spec @@ -0,0 +1,175 @@ +#%%global rc_ver 4 +%global lld_srcdir lld-%{version}%{?rc_ver:rc%{rc_ver}}.src + +# armv7lhl tests disabled because of arm issue, see https://koji.fedoraproject.org/koji/taskinfo?taskID=33660162 +%ifnarch i686 %{arm} +%global enable_test_pkg 1 +%endif + +Name: lld +Version: 8.0.0 +Release: 1%{?rc_ver:.rc%{rc_ver}}%{?dist} +Summary: The LLVM Linker + +License: NCSA +URL: http://llvm.org +Source0: http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/%{lld_srcdir}.tar.xz + +Patch0: 0001-CMake-Check-for-gtest-headers-even-if-lit.py-is-not-.patch +Patch1: 0001-lld-Prefer-using-the-newest-installed-python-version.patch + +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: llvm-devel = %{version} +%if 0%{?enable_test_pkg} +BuildRequires: llvm-test = %{version} +%endif +BuildRequires: ncurses-devel +BuildRequires: zlib-devel +BuildRequires: chrpath + +# For make check: +BuildRequires: python3-rpm-macros +BuildRequires: python3-lit +BuildRequires: llvm-googletest = %{version} + +%description +The LLVM project linker. + +%package devel +Summary: Libraries and header files for LLD + +%description devel +This package contains library and header files needed to develop new native +programs that use the LLD infrastructure. + +%package libs +Summary: LLD shared libraries + +%description libs +Shared libraries for LLD. + +%prep +%autosetup -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src -p1 + +%build + +mkdir %{_target_platform} +cd %{_target_platform} + +%cmake .. \ + -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ + -DLLVM_DYLIB_COMPONENTS="all" \ + -DPYTHON_EXECUTABLE=%{__python3} \ + -DLLVM_INCLUDE_TESTS=ON \ + -DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \ + -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \ + -DLLVM_LIT_ARGS="-sv \ + --path %{_libdir}/llvm" \ +%if 0%{?__isa_bits} == 64 + -DLLVM_LIBDIR_SUFFIX=64 +%else + -DLLVM_LIBDIR_SUFFIX= +%endif + +%make_build + +%install +cd %{_target_platform} +%make_install + +# Remove rpath +chrpath --delete %{buildroot}%{_bindir}/* +chrpath --delete %{buildroot}%{_libdir}/*.so* + +%check + +%if 0%{?enable_test_pkg} +make -C %{_target_platform} %{?_smp_mflags} check-lld +%endif + +%ldconfig_scriptlets libs + +%files +%{_bindir}/lld* +%{_bindir}/ld.lld +%{_bindir}/ld64.lld +%{_bindir}/wasm-ld + +%files devel +%{_includedir}/lld +%{_libdir}/liblld*.so + +%files libs +%{_libdir}/liblld*.so.* + +%changelog +* Tue Apr 16 2019 sguelton@redhat.com - 8.0.0-1 +- 8.0.0 Release + +* Mon Jan 14 2019 sguelton@redhat.com - 7.0.1-3 +- Fix lld + annobin integration & Setup basic CI tests + +* Sat Dec 15 2018 Tom Stellard - 7.0.1-2 +- Bump required python3-lit version + +* Fri Dec 14 2018 Tom Stellard - 7.0.1-1 +- 7.0.1-1 Release + +* Mon Dec 10 2018 Tom Stellard - 7.0.1-0.2.rc3 +- 7.0.1-rc3 Release + +* Tue Nov 27 2018 Tom Stellard - 7.0.0-1 +- 7.0.0 Release + +* Mon Oct 01 2018 Tom Stellard - 6.0.1-2 +- Drop scl macros + +* Wed Jun 27 2018 Tom Stellard - 6.0.1-1 +- 6.0.1 Release + +* Fri May 11 2018 Tom Stellard - 6.0.1-0.1.rc1 +- 6.0.1-rc1 Release + +* Thu Mar 08 2018 Tom Stellard - 6.0.0-1 +- 6.0.0 Release + +* Tue Feb 13 2018 Tom Stellard - 6.0.0-0.3.rc2 +- 6.0.0-rc2 Release + +* Thu Feb 08 2018 Fedora Release Engineering - 6.0.0-0.2.rc1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 25 2018 Tom Stellard - 6.0.0-0.1.rc1 +- 6.0.0-rc1 Release + +* Thu Dec 21 2017 Tom Stellard - 5.0.1-1 +- 5.0.1 Release + +* Mon Sep 11 2017 Tom Stellard - 5.0.0-1 +- 5.0.0 Release + +* Thu Aug 03 2017 Fedora Release Engineering - 4.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 4.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jul 06 2017 Tom Stellard - 4.0.1-2 +- Backport r307092 + +* Tue Jul 04 2017 Tom Stellard - 4.0.1-1 +- 4.0.1 Release + +* Tue Jul 04 2017 Tom Stellard - 4.0.0-4 +- Fix build without llvm-static + +* Wed May 31 2017 Tom Stellard - 4.0.0-3 +- Remove llvm-static dependency + +* Mon May 15 2017 Fedora Release Engineering - 4.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + +* Tue Mar 14 2017 Tom Stellard - 4.0.0-1 +- lld 4.0.0 Final Release