Skip to content

Commit 6d06134

Browse files
Rename --arm-gcc-prefix to --arm-none-eabi-gcc-prefix
This is supposed to be for GCC (or a compiler with a compatible command line interface) targeting arm-none-eabi, so name it accordingly. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
1 parent 10cb160 commit 6d06134

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

tests/scripts/all.sh

+14-13
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ pre_initialize_variables () {
138138
: ${OUT_OF_SOURCE_DIR:=./mbedtls_out_of_source_build}
139139
: ${ARMC5_BIN_DIR:=/usr/bin}
140140
: ${ARMC6_BIN_DIR:=/usr/bin}
141-
: ${ARM_GCC_PREFIX:=arm-none-eabi-}
141+
: ${ARM_NONE_EABI_GCC_PREFIX:=arm-none-eabi-}
142142

143143
# if MAKEFLAGS is not set add the -j option to speed up invocations of make
144144
if [ -z "${MAKEFLAGS+set}" ]; then
@@ -204,8 +204,9 @@ General options:
204204
-k|--keep-going Run all tests and report errors at the end.
205205
-m|--memory Additional optional memory tests.
206206
--append-outcome Append to the outcome file (if used).
207-
--arm-gcc-prefix=<string> Prefix for gcc as a cross-compiler for arm
208-
(default: "${ARM_GCC_PREFIX}")
207+
--arm-none-eabi-gcc-prefix=<string>
208+
Prefix for a cross-compiler for arm-none-eabi
209+
(default: "${ARM_NONE_EABI_GCC_PREFIX}")
209210
--armcc Run ARM Compiler builds (on by default).
210211
--except Exclude the COMPONENTs listed on the command line,
211212
instead of running only those.
@@ -338,7 +339,7 @@ pre_parse_command_line () {
338339
while [ $# -gt 0 ]; do
339340
case "$1" in
340341
--append-outcome) append_outcome=1;;
341-
--arm-gcc-prefix) shift; ARM_GCC_PREFIX="$1";;
342+
--arm-none-eabi-gcc-prefix) shift; ARM_NONE_EABI_GCC_PREFIX="$1";;
342343
--armcc) no_armcc=;;
343344
--armc5-bin-dir) shift; ARMC5_BIN_DIR="$1";;
344345
--armc6-bin-dir) shift; ARMC6_BIN_DIR="$1";;
@@ -551,7 +552,7 @@ pre_check_tools () {
551552
esac
552553

553554
case " $RUN_COMPONENTS " in
554-
*_arm_none_eabi_gcc[_\ ]*) check_tools "${ARM_GCC_PREFIX}gcc";;
555+
*_arm_none_eabi_gcc[_\ ]*) check_tools "${ARM_NONE_EABI_GCC_PREFIX}gcc";;
555556
esac
556557

557558
case " $RUN_COMPONENTS " in
@@ -1576,36 +1577,36 @@ component_test_no_64bit_multiplication () {
15761577
}
15771578

15781579
component_build_arm_none_eabi_gcc () {
1579-
msg "build: ${ARM_GCC_PREFIX}gcc, make" # ~ 10s
1580+
msg "build: ${ARM_NONE_EABI_GCC_PREFIX}gcc, make" # ~ 10s
15801581
scripts/config.py baremetal
1581-
make CC="${ARM_GCC_PREFIX}gcc" AR="${ARM_GCC_PREFIX}ar" LD="${ARM_GCC_PREFIX}ld" CFLAGS='-Werror -Wall -Wextra' lib
1582+
make CC="${ARM_NONE_EABI_GCC_PREFIX}gcc" AR="${ARM_NONE_EABI_GCC_PREFIX}ar" LD="${ARM_NONE_EABI_GCC_PREFIX}ld" CFLAGS='-Werror -Wall -Wextra' lib
15821583
}
15831584

15841585
component_build_arm_none_eabi_gcc_arm5vte () {
1585-
msg "build: ${ARM_GCC_PREFIX}gcc -march=arm5vte, make" # ~ 10s
1586+
msg "build: ${ARM_NONE_EABI_GCC_PREFIX}gcc -march=arm5vte, make" # ~ 10s
15861587
scripts/config.py baremetal
15871588
# Build for a target platform that's close to what Debian uses
15881589
# for its "armel" distribution (https://wiki.debian.org/ArmEabiPort).
15891590
# See https://github.com/ARMmbed/mbedtls/pull/2169 and comments.
15901591
# It would be better to build with arm-linux-gnueabi-gcc but
15911592
# we don't have that on our CI at this time.
1592-
make CC="${ARM_GCC_PREFIX}gcc" AR="${ARM_GCC_PREFIX}ar" CFLAGS='-Werror -Wall -Wextra -march=armv5te -O1' LDFLAGS='-march=armv5te' SHELL='sh -x' lib
1593+
make CC="${ARM_NONE_EABI_GCC_PREFIX}gcc" AR="${ARM_NONE_EABI_GCC_PREFIX}ar" CFLAGS='-Werror -Wall -Wextra -march=armv5te -O1' LDFLAGS='-march=armv5te' SHELL='sh -x' lib
15931594
}
15941595

15951596
component_build_arm_none_eabi_gcc_no_udbl_division () {
1596-
msg "build: ${ARM_GCC_PREFIX}gcc -DMBEDTLS_NO_UDBL_DIVISION, make" # ~ 10s
1597+
msg "build: ${ARM_NONE_EABI_GCC_PREFIX}gcc -DMBEDTLS_NO_UDBL_DIVISION, make" # ~ 10s
15971598
scripts/config.py baremetal
15981599
scripts/config.py set MBEDTLS_NO_UDBL_DIVISION
1599-
make CC="${ARM_GCC_PREFIX}gcc" AR="${ARM_GCC_PREFIX}ar" LD="${ARM_GCC_PREFIX}ld" CFLAGS='-Werror -Wall -Wextra' lib
1600+
make CC="${ARM_NONE_EABI_GCC_PREFIX}gcc" AR="${ARM_NONE_EABI_GCC_PREFIX}ar" LD="${ARM_NONE_EABI_GCC_PREFIX}ld" CFLAGS='-Werror -Wall -Wextra' lib
16001601
echo "Checking that software 64-bit division is not required"
16011602
if_build_succeeded not grep __aeabi_uldiv library/*.o
16021603
}
16031604

16041605
component_build_arm_none_eabi_gcc_no_64bit_multiplication () {
1605-
msg "build: ${ARM_GCC_PREFIX}gcc MBEDTLS_NO_64BIT_MULTIPLICATION, make" # ~ 10s
1606+
msg "build: ${ARM_NONE_EABI_GCC_PREFIX}gcc MBEDTLS_NO_64BIT_MULTIPLICATION, make" # ~ 10s
16061607
scripts/config.py baremetal
16071608
scripts/config.py set MBEDTLS_NO_64BIT_MULTIPLICATION
1608-
make CC="${ARM_GCC_PREFIX}gcc" AR="${ARM_GCC_PREFIX}ar" LD="${ARM_GCC_PREFIX}ld" CFLAGS='-Werror -O1 -march=armv6-m -mthumb' lib
1609+
make CC="${ARM_NONE_EABI_GCC_PREFIX}gcc" AR="${ARM_NONE_EABI_GCC_PREFIX}ar" LD="${ARM_NONE_EABI_GCC_PREFIX}ld" CFLAGS='-Werror -O1 -march=armv6-m -mthumb' lib
16091610
echo "Checking that software 64-bit multiplication is not required"
16101611
if_build_succeeded not grep __aeabi_lmul library/*.o
16111612
}

0 commit comments

Comments
 (0)