diff --git a/scripts/output_env.sh b/scripts/output_env.sh index fea4d44c35a2..8fb072f86c80 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.sh b/tests/scripts/all.sh index df24b622d9a5..4c2d0cc2970b 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -37,7 +37,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: @@ -162,7 +162,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-} @@ -285,7 +284,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 @@ -434,7 +432,6 @@ pre_parse_command_line () { --arm-linux-gnueabihf-gcc-prefix) shift; ARM_LINUX_GNUEABIHF_GCC_PREFIX="$1";; --aarch64-linux-gnu-gcc-prefix) shift; AARCH64_LINUX_GNU_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";; @@ -733,7 +730,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" } @@ -781,14 +777,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 @@ -799,7 +791,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 @@ -3495,14 +3487,8 @@ component_build_arm_clang_thumb () { } component_build_armcc () { - msg "build: ARM Compiler 5" + # Common configuration for all the builds below scripts/config.py baremetal - make CC="$ARMC5_CC" AR="$ARMC5_AR" WARNING_CFLAGS='--strict --c99' lib - - msg "size: ARM Compiler 5" - "$ARMC5_FROMELF" -z library/*.o - - make clean # Compile mostly with -O1 since some Arm inline assembly is disabled for -O0. @@ -3529,9 +3515,8 @@ 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) + (check_tools "$armc6_cc" > /dev/null 2>&1) } component_build_ssl_hw_record_accel() {