From 95395738b4b4f265060a284b5e6887f75c13ccd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 29 Oct 2024 11:39:41 +0100 Subject: [PATCH 1/2] Drop building with armcc5 in all.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Pégourié-Gonnard --- scripts/output_env.sh | 4 ---- tests/scripts/all-core.sh | 14 +++----------- tests/scripts/components-platform.sh | 9 ++------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/scripts/output_env.sh b/scripts/output_env.sh index b056ffde66..32f1f86efc 100755 --- a/scripts/output_env.sh +++ b/scripts/output_env.sh @@ -78,10 +78,6 @@ print_version "cmake" "--version" "" "head -n 1" echo if [ "${RUN_ARMCC:-1}" -ne 0 ]; then - : "${ARMC5_CC:=armcc}" - print_version "$ARMC5_CC" "--vsn" "" "head -n 2" - echo - : "${ARMC6_CC:=armclang}" print_version "$ARMC6_CC" "--vsn" "" "head -n 2" echo diff --git a/tests/scripts/all-core.sh b/tests/scripts/all-core.sh index ccd7e59ea1..d0bfd6fac9 100644 --- a/tests/scripts/all-core.sh +++ b/tests/scripts/all-core.sh @@ -51,7 +51,7 @@ # * GCC and Clang (recent enough for using ASan with gcc and MemSan with clang, or valgrind) # * G++ # * arm-gcc and mingw-gcc -# * ArmCC 5 and ArmCC 6, unless invoked with --no-armcc +# * ArmCC 6 (aka armclang), unless invoked with --no-armcc # * OpenSSL and GnuTLS command line tools, in suitable versions for the # interoperability tests. The following are the official versions at the # time of writing: @@ -223,7 +223,6 @@ pre_initialize_variables () { : ${GNUTLS_CLI:="gnutls-cli"} : ${GNUTLS_SERV:="gnutls-serv"} : ${OUT_OF_SOURCE_DIR:=./mbedtls_out_of_source_build} - : ${ARMC5_BIN_DIR:=/usr/bin} : ${ARMC6_BIN_DIR:=/usr/bin} : ${ARM_NONE_EABI_GCC_PREFIX:=arm-none-eabi-} : ${ARM_LINUX_GNUEABI_GCC_PREFIX:=arm-linux-gnueabi-} @@ -345,7 +344,6 @@ General options: -s|--seed Integer seed value to use for this test run. Tool path options: - --armc5-bin-dir= ARM Compiler 5 bin directory. --armc6-bin-dir= ARM Compiler 6 bin directory. --clang-earliest= Earliest version of clang available --clang-latest= Latest version of clang available @@ -506,7 +504,6 @@ pre_parse_command_line () { --arm-none-eabi-gcc-prefix) shift; ARM_NONE_EABI_GCC_PREFIX="$1";; --arm-linux-gnueabi-gcc-prefix) shift; ARM_LINUX_GNUEABI_GCC_PREFIX="$1";; --armcc) no_armcc=;; - --armc5-bin-dir) shift; ARMC5_BIN_DIR="$1";; --armc6-bin-dir) shift; ARMC6_BIN_DIR="$1";; --clang-earliest) shift; CLANG_EARLIEST="$1";; --clang-latest) shift; CLANG_LATEST="$1";; @@ -795,7 +792,6 @@ pre_print_configuration () { echo "OPENSSL_NEXT: $OPENSSL_NEXT" echo "GNUTLS_CLI: $GNUTLS_CLI" echo "GNUTLS_SERV: $GNUTLS_SERV" - echo "ARMC5_BIN_DIR: $ARMC5_BIN_DIR" echo "ARMC6_BIN_DIR: $ARMC6_BIN_DIR" } @@ -843,14 +839,10 @@ pre_check_tools () { case " $RUN_COMPONENTS " in *_armcc*) - ARMC5_CC="$ARMC5_BIN_DIR/armcc" - ARMC5_AR="$ARMC5_BIN_DIR/armar" - ARMC5_FROMELF="$ARMC5_BIN_DIR/fromelf" ARMC6_CC="$ARMC6_BIN_DIR/armclang" ARMC6_AR="$ARMC6_BIN_DIR/armar" ARMC6_FROMELF="$ARMC6_BIN_DIR/fromelf" - check_tools "$ARMC5_CC" "$ARMC5_AR" "$ARMC5_FROMELF" \ - "$ARMC6_CC" "$ARMC6_AR" "$ARMC6_FROMELF";; + check_tools "$ARMC6_CC" "$ARMC6_AR" "$ARMC6_FROMELF";; esac # past this point, no call to check_tool, only printing output @@ -861,7 +853,7 @@ pre_check_tools () { msg "info: output_env.sh" case $RUN_COMPONENTS in *_armcc*) - set "$@" ARMC5_CC="$ARMC5_CC" ARMC6_CC="$ARMC6_CC" RUN_ARMCC=1;; + set "$@" ARMC6_CC="$ARMC6_CC" RUN_ARMCC=1;; *) set "$@" RUN_ARMCC=0;; esac "$@" scripts/output_env.sh diff --git a/tests/scripts/components-platform.sh b/tests/scripts/components-platform.sh index 5f26ba458f..cea9c11a91 100644 --- a/tests/scripts/components-platform.sh +++ b/tests/scripts/components-platform.sh @@ -431,8 +431,9 @@ component_build_arm_clang_thumb () { } component_build_armcc () { - msg "build: ARM Compiler 5" + # Common configuration for all the builds below scripts/config.py baremetal + # armc[56] don't support SHA-512 intrinsics scripts/config.py unset MBEDTLS_SHA512_USE_A64_CRYPTO_IF_PRESENT @@ -449,11 +450,6 @@ component_build_armcc () { scripts/config.py set MBEDTLS_HAVE_ASM - make CC="$ARMC5_CC" AR="$ARMC5_AR" WARNING_CFLAGS='--strict --c99' lib - - msg "size: ARM Compiler 5" - "$ARMC5_FROMELF" -z library/*.o - # Compile mostly with -O1 since some Arm inline assembly is disabled for -O0. # ARM Compiler 6 - Target ARMv7-A @@ -486,7 +482,6 @@ component_build_armcc () { } support_build_armcc () { - armc5_cc="$ARMC5_BIN_DIR/armcc" armc6_cc="$ARMC6_BIN_DIR/armclang" (check_tools "$armc5_cc" "$armc6_cc" > /dev/null 2>&1) } From 62a57e68a5b980ecbccb6f81101e96f29e170977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 29 Oct 2024 12:42:43 +0100 Subject: [PATCH 2/2] Rm forgotten armc5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Pégourié-Gonnard --- tests/scripts/components-platform.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/components-platform.sh b/tests/scripts/components-platform.sh index cea9c11a91..6c6d2f44f4 100644 --- a/tests/scripts/components-platform.sh +++ b/tests/scripts/components-platform.sh @@ -483,7 +483,7 @@ component_build_armcc () { support_build_armcc () { armc6_cc="$ARMC6_BIN_DIR/armclang" - (check_tools "$armc5_cc" "$armc6_cc" > /dev/null 2>&1) + (check_tools "$armc6_cc" > /dev/null 2>&1) } # For timebeing, no VIA Padlock platform available.