diff --git a/cross_tools/configs/config.xml b/cross_tools/configs/config.xml index a5b71f473b769fe7a9200719fd69dc26c43fc90d..8736398ab111f9cbe7d35c599bd2678a04a4e450 100644 --- a/cross_tools/configs/config.xml +++ b/cross_tools/configs/config.xml @@ -1,28 +1,28 @@ -COMPILER_INFO="gcc 10.3.1" +COMPILER_INFO="gcc 12.3.0" KERNEL="kernel" KERNEL_BRANCH="5.10.0-136.20.0" MUSLC_BRANCH="master" -COMMON_BRANCH="openEuler-23.03" +COMMON_BRANCH="openEuler-23.09" GCC="gcc" -GCC_DIR="gcc-10.3.0" +GCC_DIR="gcc-12.3.0" BINUTILS="binutils" -BINUTILS_DIR="binutils-2.37" +BINUTILS_DIR="binutils-2.40" MPFR="mpfr" -MPFR_DIR="mpfr-4.1.0" +MPFR_DIR="mpfr-4.2.0" GMP="gmp" -GMP_DIR="gmp-6.2.1" +GMP_DIR="gmp-6.3.0" MPC="libmpc" MPC_DIR="mpc-1.3.1" ISL="isl" ISL_DIR="isl-0.24" GLIBC="glibc" -GLIBC_DIR="glibc-2.36" +GLIBC_DIR="glibc-2.38" MUSLC="musl" -MUSLC_DIR="musl-1.2.3" +MUSLC_DIR="musl-1.2.4" EXPAT="expat" EXPAT_DIR="expat-2.5.0" GETTEXT="gettext" -GETTEXT_DIR="gettext-0.21" +GETTEXT_DIR="gettext-0.22" LIBICONV="libiconv" LIBICONV_DIR="libiconv-1.16" NCURSES="ncurses" diff --git a/cross_tools/configs/config_aarch64 b/cross_tools/configs/config_aarch64 index 5f2358eb24d7c8d685361d607b67cafca2a1fbd5..0a296c2d1a6cbe8047deeeb806c496b8f16ee7f5 100644 --- a/cross_tools/configs/config_aarch64 +++ b/cross_tools/configs/config_aarch64 @@ -504,7 +504,7 @@ CT_GLIBC_BUILD_SSP=y CT_GLIBC_HAS_LIBIDN_ADDON=y # CT_GLIBC_USE_LIBIDN_ADDON is not set CT_GLIBC_NO_SPARC_V8=y -CT_GLIBC_EXTRA_CONFIG_ARRAY="libc_cv_rtlddir=/lib64 libc_cv_slibdir=/lib64 --libdir=/usr/lib64 " +CT_GLIBC_EXTRA_CONFIG_ARRAY="--enable-crypt libc_cv_rtlddir=/lib64 libc_cv_slibdir=/lib64 --libdir=/usr/lib64 " CT_GLIBC_CONFIGPARMS="" CT_GLIBC_EXTRA_CFLAGS="" # CT_GLIBC_ENABLE_FORTIFIED_BUILD is not set diff --git a/cross_tools/configs/config_arm32 b/cross_tools/configs/config_arm32 index 420883089fe74c29fcc7b545fc37d7371bd0bccc..c5e3c3a7151f9d9106972c4927323617c93ecb39 100644 --- a/cross_tools/configs/config_arm32 +++ b/cross_tools/configs/config_arm32 @@ -521,7 +521,7 @@ CT_GLIBC_BUILD_SSP=y CT_GLIBC_HAS_LIBIDN_ADDON=y # CT_GLIBC_USE_LIBIDN_ADDON is not set CT_GLIBC_NO_SPARC_V8=y -CT_GLIBC_EXTRA_CONFIG_ARRAY="" +CT_GLIBC_EXTRA_CONFIG_ARRAY="--enable-crypt" CT_GLIBC_CONFIGPARMS="" CT_GLIBC_EXTRA_CFLAGS="" # CT_GLIBC_ENABLE_FORTIFIED_BUILD is not set diff --git a/cross_tools/configs/config_riscv64 b/cross_tools/configs/config_riscv64 index 1eb41fd62fae2421b8bbbd8e686c1df4cdc801f5..8ae3acbb3865b011e790d402adeed5a999d5f5b0 100644 --- a/cross_tools/configs/config_riscv64 +++ b/cross_tools/configs/config_riscv64 @@ -483,7 +483,7 @@ CT_GLIBC_BUILD_SSP=y CT_GLIBC_HAS_LIBIDN_ADDON=y # CT_GLIBC_USE_LIBIDN_ADDON is not set CT_GLIBC_NO_SPARC_V8=y -CT_GLIBC_EXTRA_CONFIG_ARRAY="" +CT_GLIBC_EXTRA_CONFIG_ARRAY="--enable-crypt" CT_GLIBC_CONFIGPARMS="rtlddir=/lib64/lp64d" CT_GLIBC_EXTRA_CFLAGS="" # CT_GLIBC_ENABLE_FORTIFIED_BUILD is not set diff --git a/cross_tools/configs/config_x86_64 b/cross_tools/configs/config_x86_64 index 9c2879967a538be002362026cd3f79cc8f80b5e1..d276648841225b6bfbda3b5bfd9083de80d23657 100644 --- a/cross_tools/configs/config_x86_64 +++ b/cross_tools/configs/config_x86_64 @@ -498,7 +498,7 @@ CT_GLIBC_BUILD_SSP=y CT_GLIBC_HAS_LIBIDN_ADDON=y # CT_GLIBC_USE_LIBIDN_ADDON is not set CT_GLIBC_NO_SPARC_V8=y -CT_GLIBC_EXTRA_CONFIG_ARRAY="" +CT_GLIBC_EXTRA_CONFIG_ARRAY="--enable-crypt" CT_GLIBC_CONFIGPARMS="" CT_GLIBC_EXTRA_CFLAGS="" # CT_GLIBC_ENABLE_FORTIFIED_BUILD is not set diff --git a/cross_tools/prepare.sh b/cross_tools/prepare.sh index 8c374b52e80300dc5aa954b65f48fa39e801e098..9097e0f4562089aac90d3deb09fa12a381020784 100755 --- a/cross_tools/prepare.sh +++ b/cross_tools/prepare.sh @@ -17,10 +17,6 @@ function do_patch() { tar xf *.tar.* echo "make patchlist of $1..." cat *.spec | grep "Patch" | grep -v "#" |grep "\.patch" | awk -F ":" '{print $2}' > $1-patchlist - if [ $1 = "gcc" ];then - # current patches can't apply, it cause --sysroot bugs - sed -i '/0041-Backport-Register-sysroot-in-the-driver-switches-tab.patch/d' $1-patchlist - fi ls ${OE_PATCH_DIR}/ | grep "^$1" > $1-patchlist-oe || true pushd ${PKG%%.tar.*} for i in `cat ../$1-patchlist` @@ -66,7 +62,7 @@ function update_feature() { sed -i "s#^\#define MUSL_DYNAMIC_LINKER.*#\#define MUSL_DYNAMIC_LINKER \"/lib64/lp64d/ld-musl-riscv\" XLEN_SPEC MUSL_ABI_SUFFIX \".so.1\"#g" $LIB_PATH/$GCC/$GCC_DIR/gcc/config/riscv/linux.h # Change libstdc++.so option - sed -i "s#^\\t\$(OPT_LDFLAGS).*#\\t\$(OPT_LDFLAGS) \$(SECTION_LDFLAGS) \$(AM_CXXFLAGS) \$(LTLDFLAGS) -Wl,-z,relro,-z,now,-z,noexecstack -Wtrampolines -o \$\@#g" $LIB_PATH/$GCC/$GCC_DIR/libstdc++-v3/src/Makefile.in + sed -i "s#^\\t-o \\$\@.*#\\t-Wl,-z,relro,-z,now,-z,noexecstack -Wtrampolines -o \$\@#g" $LIB_PATH/$GCC/$GCC_DIR/libstdc++-v3/src/Makefile.in } function update_config() {