merge of '1821f6eadefc14ad7ce51d5ab026da139608f557'

     and 'b214e193f52c5b76dce3027376c5bd7eafce9971'

1 files changed, 42 insertions, 26 deletions

diff --git a/packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine b/packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine
index cef409289c..0c565238e5 100644
--- a/packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine
+++ b/packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Fri Aug 10 19:05:32 2007
+# Sat Oct 20 20:22:28 2007
 #
 # TARGET_alpha is not set
 # TARGET_arm is not set
@@ -33,11 +33,10 @@ TARGET_ARCH="bfin"
 FORCE_OPTIONS_FOR_ARCH=y
 TARGET_SUBARCH=""
 # UCLIBC_FORMAT_ELF is not set
-# UCLIBC_FORMAT_FDPIC_ELF is not set
+UCLIBC_FORMAT_FDPIC_ELF=y
 # UCLIBC_FORMAT_FLAT is not set
 # UCLIBC_FORMAT_FLAT_SEP_DATA is not set
-UCLIBC_FORMAT_SHARED_FLAT=y
-UCLIBC_SHARED_FLAT_ID=1
+# UCLIBC_FORMAT_SHARED_FLAT is not set
 ARCH_LITTLE_ENDIAN=y
 
 #
@@ -50,8 +49,8 @@ ARCH_HAS_NO_MMU=y
 #
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-KERNEL_HEADERS="/media/hda4/OE/build/tmp-new/angstrom/cross/bfin-angstrom-uclinux-uclibc/include"
+# DO_C99_MATH is not set
+KERNEL_HEADERS="/usr/include"
 # UCLIBC_UCLINUX_BROKEN_MUNMAP is not set
 EXCLUDE_BRK=y
 HAVE_DOT_CONFIG=y
@@ -60,12 +59,22 @@ HAVE_DOT_CONFIG=y
 # General Library Settings
 #
 # HAVE_NO_PIC is not set
-# DOPIC is not set
-HAVE_NO_SHARED=y
-ARCH_HAS_NO_LDSO=y
+DOPIC=y
+# HAVE_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
+UCLIBC_STATIC_LDCONFIG=y
+LDSO_RUNPATH=y
 UCLIBC_CTOR_DTOR=y
 # HAS_NO_THREADS is not set
-# UCLIBC_HAS_THREADS is not set
+UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
+LINUXTHREADS_OLD=y
 UCLIBC_HAS_LFS=y
 MALLOC=y
 # MALLOC_SIMPLE is not set
@@ -73,24 +82,24 @@ MALLOC=y
 # MALLOC_GLIBC_COMPAT is not set
 UCLIBC_DYNAMIC_ATEXIT=y
 # COMPAT_ATEXIT is not set
-UCLIBC_SUSV3_LEGACY=y
-UCLIBC_SUSV3_LEGACY_MACROS=y
-# UCLIBC_HAS_SHADOW is not set
+# UCLIBC_SUSV3_LEGACY is not set
+# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_HAS_SHADOW=y
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
 UNIX98PTY_ONLY=y
 ASSUME_DEVPTS=y
 UCLIBC_HAS_TM_EXTENSIONS=y
-# UCLIBC_HAS_TZ_CACHING is not set
-# UCLIBC_HAS_TZ_FILE is not set
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
 
 #
 # Networking Support
 #
 # UCLIBC_HAS_IPV6 is not set
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
+# UCLIBC_HAS_RPC is not set
 # UCLIBC_USE_NETLINK is not set
 
 #
@@ -103,18 +112,19 @@ UCLIBC_HAS_CTYPE_SIGNED=y
 UCLIBC_HAS_CTYPE_UNSAFE=y
 # UCLIBC_HAS_CTYPE_CHECKED is not set
 # UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_WCHAR is not set
 # UCLIBC_HAS_LOCALE is not set
 # UCLIBC_HAS_HEXADECIMAL_FLOATS is not set
 # UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set
+# USE_OLD_VFPRINTF is not set
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
 # UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
 # UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
 # UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
 # UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
 # UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
 # UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
 UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
 # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
@@ -149,8 +159,9 @@ UCLIBC_HAS_GLOB=y
 #
 # Library Installation Options
 #
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
+SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib"
+RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/"
+DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/usr/"
 MULTILIB=""
 
 #
@@ -159,16 +170,21 @@ MULTILIB=""
 # UCLIBC_HAS_ARC4RANDOM is not set
 # HAVE_NO_SSP is not set
 # UCLIBC_HAS_SSP is not set
-# UCLIBC_BUILD_NOEXECSTACK is not set
+UCLIBC_BUILD_RELRO=y
+# UCLIBC_BUILD_NOW is not set
+UCLIBC_BUILD_NOEXECSTACK=y
 
 #
 # uClibc development/debugging options
 #
-CROSS_COMPILER_PREFIX="bfin-elf-"
+CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
 # DODEBUG is not set
-# DOSTRIP is not set
+# DODEBUG_PT is not set
+DOSTRIP=y
 # DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
 # UCLIBC_MALLOC_DEBUGGING is not set
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set