diff --git a/.gitignore b/.gitignore index 51419b2..b264d5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/cfe-6.0.1.src.tar.xz +SOURCES/cfe-7.0.1.src.tar.xz SOURCES/cmake-3.4.3.tar.gz -SOURCES/llvm-6.0.1.src.tar.xz +SOURCES/llvm-7.0.1.src.tar.xz diff --git a/.llvm-private.metadata b/.llvm-private.metadata index 5b5adb7..0a8652c 100644 --- a/.llvm-private.metadata +++ b/.llvm-private.metadata @@ -1,3 +1,3 @@ -d93d8f3e3d7eb549ac58507383f7fcbdd78804d7 SOURCES/cfe-6.0.1.src.tar.xz +427e12762836d808583fb4149c033d02de0a8db2 SOURCES/cfe-7.0.1.src.tar.xz 49e4f05d46d4752e514b19ba36bf97d20a7da66a SOURCES/cmake-3.4.3.tar.gz -09a6316c5225cab255ba12391e7abe5ff4d28935 SOURCES/llvm-6.0.1.src.tar.xz +f97632fcc3186eb0d396492ef8acfc807648580f SOURCES/llvm-7.0.1.src.tar.xz diff --git a/SOURCES/0001-Don-t-run-BV-DAG-Combine-before-legalization-if-it-a.patch b/SOURCES/0001-Don-t-run-BV-DAG-Combine-before-legalization-if-it-a.patch deleted file mode 100644 index a747015..0000000 --- a/SOURCES/0001-Don-t-run-BV-DAG-Combine-before-legalization-if-it-a.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 69bb97a917250d0d299c4aa3d03bde9513351159 Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Mon, 9 Jul 2018 10:35:30 -0700 -Subject: [PATCH] Don't run BV DAG Combine before legalization if it assumes legal types - ---- - lib/Target/PowerPC/PPCISelLowering.cpp | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/lib/Target/PowerPC/PPCISelLowering.cpp b/lib/Target/PowerPC/PPCISelLowering.cpp -index 4966e88..378e494 100644 ---- a/lib/Target/PowerPC/PPCISelLowering.cpp -+++ b/lib/Target/PowerPC/PPCISelLowering.cpp -@@ -11923,10 +11923,15 @@ static SDValue combineBVOfVecSExt(SDNode *N, SelectionDAG &DAG) { - auto isSExtOfVecExtract = [&](SDValue Op) -> bool { - if (!Op) - return false; -- if (Op.getOpcode() != ISD::SIGN_EXTEND) -+ if (Op.getOpcode() != ISD::SIGN_EXTEND && -+ Op.getOpcode() != ISD::SIGN_EXTEND_INREG) - return false; - -+ // A SIGN_EXTEND_INREG might be fed by an ANY_EXTEND to produce a value -+ // of the right width. - SDValue Extract = Op.getOperand(0); -+ if (Extract.getOpcode() == ISD::ANY_EXTEND) -+ Extract = Extract.getOperand(0); - if (Extract.getOpcode() != ISD::EXTRACT_VECTOR_ELT) - return false; - -@@ -12014,8 +12019,10 @@ SDValue PPCTargetLowering::DAGCombineBuildVector(SDNode *N, - return Reduced; - - // If we're building a vector out of extended elements from another vector -- // we have P9 vector integer extend instructions. -- if (Subtarget.hasP9Altivec()) { -+ // we have P9 vector integer extend instructions. The code assumes legal -+ // input types (i.e. it can't handle things like v4i16) so do not run before -+ // legalization. -+ if (Subtarget.hasP9Altivec() && !DCI.isBeforeLegalize()) { - Reduced = combineBVOfVecSExt(N, DAG); - if (Reduced) - return Reduced; --- -1.8.3.1 - diff --git a/SOURCES/0001-Don-t-set-rpath-when-installing.patch b/SOURCES/0001-Don-t-set-rpath-when-installing.patch new file mode 100644 index 0000000..d92a387 --- /dev/null +++ b/SOURCES/0001-Don-t-set-rpath-when-installing.patch @@ -0,0 +1,24 @@ +From e67ace2ecb42c24e124f1738dc67b22055a22500 Mon Sep 17 00:00:00 2001 +From: Tom Stellard +Date: Thu, 13 Sep 2018 10:10:08 -0700 +Subject: [PATCH] Don't set rpath when installing + +--- + cmake/modules/AddLLVM.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index ce2057f..de309b5 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -1621,6 +1621,7 @@ function(llvm_codesign name) + endfunction() + + function(llvm_setup_rpath name) ++ return() + if(CMAKE_INSTALL_RPATH) + return() + endif() +-- +1.8.3.1 + diff --git a/SOURCES/0001-Export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch b/SOURCES/0001-Export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch deleted file mode 100644 index c5c6c63..0000000 --- a/SOURCES/0001-Export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4d613a84ce271c6225068bef67d727ae02b2e3b1 Mon Sep 17 00:00:00 2001 -From: Pavel Labath -Date: Wed, 14 Mar 2018 09:28:38 +0000 -Subject: [PATCH] Export LLVM_DYLIB_COMPONENTS in LLVMConfig.cmake - -Summary: -This is needed so that external projects (e.g. a standalone build of -lldb) can link to the LLVM shared library via the USE_SHARED argument of -llvm_config. Without this, llvm_config would add LLVM to the link list, -but then also add the constituent static libraries, resulting in -multiply defined symbols. - -Reviewers: beanz, mgorny - -Subscribers: llvm-commits - -Differential Revision: https://reviews.llvm.org/D44391 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@327484 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - cmake/modules/LLVMConfig.cmake.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/cmake/modules/LLVMConfig.cmake.in b/cmake/modules/LLVMConfig.cmake.in -index fe4df52..e700186 100644 ---- a/cmake/modules/LLVMConfig.cmake.in -+++ b/cmake/modules/LLVMConfig.cmake.in -@@ -13,6 +13,8 @@ set(LLVM_COMMON_DEPENDS @LLVM_COMMON_DEPENDS@) - - set(LLVM_AVAILABLE_LIBS @LLVM_AVAILABLE_LIBS@) - -+set(LLVM_DYLIB_COMPONENTS @LLVM_DYLIB_COMPONENTS@) -+ - set(LLVM_ALL_TARGETS @LLVM_ALL_TARGETS@) - - set(LLVM_TARGETS_TO_BUILD @LLVM_TARGETS_TO_BUILD@) --- -1.8.3.1 - diff --git a/SOURCES/0001-Fix-CMake-include-patch.patch b/SOURCES/0001-Fix-CMake-include-patch.patch index ed60a3d..04fd948 100644 --- a/SOURCES/0001-Fix-CMake-include-patch.patch +++ b/SOURCES/0001-Fix-CMake-include-patch.patch @@ -1,4 +1,4 @@ -From f8dac15efe0c2330e1d24bcac89b1d01d9c794b9 Mon Sep 17 00:00:00 2001 +From 21b9ac9a713657e794c6b1f57e8e94fd9ac970cb Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 2 Oct 2017 18:42:32 -0700 Subject: [PATCH] Fix CMake include patch @@ -8,10 +8,10 @@ Subject: [PATCH] Fix CMake include patch 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 160f3b0..2fd3a27 100644 +index 63122c4..6ddc261 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -303,6 +303,7 @@ else() +@@ -295,6 +295,7 @@ else() endif() # Each of them corresponds to llvm-config's. @@ -19,7 +19,7 @@ index 160f3b0..2fd3a27 100644 set(LLVM_TOOLS_BINARY_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) # --bindir set(LLVM_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) # --libdir set(LLVM_MAIN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR} ) # --src-root -@@ -768,6 +769,11 @@ set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin ) +@@ -789,6 +790,11 @@ set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin ) set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) @@ -31,7 +31,7 @@ index 160f3b0..2fd3a27 100644 if(APPLE AND DARWIN_LTO_LIBRARY) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-lto_library -Wl,${DARWIN_LTO_LIBRARY}") -@@ -949,7 +955,7 @@ add_subdirectory(cmake/modules) +@@ -966,7 +972,7 @@ endif() if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(DIRECTORY include/llvm include/llvm-c @@ -40,10 +40,10 @@ index 160f3b0..2fd3a27 100644 COMPONENT llvm-headers FILES_MATCHING PATTERN "*.def" -@@ -961,7 +967,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +@@ -978,7 +984,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) ) - install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm + install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c - DESTINATION include + DESTINATION "${INCLUDE_INSTALL_DIR}" COMPONENT llvm-headers diff --git a/SPECS/llvm.spec b/SPECS/llvm.spec index 2b29f6b..334f6f9 100644 --- a/SPECS/llvm.spec +++ b/SPECS/llvm.spec @@ -1,4 +1,4 @@ -%global maj_ver 6 +%global maj_ver 7 %global min_ver 0 %global patch_ver 1 @@ -43,7 +43,7 @@ ExcludeArch: ppc s390 %{?rhel6:s390x} Name: llvm-private Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 2%{?dist} +Release: 1%{?dist} Summary: llvm engine for Mesa Group: System Environment/Libraries @@ -55,9 +55,8 @@ Source2: http://llvm.org/releases/%{version}/cfe-%{version}%{?rc_ver:rc%{rc_ver} Source100: llvm-config.h Source101: clang-config.h +Patch0: 0001-Don-t-set-rpath-when-installing.patch Patch1: 0001-Fix-CMake-include-patch.patch -Patch5: 0001-Export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch -Patch6: 0001-Don-t-run-BV-DAG-Combine-before-legalization-if-it-a.patch BuildRequires: cmake BuildRequires: zlib-devel @@ -86,9 +85,8 @@ support in Mesa. tar xf %{SOURCE1} +%patch0 -p1 -b .rpath %patch1 -p1 -b .fixinc -%patch5 -p1 -b .cmake-fix -%patch6 -p1 -b .p9-fix %build @@ -248,7 +246,7 @@ make %{?_smp_mflags} check-all %files %doc LICENSE.TXT -%{_libdir}/libLLVM-%{maj_ver}.%{min_ver}*-%{llvm_lib_suffix}.so +%{_libdir}/libLLVM-%{maj_ver}*-%{llvm_lib_suffix}.so %{_libdir}/clang-private/libclang*.so* %files devel @@ -261,6 +259,9 @@ make %{?_smp_mflags} check-all %{_libdir}/clang/%{version}/include %changelog +* Mon Jan 14 2019 Tom Stellard - 7.0.1-1 +- 7.0.1 Release + * Thu Jul 19 2018 Tom Stellard - 6.0.1-2 - Fix crash on power9 - Resolves: rhbz#1595996