toolchain/gcc-4.6.2: fix v4bx patch

[openwrt/staging/mkresin.git] / toolchain / Config.in

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 540ae067cbdd57cc536722d67b308cb1fa18e0a4..c027be821284a66a827dd4adf4b9f14ea9a325a9 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -175,7 +175,11 @@ config INSIGHT
 
 config USE_UCLIBC
        bool
-       default y if !TOOLCHAINOPTS
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+
+config USE_EXTERNAL_LIBC
+       bool
+       default y if EXTERNAL_TOOLCHAIN || NATIVE_TOOLCHAIN
 
 source "toolchain/gcc/Config.version"
 
@@ -195,15 +199,9 @@ config LIBC_VERSION
        default GLIBC_VERSION   if USE_GLIBC
        default UCLIBC_VERSION  if USE_UCLIBC
 
-config EABI_SUPPORT
-       bool
-       depends arm||armeb
-       default y
-
 config TARGET_SUFFIX
        string
-       default "gnueabi"         if (USE_EGLIBC || USE_GLIBC) && EABI_SUPPORT
-       default "gnu"             if (USE_EGLIBC || USE_GLIBC) && !EABI_SUPPORT
-       default "uclibcgnueabi"   if USE_UCLIBC && EABI_SUPPORT
-       default "uclibc"          if USE_UCLIBC && !EABI_SUPPORT
-
+       default "gnueabi"         if (USE_EGLIBC || USE_GLIBC) && (arm || armeb)
+       default "gnu"             if (USE_EGLIBC || USE_GLIBC) && !(arm || armeb)
+       default "uclibcgnueabi"   if USE_UCLIBC && (arm || armeb)
+       default "uclibc"          if USE_UCLIBC && !(arm || armeb)