diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Configs/Config.in | 75 | ||||
| -rw-r--r-- | extra/config/confdata.c | 2 | ||||
| -rw-r--r-- | extra/locale/Makefile.in | 4 |
3 files changed, 20 insertions, 61 deletions
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index be2035e45..4ce4bb09b 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -254,7 +254,7 @@ config ARCH_HAS_NO_LDSO default n config HAVE_SHARED - bool "Enable support for shared libraries" + bool "Enable shared libraries" depends on !ARCH_HAS_NO_SHARED default y help @@ -286,7 +286,7 @@ config LDSO_LDD_SUPPORT Enable all the code needed to support traditional ldd, which executes the shared library loader to resolve all dependencies and then provide a list of shared libraries that are required for an - application to function. Disabling this option will makes uClibc's + application to function. Disabling this option will make uClibc's shared library loader a little bit smaller. Most people will answer Y. @@ -401,7 +401,6 @@ config LDSO_GNU_HASH_SUPPORT choice prompt "Thread support" - #default UCLIBC_HAS_THREADS_NATIVE if (TARGET_alpha || TARGET_arm || TARGET_i386 || TARGET_mips || TARGET_powerpc || TARGET_sh || TARGET_sh64) default HAS_NO_THREADS help If you want to compile uClibc with pthread support, then answer Y. @@ -432,42 +431,11 @@ config LINUXTHREADS_NEW the latest code from glibc, so it may be the only choice for the newer ports (like alpha/amd64/64bit arches and hppa). -config UCLIBC_HAS_THREADS_NATIVE - bool "Native POSIX Threading (NPTL)" - select UCLIBC_HAS_TLS - select UCLIBC_HAS_STDIO_FUTEXES - help - If you want to compile uClibc with NPTL support, then answer Y. - - IMPORTANT NOTE! NPTL requires a Linux 2.6 kernel, binutils - at least version 2.16 and GCC with at least version 4.1.0. NPTL - will not work with older versions of any above sources. If you - ignore any of these guidelines, you do so at your own risk. Do - not ask for help on any of the development mailing lists. - - !!!! WARNING !!!! BIG FAT WARNING !!!! REALLY BIG FAT WARNING !!!! - - This is experimental code and at times it may not even build and - even if it does it might decide to do random damage. This code is - potentially hazardous to your health and sanity. It will remain - that way until further notice at which point this notice will - disappear. Thank you for your support and for not smoking. - endchoice config UCLIBC_HAS_THREADS def_bool y if !HAS_NO_THREADS -config UCLIBC_HAS_TLS - bool "Thread-Local Storage" - depends on UCLIBC_HAS_THREADS_NATIVE - default n - help - If you want to enable TLS support then answer Y. - This is fast an efficient way to store per-thread local data - which is not on stack. It needs __thread support enabled in - gcc. - config PTHREADS_DEBUG_SUPPORT bool "Build pthreads debugging support" default n @@ -1747,14 +1715,6 @@ config UCLIBC_HAS_GNU_GETOPT Most people will answer Y. -config UCLIBC_HAS_STDIO_FUTEXES - bool "Use futexes for multithreaded I/O locking" - depends on UCLIBC_HAS_THREADS_NATIVE - default n - help - If you want to compile uClibc to use futexes for low-level - I/O locking, answer Y. Otherwise, answer N. - config UCLIBC_HAS_GETOPT_LONG bool "Support getopt_long/getopt_long_only" depends on !UCLIBC_HAS_GNU_GETOPT @@ -1891,23 +1851,6 @@ endmenu menu "Library Installation Options" -config SHARED_LIB_LOADER_PREFIX - string "Shared library loader path" - depends on HAVE_SHARED - default "$(RUNTIME_PREFIX)lib" - help - When using shared libraries, this path is the location where the - shared library will be invoked. This value will be compiled into - every binary compiled with uClibc. - - For a typical target system this should be set to "/lib", such that - 'make install' will install /lib/ld-uClibc.so.0. - - BIG FAT WARNING: - If you do not have a shared library loader with the correct name - sitting in the directory this points to, your binaries will not - run. - config RUNTIME_PREFIX string "uClibc runtime library directory" default "/usr/$(TARGET_ARCH)-linux-uclibc/" @@ -1942,6 +1885,20 @@ config DEVEL_PREFIX For a typical target system this should be set to "/usr", such that 'make install' will install /usr/include/<header files>. +config MULTILIB_DIR + string "library path component" + default "lib" + help + Path component where libraries reside. + + For a typical target system this should be set to "lib", such that + 'make install' will install libraries to "/lib" and "/usr/lib" + respectively + DEVEL_PREFIX/MULTILIB_DIR + RUNTIME_PREFIX/MULTILIB_DIR + + Other settings may include "lib32" or "lib64". + config HARDWIRED_ABSPATH bool "Hardwire absolute paths into linker scripts" default y diff --git a/extra/config/confdata.c b/extra/config/confdata.c index 281dd0024..2b848d5d0 100644 --- a/extra/config/confdata.c +++ b/extra/config/confdata.c @@ -402,6 +402,8 @@ int conf_write(const char *name) char *env; dirname[0] = 0; + if (name == NULL) + name = conf_get_configname(); if (name && name[0]) { struct stat st; char *slash; diff --git a/extra/locale/Makefile.in b/extra/locale/Makefile.in index 8bda8d8aa..221a51585 100644 --- a/extra/locale/Makefile.in +++ b/extra/locale/Makefile.in @@ -234,9 +234,9 @@ $(top_builddir)include/bits/uClibc_locale_data.h: $(locale_OUT)/uClibc_locale_da $(Q)$(AWK) 'BEGIN{i=1}{if (/WANT_/) i=/endif/;else if (i) print $0}' \ $< > $@ -objclean-y += locale_clean +objclean-y += CLEAN_extra/locale # lmmtolso.c/gen_mmap.c/tst-*.c not used -locale_clean: +CLEAN_extra/locale: $(do_rm) $(locale_HOBJ) $(locale_SRC) $(addprefix $(locale_OUT)/*., o os txt) \ $(addprefix $(locale_OUT)/,$(addsuffix .h,uClibc_locale_data lt_defines c8tables wctables locale_tables locale_collate) lmmtolso gen_mmap locale.mmap) |