diff --git a/0001-Change-branch-name-for-mathlib-and-jemalloc.patch b/0001-Change-branch-name-for-mathlib-and-jemalloc.patch new file mode 100644 index 0000000000000000000000000000000000000000..482bc53da971bdcd6db40ccad9036aaf19bcfe5d --- /dev/null +++ b/0001-Change-branch-name-for-mathlib-and-jemalloc.patch @@ -0,0 +1,29 @@ +From 8447811a9afa7345a506f45faff1bf716b9c475b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E9=83=91=E6=99=A8=E5=8D=89?= +Date: Sat, 21 Sep 2024 11:49:43 +0800 +Subject: [PATCH] Change branch name for mathlib and jemalloc + +--- + build/download.sh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/build/download.sh b/build/download.sh +index 5d97f85..2ee5106 100644 +--- a/build/download.sh ++++ b/build/download.sh +@@ -51,8 +51,10 @@ download $TEXINFO_NAME + download $MPC_NAME + download $MPFR_NAME + download $ISL_NAME +-download $MATHLIB_NAME +-download $JEMALLOC_NAME ++[ -d "$MATHLIB_NAME" ] && rm -rf $MATHLIB_NAME ++echo "Download $MATHLIB_NAME." && git clone -b openEuler-24.09-release https://gitee.com/src-openeuler/$MATHLIB_NAME.git ++[ -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-Temporarily-fix-pin-gcc-client-build-error.patch b/0002-Temporarily-fix-pin-gcc-client-build-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..5242ea8c3f58d35e02c6e897af2339df66e74a3d --- /dev/null +++ b/0002-Temporarily-fix-pin-gcc-client-build-error.patch @@ -0,0 +1,24 @@ +From 5206126dc050bcb2d5ad6296b14fbe2f8d863ddf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E9=83=91=E6=99=A8=E5=8D=89?= +Date: Mon, 23 Sep 2024 15:37:43 +0800 +Subject: [PATCH] Temporarily fix pin-gcc-client build error. + +--- + build/hcc_arm64le_native/hcc_aarch64_native_final.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build/hcc_arm64le_native/hcc_aarch64_native_final.sh b/build/hcc_arm64le_native/hcc_aarch64_native_final.sh +index ae3cc54..d0ba38e 100644 +--- a/build/hcc_arm64le_native/hcc_aarch64_native_final.sh ++++ b/build/hcc_arm64le_native/hcc_aarch64_native_final.sh +@@ -34,6 +34,7 @@ export CXX=$PREFIX_NATIVE/bin/g++ + + echo "Building pin_gcc_client..." && pushd "${ROOT_NATIVE_DIR}/obj/build-client" + sed -i '/^find_package(PkgConfig REQUIRED)/,/^pkg_check_modules(PC_PROTOBUF "protobuf>=3.1.0")/ s/^/# /' $ROOT_NATIVE_SRC/$GCC_CLIENT/cmake/common.cmake ++sed -i '/#include /a #include "unistd.h"' $ROOT_NATIVE_SRC/$GCC_CLIENT/lib/PluginClient/PluginLog.cpp + cmake -G"Unix Makefiles" $ROOT_NATIVE_SRC/$GCC_CLIENT -DLLVM_DIR=$PREFIX_MLIR/lib/cmake/llvm -DMLIR_DIR=$PREFIX_MLIR/lib/cmake/mlir -DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$ROOT_NATIVE_DIR/obj/build-client -DCMAKE_PREFIX_PATH=$PREFIX_NATIVE -DCMAKE_C_FLAGS="${SECURE_CFLAGS}" -DCMAKE_CXX_FLAGS="${SECURE_CFLAGS}" -DCMAKE_SHRAED_LINKER_FLAGS="${SECURE_LDFLAGS}" + make -j $PARALLEL && make install -j $PARAELLEL && popd + cp $ROOT_NATIVE_DIR/obj/build-client/lib64/libpin_gcc_client.so $PREFIX_NATIVE/lib64 +-- +2.33.0 + diff --git a/config.xml b/config.xml index cc53fbcd9d903cbdb3d59ae84e9197d7fa413546..de3b6cbee2b533f4214e6b11a394e463c57c97fa 100644 --- a/config.xml +++ b/config.xml @@ -1,17 +1,31 @@ -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.09" +INSTALL_NATIVE="gcc-12.3.1-2024.09-aarch64-linux" +COMPILER_INFO="gcc for openEuler 3.0.0" -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" +AUTOFDO="autofdo-0.30.1" +BOLT="llvm-project-17.0.6.src" +CMAKE="cmake-3.27.9" +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-20240116.2" +RE2="re2-2024-02-01" +JSONCPP="jsoncpp-1.9.5" +PERL="perl-5.38.0" +PERL_IPC_CMD="IPC-Cmd-1.04" \ No newline at end of file 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.0.tar.gz b/gcc-for-openEuler-2.0.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1b3e5815a715383170d923d5408c81698969a4d4 Binary files /dev/null and b/gcc-for-openEuler-2.0.0.tar.gz differ diff --git a/gcc-for-openEuler.spec b/gcc-for-openEuler.spec index d1aab4fcec5c0e3726aea12b593b9522c0387092..a7ff97ae879e2d70c9c8580ce1fc0af35d55695a 100644 --- a/gcc-for-openEuler.spec +++ b/gcc-for-openEuler.spec @@ -1,6 +1,6 @@ Name: gcc-for-openEuler -Version: 1.0.4 -Release: 6 +Version: 2.0.0 +Release: 1 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 @@ -8,13 +8,16 @@ URL: https://gitee.com/openEuler/gcc-for-openEuler Source0: %{name}-%{version}.tar.gz %global config config.xml -%global build_name gcc-10.3.1-2022.12-aarch64-linux +%global build_name gcc-12.3.1-2024.09-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 +Patch1: 0001-Change-branch-name-for-mathlib-and-jemalloc.patch +Patch2: 0002-Temporarily-fix-pin-gcc-client-build-error.patch + %description GCC released as a binary package for openEuler and other OSes. @@ -22,7 +25,7 @@ GCC released as a binary package for openEuler and other OSes. %global debug_package %{nil} %prep -%autosetup +%autosetup -p1 cp -f %{_sourcedir}/%{config} build/ %build @@ -41,6 +44,9 @@ sha256sum %{build_name}.tar.gz > %{build_name}.tar.gz.sha256 %attr(755, root, root) /%{build_name}.tar.gz.sha256 %changelog +* 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.