From b3c48f376483894fd6f18b1efdcb40c7c8fbd83f Mon Sep 17 00:00:00 2001
From: Dmitry Ilyin <dima@doty.ru>
Date: Fri, 9 Sep 2022 21:18:58 +0300
Subject: [PATCH] Disable thumb2 for development for CV500 platform (#445)

---
 .../unknown_unknown_hi3516av300_openipc_defconfig |  2 +-
 .../unknown_unknown_hi3516cv500_openipc_defconfig |  2 +-
 .../unknown_unknown_hi3516dv300_openipc_defconfig |  2 +-
 scripts/show_toolchains.sh                        | 15 ++++++++++-----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av300_openipc_defconfig
index 20803b1a..5831b579 100644
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av300_openipc_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av300_openipc_defconfig
@@ -3,7 +3,7 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_EABI=y
 BR2_ARM_FPU_NEON_VFPV4=y
-BR2_ARM_INSTRUCTIONS_THUMB2=y
+BR2_ARM_INSTRUCTIONS_THUMB2=n
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="4.9.37"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv500_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv500_openipc_defconfig
index 05f919ea..a12ca2b1 100644
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv500_openipc_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv500_openipc_defconfig
@@ -3,7 +3,7 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_EABI=y
 BR2_ARM_FPU_NEON_VFPV4=y
-BR2_ARM_INSTRUCTIONS_THUMB2=y
+BR2_ARM_INSTRUCTIONS_THUMB2=n
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="4.9.37"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv300_openipc_defconfig
index 09a24a5e..103bda90 100644
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv300_openipc_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv300_openipc_defconfig
@@ -3,7 +3,7 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_EABI=y
 BR2_ARM_FPU_NEON_VFPV4=y
-BR2_ARM_INSTRUCTIONS_THUMB2=y
+BR2_ARM_INSTRUCTIONS_THUMB2=n
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="4.9.37"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
diff --git a/scripts/show_toolchains.sh b/scripts/show_toolchains.sh
index 14cb247a..7cfc2960 100755
--- a/scripts/show_toolchains.sh
+++ b/scripts/show_toolchains.sh
@@ -7,7 +7,7 @@ toolchain_by_config() {
   FMT=$2
 
   BR2_VER=$(grep BR2_DEFAULT_KERNEL_VERSION $CF)
-  if [ ! -z $BR2_VER ]; then
+  if [ -n "$BR2_VER" ]; then
     VENDOR=$(echo $CF | cut -d - -f 4 | cut -d / -f 1 | sed -r 's/\<./\U&/g')
     KVER=$(echo $BR2_VER | cut -d \" -f 2 | awk -F . '{printf "%s_%s", $1, $2}')
     GCC_VER=$(sed -rn "s/^BR2_GCC_VERSION_([0-9]*)_X=y/\1/p" $CF)
@@ -20,13 +20,18 @@ toolchain_by_config() {
     else
       # Here we have something from ARM modern family
       HF=$(sed -rn "s/^BR2_ARM_EABI(HF)=y/\1/p" $CF | tr '[:upper:]' '[:lower:]')
-      if [ ! -z "$HF" ]; then
-        ARCH="${ARCH}_${HF}"
-      fi
     fi
 
     if [ -z "$ARCH" ]; then
       ARCH=$(sed -rn "s/^BR2_(mips_[a-z]*)=y/\1/p" $CF)
+    else
+      THUMB=$(sed -rn "s/^BR2_ARM_INSTRUCTIONS_(THUMB2)=y/\1/p" $CF)
+      if [ -n "$THUMB" ]; then
+        ARCH="${ARCH}_${THUMB,,}"
+      fi
+      if [ -n "$HF" ]; then
+        ARCH="${ARCH}_${HF}"
+      fi
     fi
 
     LIBC=$(sed -rn "s/^BR2_TOOLCHAIN_BUILDROOT_LIBC=\"(.*)\"/\1/p" $CF)
@@ -40,7 +45,7 @@ toolchain_by_config() {
         echo $ARCH $GCC_VER $LIBC $KVER
         ;;
       *)
-        if [ ! -z "$2" ]; then
+        if [ -n "$2" ]; then
           BR_DIR=buildroot-$2
           GCC_VER=$(sed -rn \
             "s/^\s+default\s+\"([0-9.]+)\"\s+if BR2_GCC_VERSION_${GCC_VER}_X/\1/p" \