diff options
Diffstat (limited to 'extra')
29 files changed, 82 insertions, 131 deletions
diff --git a/extra/Configs/Config.alpha b/extra/Configs/Config.alpha index fd2d7a8e5..144924a65 100644 --- a/extra/Configs/Config.alpha +++ b/extra/Configs/Config.alpha @@ -14,6 +14,3 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_HAS_MMU select ARCH_HAS_NO_LDSO select UCLIBC_HAS_LFS - -config ARCH_CFLAGS - string diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm index 2b91a34d3..b060ace96 100644 --- a/extra/Configs/Config.arm +++ b/extra/Configs/Config.arm @@ -12,9 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_ANY_ENDIAN -config ARCH_CFLAGS - string - choice prompt "Target ABI" default CONFIG_ARM_OABI diff --git a/extra/Configs/Config.avr32 b/extra/Configs/Config.avr32 index 8d70e6e99..cbadb4cf5 100644 --- a/extra/Configs/Config.avr32 +++ b/extra/Configs/Config.avr32 @@ -13,9 +13,6 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_BIG_ENDIAN select FORCE_SHAREABLE_TEXT_SEGMENTS -config ARCH_CFLAGS - string - choice prompt "Target CPU Type" default CONFIG_AVR32_AP7 diff --git a/extra/Configs/Config.bfin b/extra/Configs/Config.bfin index 60c397af0..a70afcfd8 100644 --- a/extra/Configs/Config.bfin +++ b/extra/Configs/Config.bfin @@ -12,6 +12,3 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_LITTLE_ENDIAN select ARCH_HAS_NO_MMU - -config ARCH_CFLAGS - string diff --git a/extra/Configs/Config.cris b/extra/Configs/Config.cris index b3811d1e9..52ca0c36b 100644 --- a/extra/Configs/Config.cris +++ b/extra/Configs/Config.cris @@ -12,9 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_LITTLE_ENDIAN -config ARCH_CFLAGS - string - choice prompt "Target Architecture Type" default CONFIG_CRIS diff --git a/extra/Configs/Config.e1 b/extra/Configs/Config.e1 index 144d9d34d..ecaa9f0e5 100644 --- a/extra/Configs/Config.e1 +++ b/extra/Configs/Config.e1 @@ -13,11 +13,3 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_BIG_ENDIAN select ARCH_HAS_NO_MMU select ARCH_HAS_NO_SHARED - -config ARCH_E1 - bool - default y - -config ARCH_CFLAGS - string - default "-mgnu-param" diff --git a/extra/Configs/Config.frv b/extra/Configs/Config.frv index 63bbfed72..b389870f9 100644 --- a/extra/Configs/Config.frv +++ b/extra/Configs/Config.frv @@ -13,6 +13,3 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_BIG_ENDIAN select UCLIBC_HAS_FPU select ARCH_HAS_NO_MMU - -config ARCH_CFLAGS - string diff --git a/extra/Configs/Config.h8300 b/extra/Configs/Config.h8300 index 262a0d245..ffcb9c837 100644 --- a/extra/Configs/Config.h8300 +++ b/extra/Configs/Config.h8300 @@ -26,6 +26,3 @@ config CONFIG_H8S bool "H8S (edosk2674)" endchoice - -config ARCH_CFLAGS - string diff --git a/extra/Configs/Config.hppa b/extra/Configs/Config.hppa index 1c264a800..1323de228 100644 --- a/extra/Configs/Config.hppa +++ b/extra/Configs/Config.hppa @@ -15,6 +15,3 @@ config FORCE_OPTIONS_FOR_ARCH select HAS_NO_THREADS select ARCH_HAS_NO_LDSO select HAVE_NO_SSP - -config ARCH_CFLAGS - string diff --git a/extra/Configs/Config.i960 b/extra/Configs/Config.i960 index cb325c7ea..798dae0c2 100644 --- a/extra/Configs/Config.i960 +++ b/extra/Configs/Config.i960 @@ -13,7 +13,3 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_LITTLE_ENDIAN select ARCH_HAS_NO_MMU select HAS_NO_THREADS - -config ARCH_CFLAGS - string - default "-mh -mint32 -fsigned-char" diff --git a/extra/Configs/Config.ia64 b/extra/Configs/Config.ia64 index dc13319b3..ae88be777 100644 --- a/extra/Configs/Config.ia64 +++ b/extra/Configs/Config.ia64 @@ -13,6 +13,3 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_LITTLE_ENDIAN select ARCH_HAS_MMU select ARCH_HAS_NO_LDSO - -config ARCH_CFLAGS - string diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 1d3e153bb..5ef2b9f14 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -265,6 +265,7 @@ config HAVE_SHARED config FORCE_SHAREABLE_TEXT_SEGMENTS bool "Only load shared libraries which can share their text segment" depends on HAVE_SHARED + select DOPIC default n help If you answer Y here, the uClibc native shared library loader will @@ -282,7 +283,7 @@ config LDSO_LDD_SUPPORT depends on HAVE_SHARED default y help - Enable this to enable all the code needed to support traditional ldd, + 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 @@ -333,14 +334,15 @@ config UCLIBC_STATIC_LDCONFIG Enable this option to statically link the ldconfig binary. Making ldconfig static can be beneficial if you have a library - problem and need to use ldconfig to recover. Sometimes, it is + problem and need to use ldconfig to recover. Sometimes it is preferable to instead keep the size of the system down, in which case you should disable this option. config LDSO_RUNPATH bool "Enable ELF RUNPATH tag support" depends on HAVE_SHARED - default y + default y if LDSO_CACHE_SUPPORT + default n if !LDSO_CACHE_SUPPORT help ELF's may have dynamic RPATH/RUNPATH tags. These tags list paths which extend the library search paths. They are really only useful @@ -724,6 +726,31 @@ config UCLIBC_HAS_GETPT def_bool y endif +config UCLIBC_HAS_LIBUTIL + bool "Provide libutil library and functions" + depends on UCLIBC_HAS_PTY + default n + help + Provide a libutil library. + This non-standard conforming library provides the following + utility functions: + + forkpty(): combines openpty(), fork(2), and login_tty() to + create a new process operating in a pseudo-terminal. + login(): write utmp and wtmp entries + login_tty(): prepares for a login on the tty fd by creating a + new session, making fd the controlling terminal for + the calling process, setting fd to be the standard + input, output, and error streams of the current + process, and closing fd. + logout(): write utmp and wtmp entries + logwtmp(): constructs a utmp structure and calls updwtmp() to + append the structure to the utmp file. + openpty(): finds an available pseudo-terminal and returns + file descriptors for the master and slave + + This library adds about 3k-4k to your system. + config UCLIBC_HAS_TM_EXTENSIONS bool "Support 'struct tm' timezone extension fields" default y @@ -1184,12 +1211,18 @@ config UCLIBC_HAS_EXTRA_COMPAT_RES_STATE Answer Y if selecting UCLIBC_HAS_COMPAT_RES_STATE is not enough. As far as I can say, this should never be needed. -config UCLIBC_HAS_RESOLV_STUB +config UCLIBC_HAS_LIBRESOLV_STUB bool "Provide libresolv stub" default n help Provide a dummy resolv library. +config UCLIBC_HAS_LIBNSL_STUB + bool "Provide libnsl stub" + default n + help + Provide a dummy nsl library. + endif @@ -1904,10 +1937,9 @@ config HARDWIRED_ABSPATH This is a build time optimization. It has no impact on dynamic linking at runtime, which doesn't use linker scripts. - You must disable this to use uClibc with a relocatable toolchain, - such as the prebuilt binary cross compilers at - http://uclibc.org/downloads/binaries which may be installed at an - arbitrary location (such as in a user's home directory). + You must disable this to use uClibc with old non-sysroot toolchains, + such as the prebuilt binary cross compilers at: + http://uclibc.org/downloads/binaries The amount of time saved by this optimization is actually too small to measure. The linker just had to search the library path to find the diff --git a/extra/Configs/Config.in.arch b/extra/Configs/Config.in.arch index 76ab0022f..8a02cb1a2 100644 --- a/extra/Configs/Config.in.arch +++ b/extra/Configs/Config.in.arch @@ -160,6 +160,17 @@ config DO_C99_MATH If your applications require the newer C99 math library functions, then answer Y. +config DO_XSI_MATH + bool "Enable XSI math extensions to the ISO C standard (bessel)" + depends on UCLIBC_HAS_FLOATS + default n + help + X/Open System Interfaces extensions to ISO C math functions + (differential equation functions): + + j0, j1, jn - Bessel functions of the first kind + y0, y1, yn - Bessel functions of the second kind + config UCLIBC_HAS_FENV bool "Enable C99 Floating-point environment" depends on UCLIBC_HAS_FLOATS diff --git a/extra/Configs/Config.microblaze b/extra/Configs/Config.microblaze index a89914ef1..a426ab51e 100644 --- a/extra/Configs/Config.microblaze +++ b/extra/Configs/Config.microblaze @@ -12,10 +12,3 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_BIG_ENDIAN select ARCH_HAS_NO_MMU - -config ARCH_CFLAGS - string - -config CROSS - string - default "mb-" diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips index 8350ea427..063b07cea 100644 --- a/extra/Configs/Config.mips +++ b/extra/Configs/Config.mips @@ -12,10 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_ANY_ENDIAN -config ARCH_CFLAGS - string - default "-mno-split-addresses" - choice prompt "Target ABI" default CONFIG_MIPS_O32_ABI diff --git a/extra/Configs/Config.nios b/extra/Configs/Config.nios index f1dbd6c42..4213a4cf8 100644 --- a/extra/Configs/Config.nios +++ b/extra/Configs/Config.nios @@ -14,10 +14,3 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_HAS_NO_MMU select ARCH_HAS_NO_LDSO select HAVE_NO_PIC - -config ARCH_CFLAGS - string - default "-funaligned-struct-hack" - -config CROSS - string diff --git a/extra/Configs/Config.nios2 b/extra/Configs/Config.nios2 index 1f945556b..2310a46c0 100644 --- a/extra/Configs/Config.nios2 +++ b/extra/Configs/Config.nios2 @@ -14,9 +14,3 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_HAS_NO_MMU select ARCH_HAS_NO_LDSO select HAVE_NO_PIC - -config ARCH_CFLAGS - string - -config CROSS - string diff --git a/extra/Configs/Config.powerpc b/extra/Configs/Config.powerpc index 8ba267cf1..84c442329 100644 --- a/extra/Configs/Config.powerpc +++ b/extra/Configs/Config.powerpc @@ -13,9 +13,6 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_BIG_ENDIAN select ARCH_HAS_MMU -config ARCH_CFLAGS - string - choice prompt "Target Processor Type" default CONFIG_CLASSIC diff --git a/extra/Configs/Config.sh b/extra/Configs/Config.sh index 8538bcc65..10e9d8b0c 100644 --- a/extra/Configs/Config.sh +++ b/extra/Configs/Config.sh @@ -12,9 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_ANY_ENDIAN -config ARCH_CFLAGS - string - choice prompt "Target Processor Type" default CONFIG_SH4 diff --git a/extra/Configs/Config.sh64 b/extra/Configs/Config.sh64 index 54d738e36..02535b96b 100644 --- a/extra/Configs/Config.sh64 +++ b/extra/Configs/Config.sh64 @@ -12,9 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_ANY_ENDIAN -config ARCH_CFLAGS - string - choice prompt "Target Processor Type" default CONFIG_SH5 diff --git a/extra/Configs/Config.sparc b/extra/Configs/Config.sparc index 3b19f9d14..abb4d7874 100644 --- a/extra/Configs/Config.sparc +++ b/extra/Configs/Config.sparc @@ -12,9 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_BIG_ENDIAN -config ARCH_CFLAGS - string - choice prompt "Target Processor Type" default CONFIG_SPARC_V8 diff --git a/extra/Configs/Config.v850 b/extra/Configs/Config.v850 index a668bba7c..fb3c4b144 100644 --- a/extra/Configs/Config.v850 +++ b/extra/Configs/Config.v850 @@ -13,10 +13,3 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_LITTLE_ENDIAN select ARCH_HAS_NO_MMU select HAVE_NO_PIC - -config ARCH_CFLAGS - string - -config CROSS - string - default "v850e-elf-" diff --git a/extra/Configs/Config.vax b/extra/Configs/Config.vax index 4192e28c2..989eeeab5 100644 --- a/extra/Configs/Config.vax +++ b/extra/Configs/Config.vax @@ -12,13 +12,3 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_LITTLE_ENDIAN select ARCH_HAS_NO_LDSO - -config ARCH_CFLAGS - string - -config ARCH_LDFLAGS - string - -config CROSS - string - default "vax-linux-uclibc-" diff --git a/extra/Configs/Config.x86_64 b/extra/Configs/Config.x86_64 index 7ae357f61..1b2808893 100644 --- a/extra/Configs/Config.x86_64 +++ b/extra/Configs/Config.x86_64 @@ -12,6 +12,3 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_LITTLE_ENDIAN select ARCH_HAS_MMU - -config ARCH_CFLAGS - string diff --git a/extra/Configs/Config.xtensa b/extra/Configs/Config.xtensa index 75132471a..d374f91bc 100644 --- a/extra/Configs/Config.xtensa +++ b/extra/Configs/Config.xtensa @@ -6,7 +6,3 @@ config TARGET_ARCH string default "xtensa" - -config ARCH_CFLAGS - string - diff --git a/extra/config/Makefile b/extra/config/Makefile index 7d8a1e4ad..04175e541 100644 --- a/extra/config/Makefile +++ b/extra/config/Makefile @@ -73,8 +73,8 @@ $(obj)/%:: $(top_srcdir)$(src)/%_shipped @$(disp_gen) $(Q)cat $< > $@ endif -clean: - $(do_rm) $(clean-files) conf +menuconfig_clean: + $(do_rm) $(clean-files) conf $(wildcard *.o) distclean: clean $(do_rm) $(lxdialog) $(conf-objs) $(mconf-objs) \ $(kxgettext-objs) \ diff --git a/extra/config/Makefile.kconfig b/extra/config/Makefile.kconfig index fa8c2dd9c..83c20c474 100644 --- a/extra/config/Makefile.kconfig +++ b/extra/config/Makefile.kconfig @@ -150,8 +150,8 @@ clean-files += config.pot linux.pot # Check that we have the required ncurses stuff installed for lxdialog (menuconfig) PHONY += $(obj)/dochecklxdialog $(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog -$(obj)/dochecklxdialog: - $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) +#$(obj)/dochecklxdialog: +# $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) always := dochecklxdialog diff --git a/extra/locale/locale_mmap.h b/extra/locale/locale_mmap.h index 4b231ef9e..5b0df9074 100644 --- a/extra/locale/locale_mmap.h +++ b/extra/locale/locale_mmap.h @@ -50,24 +50,24 @@ typedef struct { /* width?? */ #endif - __LOCALE_DATA_COMMON_MMAP(ctype); - __LOCALE_DATA_COMMON_MMAP(numeric); - __LOCALE_DATA_COMMON_MMAP(monetary); - __LOCALE_DATA_COMMON_MMAP(time); + __LOCALE_DATA_COMMON_MMAP(ctype) + __LOCALE_DATA_COMMON_MMAP(numeric) + __LOCALE_DATA_COMMON_MMAP(monetary) + __LOCALE_DATA_COMMON_MMAP(time) /* collate is different */ - __LOCALE_DATA_COMMON_MMAP(messages); + __LOCALE_DATA_COMMON_MMAP(messages) #ifdef __CTYPE_HAS_8_BIT_LOCALES const __codeset_8_bit_t codeset_8_bit[__LOCALE_DATA_NUM_CODESETS]; #endif - __LOCALE_DATA_COMMON_MMIDX(ctype); - __LOCALE_DATA_COMMON_MMIDX(numeric); - __LOCALE_DATA_COMMON_MMIDX(monetary); - __LOCALE_DATA_COMMON_MMIDX(time); + __LOCALE_DATA_COMMON_MMIDX(ctype) + __LOCALE_DATA_COMMON_MMIDX(numeric) + __LOCALE_DATA_COMMON_MMIDX(monetary) + __LOCALE_DATA_COMMON_MMIDX(time) /* collate is different */ - __LOCALE_DATA_COMMON_MMIDX(messages); + __LOCALE_DATA_COMMON_MMIDX(messages) const uint16_t collate_data[__lc_collate_data_LEN]; diff --git a/extra/scripts/install_headers.sh b/extra/scripts/install_headers.sh index 4faf04011..14d64dc9d 100755 --- a/extra/scripts/install_headers.sh +++ b/extra/scripts/install_headers.sh @@ -4,6 +4,10 @@ # $2 = dst dir # $top_builddir = well you guessed it +srcdir=${1:-include} +dstdir=${2:-`. ./.config 2>/dev/null && echo ${DEVEL_PREFIX}/include`} +: ${top_builddir:=.} + die_if_not_dir() { for dir in "$@"; do @@ -19,9 +23,9 @@ umask 022 # Sanity tests -die_if_not_dir "$1" -mkdir -p "$2" 2>/dev/null -die_if_not_dir "$2" +die_if_not_dir "${srcdir}" +mkdir -p "${dstdir}" 2>/dev/null +die_if_not_dir "${dstdir}" die_if_not_dir "$top_builddir" if ! test -x "$top_builddir/extra/scripts/unifdef"; then echo "Error: need '$top_builddir/extra/scripts/unifdef' executable" @@ -31,16 +35,16 @@ fi # Sanitize and copy uclibc headers ( -# We must cd, or else we'll prepend "$1" to filenames! -cd "$1" || exit 1 +# We must cd, or else we'll prepend "${srcdir}" to filenames! +cd "${srcdir}" || exit 1 find . ! -name '.' -a ! -path '*/.*' | sed -e 's/^\.\///' -e '/^config\//d' \ -e '/^config$/d' ) | \ ( IFS='' while read -r filename; do - if test -d "$1/$filename"; then - mkdir -p "$2/$filename" 2>/dev/null + if test -d "${srcdir}/$filename"; then + mkdir -p "${dstdir}/$filename" 2>/dev/null continue fi if test x"${filename##libc-*.h}" = x""; then @@ -55,15 +59,18 @@ while read -r filename; do -U_LIBC \ -U__UCLIBC_GEN_LOCALE \ -U__NO_CTYPE \ - "$1/$filename" \ + "${srcdir}/$filename" \ | sed -e '/^rtld_hidden_proto[ ]*([a-zA-Z0-9_]*)$/d' \ | sed -e '/^lib\(c\|m\|resolv\|dl\|intl\|rt\|nsl\|util\|crypt\|pthread\)_hidden_proto[ ]*([a-zA-Z0-9_]*)$/d' \ - >"$2/$filename" + >"${dstdir}/$filename" done ) # Fix mode/owner bits -cd "$2" || exit 1 +cd "${dstdir}" || exit 1 chmod -R u=rwX,go=rX . >/dev/null 2>&1 chown -R `id | sed 's/^uid=\([0-9]*\).*gid=\([0-9]*\).*$/\1:\2/'` . >/dev/null 2>&1 + +# ignore errors on unrelated files +exit 0 |