diff --git a/0006-Propeller-bugfix-for-MachineBasicBlock-hash-set.patch b/0006-Propeller-bugfix-for-MachineBasicBlock-hash-set.patch deleted file mode 100644 index e91b8c404a7e25ca4652e25850c16194218cd0f3..0000000000000000000000000000000000000000 --- a/0006-Propeller-bugfix-for-MachineBasicBlock-hash-set.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/llvm/lib/CodeGen/BasicBlockSections.cpp b/llvm/lib/CodeGen/BasicBlockSections.cpp -index 9b985f9f0aff..6e58c8fb2946 100644 ---- a/llvm/lib/CodeGen/BasicBlockSections.cpp -+++ b/llvm/lib/CodeGen/BasicBlockSections.cpp -@@ -319,7 +319,8 @@ void computeBBHash(MachineFunction &MF) { - } - } - } -- MBB.setHash(Hash); -+ if (MBB.getBBID()) -+ MBB.setHash(Hash); - } - } - --- \ No newline at end of file diff --git a/0006-fix-for-prefix-c.patch b/0006-fix-for-prefix-c.patch new file mode 100644 index 0000000000000000000000000000000000000000..f5334c86bc6078bebd25630f718abe5129813ecf --- /dev/null +++ b/0006-fix-for-prefix-c.patch @@ -0,0 +1,32 @@ +diff --git a/clang/test/Driver/prefix.c b/clang/test/Driver/prefix.c +index b429187a49d3..9010ac0622a6 100644 +--- a/clang/test/Driver/prefix.c ++++ b/clang/test/Driver/prefix.c +@@ -1,8 +1,8 @@ + // RUN: %clang %s +-// RUN: %clang -iprefix $(dirname `which clang`)/../lib/clang/*/ -iwithprefix include %s ++// RUN: %clang -iprefix %resource_dir/../ -iwithprefix include %s + // RUN: %clang -iwithprefix include %s + // RUN: %clang -nostdinc -iwithprefix include %s -fgcc-compatible +-// RUN: %clang -nostdinc -iprefix $(dirname `which clang`)/../lib/clang/*/ -iwithprefix include %s -fgcc-compatible ++// RUN: %clang -nostdinc -iprefix %resource_dir/../ -iwithprefix include %s -fgcc-compatible + // RUN: not %clang -nostdinc -iwithprefix include %s + // RUN: not %clang -nostdinc -iprefix "" -iwithprefix include %s + +diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt +index 43886d57ca5a..105540f64c94 100644 +--- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt ++++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt +@@ -67,8 +67,6 @@ install(PROGRAMS run-clang-tidy.py + DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT clang-tidy + RENAME run-clang-tidy) +-if(LLVM_BSPUB_COMMON) +- install(PROGRAMS clang-tidy-stats.py +- DESTINATION "${CMAKE_INSTALL_DATADIR}/clang" +- COMPONENT clang-tidy) +-endif() ++install(PROGRAMS clang-tidy-stats.py ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/clang" ++ COMPONENT clang-tidy) +-- \ No newline at end of file diff --git a/0007-Bolt-CMake-Don-t-export-bolt-libraries-in-LLVM.patch b/0007-Bolt-CMake-Don-t-export-bolt-libraries-in-LLVM.patch deleted file mode 100644 index db4d8f8e8c7830b2d46c17db56ff66c8db6c33fe..0000000000000000000000000000000000000000 --- a/0007-Bolt-CMake-Don-t-export-bolt-libraries-in-LLVM.patch +++ /dev/null @@ -1,186 +0,0 @@ -From ee0f56cff40b324bb06e034e247ec85ae9a846bf Mon Sep 17 00:00:00 2001 -From: Nikita Popov -Date: Wed, 8 Jan 2025 08:28:18 +0100 -Subject: [PATCH] [PATCH] [Bolt][CMake] Don't export bolt libraries in - LLVMExports.cmake - -Bolt makes use of add_llvm_library and as such ends up exporting -its libraries from LLVMExports.cmake, which is not correct. - -Bolt doesn't have its own exports file, and I assume that there -is no desire to have one either -- Bolt libraries are not intended -to be consumed as a cmake module, right? - -As such, this PR adds a NO_EXPORT option to simplify exclude these -libraries from the exports file. - ---- -This patch originates from this PR: - -https://patch-diff.githubusercontent.com/raw/llvm/llvm-project/pull/121936. - -The commit was: - -https://github.com/nikic/llvm-project/commit/4333a4dd270b5c046c5469b97846e3dae58fb221.patch - -And then it was rebased onto llvmorg-19.1.6. ---- - bolt/lib/Core/CMakeLists.txt | 1 + - bolt/lib/Passes/CMakeLists.txt | 1 + - bolt/lib/Profile/CMakeLists.txt | 1 + - bolt/lib/Rewrite/CMakeLists.txt | 1 + - bolt/lib/RuntimeLibs/CMakeLists.txt | 1 + - bolt/lib/Target/AArch64/CMakeLists.txt | 1 + - bolt/lib/Target/RISCV/CMakeLists.txt | 1 + - bolt/lib/Target/X86/CMakeLists.txt | 1 + - bolt/lib/Utils/CMakeLists.txt | 1 + - llvm/cmake/modules/AddLLVM.cmake | 12 +++++++++--- - 10 files changed, 18 insertions(+), 3 deletions(-) - -diff --git a/bolt/lib/Core/CMakeLists.txt b/bolt/lib/Core/CMakeLists.txt -index c913179ebcc5..f45ce15afaac 100644 ---- a/bolt/lib/Core/CMakeLists.txt -+++ b/bolt/lib/Core/CMakeLists.txt -@@ -30,6 +30,7 @@ add_llvm_library(LLVMBOLTCore - ParallelUtilities.cpp - Relocation.cpp - -+ NO_EXPORT - DISABLE_LLVM_LINK_LLVM_DYLIB - LINK_LIBS - ${LLVM_PTHREAD_LIB} -diff --git a/bolt/lib/Passes/CMakeLists.txt b/bolt/lib/Passes/CMakeLists.txt -index b8bbe59a6448..80fce073d0f7 100644 ---- a/bolt/lib/Passes/CMakeLists.txt -+++ b/bolt/lib/Passes/CMakeLists.txt -@@ -49,6 +49,7 @@ add_llvm_library(LLVMBOLTPasses - VeneerElimination.cpp - RetpolineInsertion.cpp - -+ NO_EXPORT - DISABLE_LLVM_LINK_LLVM_DYLIB - - LINK_LIBS -diff --git a/bolt/lib/Profile/CMakeLists.txt b/bolt/lib/Profile/CMakeLists.txt -index 3a31a9cc1919..9bbd9f39b7bb 100644 ---- a/bolt/lib/Profile/CMakeLists.txt -+++ b/bolt/lib/Profile/CMakeLists.txt -@@ -8,6 +8,7 @@ add_llvm_library(LLVMBOLTProfile - YAMLProfileReader.cpp - YAMLProfileWriter.cpp - -+ NO_EXPORT - DISABLE_LLVM_LINK_LLVM_DYLIB - - LINK_COMPONENTS -diff --git a/bolt/lib/Rewrite/CMakeLists.txt b/bolt/lib/Rewrite/CMakeLists.txt -index b0e2b7f46bef..676c41a3b691 100644 ---- a/bolt/lib/Rewrite/CMakeLists.txt -+++ b/bolt/lib/Rewrite/CMakeLists.txt -@@ -23,6 +23,7 @@ add_llvm_library(LLVMBOLTRewrite - RewriteInstance.cpp - SDTRewriter.cpp - -+ NO_EXPORT - DISABLE_LLVM_LINK_LLVM_DYLIB - - LINK_LIBS -diff --git a/bolt/lib/RuntimeLibs/CMakeLists.txt b/bolt/lib/RuntimeLibs/CMakeLists.txt -index d3ac71d3e797..b8db7e4a1553 100644 ---- a/bolt/lib/RuntimeLibs/CMakeLists.txt -+++ b/bolt/lib/RuntimeLibs/CMakeLists.txt -@@ -11,6 +11,7 @@ add_llvm_library(LLVMBOLTRuntimeLibs - HugifyRuntimeLibrary.cpp - InstrumentationRuntimeLibrary.cpp - -+ NO_EXPORT - DISABLE_LLVM_LINK_LLVM_DYLIB - ) - -diff --git a/bolt/lib/Target/AArch64/CMakeLists.txt b/bolt/lib/Target/AArch64/CMakeLists.txt -index be03e247aa96..526a9645cb54 100644 ---- a/bolt/lib/Target/AArch64/CMakeLists.txt -+++ b/bolt/lib/Target/AArch64/CMakeLists.txt -@@ -7,6 +7,7 @@ set(LLVM_LINK_COMPONENTS - add_llvm_library(LLVMBOLTTargetAArch64 - AArch64MCPlusBuilder.cpp - -+ NO_EXPORT - DISABLE_LLVM_LINK_LLVM_DYLIB - - DEPENDS -diff --git a/bolt/lib/Target/RISCV/CMakeLists.txt b/bolt/lib/Target/RISCV/CMakeLists.txt -index 7f9557606320..3955cfc0f089 100644 ---- a/bolt/lib/Target/RISCV/CMakeLists.txt -+++ b/bolt/lib/Target/RISCV/CMakeLists.txt -@@ -7,6 +7,7 @@ set(LLVM_LINK_COMPONENTS - add_llvm_library(LLVMBOLTTargetRISCV - RISCVMCPlusBuilder.cpp - -+ NO_EXPORT - DISABLE_LLVM_LINK_LLVM_DYLIB - - DEPENDS -diff --git a/bolt/lib/Target/X86/CMakeLists.txt b/bolt/lib/Target/X86/CMakeLists.txt -index 2b769bc7e7f5..00100e9b84c9 100644 ---- a/bolt/lib/Target/X86/CMakeLists.txt -+++ b/bolt/lib/Target/X86/CMakeLists.txt -@@ -9,6 +9,7 @@ add_llvm_library(LLVMBOLTTargetX86 - X86MCPlusBuilder.cpp - X86MCSymbolizer.cpp - -+ NO_EXPORT - DISABLE_LLVM_LINK_LLVM_DYLIB - - DEPENDS -diff --git a/bolt/lib/Utils/CMakeLists.txt b/bolt/lib/Utils/CMakeLists.txt -index d1403314274b..ceddcfc8f57a 100644 ---- a/bolt/lib/Utils/CMakeLists.txt -+++ b/bolt/lib/Utils/CMakeLists.txt -@@ -2,6 +2,7 @@ add_llvm_library(LLVMBOLTUtils - CommandLineOpts.cpp - Utils.cpp - -+ NO_EXPORT - DISABLE_LLVM_LINK_LLVM_DYLIB - - LINK_LIBS -diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake -index 6d74e58aea6a..88225593ff3f 100644 ---- a/llvm/cmake/modules/AddLLVM.cmake -+++ b/llvm/cmake/modules/AddLLVM.cmake -@@ -838,7 +838,7 @@ endfunction() - - macro(add_llvm_library name) - cmake_parse_arguments(ARG -- "SHARED;BUILDTREE_ONLY;MODULE;INSTALL_WITH_TOOLCHAIN" -+ "SHARED;BUILDTREE_ONLY;MODULE;INSTALL_WITH_TOOLCHAIN;NO_EXPORT" - "" - "" - ${ARGN}) -@@ -873,7 +873,11 @@ macro(add_llvm_library name) - set(umbrella) - endif() - -- get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) -+ if(ARG_NO_EXPORT) -+ set(export_to_llvmexports) -+ else() -+ get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) -+ endif() - install(TARGETS ${name} - ${export_to_llvmexports} - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} -@@ -886,7 +890,9 @@ macro(add_llvm_library name) - COMPONENT ${name}) - endif() - endif() -- set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) -+ if(NOT ARG_NO_EXPORT) -+ set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) -+ endif() - endif() - if (ARG_MODULE) - set_target_properties(${name} PROPERTIES FOLDER "Loadable modules") --- -2.47.1 diff --git a/llvm-for-oE-17.0.6-2509.0.2.tar.gz b/llvm-for-oE-17.0.6-2512.0.1.tar.gz similarity index 32% rename from llvm-for-oE-17.0.6-2509.0.2.tar.gz rename to llvm-for-oE-17.0.6-2512.0.1.tar.gz index d5697597bf528ed2c63f842912561ab7fae2de18..14d4ac0795550fb949ca3f04cb8f683c355b5a06 100644 --- a/llvm-for-oE-17.0.6-2509.0.2.tar.gz +++ b/llvm-for-oE-17.0.6-2512.0.1.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:717518c4ddf31b5d141fce1bdac7ede96a59de292f09f72482277ca0a49f489b -size 212666397 +oid sha256:e037aa165150e01d69c8177e1772ff8afec9662ec8e9a3dfb1cf8624c60d5752 +size 212723878 diff --git a/llvm.spec b/llvm.spec index ce29556e2587812648e3fa2495f56b3064087a17..d59962688578d930b7cee41581a511aa27a3de5e 100644 --- a/llvm.spec +++ b/llvm.spec @@ -38,7 +38,7 @@ %undefine __cmake_in_source_build -%global src_tarball llvm-for-oE-17.0.6-2509.0.2 +%global src_tarball llvm-for-oE-17.0.6-2512.0.1 %global src_tarball_dir llvm-project-%{src_tarball} #region LLVM globals @@ -164,7 +164,7 @@ Name: llvm Name: llvm-toolset-%{maj_ver} %endif Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 53 +Release: 54 Summary: The Low Level Virtual Machine License: NCSA @@ -186,8 +186,7 @@ Patch0004: 0004-remove-cmake_minimum_required.patch %if %{with bisheng_autotuner} Patch0005: 0005-Fix-for-building-autotuner-with-mlir.patch %endif -Patch0006: 0006-Propeller-bugfix-for-MachineBasicBlock-hash-set.patch -Patch0007: 0007-Bolt-CMake-Don-t-export-bolt-libraries-in-LLVM.patch +Patch0006: 0006-fix-for-prefix-c.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -2651,6 +2650,7 @@ fi %{install_datadir}/clang/clang-format-diff.py* %{install_datadir}/clang/clang-include-fixer.py* %{install_datadir}/clang/clang-tidy-diff.py* +%{install_datadir}/clang/clang-tidy-stats.py* %{install_datadir}/clang/run-find-all-symbols.py* %if %{maj_ver} < 20 %{install_datadir}/clang/clang-rename.py* @@ -3013,6 +3013,10 @@ fi #endregion files %changelog +* Tue Nov 18 2025 liyunfei - 17.0.6-54 +- update to llvm-for-oe-17.0.6-2512.0.1 +- release-note https://gitee.com/openeuler/llvm-project/releases/tag/llvm-for-oE-17.0.6-2512.0.1 + * Fri Oct 17 2025 liyunfei - 17.0.6-53 - update target triples for all openEuler based distribution.