make the locale config mostly match the non-locale config

diff --git a/toolchain/uClibc/uClibc.config-locale b/toolchain/uClibc/uClibc.config-locale
index 8d88dcb17b308796c2849b483df3d45fd099524d..0feb796df3ae0725f89f2c8e69ebdee394038906 100644 (file)
--- a/toolchain/uClibc/uClibc.config-locale
+++ b/toolchain/uClibc/uClibc.config-locale
@@ -8,6 +8,7 @@
 # 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_m68k is not set
@@ -27,6 +28,8 @@
 #
 HAVE_ELF=y
 TARGET_ARCH="none"
+# ARCH_LITTLE_ENDIAN is not set
+# ARCH_BIG_ENDIAN is not set
 # ARCH_HAS_NO_MMU is not set
 UCLIBC_HAS_FLOATS=y
 HAS_FPU=y
@@ -34,6 +37,17 @@ DO_C99_MATH=y
 WARNINGS="-Wall"
 KERNEL_SOURCE="/usr/src/linux"
 HAVE_DOT_CONFIG=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
 
 #
 # General Library Settings
@@ -49,12 +63,14 @@ LDSO_LDD_SUPPORT=y
 LDSO_CACHE_SUPPORT=y
 # LDSO_PRELOAD_FILE_SUPPORT is not set
 LDSO_BASE_FILENAME="ld.so"
+LDSO_RUNPATH=n
 # DL_FINI_CRT_COMPAT is not set
 UCLIBC_CTOR_DTOR=y
 # HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
+# UCLIBC_HAS_THREADS is not set
+# PTHREADS_DEBUG_SUPPORT is not set
+# UCLIBC_HAS_THREADS_NATIVE is not set
+# LINUXTHREADS_OLD is not set
 UCLIBC_HAS_LFS=y
 # UCLIBC_STATIC_LDCONFIG is not set
 # MALLOC is not set
@@ -96,8 +112,6 @@ UCLIBC_PREGENERATED_LOCALE_DATA=y
 UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y
 UCLIBC_HAS_XLOCALE=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y
-UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
 UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
@@ -111,6 +125,7 @@ UCLIBC_HAS_STDIO_BUFSIZ_4096=y
 UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
 # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
 # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT=n
 UCLIBC_HAS_STDIO_GETC_MACRO=y
 UCLIBC_HAS_STDIO_PUTC_MACRO=y
 UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
@@ -128,6 +143,7 @@ UCLIBC_HAS_GNU_GETOPT=y
 # Big and Tall
 #
 UCLIBC_HAS_REGEX=y
+UCLIBC_HAS_REGEX_OLD=y
 # UCLIBC_HAS_WORDEXP is not set
 UCLIBC_HAS_FTW=y
 UCLIBC_HAS_GLOB=y
@@ -143,14 +159,21 @@ DEVEL_PREFIX="/usr/"
 # uClibc security related options
 #
 # UCLIBC_SECURITY is not set
+UCLIBC_BUILD_PIE=n
+UCLIBC_HAS_SSP=n
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
 
 #
 # uClibc development/debugging options
 #
 CROSS_COMPILER_PREFIX=""
 # DODEBUG is not set
+# DODEBUG_PT is not set
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
 WARNINGS="-Wall"
+# DOMULTI is not set
 # UCLIBC_MJN3_ONLY is not set