uClibc-ng: refresh config and remove several legacy options

SUSV3_LEGACY_MACROS are completely unused since SUSV3_LEGACY is enabled

HAS_OBSOLETE_BSD_SIGNAL is completely deprecated functionality.

HAS_BSD_RES_CLOSE is completely deprecated functionality.

HAS_FTW is deprecated SUSV4 functionality. Saves ~4.5kb.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

22 files changed, 4 insertions, 159 deletions

diff --git a/toolchain/uClibc/config/arc b/toolchain/uClibc/config/arc
index de1ffc4415..f92328b7ed 100644
--- a/toolchain/uClibc/config/arc
+++ b/toolchain/uClibc/config/arc
@@ -3,8 +3,6 @@ ARCH_LITTLE_ENDIAN=y
 ARCH_WANTS_LITTLE_ENDIAN=y
 TARGET_ARCH="arc"
 TARGET_arc=y
-CONFIG_ARC_CPU_700=y
-# CONFIG_ARC_CPU_HS is not set
 CONFIG_ARC_PAGE_SIZE_8K=y
 # CONFIG_ARC_PAGE_SIZE_16K is not set
 # CONFIG_ARC_PAGE_SIZE_4K is not set
diff --git a/toolchain/uClibc/config/archs b/toolchain/uClibc/config/archs
index 961628ed8c..f92328b7ed 100644
--- a/toolchain/uClibc/config/archs
+++ b/toolchain/uClibc/config/archs
@@ -3,8 +3,6 @@ ARCH_LITTLE_ENDIAN=y
 ARCH_WANTS_LITTLE_ENDIAN=y
 TARGET_ARCH="arc"
 TARGET_arc=y
-# CONFIG_ARC_CPU_700 is not set
-CONFIG_ARC_CPU_HS=y
 CONFIG_ARC_PAGE_SIZE_8K=y
 # CONFIG_ARC_PAGE_SIZE_16K is not set
 # CONFIG_ARC_PAGE_SIZE_4K is not set
diff --git a/toolchain/uClibc/config/arm b/toolchain/uClibc/config/arm
index 41a60b1c38..9544f144d1 100644
--- a/toolchain/uClibc/config/arm
+++ b/toolchain/uClibc/config/arm
@@ -1,9 +1,7 @@
 ARCH_ANY_ENDIAN=y
 ARCH_LITTLE_ENDIAN=y
 ARCH_WANTS_LITTLE_ENDIAN=y
-# COMPILE_IN_THUMB_MODE is not set
 TARGET_ARCH="arm"
 TARGET_arm=y
-# USE_BX is not set
 CONFIG_ARM_EABI=y
 
diff --git a/toolchain/uClibc/config/armeb b/toolchain/uClibc/config/armeb
index 2e46dd67d9..e329c7e369 100644
--- a/toolchain/uClibc/config/armeb
+++ b/toolchain/uClibc/config/armeb
@@ -1,9 +1,7 @@
 ARCH_ANY_ENDIAN=y
 ARCH_BIG_ENDIAN=y
 ARCH_WANTS_BIG_ENDIAN=y
-# COMPILE_IN_THUMB_MODE is not set
 TARGET_ARCH="arm"
 TARGET_arm=y
-# USE_BX is not set
 CONFIG_ARM_EABI=y
 
diff --git a/toolchain/uClibc/config/common b/toolchain/uClibc/config/common
index b679c0a1ec..d88d5bf473 100644
--- a/toolchain/uClibc/config/common
+++ b/toolchain/uClibc/config/common
@@ -7,13 +7,11 @@ ARCH_USE_MMU=y
 # ARCH_WANTS_BIG_ENDIAN is not set
 # ARCH_WANTS_LITTLE_ENDIAN is not set
 ASSUME_DEVPTS=y
-# COMPAT_ATEXIT is not set
 CROSS_COMPILER_PREFIX=""
 DEVEL_PREFIX="/usr/"
 # DOASSERTS is not set
 # DODEBUG is not set
 # DODEBUG_PT is not set
-# DOMULTI is not set
 DOPIC=y
 DOSTRIP=y
 DO_C99_MATH=y
@@ -33,7 +31,6 @@ LDSO_CACHE_SUPPORT=y
 # LDSO_GNU_HASH_SUPPORT is not set
 LDSO_LD_LIBRARY_PATH=y
 LDSO_LDD_SUPPORT=y
-# LDSO_NO_CLEANUP is not set
 # LDSO_PRELINK_SUPPORT is not set
 # LDSO_PRELOAD_FILE_SUPPORT is not set
 LDSO_PRELOAD_ENV_SUPPORT=y
@@ -42,12 +39,9 @@ LDSO_SAFE_RUNPATH=y
 # LDSO_RUNPATH_OF_EXECUTABLE is not set
 # LDSO_SEARCH_INTERP_PATH is not set
 # LDSO_STANDALONE_SUPPORT is not set
-# LINUXTHREADS_NEW is not set
-# LINUXTHREADS_OLD is not set
 # UCLIBC_HAS_BACKTRACE is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 # MALLOC is not set
-MALLOC_GLIBC_COMPAT=y
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MULTILIB_DIR="lib"
@@ -63,12 +57,10 @@ TARGET_SUBARCH=""
 # TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
-# TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
 # TARGET_hppa is not set
 # TARGET_i386 is not set
-# TARGET_i960 is not set
 # TARGET_ia64 is not set
 # TARGET_lm32 is not set
 # TARGET_m68k is not set
@@ -80,10 +72,7 @@ TARGET_SUBARCH=""
 # TARGET_or1k is not set
 # TARGET_powerpc is not set
 # TARGET_sh is not set
-# TARGET_sh64 is not set
 # TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
 UCLIBC_BSD_SPECIFIC=y
@@ -96,10 +85,9 @@ UCLIBC_DYNAMIC_ATEXIT=y
 UCLIBC_EXTRA_CFLAGS=""
 UCLIBC_GRP_BUFFER_SIZE=256
 UCLIBC_HAS_ADVANCED_REALTIME=y
-# UCLIBC_HAS_ARC4RANDOM is not set
 # UCLIBC_HAS_ARGP is not set
 UCLIBC_HAS_BSD_ERR=y
-UCLIBC_HAS_BSD_RES_CLOSE=y
+# UCLIBC_HAS_BSD_RES_CLOSE is not set
 # UCLIBC_HAS_COMPAT_RES_STATE is not set
 UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_CRYPT_IMPL=y
@@ -114,14 +102,12 @@ UCLIBC_HAS_ERRNO_MESSAGES=y
 # UCLIBC_HAS_FENV is not set
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
 # UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set
 UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
 # UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
 # UCLIBC_HAS_FPU is not set
 UCLIBC_HAS_FTS=y
-UCLIBC_HAS_FTW=y
-# UCLIBC_HAS_FULL_RPC is not set
+# UCLIBC_HAS_FTW is not set
 UCLIBC_HAS_GETPT=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
@@ -135,29 +121,22 @@ UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_IPV4=y
 UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_LFS=y
-UCLIBC_HAS_LIBNSL_STUB=y
-UCLIBC_HAS_LIBRESOLV_STUB=y
 UCLIBC_HAS_LIBUTIL=y
 # UCLIBC_HAS_LOCALE is not set
 # UCLIBC_BUILD_ALL_LOCALE is not set
 # UCLIBC_BUILD_MINIMAL_LOCALE is not set
-# UCLIBC_PREGENERATED_LOCALE_DATA is not set
 UCLIBC_HAS_LONG_DOUBLE_MATH=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_NFTW=y
-UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
 # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
 UCLIBC_HAS_PRINTF_M_SPEC=y
 # UCLIBC_HAS_PROFILING is not set
 UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
 UCLIBC_HAS_PTY=y
 UCLIBC_HAS_REALTIME=y
-# UCLIBC_HAS_REENTRANT_RPC is not set
 UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
 UCLIBC_HAS_RESOLVER_SUPPORT=y
-# UCLIBC_HAS_RPC is not set
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
 # UCLIBC_HAS_SHA256_CRYPT_IMPL is not set
 # UCLIBC_HAS_SHA512_CRYPT_IMPL is not set
 UCLIBC_HAS_SHADOW=y
@@ -165,7 +144,6 @@ UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_SOFT_FLOAT=y
 # UCLIBC_HAS_SSP is not set
-# UCLIBC_HAS_SSP_COMPAT is not set
 UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
 # UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
 # UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
@@ -198,11 +176,8 @@ UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_XATTR=y
 # UCLIBC_HAS_XLOCALE is not set
 UCLIBC_HAS___PROGNAME=y
-# UCLIBC_LINUX_MODULE_24 is not set
-UCLIBC_LINUX_MODULE_26=y
 UCLIBC_LINUX_SPECIFIC=y
 # UCLIBC_MALLOC_DEBUGGING is not set
-# UCLIBC_MJN3_ONLY is not set
 # UCLIBC_NTP_LEGACY is not set
 # USE_OLD_VFPRINTF is not set
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
@@ -211,16 +186,14 @@ UCLIBC_PWD_BUFFER_SIZE=256
 # UCLIBC_STRICT_HEADERS is not set
 UCLIBC_SUPPORT_AI_ADDRCONFIG=y
 UCLIBC_SUSV3_LEGACY=y
-UCLIBC_SUSV3_LEGACY_MACROS=y
+# UCLIBC_SUSV3_LEGACY_MACROS is not set
 UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_SV4_DEPRECATED is not set
 UCLIBC_TZ_FILE_PATH="/etc/TZ"
 # UCLIBC_FALLBACK_TO_ETC_LOCALTIME is not set
 UCLIBC_USE_NETLINK=y
 # UNIX98PTY_ONLY is not set
-USE_BX=y
 WARNINGS="-Wall"
-# UCLIBC_HAS_OBSTACK is not set
 # UCLIBC_SUSV2_LEGACY is not set
 # UCLIBC_HAS_CONTEXT_FUNCS is not set
 UCLIBC_HAS_GETOPT_LONG=y
diff --git a/toolchain/uClibc/config/i386 b/toolchain/uClibc/config/i386
index 5ef264c271..cddb709630 100644
--- a/toolchain/uClibc/config/i386
+++ b/toolchain/uClibc/config/i386
@@ -2,20 +2,7 @@ ARCH_LITTLE_ENDIAN=y
 # CONFIG_386 is not set
 CONFIG_486=y
 # CONFIG_586 is not set
-# CONFIG_586MMX is not set
 # CONFIG_686 is not set
-# CONFIG_CRUSOE is not set
-# CONFIG_CYRIXIII is not set
-# CONFIG_ELAN is not set
-# CONFIG_GENERIC_386 is not set
-# CONFIG_K6 is not set
-# CONFIG_K7 is not set
-# CONFIG_NEHEMIAH is not set
-# CONFIG_PENTIUM4 is not set
-# CONFIG_PENTIUMII is not set
-# CONFIG_PENTIUMIII is not set
-# CONFIG_WINCHIP2 is not set
-# CONFIG_WINCHIPC6 is not set
 TARGET_ARCH="i386"
 TARGET_i386=y
 UCLIBC_HAS_FPU=y
diff --git a/toolchain/uClibc/config/i686 b/toolchain/uClibc/config/i686
index ba615f6b86..8a25f41e23 100644
--- a/toolchain/uClibc/config/i686
+++ b/toolchain/uClibc/config/i686
@@ -2,20 +2,7 @@ ARCH_LITTLE_ENDIAN=y
 # CONFIG_386 is not set
 # CONFIG_486 is not set
 # CONFIG_586 is not set
-# CONFIG_586MMX is not set
 CONFIG_686=y
-# CONFIG_CRUSOE is not set
-# CONFIG_CYRIXIII is not set
-# CONFIG_ELAN is not set
-# CONFIG_GENERIC_386 is not set
-# CONFIG_K6 is not set
-# CONFIG_K7 is not set
-# CONFIG_NEHEMIAH is not set
-# CONFIG_PENTIUM4 is not set
-# CONFIG_PENTIUMII is not set
-# CONFIG_PENTIUMIII is not set
-# CONFIG_WINCHIP2 is not set
-# CONFIG_WINCHIPC6 is not set
 TARGET_ARCH="i386"
 TARGET_i386=y
 UCLIBC_HAS_FPU=y
diff --git a/toolchain/uClibc/config/m68k b/toolchain/uClibc/config/m68k
index 14ce5aef7b..0675bb9080 100644
--- a/toolchain/uClibc/config/m68k
+++ b/toolchain/uClibc/config/m68k
@@ -1,5 +1,4 @@
 ARCH_BIG_ENDIAN=y
-LINUXTHREADS_OLD=y
 TARGET_ARCH="m68k"
 TARGET_SUBARCH=""
 TARGET_m68k=y
diff --git a/toolchain/uClibc/config/mips b/toolchain/uClibc/config/mips
index 8cec22f4de..c8f71f03c9 100644
--- a/toolchain/uClibc/config/mips
+++ b/toolchain/uClibc/config/mips
@@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y
 ARCH_BIG_ENDIAN=y
 ARCH_CFLAGS="-mno-split-addresses"
 ARCH_WANTS_BIG_ENDIAN=y
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-# CONFIG_MIPS_ISA_3 is not set
-# CONFIG_MIPS_ISA_4 is not set
-CONFIG_MIPS_ISA_MIPS32=y
-# CONFIG_MIPS_ISA_MIPS32R2 is not set
-# CONFIG_MIPS_ISA_MIPS64 is not set
-# CONFIG_MIPS_ISA_MIPS64R2 is not set
 # CONFIG_MIPS_N32_ABI is not set
 # CONFIG_MIPS_N64_ABI is not set
 CONFIG_MIPS_O32_ABI=y
diff --git a/toolchain/uClibc/config/mips64 b/toolchain/uClibc/config/mips64
index 566d87a6e4..453293def3 100644
--- a/toolchain/uClibc/config/mips64
+++ b/toolchain/uClibc/config/mips64
@@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y
 ARCH_BIG_ENDIAN=y
 ARCH_CFLAGS="-mno-split-addresses"
 ARCH_WANTS_BIG_ENDIAN=y
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-# CONFIG_MIPS_ISA_3 is not set
-# CONFIG_MIPS_ISA_4 is not set
-# CONFIG_MIPS_ISA_MIPS32 is not set
-# CONFIG_MIPS_ISA_MIPS32R2 is not set
-CONFIG_MIPS_ISA_MIPS64=y
-# CONFIG_MIPS_ISA_MIPS64R2 is not set
 # CONFIG_MIPS_N32_ABI is not set
 CONFIG_MIPS_N64_ABI=y
 # CONFIG_MIPS_O32_ABI is not set
diff --git a/toolchain/uClibc/config/mips64.32 b/toolchain/uClibc/config/mips64.32
index b7ea8f457e..4e98968633 100644
--- a/toolchain/uClibc/config/mips64.32
+++ b/toolchain/uClibc/config/mips64.32
@@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y
 ARCH_BIG_ENDIAN=y
 ARCH_CFLAGS="-mno-split-addresses"
 ARCH_WANTS_BIG_ENDIAN=y
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-# CONFIG_MIPS_ISA_3 is not set
-# CONFIG_MIPS_ISA_4 is not set
-# CONFIG_MIPS_ISA_MIPS32 is not set
-# CONFIG_MIPS_ISA_MIPS32R2 is not set
-CONFIG_MIPS_ISA_MIPS64=y
-# CONFIG_MIPS_ISA_MIPS64R2 is not set
 # CONFIG_MIPS_N32_ABI is not set
 # CONFIG_MIPS_N64_ABI is not set
 CONFIG_MIPS_O32_ABI=y
diff --git a/toolchain/uClibc/config/mips64.64 b/toolchain/uClibc/config/mips64.64
index 2a0b755a73..bf4ecca704 100644
--- a/toolchain/uClibc/config/mips64.64
+++ b/toolchain/uClibc/config/mips64.64
@@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y
 ARCH_BIG_ENDIAN=y
 ARCH_CFLAGS="-mno-split-addresses"
 ARCH_WANTS_BIG_ENDIAN=y
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-# CONFIG_MIPS_ISA_3 is not set
-# CONFIG_MIPS_ISA_4 is not set
-# CONFIG_MIPS_ISA_MIPS32 is not set
-# CONFIG_MIPS_ISA_MIPS32R2 is not set
-CONFIG_MIPS_ISA_MIPS64=y
-# CONFIG_MIPS_ISA_MIPS64R2 is not set
 # CONFIG_MIPS_N32_ABI is not set
 CONFIG_MIPS_N64_ABI=y
 # CONFIG_MIPS_O32_ABI is not set
diff --git a/toolchain/uClibc/config/mips64.n32 b/toolchain/uClibc/config/mips64.n32
index f8def5837f..c26ecec4c2 100644
--- a/toolchain/uClibc/config/mips64.n32
+++ b/toolchain/uClibc/config/mips64.n32
@@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y
 ARCH_BIG_ENDIAN=y
 ARCH_CFLAGS="-mno-split-addresses"
 ARCH_WANTS_BIG_ENDIAN=y
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-# CONFIG_MIPS_ISA_3 is not set
-# CONFIG_MIPS_ISA_4 is not set
-# CONFIG_MIPS_ISA_MIPS32 is not set
-# CONFIG_MIPS_ISA_MIPS32R2 is not set
-CONFIG_MIPS_ISA_MIPS64=y
-# CONFIG_MIPS_ISA_MIPS64R2 is not set
 CONFIG_MIPS_N32_ABI=y
 # CONFIG_MIPS_N64_ABI is not set
 # CONFIG_MIPS_O32_ABI is not set
diff --git a/toolchain/uClibc/config/mips64el b/toolchain/uClibc/config/mips64el
index 53580787b5..98d9bb4569 100644
--- a/toolchain/uClibc/config/mips64el
+++ b/toolchain/uClibc/config/mips64el
@@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y
 ARCH_CFLAGS="-mno-split-addresses"
 ARCH_LITTLE_ENDIAN=y
 ARCH_WANTS_LITTLE_ENDIAN=y
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-# CONFIG_MIPS_ISA_3 is not set
-# CONFIG_MIPS_ISA_4 is not set
-# CONFIG_MIPS_ISA_MIPS32 is not set
-# CONFIG_MIPS_ISA_MIPS32R2 is not set
-CONFIG_MIPS_ISA_MIPS64=y
-# CONFIG_MIPS_ISA_MIPS64R2 is not set
 # CONFIG_MIPS_N32_ABI is not set
 CONFIG_MIPS_N64_ABI=y
 # CONFIG_MIPS_O32_ABI is not set
diff --git a/toolchain/uClibc/config/mips64el.32 b/toolchain/uClibc/config/mips64el.32
index a10840bf96..03ab17c24f 100644
--- a/toolchain/uClibc/config/mips64el.32
+++ b/toolchain/uClibc/config/mips64el.32
@@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y
 ARCH_CFLAGS="-mno-split-addresses"
 ARCH_LITTLE_ENDIAN=y
 ARCH_WANTS_LITTLE_ENDIAN=y
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-# CONFIG_MIPS_ISA_3 is not set
-# CONFIG_MIPS_ISA_4 is not set
-# CONFIG_MIPS_ISA_MIPS32 is not set
-# CONFIG_MIPS_ISA_MIPS32R2 is not set
-CONFIG_MIPS_ISA_MIPS64=y
-# CONFIG_MIPS_ISA_MIPS64R2 is not set
 # CONFIG_MIPS_N32_ABI is not set
 # CONFIG_MIPS_N64_ABI is not set
 CONFIG_MIPS_O32_ABI=y
diff --git a/toolchain/uClibc/config/mips64el.64 b/toolchain/uClibc/config/mips64el.64
index 8b90a54a57..884640c756 100644
--- a/toolchain/uClibc/config/mips64el.64
+++ b/toolchain/uClibc/config/mips64el.64
@@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y
 ARCH_CFLAGS="-mno-split-addresses"
 ARCH_LITTLE_ENDIAN=y
 ARCH_WANTS_LITTLE_ENDIAN=y
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-# CONFIG_MIPS_ISA_3 is not set
-# CONFIG_MIPS_ISA_4 is not set
-# CONFIG_MIPS_ISA_MIPS32 is not set
-# CONFIG_MIPS_ISA_MIPS32R2 is not set
-CONFIG_MIPS_ISA_MIPS64=y
-# CONFIG_MIPS_ISA_MIPS64R2 is not set
 # CONFIG_MIPS_N32_ABI is not set
 CONFIG_MIPS_N64_ABI=y
 # CONFIG_MIPS_O32_ABI is not set
diff --git a/toolchain/uClibc/config/mips64el.n32 b/toolchain/uClibc/config/mips64el.n32
index 4ac4d06c0d..9a8bb3d3fb 100644
--- a/toolchain/uClibc/config/mips64el.n32
+++ b/toolchain/uClibc/config/mips64el.n32
@@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y
 ARCH_CFLAGS="-mno-split-addresses"
 ARCH_LITTLE_ENDIAN=y
 ARCH_WANTS_LITTLE_ENDIAN=y
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-# CONFIG_MIPS_ISA_3 is not set
-# CONFIG_MIPS_ISA_4 is not set
-# CONFIG_MIPS_ISA_MIPS32 is not set
-# CONFIG_MIPS_ISA_MIPS32R2 is not set
-CONFIG_MIPS_ISA_MIPS64=y
-# CONFIG_MIPS_ISA_MIPS64R2 is not set
 CONFIG_MIPS_N32_ABI=y
 # CONFIG_MIPS_N64_ABI is not set
 # CONFIG_MIPS_O32_ABI is not set
diff --git a/toolchain/uClibc/config/mipsel b/toolchain/uClibc/config/mipsel
index d9dedbb02c..2a79c16bdb 100644
--- a/toolchain/uClibc/config/mipsel
+++ b/toolchain/uClibc/config/mipsel
@@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y
 ARCH_CFLAGS="-mno-split-addresses"
 ARCH_LITTLE_ENDIAN=y
 ARCH_WANTS_LITTLE_ENDIAN=y
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-# CONFIG_MIPS_ISA_3 is not set
-# CONFIG_MIPS_ISA_4 is not set
-CONFIG_MIPS_ISA_MIPS32=y
-# CONFIG_MIPS_ISA_MIPS32R2 is not set
-# CONFIG_MIPS_ISA_MIPS64 is not set
-# CONFIG_MIPS_ISA_MIPS64R2 is not set
 # CONFIG_MIPS_N32_ABI is not set
 # CONFIG_MIPS_N64_ABI is not set
 CONFIG_MIPS_O32_ABI=y
diff --git a/toolchain/uClibc/config/mipsel.cobalt b/toolchain/uClibc/config/mipsel.cobalt
index 1d42a70f23..2a79c16bdb 100644
--- a/toolchain/uClibc/config/mipsel.cobalt
+++ b/toolchain/uClibc/config/mipsel.cobalt
@@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y
 ARCH_CFLAGS="-mno-split-addresses"
 ARCH_LITTLE_ENDIAN=y
 ARCH_WANTS_LITTLE_ENDIAN=y
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-CONFIG_MIPS_ISA_3=y
-# CONFIG_MIPS_ISA_4 is not set
-# CONFIG_MIPS_ISA_MIPS32 is not set
-# CONFIG_MIPS_ISA_MIPS32R2 is not set
-# CONFIG_MIPS_ISA_MIPS64 is not set
-# CONFIG_MIPS_ISA_MIPS64R2 is not set
 # CONFIG_MIPS_N32_ABI is not set
 # CONFIG_MIPS_N64_ABI is not set
 CONFIG_MIPS_O32_ABI=y
diff --git a/toolchain/uClibc/config/sparc b/toolchain/uClibc/config/sparc
index e1596c4100..3630b24a7e 100644
--- a/toolchain/uClibc/config/sparc
+++ b/toolchain/uClibc/config/sparc
@@ -1,8 +1,6 @@
 ARCH_BIG_ENDIAN=y
 # CONFIG_SPARC_V7 is not set
 # CONFIG_SPARC_V8 is not set
-CONFIG_SPARC_V9=y
-# CONFIG_SPARC_V9B is not set
 TARGET_ARCH="sparc"
 TARGET_sparc=y
 UCLIBC_HAS_LONG_DOUBLE_MATH=y
diff --git a/toolchain/uClibc/config/sparc.leon b/toolchain/uClibc/config/sparc.leon
index eb725ac05d..3deb5148d9 100644
--- a/toolchain/uClibc/config/sparc.leon
+++ b/toolchain/uClibc/config/sparc.leon
@@ -1,8 +1,6 @@
 ARCH_BIG_ENDIAN=y
 # CONFIG_SPARC_V7 is not set
 CONFIG_SPARC_V8=y
-# CONFIG_SPARC_V9 is not set
-# CONFIG_SPARC_V9B is not set
 TARGET_ARCH="sparc"
 TARGET_sparc=y
 UCLIBC_HAS_LONG_DOUBLE_MATH=y
diff --git a/toolchain/uClibc/config/x86_64 b/toolchain/uClibc/config/x86_64
index b6dc2c2afe..a13d659ba1 100644
--- a/toolchain/uClibc/config/x86_64
+++ b/toolchain/uClibc/config/x86_64
@@ -1,5 +1,4 @@
 ARCH_LITTLE_ENDIAN=y
-# LINUXTHREADS_NEW is not set
 TARGET_ARCH="x86_64"
 TARGET_x86_64=y
 UCLIBC_BSD_SPECIFIC=y