From e9a5d57296c114c5ad6050191746ff300a466534 Mon Sep 17 00:00:00 2001 From: wangqiang Date: Fri, 30 May 2025 16:30:24 +0800 Subject: [PATCH 1/2] Modified python3-lldb dependency to require exact version match Signed-off-by: wangqiang --- llvm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/llvm.spec b/llvm.spec index 88d299d..14ee20d 100644 --- a/llvm.spec +++ b/llvm.spec @@ -151,7 +151,7 @@ Name: llvm Name: llvm-toolset-%{maj_ver} %endif Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 39 +Release: 40 Summary: The Low Level Virtual Machine License: NCSA @@ -592,7 +592,7 @@ URL: http://lldb.llvm.org/ Requires: %{pkg_name_clang}-libs%{?_isa} = %{version}-%{release} %if %{with sys_llvm} -Requires: python%{python3_pkgversion}-lldb +Requires: python%{python3_pkgversion}-lldb = %{version}-%{release} %endif %description -n %{pkg_name_lldb} @@ -2880,6 +2880,9 @@ fi #endregion files %changelog +* Thu May 29 2025 wangqiang - 17.0.6-40 +- Modified python3-lldb dependency to require exact version match + * Thu May 08 2025 chenli - 17.0.6-39 - LoongArch: Fix mlir testcases which depend on MCJIT - LoongArch: Fix liborc_rt.a file not found -- Gitee From 7f4790528e0f87eef661e44ac40a4f11ca9879c6 Mon Sep 17 00:00:00 2001 From: liyunfei Date: Wed, 4 Jun 2025 11:27:09 +0800 Subject: [PATCH 2/2] update to llvm-for-oe-17.0.6-2506.0.2 Signed-off-by: liyunfei --- ...-Fix-compile-error-after-commit-5298.patch | 26 ------------------- ...r.gz => llvm-for-oE-17.0.6-2506.0.2.tar.gz | 4 +-- llvm.spec | 12 ++++++--- 3 files changed, 11 insertions(+), 31 deletions(-) delete mode 100644 0006-openmp-LoongArch-Fix-compile-error-after-commit-5298.patch rename llvm-for-oE-17.0.6-2506.0.1.tar.gz => llvm-for-oE-17.0.6-2506.0.2.tar.gz (32%) diff --git a/0006-openmp-LoongArch-Fix-compile-error-after-commit-5298.patch b/0006-openmp-LoongArch-Fix-compile-error-after-commit-5298.patch deleted file mode 100644 index 3d4c73c..0000000 --- a/0006-openmp-LoongArch-Fix-compile-error-after-commit-5298.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 256de0c8f68e8dc906256a2eecea0a53229966b0 Mon Sep 17 00:00:00 2001 -From: chenli -Date: Fri, 9 May 2025 15:32:29 +0800 -Subject: [PATCH] [openmp][LoongArch] Fix compile error after commit - 5298e93560ddd - ---- - openmp/runtime/src/kmp_platform.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/openmp/runtime/src/kmp_platform.h b/openmp/runtime/src/kmp_platform.h -index 780ff3b185b3..d9fa8a7a4a91 100644 ---- a/openmp/runtime/src/kmp_platform.h -+++ b/openmp/runtime/src/kmp_platform.h -@@ -210,7 +210,7 @@ - // TODO: Fixme - This is clever, but really fugly - #if (1 != KMP_ARCH_X86 + KMP_ARCH_X86_64 + KMP_ARCH_ARM + KMP_ARCH_PPC64 + \ - KMP_ARCH_AARCH64 + KMP_ARCH_MIPS + KMP_ARCH_MIPS64 + \ -- KMP_ARCH_RISCV64 + KMP_ARCH_LOONGARCH6464 + KMP_ARCH_SW64) -+ KMP_ARCH_RISCV64 + KMP_ARCH_LOONGARCH64 + KMP_ARCH_SW64) - #error Unknown or unsupported architecture - #endif - --- -2.20.1 - diff --git a/llvm-for-oE-17.0.6-2506.0.1.tar.gz b/llvm-for-oE-17.0.6-2506.0.2.tar.gz similarity index 32% rename from llvm-for-oE-17.0.6-2506.0.1.tar.gz rename to llvm-for-oE-17.0.6-2506.0.2.tar.gz index 231eaac..05523a6 100644 --- a/llvm-for-oE-17.0.6-2506.0.1.tar.gz +++ b/llvm-for-oE-17.0.6-2506.0.2.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db733ac396925145ce00854d8175a66ea87a8b18e808fb00d167148271d644e9 -size 195853097 +oid sha256:5de6b25269c51cdaec2b4c296fe13d8ed07440e052c66c5d054f8199f41e7937 +size 212517798 diff --git a/llvm.spec b/llvm.spec index 14ee20d..0f90ce0 100644 --- a/llvm.spec +++ b/llvm.spec @@ -27,7 +27,7 @@ %undefine __cmake_in_source_build -%global src_tarball llvm-for-oE-17.0.6-2506.0.1 +%global src_tarball llvm-for-oE-17.0.6-2506.0.2 %global src_tarball_dir llvm-project-%{src_tarball} #region LLVM globals @@ -151,7 +151,7 @@ Name: llvm Name: llvm-toolset-%{maj_ver} %endif Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 40 +Release: 41 Summary: The Low Level Virtual Machine License: NCSA @@ -173,7 +173,6 @@ Patch0004: 0004-remove-cmake_minimum_required.patch %if %{with bisheng_autotuner} Patch0005: 0005-Fix-for-building-autotuner-with-mlir.patch %endif -Patch0006: 0006-openmp-LoongArch-Fix-compile-error-after-commit-5298.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -1662,6 +1661,8 @@ reset_test_opts reset_test_opts # Xfail testing of update utility tools export LIT_XFAIL="tools/UpdateTestChecks" +# Todo: temporarily block this testcase +export LIT_XFAIL="$LIT_XFAIL;CodeGen/X86/machine-function-splitter.ll" %build_tool %cmake_target_opts check-llvm #endregion Test LLVM @@ -2880,6 +2881,11 @@ fi #endregion files %changelog +* Wed Jun 04 2025 liyunfei - 17.0.6-41 +- update to llvm-for-oe-17.0.6-2506.0.2 +- release-note https://gitee.com/openeuler/llvm-project/releases/tag/llvm-for-oE-17.0.6-2506.0.2 +- add a small patch for backport testcase issue fix + * Thu May 29 2025 wangqiang - 17.0.6-40 - Modified python3-lldb dependency to require exact version match -- Gitee