diff --git a/0001-Change-branch-name-for-jemalloc.patch b/0001-Change-branch-name-for-jemalloc.patch new file mode 100644 index 0000000000000000000000000000000000000000..c96068576b4ea1f8e7cf196aab6a8404bfadb8a9 --- /dev/null +++ b/0001-Change-branch-name-for-jemalloc.patch @@ -0,0 +1,26 @@ +From f8ce0c51d9acc58ad3a414831dc8ed0507a5519e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E9=83=91=E6=99=A8=E5=8D=89?= +Date: Wed, 11 Dec 2024 17:17:48 +0800 +Subject: [PATCH] Change branch name for jemalloc. + +--- + build/download.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build/download.sh b/build/download.sh +index 02ad9b6..e1a4c0b 100644 +--- a/build/download.sh ++++ b/build/download.sh +@@ -56,7 +56,8 @@ download $MPC_NAME + download $MPFR_NAME + download $ISL_NAME + download $MATHLIB_NAME +-download $JEMALLOC_NAME ++[ -d "$JEMALLOC_NAME" ] && rm -rf $JEMALLOC_NAME ++echo "Download $JEMALLOC_NAME." && git clone -b openEuler-22.03-LTS-SP1-release https://gitee.com/src-openeuler/$JEMALLOC_NAME.git + download $AUTOFDO_NAME + download $BOLT_NAME + download $CMAKE_NAME +-- +2.33.0 + diff --git a/0002-install-python3-wheel.patch b/0002-install-python3-wheel.patch new file mode 100644 index 0000000000000000000000000000000000000000..f98972e2dcc492d6ed6a0406cff29bd31c34db82 --- /dev/null +++ b/0002-install-python3-wheel.patch @@ -0,0 +1,25 @@ +From 9e2bfbbdbed9ef7e33adc07428f6cd6d432707ef Mon Sep 17 00:00:00 2001 +From: zhenyu--zhao_admin +Date: Sat, 14 Dec 2024 12:26:43 +0800 +Subject: [PATCH] install python3-wheel. + +--- + build/download.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/build/download.sh b/build/download.sh +index 02ad9b6..727e2c4 100644 +--- a/build/download.sh ++++ b/build/download.sh +@@ -40,6 +40,8 @@ readonly AUTO_TUNER="BiSheng-Autotuner" + # Create the open source software directory. + [ ! -d "$OPEN_SOURCE_PATH" ] && mkdir $OPEN_SOURCE_PATH + ++pip3 install $PWD/*.whl ++ + download() { + [ -d "$1" ] && rm -rf $1 + echo "Download $1." && git clone -b $BRANCH https://gitee.com/src-openeuler/$1.git --depth=1 +-- +2.33.0 + 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/config.xml b/config.xml index cc53fbcd9d903cbdb3d59ae84e9197d7fa413546..239236521f7babb2de1774be8b727472e77e1b51 100644 --- a/config.xml +++ b/config.xml @@ -1,17 +1,35 @@ -BRANCH="openEuler-22.03-LTS-Next" -INSTALL_NATIVE="gcc-10.3.1-2022.12-aarch64-linux" -COMPILER_INFO="gcc for openEuler 2.3.3" +BRANCH="openEuler-24.03-LTS-SP1" +INSTALL_NATIVE="gcc-12.3.1-2024.12-aarch64-linux" +COMPILER_INFO="gcc for openEuler 3.0.1" -GCC="gcc-10.3.0" -BINUTILS="binutils-2.37" -GMP="gmp-6.2.1" -MPC="mpc-1.2.0" -MATHLIB="optimized-routines-21.02" -ISL="isl-0.16.1" -OLD_ISL="isl-0.14" +GCC="gcc-12.3.0" +BINUTILS="binutils-2.41" +GMP="gmp-6.3.0" +TEXINFO="texinfo-7.0.3" +MPC="mpc-1.3.1" +MPFR="mpfr-4.2.1" +ISL="isl-0.24" +MATHLIB="optimized-routines-24.01" JEMALLOC="jemalloc-5.2.1" -MPFR="mpfr-4.1.0" AUTOFDO="autofdo-0.19" -BOLT="llvm-bolt-0" -CMAKE="cmake-3.22.0" -OPENSSL="openssl-1.1.1m" +BOLT="llvm-project-17.0.6.src" +CMAKE="cmake-3.27.9" +AI4C="AI4C-v1.0.4-alpha" +YAML_CPP="yaml-cpp-0.7.0" +OPENSSL="openssl-3.0.12" +NCURSES="ncurses-6.4" +LLVM="llvm-17.0.6.src" +LLVM_CMAKE="cmake-17.0.6.src" +LLVM_THIRD_PARTY="third-party-17.0.6.src" +MLIR="mlir-17.0.6.src" +PROTOBUF="protobuf-25.1" +GCC_CLIENT="pin-gcc-client-0.4.1" +GRPC="grpc-1.60.0" +CARES="c-ares-1.19.1" +ABSEIL="abseil-cpp-20230802.1" +RE2="re2-2024-02-01" +JSONCPP="jsoncpp-1.9.5" +PERL="perl-5.38.0" +PERL_IPC_CMD="IPC-Cmd-1.04" +OPEN_TUNER="BiSheng-opentuner-0.8.8" +AUTO_TUNER="BiSheng-Autotuner-2.2.0" diff --git a/gcc-for-openEuler-1.0.4.tar.gz b/gcc-for-openEuler-1.0.4.tar.gz deleted file mode 100644 index 0e9d128d7b11addd519b642d9ed21ecd140e225a..0000000000000000000000000000000000000000 Binary files a/gcc-for-openEuler-1.0.4.tar.gz and /dev/null differ diff --git a/gcc-for-openEuler-2.0.1.tar.gz b/gcc-for-openEuler-2.0.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..6e31c26108c391296377e134a2cb783981083085 Binary files /dev/null and b/gcc-for-openEuler-2.0.1.tar.gz differ diff --git a/gcc-for-openEuler.spec b/gcc-for-openEuler.spec index d1aab4fcec5c0e3726aea12b593b9522c0387092..d5e2fd9787b43e0d494d9aa24d34805203373e74 100644 --- a/gcc-for-openEuler.spec +++ b/gcc-for-openEuler.spec @@ -1,19 +1,25 @@ Name: gcc-for-openEuler -Version: 1.0.4 -Release: 6 +Version: 2.0.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 URL: https://gitee.com/openEuler/gcc-for-openEuler Source0: %{name}-%{version}.tar.gz +Source1: wheel-0.37.1-py2.py3-none-any.whl %global config config.xml -%global build_name gcc-10.3.1-2022.12-aarch64-linux +%global build_name gcc-12.3.1-2024.12-aarch64-linux ExclusiveArch: aarch64 BuildRequires: git bison flex texinfo autoconf libtool elfutils-libelf-devel glibc-static -BuildRequires: chrpath centos-release-scl devtoolset-7 python3 zlib-devel lksctp-tools-devel +BuildRequires: chrpath centos-release-scl devtoolset-7 python3 zlib-devel lksctp-tools-devel python3-setuptools + +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. @@ -22,8 +28,10 @@ GCC released as a binary package for openEuler and other OSes. %global debug_package %{nil} %prep -%autosetup +%autosetup -p1 + cp -f %{_sourcedir}/%{config} build/ +cp %{_sourcedir}/wheel-*.whl build/ %build cd %{_builddir}/%{name}-%{version}/build @@ -41,6 +49,27 @@ 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. + +* Thu Nov 28 2024 Zheng Chenhui - 2.0.0-5 +- Fix bolt/grpc build bugs and link error. + +* Thu Oct 10 2024 Zheng Chenhui - 2.0.0-4 +- Add libcrypto.so. + +* Wed Oct 9 2024 Zheng Chenhui - 2.0.0-3 +- Add autofdo binary files. + +* Fri Sep 27 2024 Zheng Chenhui - 2.0.0-2 +- Modify openssl compilation options to match src repository. + +* Fri Sep 20 2024 Zheng Chenhui - 2.0.0-1 +- Update to GCC12 version. + * Wed Dec 21 2022 Xiong Zhou - 1.0.4-6 - Update the date to 2022.12 in the gcc build name. diff --git a/wheel-0.37.1-py2.py3-none-any.whl b/wheel-0.37.1-py2.py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..e6c4d95f532b91c4e653ae7fc1c849a377199870 Binary files /dev/null and b/wheel-0.37.1-py2.py3-none-any.whl differ