diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-01-14 04:29:39 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-01-14 04:29:39 +0000 |
| commit | 3ab3774017b65fe587b164535148a788207c2f27 (patch) | |
| tree | a31b233ff0f4feb3909dc5c88ec66556dd798f57 | |
| parent | e23f08ed8e49d9f5714baf69f378b3dcdb1b33da (diff) | |
tcwg_bmk-build.sh: Rename ${rr[target]} from "arm-eabi" to "arm_eabi"
... so that we can correctly extract it from ${rr[ci_config]}, which
splits fields on "-". At the moment we detect target as "arm" and
pass "--target arm-linux-gnueabihf" to abe.sh.
Change-Id: Ie2fd34e6d2b627181e6134ea55f31b0c5a0763b0
| -rw-r--r-- | jenkins-helpers.sh | 2 | ||||
| -rwxr-xr-x | tcwg_bmk-build.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jenkins-helpers.sh b/jenkins-helpers.sh index a0f279e5..129aeef9 100644 --- a/jenkins-helpers.sh +++ b/jenkins-helpers.sh @@ -1017,7 +1017,7 @@ print_gnu_target () fi case "$target" in "aarch64") target="aarch64-linux-gnu" ;; - "arm-eabi") target="arm-eabi" ;; + "arm_eabi") target="arm-eabi" ;; "arm"*) target="arm-linux-gnueabihf" ;; "x86_64") target="x86_64-linux-gnu" ;; *) echo "ERROR: Unknown target $target" >&2; exit 1 ;; diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index dc197888..fa18227e 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -72,7 +72,7 @@ for i in $(seq 0 $(("${#cflags[@]}" - 1))); do cflags_mode=arm cflags[$i]="${cflags[$i]}_marm" ;; - "arm-eabi:"*) + "arm_eabi:"*) cflags_mode=thumb cflags[$i]="${cflags[$i]}_thumb" ;; @@ -220,7 +220,7 @@ benchmark () local hw results_top image_arch results_id case "${rr[target]}" in armv8*) hw=tx1; results_top=tx1_32; image_arch=armhf ;; - arm-eabi) hw=stm32; results_top=STM32L476RGTx; image_arch=armhf ;; + arm_eabi) hw=stm32; results_top=STM32L476RGTx; image_arch=armhf ;; arm*) hw=tk1; results_top=tk1_32; image_arch=armhf ;; aarch64*) hw=tx1; results_top=tx1_64; image_arch=arm64 ;; *) echo "ERROR: Unknown target ${rr[target]}"; exit 1 ;; |