From d6edf66cab023a253efa2ba495030f39245a5a72 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 4 Jul 2023 13:13:34 +0200 Subject: [PATCH] Update to LLVM 16.0.6 Resolves: rhbz#2178796 --- D145763.diff | 21 ----------------- lit.fedora.cfg.py | 17 -------------- llvm.spec | 24 ++++++++----------- run-lit-tests | 59 ----------------------------------------------- sources | 14 +++++------ 5 files changed, 16 insertions(+), 119 deletions(-) delete mode 100644 D145763.diff delete mode 100644 lit.fedora.cfg.py delete mode 100755 run-lit-tests diff --git a/D145763.diff b/D145763.diff deleted file mode 100644 index 79de2d7..0000000 --- a/D145763.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg b/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg ---- a/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg -+++ b/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg -@@ -1,3 +1,6 @@ - if not ('PowerPC' in config.root.targets): - # We need support for PowerPC. - config.unsupported = True -+elif not ('powerpc' in config.root.host_triple): -+ # We need to be running on an PPC host. -+ config.unsupported = True -diff --git a/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg b/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg ---- a/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg -+++ b/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg -@@ -1,3 +1,6 @@ - if not ('X86' in config.root.targets): - # We need support for X86. - config.unsupported = True -+elif not ('x86_64' in config.root.host_triple): -+ # We need to be running on an X86 host. -+ config.unsupported = True - diff --git a/lit.fedora.cfg.py b/lit.fedora.cfg.py deleted file mode 100644 index 1c918b4..0000000 --- a/lit.fedora.cfg.py +++ /dev/null @@ -1,17 +0,0 @@ - -config.llvm_tools_dir = '/usr/bin' -config.llvm_shlib_dir = '%(llvm_shlib_dir)s' % lit_config.params - -if hasattr(config, 'host_triple'): - # This means we are running lit regression tests - - # Regression tests write output to this directory, so we need to be able to specify - # a temp directory when invoking lit. e.g. lit -Dllvm_obj_root=/tmp/lit - config.llvm_obj_root = "%(llvm_obj_root)s" % lit_config.params - lit_config.load_config(config, '%(llvm_test_root)s/lit.cfg.py' % lit_config.params) -else: - # This means we are running lit unit tests - - # For unit tests, llvm_obj_root is used to find the unit test binaries. - config.llvm_obj_root = '%(llvm_unittest_bindir)s' % lit_config.params - lit_config.load_config(config, '%(llvm_test_root)s/Unit/lit.cfg.py' % lit_config.params) diff --git a/llvm.spec b/llvm.spec index d5ca199..9f4a573 100644 --- a/llvm.spec +++ b/llvm.spec @@ -13,7 +13,7 @@ %endif %bcond_with compat_build -%bcond_without bundle_compat_lib +%bcond_with bundle_compat_lib %bcond_without check %if %{with bundle_compat_lib} @@ -26,7 +26,7 @@ #global rc_ver 3 %global maj_ver 16 %global min_ver 0 -%global patch_ver 1 +%global patch_ver 6 %global llvm_srcdir llvm-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src %global cmake_srcdir cmake-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src %global third_party_srcdir third-party-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ @@ -81,7 +81,7 @@ ver:rc%{rc_ver}}.src Name: %{pkg_name} Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}} -Release: 4%{?dist} +Release: 1%{?dist} Summary: The Low Level Virtual Machine License: Apache-2.0 WITH LLVM-exception OR NCSA @@ -94,18 +94,11 @@ Source4: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ve Source5: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{third_party_srcdir}.tar.xz.sig Source6: release-keys.asc -%if %{without compat_build} -Source7: run-lit-tests -Source8: lit.fedora.cfg.py -%endif %if %{with bundle_compat_lib} -Source9: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/llvm-%{compat_ver}.src.tar.xz -Source10: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/llvm-%{compat_ver}.src.tar.xz.sig +Source7: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/llvm-%{compat_ver}.src.tar.xz +Source8: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/llvm-%{compat_ver}.src.tar.xz.sig %endif -# Backport from LLVM 17. -Patch0: D145763.diff - # Backported from LLVM 17 Patch1: 0001-SystemZ-Improve-error-messages-for-unsupported-reloc.patch # See https://reviews.llvm.org/D137890 for the next two patches @@ -247,7 +240,7 @@ This is the main package for llvm-toolset. %{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE3}' --data='%{SOURCE2}' %{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE5}' --data='%{SOURCE4}' %if %{with bundle_compat_lib} -%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE10}' --data='%{SOURCE9}' +%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE8}' --data='%{SOURCE7}' %endif %setup -T -q -b 2 -n %{cmake_srcdir} @@ -262,7 +255,7 @@ cd .. mv %{third_party_srcdir} third-party %if %{with bundle_compat_lib} -%setup -T -q -b 9 -n llvm-%{compat_ver}.src +%setup -T -q -b 7 -n llvm-%{compat_ver}.src %endif %setup -T -q -b 0 -n %{llvm_srcdir} @@ -654,6 +647,9 @@ fi %endif %changelog +* Tue Jul 04 2023 Nikita Popov - 16.0.6-1 +- Update to LLVM 16.0.6 + * Mon Jul 03 2023 Tulio Magno Quites Machado Filho - 16.0.1-4 - Improve error messages for unsupported relocs on s390x (rhbz#2216906) - Disable LLVM_UNREACHABLE_OPTIMIZE diff --git a/run-lit-tests b/run-lit-tests deleted file mode 100755 index 314f2be..0000000 --- a/run-lit-tests +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash - -usage() { - echo "usage: `basename $0` [OPTIONS]" - echo " --threads NUM The number of threads to use for running tests." - echo " --multilib-arch ARCH Use this option to test 32-bit libs/binaries on" - echo " 64-bit hosts." -} - -threads_arg='' - -while [ $# -gt 0 ]; do - case $1 in - --threads) - shift - threads_arg="--threads $1" - ;; - --multilib-arch) - shift - ARCH=$1 - ;; - * ) - echo "unknown option: $1" - echo "" - usage - exit 1 - ;; - esac - shift -done - -set -xe - -if [ -z "$ARCH" ]; then - ARCH=`rpm --eval '%_arch'` -fi - -case $ARCH in - arm) - ;& - i686) - LIB_DIR="/usr/lib/" - ;; - *) - LIB_DIR="/usr/lib64/" - ;; -esac - -cd $(mktemp -d) -ln -s /usr/include include -ln -s /usr/share/llvm/src/docs docs -tar -xzf /usr/share/llvm/src/test.tar.gz -ln -s /usr/share/llvm/src/$ARCH.site.cfg.py test/lit.site.cfg.py -ln -s /usr/share/llvm/src/$ARCH.Unit.site.cfg.py test/Unit/lit.site.cfg.py -lit -v -s $threads_arg test \ - -Dllvm_obj_root=`pwd` \ - -Dllvm_test_root=`pwd`/test \ - -Dllvm_unittest_bindir=$LIB_DIR/llvm \ - -Dllvm_shlib_dir=$LIB_DIR diff --git a/sources b/sources index 091cd92..30ea4ea 100644 --- a/sources +++ b/sources @@ -1,8 +1,6 @@ -SHA512 (llvm-15.0.7.src.tar.xz) = ed8d565515b1bc6164e4ff06d3388ba92e332850305496fd65db9adf1ec87bd9dd1bfde49dd41be5d5216289efc72bfd287cd7392f2bba80b740d4c314c749e5 -SHA512 (llvm-15.0.7.src.tar.xz.sig) = 79fc82dfabe397f7df4c139f75fa9a0a34c92b77d603543a4eb3e579e253a9d84d0e8314f7356ed77326977d6190997b42f074a6c910d0f932e6b21d09374bde -SHA512 (cmake-16.0.1.src.tar.xz) = 7a0f01a82660a953e06b1df267918542205ac46f151d284dca74255c36fe5ccd995266638a85ce502a81cdd5e76ff3311e5f8488e09d0abbf22ee07cec186f5f -SHA512 (cmake-16.0.1.src.tar.xz.sig) = 8d49050e9b04df253a5bb2fa3b27796f204d085610432826bef6bb6cab876990d67e7fd5267fc89fadf21d88da73c535c82ae6ea0e1c867f7cd5efac244b0fa2 -SHA512 (llvm-16.0.1.src.tar.xz) = f0ad41adc6075c20f8f4434b5a5704a17a1ca3308c67eabb1e132330c32d637faab86516c822db9661f6163af5ad1e7af6cd4a2ff030d6e148c3f6fd40925b7d -SHA512 (llvm-16.0.1.src.tar.xz.sig) = 2774c96158b34f789bae54d01905910f396179220317da5ea8e7085c9f19068bbd4406f8a66b5a1cea672be2b761a0ea949ab29ccdaeee8c57f690d2480dd5e5 -SHA512 (third-party-16.0.1.src.tar.xz) = 3293aacac5b636d15b9ae2e28b1db9395ad6f56d558c42eebf2a491622d9290e8b1be2dfabcd27ea1b0a6301746ddf01031f69230ffc8fe737c127f6b396245b -SHA512 (third-party-16.0.1.src.tar.xz.sig) = d2ee851b35e3c60b4d2c8881c7ee3c49f078f25837c7bb77a4d7c34ca9e5b4ba9ae7502b41f7050f21474f177115fb3a31c2373b01f176676e490da0ba400967 +SHA512 (llvm-16.0.6.src.tar.xz) = 8d4cdadc9a1ad249fbf9248c8e56f3bcafab73a473a0b0ca73499ed8825c62e27668aac4f1d03341631e5ad93701621e834e9e196ca32eac3ef805cf1c860083 +SHA512 (llvm-16.0.6.src.tar.xz.sig) = 9adda28085f4a2e2a64dab1d8e4ff23c5629bbb0bb6b34afc081e44f6f85ac4f3c6cd0c3488af98c0fad939c33f9d2a8a0cbef67a577cd7fe3013bc2200452b1 +SHA512 (cmake-16.0.6.src.tar.xz) = 52ecd941d2d85a5b668caa5d0d40480cb6a97b3bf1174e634c2a93e9ef6d03670ca7e96abb0a60cb33ba537b93d5788754dab1f2f45c1f623f788162717d088b +SHA512 (cmake-16.0.6.src.tar.xz.sig) = d20c5e51315aa476775e6ce886684b9f882ce283fc40aa6c1b8f03964c77a1e745e2e1fb00b3488dddfe1a04378e2bfd090350de28e58088525a5305ecb1bea6 +SHA512 (third-party-16.0.6.src.tar.xz) = 51683e92953eb57ed36ebc8a43cb688863edf4f24ba71965d57016cfdc17bad10f8f3942e9597a729329f89489597e79bb4653445ff1ec36ec03077adb1dd7b9 +SHA512 (third-party-16.0.6.src.tar.xz.sig) = aefb22ee35b2299e77669d72557079630fba5df2c0031c72a025082de3c4ca56ea0e1ec870c42d9056752195ad0e5b68258b548caf801ef4269e2ec1cd9da513