Update the uclibc from cvs defconfigs for i386/i686.

BKrev: 419ff9deCYehgS5mGowU7S4X5gcmwA

2 files changed, 18 insertions, 8 deletions

diff --git a/uclibc/uclibc-cvs/i386/uClibc.config b/uclibc/uclibc-cvs/i386/uClibc.config
index dc8a42e2a4..1a597853d8 100644
--- a/uclibc/uclibc-cvs/i386/uClibc.config
+++ b/uclibc/uclibc-cvs/i386/uClibc.config
@@ -12,6 +12,8 @@ TARGET_i386=y
 # TARGET_m68k is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
 # TARGET_powerpc is not set
 # TARGET_sh is not set
 # TARGET_sparc is not set
@@ -24,14 +26,14 @@ HAVE_ELF=y
 ARCH_SUPPORTS_LITTLE_ENDIAN=y
 TARGET_ARCH="i386"
 # CONFIG_GENERIC_386 is not set
-CONFIG_386=y
+# CONFIG_386 is not set
 # CONFIG_486 is not set
 # CONFIG_586 is not set
 # CONFIG_586MMX is not set
 # CONFIG_686 is not set
 # CONFIG_PENTIUMII is not set
 # CONFIG_PENTIUMIII is not set
-# CONFIG_PENTIUM4 is not set
+CONFIG_PENTIUM4=y
 # CONFIG_K6 is not set
 # CONFIG_K7 is not set
 # CONFIG_ELAN is not set
@@ -48,7 +50,7 @@ UCLIBC_HAS_FLOATS=y
 HAS_FPU=y
 DO_C99_MATH=y
 WARNINGS="-Wall"
-KERNEL_SOURCE="/usr/local/projects/tmp/work/uclibc-snapshot-20040620-r0/linux"
+KERNEL_SOURCE="/home/kergoth/code/build-x86/tmp/cross/i686-linux-uclibc/include"
 C_SYMBOL_PREFIX=""
 HAVE_DOT_CONFIG=y
 
@@ -64,9 +66,11 @@ BUILD_UCLIBC_LDSO=y
 # FORCE_SHAREABLE_TEXT_SEGMENTS is not set
 # UCLIBC_PIE_SUPPORT is not set
 LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
 UCLIBC_CTOR_DTOR=y
 # UCLIBC_PROPOLICE is not set
-# UCLIBC_PROFILING is not set
 # HAS_NO_THREADS is not set
 UCLIBC_HAS_THREADS=y
 PTHREADS_DEBUG_SUPPORT=y
@@ -95,6 +99,8 @@ UCLIBC_HAS_FULL_RPC=y
 #
 # String and Stdio Support
 #
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -132,7 +138,6 @@ UCLIBC_HAS_ERRNO_MESSAGES=y
 # UCLIBC_HAS_SYS_ERRLIST is not set
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 # UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GETTEXT_AWARENESS=y
 UCLIBC_HAS_GNU_GETOPT=y
 
 #
diff --git a/uclibc/uclibc-cvs/i686/uClibc.config b/uclibc/uclibc-cvs/i686/uClibc.config
index bbada74036..1a597853d8 100644
--- a/uclibc/uclibc-cvs/i686/uClibc.config
+++ b/uclibc/uclibc-cvs/i686/uClibc.config
@@ -12,6 +12,8 @@ TARGET_i386=y
 # TARGET_m68k is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
 # TARGET_powerpc is not set
 # TARGET_sh is not set
 # TARGET_sparc is not set
@@ -48,7 +50,7 @@ UCLIBC_HAS_FLOATS=y
 HAS_FPU=y
 DO_C99_MATH=y
 WARNINGS="-Wall"
-KERNEL_SOURCE="/usr/local/projects/tmp/work/uclibc-snapshot-20040620-r0/linux"
+KERNEL_SOURCE="/home/kergoth/code/build-x86/tmp/cross/i686-linux-uclibc/include"
 C_SYMBOL_PREFIX=""
 HAVE_DOT_CONFIG=y
 
@@ -64,9 +66,11 @@ BUILD_UCLIBC_LDSO=y
 # FORCE_SHAREABLE_TEXT_SEGMENTS is not set
 # UCLIBC_PIE_SUPPORT is not set
 LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
 UCLIBC_CTOR_DTOR=y
 # UCLIBC_PROPOLICE is not set
-# UCLIBC_PROFILING is not set
 # HAS_NO_THREADS is not set
 UCLIBC_HAS_THREADS=y
 PTHREADS_DEBUG_SUPPORT=y
@@ -95,6 +99,8 @@ UCLIBC_HAS_FULL_RPC=y
 #
 # String and Stdio Support
 #
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -132,7 +138,6 @@ UCLIBC_HAS_ERRNO_MESSAGES=y
 # UCLIBC_HAS_SYS_ERRLIST is not set
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 # UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GETTEXT_AWARENESS=y
 UCLIBC_HAS_GNU_GETOPT=y
 
 #