diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..8b07dd7828f72b0cb2345ae0f4d295507305991f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..d4809a9283ef794cadf57b349f66618cef27c772 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/llvm-toolset-17 \ No newline at end of file diff --git a/0004-remove-cmake_minimum_required.patch b/0004-remove-cmake_minimum_required.patch new file mode 100644 index 0000000000000000000000000000000000000000..4c6a706ba1dc71c9640ae962e319c69d60b672d3 --- /dev/null +++ b/0004-remove-cmake_minimum_required.patch @@ -0,0 +1,343 @@ +From 17621e9cc5dea359fbf2aaa0e20e4f2a67d41fa6 Mon Sep 17 00:00:00 2001 +From: liyunfei +Date: Thu, 6 Mar 2025 12:48:04 +0800 +Subject: [PATCH] remove cmake_minimum_required + +--- + bolt/runtime/CMakeLists.txt | 2 +- + clang/CMakeLists.txt | 2 +- + clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt | 2 +- + compiler-rt/CMakeLists.txt | 2 +- + compiler-rt/lib/builtins/CMakeLists.txt | 2 +- + flang/CMakeLists.txt | 2 +- + flang/lib/Decimal/CMakeLists.txt | 2 +- + flang/runtime/CMakeLists.txt | 2 +- + libc/CMakeLists.txt | 2 +- + libc/examples/hello_world/CMakeLists.txt | 2 +- + libclc/CMakeLists.txt | 2 +- + libcxx/CMakeLists.txt | 2 +- + libcxxabi/CMakeLists.txt | 2 +- + libunwind/CMakeLists.txt | 2 +- + lld/CMakeLists.txt | 2 +- + lldb/CMakeLists.txt | 2 +- + lldb/tools/debugserver/CMakeLists.txt | 2 +- + llvm-libgcc/CMakeLists.txt | 2 +- + llvm/CMakeLists.txt | 2 +- + mlir/CMakeLists.txt | 2 +- + mlir/examples/standalone/CMakeLists.txt | 2 +- + openmp/CMakeLists.txt | 2 +- + openmp/cmake/DetectTestCompiler/CMakeLists.txt | 2 +- + openmp/libompd/src/CMakeLists.txt | 2 +- + polly/CMakeLists.txt | 2 +- + pstl/CMakeLists.txt | 2 +- + runtimes/CMakeLists.txt | 2 +- + 27 files changed, 27 insertions(+), 27 deletions(-) + +diff --git a/bolt/runtime/CMakeLists.txt b/bolt/runtime/CMakeLists.txt +index 8472ce00b413..3ddfd2b1743b 100644 +--- a/bolt/runtime/CMakeLists.txt ++++ b/bolt/runtime/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + include(CheckIncludeFiles) + include(GNUInstallDirs) + +diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt +index 98fcb6ea1a07..18936e79a24c 100644 +--- a/clang/CMakeLists.txt ++++ b/clang/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) + set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) +diff --git a/clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt b/clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt +index 95c6fdb610e0..1d1d2a40050e 100644 +--- a/clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt ++++ b/clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt +@@ -1,6 +1,6 @@ + project(exec C) + +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + include(CheckCCompilerFlag) + check_c_compiler_flag("-std=c99" C99_SUPPORTED) +diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt +index cfa97023d281..5f20a92155e3 100644 +--- a/compiler-rt/CMakeLists.txt ++++ b/compiler-rt/CMakeLists.txt +@@ -3,7 +3,7 @@ + # An important constraint of the build is that it only produces libraries + # based on the ability of the host toolchain to target various platforms. + +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake +diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt +index d62fa0432e2a..1b5028472ddc 100644 +--- a/compiler-rt/lib/builtins/CMakeLists.txt ++++ b/compiler-rt/lib/builtins/CMakeLists.txt +@@ -3,7 +3,7 @@ + # architecture-specific code in various subdirectories. + + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +- cmake_minimum_required(VERSION 3.20.0) ++ cmake_minimum_required(VERSION 3.16.0) + + set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) + project(CompilerRTBuiltins C ASM) +diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt +index ac30da89995e..2b778265b432 100644 +--- a/flang/CMakeLists.txt ++++ b/flang/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) + set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) +diff --git a/flang/lib/Decimal/CMakeLists.txt b/flang/lib/Decimal/CMakeLists.txt +index 3116ff68ea26..319c75957e89 100644 +--- a/flang/lib/Decimal/CMakeLists.txt ++++ b/flang/lib/Decimal/CMakeLists.txt +@@ -1,5 +1,5 @@ + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +- cmake_minimum_required(VERSION 3.20.0) ++ cmake_minimum_required(VERSION 3.16.0) + + project(FortranDecimal C CXX) + +diff --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt +index 5b23065a32d1..22ef3984110a 100644 +--- a/flang/runtime/CMakeLists.txt ++++ b/flang/runtime/CMakeLists.txt +@@ -7,7 +7,7 @@ + #===------------------------------------------------------------------------===# + + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +- cmake_minimum_required(VERSION 3.20.0) ++ cmake_minimum_required(VERSION 3.16.0) + + project(FlangRuntime C CXX) + +diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt +index 4be92ba1380c..9ac479b1c01d 100644 +--- a/libc/CMakeLists.txt ++++ b/libc/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + # Include LLVM's cmake policies. + if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) +diff --git a/libc/examples/hello_world/CMakeLists.txt b/libc/examples/hello_world/CMakeLists.txt +index 1561cdc1c3bf..64062f522a11 100644 +--- a/libc/examples/hello_world/CMakeLists.txt ++++ b/libc/examples/hello_world/CMakeLists.txt +@@ -1,5 +1,5 @@ + project(hello_world) +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + include(../examples.cmake) + + add_example( +diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt +index 9daef8265c16..2b4c32e235f6 100644 +--- a/libclc/CMakeLists.txt ++++ b/libclc/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + project( libclc VERSION 0.2.0 LANGUAGES CXX C) + +diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt +index b8ac536588d3..4d8ba59e9a14 100644 +--- a/libcxx/CMakeLists.txt ++++ b/libcxx/CMakeLists.txt +@@ -4,7 +4,7 @@ + #=============================================================================== + # Setup Project + #=============================================================================== +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + +diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt +index f380fe6b6b92..12a8686fe429 100644 +--- a/libcxxabi/CMakeLists.txt ++++ b/libcxxabi/CMakeLists.txt +@@ -4,7 +4,7 @@ + # Setup Project + #=============================================================================== + +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + +diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt +index bc2a820fe98e..ac5b67357152 100644 +--- a/libunwind/CMakeLists.txt ++++ b/libunwind/CMakeLists.txt +@@ -2,7 +2,7 @@ + # Setup Project + #=============================================================================== + +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + +diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt +index 595c286abd91..2ecd15275929 100644 +--- a/lld/CMakeLists.txt ++++ b/lld/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) + set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) +diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt +index 4a53d7ef3d0d..c643ee9654f3 100644 +--- a/lldb/CMakeLists.txt ++++ b/lldb/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) + set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) +diff --git a/lldb/tools/debugserver/CMakeLists.txt b/lldb/tools/debugserver/CMakeLists.txt +index 74afea804598..9274870fe830 100644 +--- a/lldb/tools/debugserver/CMakeLists.txt ++++ b/lldb/tools/debugserver/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + project(Debugserver LANGUAGES C CXX ASM-ATT) + +diff --git a/llvm-libgcc/CMakeLists.txt b/llvm-libgcc/CMakeLists.txt +index de42d908c371..cd825172274b 100644 +--- a/llvm-libgcc/CMakeLists.txt ++++ b/llvm-libgcc/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libunwind") + message(FATAL_ERROR "llvm-libgcc requires being built in a monorepo layout with libunwind available") +diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt +index b0afb47a7243..1885b9450ae5 100644 +--- a/llvm/CMakeLists.txt ++++ b/llvm/CMakeLists.txt +@@ -1,6 +1,6 @@ + # See docs/CMake.html for instructions about how to build LLVM with CMake. + +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) + include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake +diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt +index c91e9cd93dc8..beacaf45721f 100644 +--- a/mlir/CMakeLists.txt ++++ b/mlir/CMakeLists.txt +@@ -1,5 +1,5 @@ + # MLIR project. +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) + set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) +diff --git a/mlir/examples/standalone/CMakeLists.txt b/mlir/examples/standalone/CMakeLists.txt +index 038242ba1437..c143d373fa6b 100644 +--- a/mlir/examples/standalone/CMakeLists.txt ++++ b/mlir/examples/standalone/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + project(standalone-dialect LANGUAGES CXX C) + + set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) +diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt +index c1efcaf80b54..e82b81aa3052 100644 +--- a/openmp/CMakeLists.txt ++++ b/openmp/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) + +diff --git a/openmp/cmake/DetectTestCompiler/CMakeLists.txt b/openmp/cmake/DetectTestCompiler/CMakeLists.txt +index 8ea7ab8d45ba..56ffd3c51a7f 100644 +--- a/openmp/cmake/DetectTestCompiler/CMakeLists.txt ++++ b/openmp/cmake/DetectTestCompiler/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + project(DetectTestCompiler C CXX) + + include(CheckCCompilerFlag) +diff --git a/openmp/libompd/src/CMakeLists.txt b/openmp/libompd/src/CMakeLists.txt +index 0402a0177201..f9955c02b545 100644 +--- a/openmp/libompd/src/CMakeLists.txt ++++ b/openmp/libompd/src/CMakeLists.txt +@@ -9,7 +9,7 @@ + # + + project (libompd) +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + add_library (ompd SHARED TargetValue.cpp omp-debug.cpp omp-state.cpp omp-icv.cpp) + +diff --git a/polly/CMakeLists.txt b/polly/CMakeLists.txt +index 5d0f2cd7f00e..28f7c580f6a4 100644 +--- a/polly/CMakeLists.txt ++++ b/polly/CMakeLists.txt +@@ -1,7 +1,7 @@ + # Check if this is a in tree build. + if (NOT DEFINED LLVM_MAIN_SRC_DIR) + project(Polly) +- cmake_minimum_required(VERSION 3.20.0) ++ cmake_minimum_required(VERSION 3.16.0) + set(POLLY_STANDALONE_BUILD TRUE) + endif() + +diff --git a/pstl/CMakeLists.txt b/pstl/CMakeLists.txt +index 255e22af9a26..1364d451224a 100644 +--- a/pstl/CMakeLists.txt ++++ b/pstl/CMakeLists.txt +@@ -5,7 +5,7 @@ + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception + # + #===----------------------------------------------------------------------===## +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + set(PARALLELSTL_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/include/pstl/internal/pstl_config.h") + file(STRINGS "${PARALLELSTL_VERSION_FILE}" PARALLELSTL_VERSION_SOURCE REGEX "#define _PSTL_VERSION .*$") +diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt +index 599529852688..918e7a9c1c7e 100644 +--- a/runtimes/CMakeLists.txt ++++ b/runtimes/CMakeLists.txt +@@ -1,5 +1,5 @@ + # This file handles building LLVM runtime sub-projects. +-cmake_minimum_required(VERSION 3.20.0) ++cmake_minimum_required(VERSION 3.16.0) + + # Add path for custom and the LLVM build's modules to the CMake module path. + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") +-- +2.42.0.windows.2 + diff --git a/llvm-for-oE-17.0.6-2503.0.1.tar.gz b/llvm-for-oE-17.0.6-2503.0.1.tar.gz deleted file mode 100644 index 0ab84e1a91541361cb683fcb8ec76e050ea98553..0000000000000000000000000000000000000000 Binary files a/llvm-for-oE-17.0.6-2503.0.1.tar.gz and /dev/null differ diff --git a/llvm-for-oE-17.0.6-2503.0.2.tar.gz b/llvm-for-oE-17.0.6-2503.0.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d1e8005354bf453aa8efed27735584a76c8cb445 --- /dev/null +++ b/llvm-for-oE-17.0.6-2503.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69d108c6097cce7c7ba73346e99fbe75a8f59d5fa573e189bed0fd66e18b39a9 +size 195644037 diff --git a/llvm-toolset-17.spec b/llvm-toolset-17.spec index f12ce0d7cc051346f366b7de0cd8b20be27290d2..554191bd66e15a1f734656bcfd5f904ac4ca4ab7 100644 --- a/llvm-toolset-17.spec +++ b/llvm-toolset-17.spec @@ -9,7 +9,7 @@ # Build sys_llvm packages or compat packages %bcond_with sys_llvm %bcond_with check -%if %{os_version} <= 2203 +%if %{os_version} == 2203 %bcond_with toolchain_clang %else %bcond_without toolchain_clang @@ -30,7 +30,7 @@ %undefine __cmake_in_source_build -%global src_tarball llvm-for-oE-17.0.6-2503.0.1 +%global src_tarball llvm-for-oE-17.0.6-2503.0.2 %global src_tarball_dir llvm-project-%{src_tarball} #region LLVM globals @@ -150,7 +150,7 @@ #region main package Name: llvm-toolset-%{maj_ver} Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 5 +Release: 7 Summary: The Low Level Virtual Machine License: NCSA @@ -166,6 +166,9 @@ Source2: CMakeLists.txt Patch0001: 0001-PATCH-clang-Don-t-install-static-libraries.patch Patch0002: 0002-Always-build-shared-libs-for-LLD.patch Patch0003: 0003-fedora-standalone.patch +%if %{os_version} <= 2003 +Patch0004: 0004-remove-cmake_minimum_required.patch +%endif BuildRequires: gcc BuildRequires: gcc-c++ @@ -786,6 +789,12 @@ export ASMFLAGS="%{build_cflags}" %global cmake_config_args %{cmake_common_args} +%if %{with toolchain_clang} +%global cmake_config_args %{cmake_config_args} \\\ + -DCMAKE_C_COMPILER=clang \\\ + -DCMAKE_CXX_COMPILER=clang++ +%endif + #region clang options %global cmake_config_args %{cmake_config_args} \\\ -DCLANG_BUILD_EXAMPLES:BOOL=OFF \\\ @@ -1360,10 +1369,8 @@ rm -rf %{buildroot}/%{install_datadir}/gdb %ifnarch %{ix86} # Remove files that we don't package, yet. -%if %{os_version} > 2203 -rm %{buildroot}%{install_bindir}/llvm-omp-device-info -rm %{buildroot}%{install_bindir}/llvm-omp-kernel-replay -%endif +rm -rf %{buildroot}%{install_bindir}/llvm-omp-device-info +rm -rf %{buildroot}%{install_bindir}/llvm-omp-kernel-replay %endif #endregion OPENMP installation @@ -2765,6 +2772,12 @@ fi #endregion files %changelog +* Mon Mar 17 2025 liyunfei liyunfei33@huawei.com - 17.0.6-7 +- update to llvm-for-oE-17.0.6-2503.0.2 + +* Mon Mar 3 2025 liyunfei liyunfei33@huawei.com - 17.0.6-6 +- fix cmake version requirment for 2003 build + * Mon Mar 3 2025 liyunfei liyunfei33@huawei.com - 17.0.6-5 - Remove python pack without sys_llvm