From 999c0d4d60937174ad592d3992e608415ff91a20 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 01:37:52 +0200
Subject: rework thumb2 support

do not change gcc defaults, discussed with phil, make
the resulting toolchains more conform.
---
 target/config/Config.in | 13 -------------
 toolchain/Config.in     | 15 ++++-----------
 toolchain/gcc/Makefile  |  1 -
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/target/config/Config.in b/target/config/Config.in
index b5cd6121c..8cc77b06c 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -50,12 +50,6 @@ config ADK_fpu_neon
 config ADK_fpu_vfp
 	boolean
 
-config ADK_mode_arm
-	boolean
-
-config ADK_mode_thumb
-	boolean
-
 config ADK_TARGET_FLOAT
 	string
 	default "hard" if ADK_hard_float
@@ -66,13 +60,6 @@ config ADK_TARGET_FPU
 	default "vfp" if ADK_fpu_vfp
 	default "neon" if ADK_fpu_neon
 
-config ADK_TARGET_ARM_MODE
-	depends on ADK_LINUX_ARM
-	string
-	default "arm" if ADK_mode_arm
-	default "thumb" if ADK_mode_thumb
-	default "arm"
-
 config ADK_TARGET_ENDIAN
 	string
 	default "little" if ADK_little
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 6a41140b8..f80c44841 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -44,18 +44,11 @@ config ADK_TOOLCHAIN_USE_GOLD
 	depends on ADK_TOOLCHAIN_GOLD
 	default n
 
-choice
-prompt "Use ARM thumb mode"
-depends on ADK_CPU_CORTEX_A9
-
-config ADK_LINUX_ARM_WITHOUT_THUMB
-	boolean "disabled"
-	select ADK_mode_arm
-
 config ADK_LINUX_ARM_WITH_THUMB
-	boolean "enabled"
-	select ADK_mode_thumb
+	prompt "Use THUMB2 ARM mode"
+	boolean
+	depends on ADK_CPU_CORTEX_A9 && ADK_TARGET_LIB_GLIBC
 	select ADK_KERNEL_THUMB2_KERNEL
+	default n
 
-endchoice
 endmenu
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 12ad4ebca..7616f2ab3 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -89,7 +89,6 @@ endif
 
 ifeq ($(ARCH),arm)
 GCC_CONFOPTS+=		--with-float=$(ADK_TARGET_FLOAT)
-GCC_CONFOPTS+=		--with-mode=$(ADK_TARGET_ARM_MODE)
 ifneq ($(ADK_TARGET_FPU),)
 GCC_CONFOPTS+=		--with-fpu=$(ADK_TARGET_FPU)
 endif
-- 
cgit v1.2.3