diff --git a/.gitignore b/.gitignore index 7e24497..0859594 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,7 @@ SOURCES/cmake-15.0.7.src.tar.xz SOURCES/llvm-15.0.7.src.tar.xz -SOURCES/release-keys.asc /cmake-15.0.7.src.tar.xz /llvm-15.0.7.src.tar.xz -/release-keys.asc /llvm-16.0.0.src.tar.xz /llvm-16.0.0.src.tar.xz.sig /cmake-16.0.0.src.tar.xz @@ -16,3 +14,9 @@ SOURCES/release-keys.asc /cmake-16.0.6.src.tar.xz.sig /third-party-16.0.6.src.tar.xz /third-party-16.0.6.src.tar.xz.sig +/llvm-17.0.2.src.tar.xz +/llvm-17.0.2.src.tar.xz.sig +/cmake-17.0.2.src.tar.xz +/cmake-17.0.2.src.tar.xz.sig +/third-party-17.0.2.src.tar.xz +/third-party-17.0.2.src.tar.xz.sig diff --git a/0001-Deactivate-markdown-doc.patch b/0001-Deactivate-markdown-doc.patch deleted file mode 100644 index 92e048d..0000000 --- a/0001-Deactivate-markdown-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur a/llvm/docs/conf.py b/llvm/docs/conf.py ---- a/llvm/docs/conf.py 2020-09-15 09:12:24.318287611 +0000 -+++ b/llvm/docs/conf.py 2020-09-15 15:01:00.025893199 +0000 -@@ -36,20 +36,7 @@ - '.rst': 'restructuredtext', - } - --try: -- import recommonmark --except ImportError: -- # manpages do not use any .md sources -- if not tags.has('builder-man'): -- raise --else: -- import sphinx -- if sphinx.version_info >= (3, 0): -- # This requires 0.5 or later. -- extensions.append('recommonmark') -- else: -- source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'} -- source_suffix['.md'] = 'markdown' -+import sphinx - - # The encoding of source files. - #source_encoding = 'utf-8-sig' diff --git a/0001-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch b/0001-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch deleted file mode 100644 index 1ddfb0c..0000000 --- a/0001-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3df079ae29426b4bee3ca11681a41958d72b983a Mon Sep 17 00:00:00 2001 -From: Nikita Popov -Date: Mon, 31 Jan 2022 10:33:27 +0100 -Subject: [PATCH] Disable CrashRecoveryTest.DumpStackCleanup test on aarch64 - -Produces a non-reproducible failure on aarch64: -https://bugzilla.redhat.com/show_bug.cgi?id=2048440 ---- - llvm/unittests/Support/CrashRecoveryTest.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/llvm/unittests/Support/CrashRecoveryTest.cpp b/llvm/unittests/Support/CrashRecoveryTest.cpp -index e95513eb2841..afb1d3a1f6a2 100644 ---- a/llvm/unittests/Support/CrashRecoveryTest.cpp -+++ b/llvm/unittests/Support/CrashRecoveryTest.cpp -@@ -76,6 +76,7 @@ TEST(CrashRecoveryTest, Cleanup) { - llvm::CrashRecoveryContext::Disable(); - } - -+#ifndef __aarch64__ - TEST(CrashRecoveryTest, DumpStackCleanup) { - SmallString<128> Filename; - std::error_code EC = sys::fs::createTemporaryFile("crash", "test", Filename); -@@ -101,6 +102,7 @@ TEST(CrashRecoveryTest, DumpStackCleanup) { - EXPECT_EQ(GlobalInt, 1); - llvm::CrashRecoveryContext::Disable(); - } -+#endif - - TEST(CrashRecoveryTest, LimitedStackTrace) { - std::string Res; --- -2.34.1 - - diff --git a/0001-SystemZ-Improve-error-messages-for-unsupported-reloc.patch b/0001-SystemZ-Improve-error-messages-for-unsupported-reloc.patch deleted file mode 100644 index 34128b6..0000000 --- a/0001-SystemZ-Improve-error-messages-for-unsupported-reloc.patch +++ /dev/null @@ -1,184 +0,0 @@ -From efbaf8bc61f4c0e29a3eaafb11ac0ddda8bd3dff Mon Sep 17 00:00:00 2001 -From: Ulrich Weigand -Date: Fri, 30 Jun 2023 16:02:56 +0200 -Subject: [PATCH] [SystemZ] Improve error messages for unsupported relocations - -In the SystemZMCObjectWriter, we currently just abort in case -some unsupported relocation in requested. However, as this -situation can be triggered by invalid (inline) assembler input, -we should really get a regular error message instead. ---- - .../MCTargetDesc/SystemZMCObjectWriter.cpp | 59 +++++++++++-------- - 1 file changed, 35 insertions(+), 24 deletions(-) - -diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp -index c23463ab9bde..0b11468afc52 100644 ---- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp -+++ b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp -@@ -9,6 +9,7 @@ - #include "MCTargetDesc/SystemZMCFixups.h" - #include "MCTargetDesc/SystemZMCTargetDesc.h" - #include "llvm/BinaryFormat/ELF.h" -+#include "llvm/MC/MCContext.h" - #include "llvm/MC/MCELFObjectWriter.h" - #include "llvm/MC/MCExpr.h" - #include "llvm/MC/MCFixup.h" -@@ -40,7 +41,7 @@ SystemZObjectWriter::SystemZObjectWriter(uint8_t OSABI) - /*HasRelocationAddend_=*/ true) {} - - // Return the relocation type for an absolute value of MCFixupKind Kind. --static unsigned getAbsoluteReloc(unsigned Kind) { -+static unsigned getAbsoluteReloc(MCContext &Ctx, SMLoc Loc, unsigned Kind) { - switch (Kind) { - case FK_Data_1: return ELF::R_390_8; - case FK_Data_2: return ELF::R_390_16; -@@ -49,11 +50,12 @@ static unsigned getAbsoluteReloc(unsigned Kind) { - case SystemZ::FK_390_12: return ELF::R_390_12; - case SystemZ::FK_390_20: return ELF::R_390_20; - } -- llvm_unreachable("Unsupported absolute address"); -+ Ctx.reportError(Loc, "Unsupported absolute address"); -+ return 0; - } - - // Return the relocation type for a PC-relative value of MCFixupKind Kind. --static unsigned getPCRelReloc(unsigned Kind) { -+static unsigned getPCRelReloc(MCContext &Ctx, SMLoc Loc, unsigned Kind) { - switch (Kind) { - case FK_Data_2: return ELF::R_390_PC16; - case FK_Data_4: return ELF::R_390_PC32; -@@ -63,62 +65,69 @@ static unsigned getPCRelReloc(unsigned Kind) { - case SystemZ::FK_390_PC24DBL: return ELF::R_390_PC24DBL; - case SystemZ::FK_390_PC32DBL: return ELF::R_390_PC32DBL; - } -- llvm_unreachable("Unsupported PC-relative address"); -+ Ctx.reportError(Loc, "Unsupported PC-relative address"); -+ return 0; - } - - // Return the R_390_TLS_LE* relocation type for MCFixupKind Kind. --static unsigned getTLSLEReloc(unsigned Kind) { -+static unsigned getTLSLEReloc(MCContext &Ctx, SMLoc Loc, unsigned Kind) { - switch (Kind) { - case FK_Data_4: return ELF::R_390_TLS_LE32; - case FK_Data_8: return ELF::R_390_TLS_LE64; - } -- llvm_unreachable("Unsupported absolute address"); -+ Ctx.reportError(Loc, "Unsupported thread-local address (local-exec)"); -+ return 0; - } - - // Return the R_390_TLS_LDO* relocation type for MCFixupKind Kind. --static unsigned getTLSLDOReloc(unsigned Kind) { -+static unsigned getTLSLDOReloc(MCContext &Ctx, SMLoc Loc, unsigned Kind) { - switch (Kind) { - case FK_Data_4: return ELF::R_390_TLS_LDO32; - case FK_Data_8: return ELF::R_390_TLS_LDO64; - } -- llvm_unreachable("Unsupported absolute address"); -+ Ctx.reportError(Loc, "Unsupported thread-local address (local-dynamic)"); -+ return 0; - } - - // Return the R_390_TLS_LDM* relocation type for MCFixupKind Kind. --static unsigned getTLSLDMReloc(unsigned Kind) { -+static unsigned getTLSLDMReloc(MCContext &Ctx, SMLoc Loc, unsigned Kind) { - switch (Kind) { - case FK_Data_4: return ELF::R_390_TLS_LDM32; - case FK_Data_8: return ELF::R_390_TLS_LDM64; - case SystemZ::FK_390_TLS_CALL: return ELF::R_390_TLS_LDCALL; - } -- llvm_unreachable("Unsupported absolute address"); -+ Ctx.reportError(Loc, "Unsupported thread-local address (local-dynamic)"); -+ return 0; - } - - // Return the R_390_TLS_GD* relocation type for MCFixupKind Kind. --static unsigned getTLSGDReloc(unsigned Kind) { -+static unsigned getTLSGDReloc(MCContext &Ctx, SMLoc Loc, unsigned Kind) { - switch (Kind) { - case FK_Data_4: return ELF::R_390_TLS_GD32; - case FK_Data_8: return ELF::R_390_TLS_GD64; - case SystemZ::FK_390_TLS_CALL: return ELF::R_390_TLS_GDCALL; - } -- llvm_unreachable("Unsupported absolute address"); -+ Ctx.reportError(Loc, "Unsupported thread-local address (general-dynamic)"); -+ return 0; - } - - // Return the PLT relocation counterpart of MCFixupKind Kind. --static unsigned getPLTReloc(unsigned Kind) { -+static unsigned getPLTReloc(MCContext &Ctx, SMLoc Loc, unsigned Kind) { - switch (Kind) { - case SystemZ::FK_390_PC12DBL: return ELF::R_390_PLT12DBL; - case SystemZ::FK_390_PC16DBL: return ELF::R_390_PLT16DBL; - case SystemZ::FK_390_PC24DBL: return ELF::R_390_PLT24DBL; - case SystemZ::FK_390_PC32DBL: return ELF::R_390_PLT32DBL; - } -- llvm_unreachable("Unsupported absolute address"); -+ Ctx.reportError(Loc, "Unsupported PC-relative PLT address"); -+ return 0; - } - - unsigned SystemZObjectWriter::getRelocType(MCContext &Ctx, - const MCValue &Target, - const MCFixup &Fixup, - bool IsPCRel) const { -+ SMLoc Loc = Fixup.getLoc(); - unsigned Kind = Fixup.getKind(); - if (Kind >= FirstLiteralRelocationKind) - return Kind - FirstLiteralRelocationKind; -@@ -126,38 +135,40 @@ unsigned SystemZObjectWriter::getRelocType(MCContext &Ctx, - switch (Modifier) { - case MCSymbolRefExpr::VK_None: - if (IsPCRel) -- return getPCRelReloc(Kind); -- return getAbsoluteReloc(Kind); -+ return getPCRelReloc(Ctx, Loc, Kind); -+ return getAbsoluteReloc(Ctx, Loc, Kind); - - case MCSymbolRefExpr::VK_NTPOFF: - assert(!IsPCRel && "NTPOFF shouldn't be PC-relative"); -- return getTLSLEReloc(Kind); -+ return getTLSLEReloc(Ctx, Loc, Kind); - - case MCSymbolRefExpr::VK_INDNTPOFF: - if (IsPCRel && Kind == SystemZ::FK_390_PC32DBL) - return ELF::R_390_TLS_IEENT; -- llvm_unreachable("Only PC-relative INDNTPOFF accesses are supported for now"); -+ Ctx.reportError(Loc, "Only PC-relative INDNTPOFF accesses are supported for now"); -+ return 0; - - case MCSymbolRefExpr::VK_DTPOFF: - assert(!IsPCRel && "DTPOFF shouldn't be PC-relative"); -- return getTLSLDOReloc(Kind); -+ return getTLSLDOReloc(Ctx, Loc, Kind); - - case MCSymbolRefExpr::VK_TLSLDM: - assert(!IsPCRel && "TLSLDM shouldn't be PC-relative"); -- return getTLSLDMReloc(Kind); -+ return getTLSLDMReloc(Ctx, Loc, Kind); - - case MCSymbolRefExpr::VK_TLSGD: - assert(!IsPCRel && "TLSGD shouldn't be PC-relative"); -- return getTLSGDReloc(Kind); -+ return getTLSGDReloc(Ctx, Loc, Kind); - - case MCSymbolRefExpr::VK_GOT: - if (IsPCRel && Kind == SystemZ::FK_390_PC32DBL) - return ELF::R_390_GOTENT; -- llvm_unreachable("Only PC-relative GOT accesses are supported for now"); -+ Ctx.reportError(Loc, "Only PC-relative GOT accesses are supported for now"); -+ return 0; - - case MCSymbolRefExpr::VK_PLT: -- assert(IsPCRel && "@PLT shouldt be PC-relative"); -- return getPLTReloc(Kind); -+ assert(IsPCRel && "@PLT shouldn't be PC-relative"); -+ return getPLTReloc(Ctx, Loc, Kind); - - default: - llvm_unreachable("Modifier not supported"); --- -2.41.0 - diff --git a/0001-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch b/0001-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch deleted file mode 100644 index 0f4acd3..0000000 --- a/0001-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 01529ba2c76be37e41713cf7f3eca8b61833e320 Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Tue, 9 Nov 2021 15:05:07 +0100 -Subject: [PATCH] XFAIL missing-abstract-variable.ll test on ppc64le - -It's seems the strategy with this test is to XFAIL it on all -architectures that it fails on. I wonder if we should be passing -it a specific triple? Also, from what I can tell, this tests only -runs when llvm is configured with LLVM_DEFAULT_TARGET_TRIPLE set -to a non-empty value, which is why it may not fail in every build -configuration. - -Differential Revision: https://reviews.llvm.org/D109806 ---- - llvm/test/DebugInfo/Generic/missing-abstract-variable.ll | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll b/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll -index 8f8d404..07a8778 100644 ---- a/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll -+++ b/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll -@@ -4,7 +4,7 @@ - ; powerpc64 (and on x86_64 at at least -O2). Presumably this is a SelectionDAG - ; issue. - ; FIXME: arm64 is an alias for aarch64 on macs, apparently? --; XFAIL: powerpc64, aarch64, arm64, hexagon, riscv, sparc -+; XFAIL: powerpc64, aarch64, arm64, hexagon, riscv, sparc, ppc64le - - ; Build from the following source with clang -O2. - --- -1.8.3.1 - diff --git a/0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch b/0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch deleted file mode 100644 index 82a00f2..0000000 --- a/0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 3dc5722d5c7673a879f2b4680369d3ac8b6b64b6 Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Wed, 4 Aug 2021 14:05:38 -0700 -Subject: [PATCH] cmake: Allow shared libraries to customize the soname using - LLVM_ABI_REVISION - -The LLVM_ABI_REVISION variable is intended to be used for release -candidates which introduce an ABI change to a shared library. This -variable can be specified per library, so there is not one global value -for all of LLVM. - -For example, if we LLVM X.0.0-rc2 introduces an ABI change for a library -compared with LLVM X.0.0-rc1, then the LLVM_ABI_REVISION number for -library will be incremented by 1. - -In the main branch, LLVM_ABI_REVISION should always be 0, it is only -meant to be used in the release branch. - -Differential Revision: https://reviews.llvm.org/D105594 ---- - llvm/cmake/modules/AddLLVM.cmake | 7 +++++-- - llvm/tools/llvm-shlib/CMakeLists.txt | 9 +++++++++ - 3 files changed, 19 insertions(+), 2 deletions(-) - -diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake -index 3e009f5061d3..a09405a1be3e 100644 ---- a/llvm/cmake/modules/AddLLVM.cmake -+++ b/llvm/cmake/modules/AddLLVM.cmake -@@ -586,11 +586,14 @@ function(llvm_add_library name) - # Set SOVERSION on shared libraries that lack explicit SONAME - # specifier, on *nix systems that are not Darwin. - if(UNIX AND NOT APPLE AND NOT ARG_SONAME) -+ if (NOT LLVM_ABI_REVISION) -+ set(LLVM_ABI_REVISION 0) -+ endif() - set_target_properties(${name} - PROPERTIES - # Since 4.0.0, the ABI version is indicated by the major version -- SOVERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} -- VERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX}) -+ SOVERSION ${LLVM_VERSION_MAJOR}.${LLVM_ABI_REVISION} -+ VERSION ${LLVM_VERSION_MAJOR}.${LLVM_ABI_REVISION}) - endif() - endif() - -diff --git a/llvm/tools/llvm-shlib/CMakeLists.txt b/llvm/tools/llvm-shlib/CMakeLists.txt -index 76b9a25cbbcd..b876e7fed6b5 100644 ---- a/llvm/tools/llvm-shlib/CMakeLists.txt -+++ b/llvm/tools/llvm-shlib/CMakeLists.txt -@@ -2,6 +2,11 @@ - # library is enabled by setting LLVM_BUILD_LLVM_DYLIB=yes on the CMake - # commandline. By default the shared library only exports the LLVM C API. - -+# In the main branch, LLVM_ABI_REVISION should always be 0. In the release -+# branches, this should be incremented before each release candidate every -+# time the ABI of libLLVM.so changes. -+set(LLVM_ABI_REVISION 0 CACHE STRING "ABI Revision number for SONAMEs (default: 0)") -+ - set(SOURCES - libllvm.cpp - ) -@@ -67,6 +72,10 @@ if(LLVM_BUILD_LLVM_DYLIB) - set_property(TARGET LLVM APPEND_STRING PROPERTY - LINK_FLAGS - " -compatibility_version 1 -current_version ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}") -+ else() -+ set_target_properties(LLVM -+ PROPERTIES -+ SOVERSION ${LLVM_ABI_REVISION}) - endif() - - if(TARGET libLLVMExports) --- -2.27.0 - diff --git a/0001-llvm-Add-install-targets-for-gtest.patch b/0001-llvm-Add-install-targets-for-gtest.patch deleted file mode 100644 index e84c444..0000000 --- a/0001-llvm-Add-install-targets-for-gtest.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8cc3870f09d728d9017c72eba9520117a4283fee Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Thu, 17 Nov 2022 09:01:10 +0000 -Subject: Add install targets for gtest - -Stand-alone builds need an installed version of gtest in order to run -the unittests. - -Differential Revision: https://reviews.llvm.org/D137890 ---- - llvm/CMakeLists.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt -index 60e1f29620af..d91338532815 100644 ---- a/llvm/CMakeLists.txt -+++ b/llvm/CMakeLists.txt -@@ -693,6 +693,11 @@ option(LLVM_BUILD_TESTS - "Build LLVM unit tests. If OFF, just generate build targets." OFF) - option(LLVM_INCLUDE_TESTS "Generate build targets for the LLVM unit tests." ON) - -+option(LLVM_INSTALL_GTEST -+ "Install the llvm gtest library. This should be on if you want to do -+ stand-alone builds of the other projects and run their unit tests." OFF) -+ -+ - option(LLVM_BUILD_BENCHMARKS "Add LLVM benchmark targets to the list of default - targets. If OFF, benchmarks still could be built using Benchmarks target." OFF) - option(LLVM_INCLUDE_BENCHMARKS "Generate benchmark targets. If OFF, benchmarks can't be built." ON) --- -2.34.3 - diff --git a/0101-Deactivate-markdown-doc.patch b/0101-Deactivate-markdown-doc.patch new file mode 100644 index 0000000..603cb39 --- /dev/null +++ b/0101-Deactivate-markdown-doc.patch @@ -0,0 +1,26 @@ +diff -Naur a/llvm/docs/conf.py b/llvm/docs/conf.py +--- a/llvm/docs/conf.py 2020-09-15 09:12:24.318287611 +0000 ++++ b/llvm/docs/conf.py 2020-09-15 15:01:00.025893199 +0000 +@@ -36,21 +36,7 @@ + ".rst": "restructuredtext", + } + +-try: +- import recommonmark +-except ImportError: +- # manpages do not use any .md sources +- if not tags.has("builder-man"): +- raise +-else: +- import sphinx +- +- if sphinx.version_info >= (3, 0): +- # This requires 0.5 or later. +- extensions.append("recommonmark") +- else: +- source_parsers = {".md": "recommonmark.parser.CommonMarkParser"} +- source_suffix[".md"] = "markdown" ++import sphinx + + # The encoding of source files. + # source_encoding = 'utf-8-sig' diff --git a/0201-third-party-Add-install-targets-for-gtest.patch b/0201-third-party-Add-install-targets-for-gtest.patch deleted file mode 100644 index 5c86130..0000000 --- a/0201-third-party-Add-install-targets-for-gtest.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 8cc3870f09d728d9017c72eba9520117a4283fee Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Thu, 17 Nov 2022 09:01:10 +0000 -Subject: Add install targets for gtest - -Stand-alone builds need an installed version of gtest in order to run -the unittests. - -Differential Revision: https://reviews.llvm.org/D137890 ---- - third-party/unittest/CMakeLists.txt | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/third-party/unittest/CMakeLists.txt b/third-party/unittest/CMakeLists.txt -index 0e54e0e57c35..1d2a52730d7d 100644 ---- a/third-party/unittest/CMakeLists.txt -+++ b/third-party/unittest/CMakeLists.txt -@@ -65,12 +65,25 @@ if (NOT LLVM_ENABLE_THREADS) - endif () - - target_include_directories(llvm_gtest -- PUBLIC googletest/include googlemock/include -+ PUBLIC $ -+ $ -+ $ -+ $ - PRIVATE googletest googlemock - ) - - add_subdirectory(UnitTestMain) - -+if (LLVM_INSTALL_GTEST) -+export(TARGETS llvm_gtest llvm_gtest_main LLVMTestingSupport FILE LLVMGTestConfig.cmake) -+install(TARGETS llvm_gtest llvm_gtest_main LLVMTestingSupport EXPORT LLVMGTestConfig -+ ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT llvm_gtest) -+ install(EXPORT LLVMGTestConfig DESTINATION ${LLVM_INSTALL_PACKAGE_DIR} COMPONENT llvm_gtest) -+ add_llvm_install_targets(install-llvm_gtest COMPONENT llvm_gtest DEPENDS llvm_gtest LLVMGTestConfig.cmake) -+ install(DIRECTORY googletest/include/gtest/ DESTINATION include/llvm-gtest/gtest/ COMPONENT llvm_gtest) -+ install(DIRECTORY googlemock/include/gmock/ DESTINATION include/llvm-gmock/gmock/ COMPONENT llvm_gtest) -+endif() -+ - # When LLVM_LINK_LLVM_DYLIB is enabled, libLLVM.so is added to the interface - # link libraries for gtest and gtest_main. This means that any target, like - # unittests for example, that links against gtest will be forced to link --- -2.34.3 - diff --git a/D156379.diff b/D156379.diff deleted file mode 100644 index 6d7aef1..0000000 --- a/D156379.diff +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.cpp b/llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.cpp ---- a/llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.cpp -+++ b/llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.cpp -@@ -1152,6 +1152,11 @@ - } - } - -+ // Type legalization (via getNumberOfParts) can't handle structs -+ if (TLI->getValueType(DL, Src, true) == MVT::Other) -+ return BaseT::getMemoryOpCost(Opcode, Src, Alignment, AddressSpace, -+ CostKind); -+ - unsigned NumOps = - (Src->isVectorTy() ? getNumVectorRegs(Src) : getNumberOfParts(Src)); - -diff --git a/llvm/test/Analysis/CostModel/SystemZ/struct-cost-crash.ll b/llvm/test/Analysis/CostModel/SystemZ/struct-cost-crash.ll -new file mode 100644 ---- /dev/null -+++ b/llvm/test/Analysis/CostModel/SystemZ/struct-cost-crash.ll -@@ -0,0 +1,25 @@ -+; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py UTC_ARGS: --version 2 -+; RUN: opt -passes="print" 2>&1 -disable-output < %s | FileCheck %s -+; -+; Check that SystemZTTIImpl::getMemoryOpCost doesn't try to legalize structs, -+; which was failing llvm_unreachable in MVT::getVT. -+ -+target datalayout = "E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-a:8:16-n32:64" -+target triple = "s390x-unknown-linux-gnu" -+ -+declare { i64, i32 } @bar() -+ -+define i8 @foo() { -+; CHECK-LABEL: 'foo' -+; CHECK-NEXT: Cost Model: Found an estimated cost of 1 for instruction: br label %1 -+; CHECK-NEXT: Cost Model: Found an estimated cost of 1 for instruction: %2 = call { i64, i32 } @bar() -+; CHECK-NEXT: Cost Model: Found an estimated cost of 4 for instruction: store { i64, i32 } %2, ptr inttoptr (i64 16 to ptr), align 16 -+; CHECK-NEXT: Cost Model: Found an estimated cost of 1 for instruction: br label %1 -+; -+ br label %1 -+ -+1: ; preds = %1, %0 -+ %2 = call { i64, i32 } @bar() -+ store { i64, i32 } %2, ptr inttoptr (i64 16 to ptr), align 16 -+ br label %1 -+} - 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-Config-config.h b/llvm-Config-config.h deleted file mode 100644 index c369b45..0000000 --- a/llvm-Config-config.h +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#if __WORDSIZE == 32 -#include "config-32.h" -#elif __WORDSIZE == 64 -#include "config-64.h" -#else -#error "Unknown word size" -#endif diff --git a/llvm-Config-llvm-config.h b/llvm-Config-llvm-config.h deleted file mode 100644 index 2fa08c9..0000000 --- a/llvm-Config-llvm-config.h +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#if __WORDSIZE == 32 -#include "llvm-config-32.h" -#elif __WORDSIZE == 64 -#include "llvm-config-64.h" -#else -#error "Unknown word size" -#endif diff --git a/llvm.spec b/llvm.spec index 3ba9b53..5d86c1e 100644 --- a/llvm.spec +++ b/llvm.spec @@ -1,9 +1,20 @@ +%bcond_with snapshot_build + +%if %{with snapshot_build} +# Unlock LLVM Snapshot LUA functions +%{llvm_sb} +%endif + # We are building with clang for faster/lower memory LTO builds. # See https://docs.fedoraproject.org/en-US/packaging-guidelines/#_compiler_macros %global toolchain clang +# Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer +# https://bugzilla.redhat.com/show_bug.cgi?id=2158587 +%undefine _include_frame_pointers + # Components enabled if supported by target architecture: -%define gold_arches %{ix86} x86_64 %{arm} aarch64 %{power64} s390x +%define gold_arches %{ix86} x86_64 aarch64 %{power64} s390x %ifarch %{gold_arches} %bcond_without gold %else @@ -13,14 +24,31 @@ %bcond_with compat_build %bcond_without check -#global rc_ver 4 -%global maj_ver 16 +%ifarch %ix86 +# Disable LTO on x86 in order to reduce memory consumption +%bcond_with lto_build +%elif %{with snapshot_build} +# Disable LTO to speed up builds +%bcond_with lto_build +%else +%bcond_without lto_build +%endif + +%global maj_ver 17 %global min_ver 0 -%global patch_ver 6 +%global patch_ver 2 +#global rc_ver 4 + +%if %{with snapshot_build} +%undefine rc_ver +%global maj_ver %{llvm_snapshot_version_major} +%global min_ver %{llvm_snapshot_version_minor} +%global patch_ver %{llvm_snapshot_version_patch} +%endif + %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_ver:rc%{rc_ver}}.src -%global _lto_cflags -flto=thin %if %{with compat_build} %global pkg_name llvm%{maj_ver} @@ -30,15 +58,15 @@ %global install_includedir %{install_prefix}/include %global install_libdir %{install_prefix}/lib -%global pkg_bindir %{install_bindir} %global pkg_includedir %{_includedir}/%{name} -%global pkg_libdir %{install_libdir} +%global pkg_datadir %{install_prefix}/share %else %global pkg_name llvm %global install_prefix /usr +%global install_bindir %{_bindir} %global install_libdir %{_libdir} -%global pkg_bindir %{_bindir} -%global pkg_libdir %{install_libdir} +%global install_includedir %{_includedir} +%global pkg_datadir %{_datadir} %global exec_suffix %{nil} %endif @@ -56,12 +84,13 @@ %global _dwz_low_mem_die_limit_s390x 1 %global _dwz_max_die_limit_s390x 1000000 +%global llvm_triple %{_target_platform} + # https://fedoraproject.org/wiki/Changes/PythonSafePath#Opting_out # Don't add -P to Python shebangs # The executable Python scripts in /usr/share/opt-viewer/ import each other %undefine _py3_shebang_P -%global llvm_triple %{_host} ################################################################################ # OS Specific Configuration ################################################################################ @@ -70,8 +99,6 @@ # RHEL # ######## %if 0%{?rhel} -%global targets_to_build "X86;AMDGPU;PowerPC;NVPTX;SystemZ;AArch64;ARM;Mips;BPF;WebAssembly" -%global experimental_targets_to_build "" %global _smp_mflags -j8 %if 0%{?rhel} == 8 @@ -85,13 +112,6 @@ %if 0%{?rhel} > 8 %global use_libedit 1 %endif - -%else -########## -# FEDORA # -########## -%global targets_to_build "all" -%global experimental_targets_to_build "AVR" %endif ################################################################################ @@ -100,12 +120,18 @@ Name: %{pkg_name} -Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}} -Release: 3%{?dist} +Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}} +Release: 1%{?dist} Summary: The Low Level Virtual Machine License: Apache-2.0 WITH LLVM-exception OR NCSA URL: http://llvm.org +%if %{with snapshot_build} +Source0: %{llvm_snapshot_source_prefix}llvm-%{llvm_snapshot_yyyymmdd}.src.tar.xz +Source2: %{llvm_snapshot_source_prefix}cmake-%{llvm_snapshot_yyyymmdd}.src.tar.xz +Source4: %{llvm_snapshot_source_prefix}third-party-%{llvm_snapshot_yyyymmdd}.src.tar.xz +%{llvm_snapshot_extra_source_tags} +%else Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz.sig Source2: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz @@ -113,23 +139,10 @@ Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ve Source4: 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 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 -# RHEL-specific patches. -Patch101: 0001-Deactivate-markdown-doc.patch -# 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 -Patch2: 0001-llvm-Add-install-targets-for-gtest.patch -# Backport of https://reviews.llvm.org/D156379 from LLVM 18. -Patch3: D156379.diff - -# Patching third-party dir with a 200 offset in patch number -Patch201: 0201-third-party-Add-install-targets-for-gtest.patch +# RHEL-specific patch to avoid unwanted recommonmark dep +Patch101: 0101-Deactivate-markdown-doc.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -141,6 +154,9 @@ BuildRequires: libffi-devel BuildRequires: ncurses-devel BuildRequires: python3-psutil BuildRequires: python3-sphinx +%if %{undefined rhel} +BuildRequires: python3-recommonmark +%endif BuildRequires: multilib-rpm-config %if %{with gold} BuildRequires: binutils-devel @@ -155,9 +171,6 @@ BuildRequires: libedit-devel %endif # Need pandoc to cover markdown to rst, because RHEL does not have recommonmark, # so we can't build the documentation as is. -%if !0%{?rhel} -BuildRequires: python3-recommonmark -%endif %if 0%{?rhel} == 8 # RHEL8 has pandoc which we can use instead of python3-recommonmark for some things. BuildRequires: pandoc @@ -190,14 +203,15 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %if 0%{?use_libedit} Requires: libedit-devel %endif -# The installed cmake files reference binaries from llvm-test and llvm-static. -# We tried in the past to split the cmake exports for these binaries out into -# separate files, so that llvm-devel would not need to Require these packages, +# The installed cmake files reference binaries from llvm-test, llvm-static, and +# llvm-gtest. We tried in the past to split the cmake exports for these binaries +# out into separate files, so that llvm-devel would not need to Require these packages, # but this caused bugs (rhbz#1773678) and forced us to carry two non-upstream # patches. Requires: %{name}-static%{?_isa} = %{version}-%{release} %if %{without compat_build} Requires: %{name}-test%{?_isa} = %{version}-%{release} +Requires: %{name}-googletest%{?_isa} = %{version}-%{release} %endif @@ -233,6 +247,13 @@ Provides: llvm-static(major) = %{maj_ver} %description static Static libraries for the LLVM compiler infrastructure. +%package cmake-utils +Summary: CMake utilities shared across LLVM subprojects + +%description cmake-utils +CMake utilities shared across LLVM subprojects. +This is for internal use by LLVM packages only. + %if %{without compat_build} %package test @@ -268,21 +289,22 @@ This is the main package for llvm-toolset. %endif %prep +%if %{without snapshot_build} %{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE3}' --data='%{SOURCE2}' %{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE5}' --data='%{SOURCE4}' +%endif %setup -T -q -b 2 -n %{cmake_srcdir} # TODO: It would be more elegant to set -DLLVM_COMMON_CMAKE_UTILS=%{_builddir}/%{cmake_srcdir}, # but this is not a CACHED variable, so we can't actually set it externally :( cd .. mv %{cmake_srcdir} cmake %setup -T -q -b 4 -n %{third_party_srcdir} -%autopatch -m200 -p2 cd .. mv %{third_party_srcdir} third-party %setup -T -q -b 0 -n %{llvm_srcdir} -%autopatch -M200 -p2 +%autopatch -M%{?!rhel:100}%{?rhel:200} -p2 %py3_shebang_fix \ test/BugPoint/compile-custom.ll.py \ @@ -297,28 +319,26 @@ find -name '*.md' | while read md; do sed -r -e 's/^( )*\* /\n\1\* /' ${md} | pa %build -%ifarch s390 s390x -# Fails with "exceeded PCRE's backtracking limit" +%if %{without lto_build} %global _lto_cflags %nil -%else -%global _lto_cflags -flto=thin %endif -%ifarch s390 s390x %{arm} %ix86 +%ifarch s390 s390x %ix86 # Decrease debuginfo verbosity to reduce memory consumption during final library linking %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif # Copy CFLAGS into ASMFLAGS, so -fcf-protection is used when compiling assembly files. -export ASMFLAGS=$CFLAGS +export ASMFLAGS="%{build_cflags}" # force off shared libs as cmake macros turns it on. +# TODO: Disable LLVM_UNREACHABLE_OPTIMIZE. %cmake -G Ninja \ -DBUILD_SHARED_LIBS:BOOL=OFF \ -DLLVM_PARALLEL_LINK_JOBS=1 \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -%ifarch s390 %{arm} %ix86 +%ifarch s390 %ix86 -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \ %endif @@ -348,7 +368,11 @@ export ASMFLAGS=$CFLAGS \ -DLLVM_INCLUDE_TESTS:BOOL=ON \ -DLLVM_BUILD_TESTS:BOOL=ON \ +%if %{with compat_build} + -DLLVM_INSTALL_GTEST:BOOL=OFF \ +%else -DLLVM_INSTALL_GTEST:BOOL=ON \ +%endif -DLLVM_LIT_ARGS=-v \ \ -DLLVM_INCLUDE_EXAMPLES:BOOL=ON \ @@ -368,10 +392,12 @@ export ASMFLAGS=$CFLAGS -DLLVM_ENABLE_SPHINX:BOOL=ON \ -DLLVM_ENABLE_DOXYGEN:BOOL=OFF \ \ -%if %{without compat_build} +%if %{with snapshot_build} + -DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \ +%else -DLLVM_VERSION_SUFFIX='' \ %endif - -DLLVM_UNREACHABLE_OPTIMIZE:BOOL=OFF \ + -DLLVM_UNREACHABLE_OPTIMIZE:BOOL=ON \ -DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \ -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ -DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL=ON \ @@ -381,7 +407,11 @@ export ASMFLAGS=$CFLAGS -DCMAKE_INSTALL_PREFIX=%{install_prefix} \ -DLLVM_INSTALL_SPHINX_HTML_DIR=%{_pkgdocdir}/html \ -DSPHINX_EXECUTABLE=%{_bindir}/sphinx-build-3 \ - -DLLVM_INCLUDE_BENCHMARKS=OFF + -DLLVM_INCLUDE_BENCHMARKS=OFF \ +%if %{with lto_build} + -DLLVM_UNITTEST_LINK_FLAGS="-Wl,-plugin-opt=O0" \ +%endif + -DCMAKE_SHARED_LINKER_FLAGS="$LDFLAGS -Wl,-z,cet-report=error" # Build libLLVM.so first. This ensures that when libLLVM.so is linking, there # are no other compile jobs running. This will help reduce OOM errors on the @@ -413,26 +443,11 @@ rm -rf test/tools/UpdateTestChecks %multilib_fix_c_header --file %{_includedir}/llvm/Config/llvm-config.h # Install libraries needed for unittests -%if 0%{?__isa_bits} == 64 -%global build_libdir %{_vpath_builddir}/lib64 -%else -%global build_libdir %{_vpath_builddir}/lib -%endif +%global build_libdir %{_vpath_builddir}/%{_lib} install %{build_libdir}/libLLVMTestingSupport.a %{buildroot}%{_libdir} install %{build_libdir}/libLLVMTestingAnnotations.a %{buildroot}%{_libdir} -%global install_srcdir %{buildroot}%{_datadir}/llvm/src - -# Install gtest sources so clang can use them for gtest -install -d %{install_srcdir} -install -d %{install_srcdir}/utils/ -cp -R ../third-party/unittest %{install_srcdir}/utils/ - -# Clang needs these for running lit tests. -cp utils/update_cc_test_checks.py %{install_srcdir}/utils/ -cp -R utils/UpdateTestChecks %{install_srcdir}/utils/ - %if %{with gold} # Add symlink to lto plugin in the binutils plugin directory. %{__mkdir_p} %{buildroot}%{_libdir}/bfd-plugins/ @@ -458,7 +473,7 @@ ln -s ../../../%{install_includedir}/llvm-c %{buildroot}/%{pkg_includedir}/llvm- # Create ld.so.conf.d entry mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf << EOF -%{pkg_libdir} +%{install_libdir} EOF # Add version suffix to man pages and move them to mandir. @@ -480,63 +495,51 @@ rm -Rf %{build_install_prefix}/share/opt-viewer %if %{without compat_build} -mv %{buildroot}/%{pkg_bindir}/llvm-config %{buildroot}/%{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} +mv %{buildroot}/%{install_bindir}/llvm-config %{buildroot}/%{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} # We still maintain a versionned symlink for consistency across llvm versions. # This is specific to the non-compat build and matches the exec prefix for # compat builds. An isa-agnostic versionned symlink is also maintained in the (un)install # steps. -(cd %{buildroot}/%{pkg_bindir} ; ln -s llvm-config%{exec_suffix}-%{__isa_bits} llvm-config-%{maj_ver}-%{__isa_bits} ) +(cd %{buildroot}/%{install_bindir} ; ln -s llvm-config%{exec_suffix}-%{__isa_bits} llvm-config-%{maj_ver}-%{__isa_bits} ) # ghost presence touch %{buildroot}%{_bindir}/llvm-config-%{maj_ver} %else rm %{buildroot}%{_bindir}/llvm-config%{exec_suffix} -(cd %{buildroot}/%{pkg_bindir} ; ln -s llvm-config llvm-config%{exec_suffix}-%{__isa_bits} ) +(cd %{buildroot}/%{install_bindir} ; ln -s llvm-config llvm-config%{exec_suffix}-%{__isa_bits} ) %endif # ghost presence touch %{buildroot}%{_bindir}/llvm-config%{exec_suffix} -%if %{without compat_build} -cp -Rv ../cmake/Modules/* %{buildroot}%{pkg_libdir}/cmake/llvm -%endif - +mkdir -p %{buildroot}%{pkg_datadir}/llvm/cmake +cp -Rv ../cmake/* %{buildroot}%{pkg_datadir}/llvm/cmake %check -# Disable check section on arm due to some kind of memory related failure. -# Possibly related to https://bugzilla.redhat.com/show_bug.cgi?id=1920183 -%ifnarch %{arm} - -# TODO: Fix the failures below -%ifarch %{arm} -rm test/tools/llvm-readobj/ELF/dependent-libraries.test -%endif # non reproducible errors rm test/tools/dsymutil/X86/swift-interface.test %if %{with check} # FIXME: use %%cmake_build instead of %%__ninja -LD_LIBRARY_PATH=%{buildroot}/%{pkg_libdir} %{__ninja} check-all -C %{_vpath_builddir} -%endif - +LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C %{_vpath_builddir} %endif %ldconfig_scriptlets libs %post devel -%{_sbindir}/update-alternatives --install %{_bindir}/llvm-config%{exec_suffix} llvm-config%{exec_suffix} %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits} +%{_sbindir}/update-alternatives --install %{_bindir}/llvm-config%{exec_suffix} llvm-config%{exec_suffix} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits} %if %{without compat_build} -%{_sbindir}/update-alternatives --install %{_bindir}/llvm-config-%{maj_ver} llvm-config-%{maj_ver} %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits} +%{_sbindir}/update-alternatives --install %{_bindir}/llvm-config-%{maj_ver} llvm-config-%{maj_ver} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits} %endif %postun devel if [ $1 -eq 0 ]; then - %{_sbindir}/update-alternatives --remove llvm-config%{exec_suffix} %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} + %{_sbindir}/update-alternatives --remove llvm-config%{exec_suffix} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %if %{without compat_build} - %{_sbindir}/update-alternatives --remove llvm-config-%{maj_ver} %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} + %{_sbindir}/update-alternatives --remove llvm-config-%{maj_ver} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %endif fi @@ -547,11 +550,11 @@ fi %{_bindir}/* %exclude %{_bindir}/llvm-config%{exec_suffix} -%exclude %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} +%exclude %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %if %{without compat_build} %exclude %{_bindir}/llvm-config-%{maj_ver} -%exclude %{pkg_bindir}/llvm-config-%{maj_ver}-%{__isa_bits} +%exclude %{install_bindir}/llvm-config-%{maj_ver}-%{__isa_bits} %exclude %{_bindir}/not %exclude %{_bindir}/count %exclude %{_bindir}/yaml-bench @@ -560,12 +563,12 @@ fi %exclude %{_bindir}/llvm-opt-fuzzer %{_datadir}/opt-viewer %else -%{pkg_bindir} +%{install_bindir} %endif %files libs %license LICENSE.TXT -%{pkg_libdir}/libLLVM-%{maj_ver}.so +%{install_libdir}/libLLVM-%{maj_ver}%{?llvm_snapshot_version_suffix:%{llvm_snapshot_version_suffix}}.so %if %{without compat_build} %if %{with gold} %{_libdir}/LLVMgold.so @@ -578,34 +581,30 @@ fi %if %{with gold} %{_libdir}/%{name}/lib/LLVMgold.so %endif -%{pkg_libdir}/libLLVM-%{maj_ver}.%{min_ver}*.so -%{pkg_libdir}/libLTO.so* -%exclude %{pkg_libdir}/libLTO.so +%{install_libdir}/libLLVM-%{maj_ver}.%{min_ver}*.so +%{install_libdir}/libLTO.so* +%exclude %{install_libdir}/libLTO.so %endif -%{pkg_libdir}/libRemarks.so* +%{install_libdir}/libRemarks.so* %files devel %license LICENSE.TXT %ghost %{_bindir}/llvm-config%{exec_suffix} -%{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} +%{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{_mandir}/man1/llvm-config* -%if %{without compat_build} -%{_includedir}/llvm -%{_includedir}/llvm-c -%{_libdir}/libLLVM.so -%{_libdir}/cmake/llvm -%{pkg_bindir}/llvm-config-%{maj_ver}-%{__isa_bits} -%ghost %{_bindir}/llvm-config-%{maj_ver} -%else %{install_includedir}/llvm %{install_includedir}/llvm-c +%{install_libdir}/libLLVM.so +%{install_libdir}/cmake/llvm +%if %{without compat_build} +%{install_bindir}/llvm-config-%{maj_ver}-%{__isa_bits} +%ghost %{_bindir}/llvm-config-%{maj_ver} +%else %{pkg_includedir}/llvm %{pkg_includedir}/llvm-c -%{pkg_libdir}/libLTO.so -%{pkg_libdir}/libLLVM.so -%{pkg_libdir}/cmake/llvm +%{install_libdir}/libLTO.so %endif %files doc @@ -614,14 +613,18 @@ fi %files static %license LICENSE.TXT +%{install_libdir}/*.a %if %{without compat_build} -%{_libdir}/*.a -%exclude %{_libdir}/libLLVMTestingSupport.a -%exclude %{_libdir}/libLLVMTestingAnnotations.a -%else -%{_libdir}/%{name}/lib/*.a +%exclude %{install_libdir}/libLLVMTestingSupport.a +%exclude %{install_libdir}/libLLVMTestingAnnotations.a +%exclude %{install_libdir}/libllvm_gtest.a +%exclude %{install_libdir}/libllvm_gtest_main.a %endif +%files cmake-utils +%license LICENSE.TXT +%{pkg_datadir}/llvm/cmake + %if %{without compat_build} %files test @@ -635,11 +638,12 @@ fi %files googletest %license LICENSE.TXT -%{_datadir}/llvm/src/utils -%{_libdir}/libLLVMTestingSupport.a -%{_libdir}/libLLVMTestingAnnotations.a -%{_includedir}/llvm-gtest -%{_includedir}/llvm-gmock +%{install_libdir}/libLLVMTestingSupport.a +%{install_libdir}/libLLVMTestingAnnotations.a +%{install_libdir}/libllvm_gtest.a +%{install_libdir}/libllvm_gtest_main.a +%{install_includedir}/llvm-gtest +%{install_includedir}/llvm-gmock %if 0%{?rhel} %files toolset @@ -649,6 +653,9 @@ fi %endif %changelog +* Wed Oct 04 2023 Nikita Popov - 17.0.2-1 +- Update to LLVM 17.0.2 + * Thu Aug 03 2023 Tulio Magno Quites Machado Filho - 16.0.6-3 - Fix rhbz #2228944 diff --git a/release-keys.asc b/release-keys.asc new file mode 100644 index 0000000..0d3789a --- /dev/null +++ b/release-keys.asc @@ -0,0 +1,104 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +9RmlwZlOTFGcWBYl/cfRONn9qi9a6w== +=Lvw+ +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=tMzl +-----END PGP PUBLIC KEY BLOCK----- diff --git a/run-lit-tests b/run-lit-tests deleted file mode 100755 index 4d8cdf5..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 -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 -ln -s /usr/share/llvm/src/docs docs -lit -v $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 6875bda..a673737 100644 --- a/sources +++ b/sources @@ -1,7 +1,6 @@ -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 -SHA512 (release-keys.asc) = 08eab15cd40116bb1eea5ddcdd2822d248d6d7f5dce37868aa7152377aa0062567fe571909a1c9d3c3f8978ebcf5e0f6b0ab8fff13e3578c0548e21be3026462 +SHA512 (llvm-17.0.2.src.tar.xz) = 5835b73e023e58e5aa82da2631171e274b0beca10d53b66d40ee44c6c87a4647a9fc6fb6ea93ff4b513805a9d7d157c08e8c22af8e034cc2373982d630e7dc72 +SHA512 (llvm-17.0.2.src.tar.xz.sig) = f3df4c292017f66a49a27f3e823f62eeb8c3e6842095200fdad3d757320f96411927fd4db0c296b33e68e2e7f2117b5dcb2f98e723a0c7896b8e64f87f6ca3d5 +SHA512 (cmake-17.0.2.src.tar.xz) = 5740262336dd0b99db0f96122cd8bd3e52f1fa2677f7cb70ea35c4ad61b62c150db633a61674fe6a27ad8009abf52ab53148f9dbdde7c24aa5217ca337099b6f +SHA512 (cmake-17.0.2.src.tar.xz.sig) = 9f190af68e099328860a5ba19c90e87b779d1c185f9b9940ff5575848c8bcb689c1a32f5844f011d33a708d98591db2cf066b2188350a5886ae4410d82f497e1 +SHA512 (third-party-17.0.2.src.tar.xz) = bbdece9190d0b81d10ba680292fab9e86c9af49e563b3fbef310da911a2b629c372b9888aa553a82625b5e82e2d83dfa598e6d1bda64f36fa6f646332a569f60 +SHA512 (third-party-17.0.2.src.tar.xz.sig) = bafad421da451077d2a1eda20105003c286d145f025b36a4b0d359052f98c236a189bf08c36a1e667960ddf31982c858f59713c7d6af491b825ca5d0959318e7 diff --git a/tstellar-gpg-key.asc b/tstellar-gpg-key.asc deleted file mode 100644 index eba625c..0000000 Binary files a/tstellar-gpg-key.asc and /dev/null differ