diff --git a/0003-move-bolt-libraries-to-lib.patch b/0003-move-bolt-libraries-to-lib.patch new file mode 100644 index 0000000000000000000000000000000000000000..b342a073b1f22ccce73b0e3b7ed494bc51c3b140 --- /dev/null +++ b/0003-move-bolt-libraries-to-lib.patch @@ -0,0 +1,25 @@ +From fe2456e8d09f561645460b477e4bff8fb03d1031 Mon Sep 17 00:00:00 2001 +From: zhenyu--zhao_admin +Date: Thu, 26 Dec 2024 19:52:28 +0800 +Subject: [PATCH] move bolt libraries to /lib + +--- + build/hcc_arm64le_native/hcc_aarch64_native_release.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/hcc_arm64le_native/hcc_aarch64_native_release.sh b/build/hcc_arm64le_native/hcc_aarch64_native_release.sh +index 93b2158..2b90ccb 100644 +--- a/build/hcc_arm64le_native/hcc_aarch64_native_release.sh ++++ b/build/hcc_arm64le_native/hcc_aarch64_native_release.sh +@@ -127,7 +127,7 @@ cmake -G"Unix Makefiles" $ROOT_NATIVE_SRC/$BOLT/llvm -DCMAKE_BUILD_TYPE=Release + make -j $PARALLEL && make install -j $PARALLEL && popd + # Put in llvm-bolt and perf2bolt. + cp $PREFIX_BOLT/bin/llvm-bolt $PREFIX_BOLT/bin/perf2bolt $PREFIX_NATIVE/bin +-cp -r $PREFIX_BOLT/lib/lib* $PREFIX_NATIVE/lib64 ++cp -r $PREFIX_BOLT/lib/lib* $PREFIX_NATIVE/lib + + echo "Building mlir..." && pushd $ROOT_NATIVE_DIR/obj/build-llvm-mlir + cmake -G"Unix Makefiles" $ROOT_NATIVE_SRC/$MLIR -DLLVM_ENABLE_RTTI=ON -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_ENABLE_PROJECTS="mlir" -DLLVM_TARGETS_TO_BUILD="AArch64" -DCMAKE_INSTALL_PREFIX=$PREFIX_MLIR +-- +2.33.0 + diff --git a/0004-Change-branch-name-for-gcc-and-AI4C.patch b/0004-Change-branch-name-for-gcc-and-AI4C.patch new file mode 100644 index 0000000000000000000000000000000000000000..f51ad98e673d01928c5603ce144ea3518cc34eec --- /dev/null +++ b/0004-Change-branch-name-for-gcc-and-AI4C.patch @@ -0,0 +1,36 @@ +From ed44ca6c35ce90b69a6255dd035f6496743633dc Mon Sep 17 00:00:00 2001 +From: zhenyu--zhao_admin +Date: Tue, 31 Dec 2024 15:08:22 +0800 +Subject: [PATCH] Change branch name for gcc and AI4C. + +--- + build/download.sh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/build/download.sh b/build/download.sh +index 02ad9b6..8ea633e 100644 +--- a/build/download.sh ++++ b/build/download.sh +@@ -48,7 +48,8 @@ download() { + # Download packages. + pushd $OPEN_SOURCE_PATH + +-download $GCC_NAME ++[ -d "$GCC_NAME" ] && rm -rf $GCC_NAME ++echo "Download $GCC_NAME." && git clone -b openEuler-24.03-LTS-SP1-release https://gitee.com/src-openeuler/$GCC_NAME.git --depth=1 + download $BINUTILS_NAME + download $GMP_NAME + download $TEXINFO_NAME +@@ -60,7 +61,8 @@ download $JEMALLOC_NAME + download $AUTOFDO_NAME + download $BOLT_NAME + download $CMAKE_NAME +-download $AI4C_NAME ++[ -d "$AI4C_NAME" ] && rm -rf $AI4C_NAME ++echo "Download $AI4C_NAME." && git clone -b openEuler-24.03-LTS-SP1-release https://gitee.com/src-openeuler/$AI4C_NAME.git --depth=1 + download $YAML_CPP_NAME + download $OPENSSL_NAME + download $NCURSES_NAME +-- +2.33.0 + diff --git a/gcc-for-openEuler.spec b/gcc-for-openEuler.spec index b16761d34711df5fb157adf23b9e5b4bcb4c9680..d5e2fd9787b43e0d494d9aa24d34805203373e74 100644 --- a/gcc-for-openEuler.spec +++ b/gcc-for-openEuler.spec @@ -1,6 +1,6 @@ Name: gcc-for-openEuler Version: 2.0.1 -Release: 1 +Release: 2 Summary: GCC released as a binary package for openEuler and other OSes. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2 and BSD @@ -18,6 +18,8 @@ BuildRequires: chrpath centos-release-scl devtoolset-7 python3 zlib-devel lksctp Patch1: 0001-Change-branch-name-for-jemalloc.patch Patch2: 0002-install-python3-wheel.patch +Patch3: 0003-move-bolt-libraries-to-lib.patch +Patch4: 0004-Change-branch-name-for-gcc-and-AI4C.patch %description GCC released as a binary package for openEuler and other OSes. @@ -47,6 +49,9 @@ sha256sum %{build_name}.tar.gz > %{build_name}.tar.gz.sha256 %attr(755, root, root) /%{build_name}.tar.gz.sha256 %changelog +* Tue Dec 31 2024 Zheng Chenhui - 2.0.1-2 +- Fix some build error and change branch name for gcc/AI4C. + * Wed Dec 11 2024 Zheng Chenhui - 2.0.1-1 - Add AI4C and fix some build error.