From 168457afa6a03e4165297985b6ec2d90c83d43c6 Mon Sep 17 00:00:00 2001 From: Austin Foxley Date: Tue, 20 Oct 2009 13:19:35 -0700 Subject: remove useless .gitignore Signed-off-by: Austin Foxley --- extra/.gitignore | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 extra/.gitignore (limited to 'extra') diff --git a/extra/.gitignore b/extra/.gitignore deleted file mode 100644 index f47fe57ec..000000000 --- a/extra/.gitignore +++ /dev/null @@ -1,22 +0,0 @@ -# -# Never ignore these -# -!.gitignore - -# -# Generated files -# -locale/c8tables.h -locale/codesets.txt -locale/gen_collate -locale/gen_ldc -locale/gen_locale -locale/gen_wc8bit -locale/gen_wctype -locale/locale_collate.h -locale/locale_data.c -locale/locale_tables.h -locale/locales.txt -locale/lt_defines.h -locale/uClibc_locale_data.h -locale/wctables.h -- cgit v1.2.3 From 575c76ab8f915aa1c728f353ed9d528f0070449c Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 28 Oct 2009 20:12:54 +0100 Subject: support selecting which locales to build Introduce UCLIBC_BUILD_MINIMAL_LOCALES and if selected build only those locales. Based on a patch by Bernhard Reutner-Fischer. Signed-off-by: Marc Andre Tanner Signed-off-by: Bernhard Reutner-Fischer --- extra/Configs/Config.in | 38 +++++++++++++++++++++++++++++++++++++- extra/locale/Makefile.in | 32 +++++++++++++++++--------------- 2 files changed, 54 insertions(+), 16 deletions(-) (limited to 'extra') diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 8fa9a47ae..75f87feff 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1299,6 +1299,28 @@ config UCLIBC_HAS_LOCALE Answer Y to enable locale support. Most people will answer N. +choice + +prompt "Locale data" + depends on UCLIBC_HAS_LOCALE + default UCLIBC_BUILD_ALL_LOCALE + +config UCLIBC_BUILD_ALL_LOCALE + bool "All locales" + depends on UCLIBC_HAS_LOCALE + default y + help + This builds all the locales that are available on your + host-box. + +config UCLIBC_BUILD_MINIMAL_LOCALE + bool "Only selected locales" + depends on UCLIBC_HAS_LOCALE + default n + help + If you do not need all locales that are available on your + host-box, then set this to 'Y'. + config UCLIBC_PREGENERATED_LOCALE_DATA bool "Use Pre-generated Locale Data" depends on UCLIBC_HAS_LOCALE @@ -1311,6 +1333,20 @@ config UCLIBC_PREGENERATED_LOCALE_DATA Saying N here is highly recommended. +endchoice + +config UCLIBC_BUILD_MINIMAL_LOCALES + string "locales to use" + depends on UCLIBC_BUILD_MINIMAL_LOCALE + default "en_US" + help + Space separated list of locales to use. + + E.g.: + en_US en_GB de_AT + default: + en_US + config UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA bool "Automagically Download the Pre-generated Locale Data (if necessary)" depends on UCLIBC_PREGENERATED_LOCALE_DATA @@ -1323,7 +1359,7 @@ config UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA and place the uClibc-locale-*.tgz tarball in the extra/locale/ directory. - Go ahead and make life easy for yourself... Answer Y. + Note that the use of pregenerated locale data is discouraged. config UCLIBC_HAS_XLOCALE bool "Extended Locale Support (experimental/incomplete)" diff --git a/extra/locale/Makefile.in b/extra/locale/Makefile.in index fe2e3cfd8..8bda8d8aa 100644 --- a/extra/locale/Makefile.in +++ b/extra/locale/Makefile.in @@ -85,7 +85,7 @@ $(locale_OUT)/codesets.txt: echo "and then edit that file to disable/enable the codesets you wish to support. "; \ echo " "; \ false; \ - fi; + fi $(locale_OUT)/locales.txt: @if [ ! -f $@ ] ; then \ @@ -100,14 +100,14 @@ $(locale_OUT)/locales.txt: echo "to support. "; \ echo " "; \ false; \ - fi; + fi else $(locale_OUT)/codesets.txt: @$(disp_gen) ifeq ($(UCLIBC_BUILD_MINIMAL_LOCALE),y) - $(Q)echo "$(CURDIR)/$(locale_DIR)/charmaps/ASCII.pairs" > $@ ; \ + $(Q)echo "$(CURDIR)/$(locale_DIR)/charmaps/ASCII.pairs" > $@ $(Q)echo "$(CURDIR)/$(locale_DIR)/charmaps/ISO-8859-1.pairs" >> $@ else $(Q)set -e; \ @@ -128,13 +128,15 @@ endif $(locale_OUT)/locales.txt: $(locale_DIR)/LOCALES @$(disp_gen) ifeq ($(UCLIBC_BUILD_MINIMAL_LOCALE),y) - $(Q)echo "@euro e" > $@ ; \ - $(Q)echo "#-" >> $@ ; \ - $(Q)echo "UTF-8 yes" >> $@ ; \ - $(Q)echo "8-BIT yes" >> $@ ; \ - $(Q)echo "#-" >> $@ ; \ - $(Q)echo "en_US.UTF-8 UTF-8" >> $@ ; \ - $(Q)echo "en_US ISO-8859-1" >> $@ + $(Q)echo "@euro e" > $@ + $(Q)echo "#-" >> $@ + $(Q)echo "UTF-8 yes" >> $@ + $(Q)echo "8-BIT yes" >> $@ + $(Q)echo "#-" >> $@ + $(Q)for locale in $(call qstrip,$(UCLIBC_BUILD_MINIMAL_LOCALES)); do \ + echo "$$locale.UTF-8 UTF-8"; \ + echo "$$locale ISO-8859-1"; \ + done >> $@ else $(Q)cat $< > $@ endif @@ -175,11 +177,11 @@ $(locale_OUT)/c8tables.h: $(locale_OUT)/gen_wc8bit $(locale_OUT)/codesets.txt # Warning! Beware tr_TR toupper/tolower exceptions! $(locale_OUT)/wctables.h: $(locale_OUT)/gen_wctype @$(disp_gen) - $(Q)$< $(FLAG-locale-verbose) en_US > $@ || \ - $< $(FLAG-locale-verbose) en_US.UTF-8 > $@ || \ - $< $(FLAG-locale-verbose) en_US.iso8859-1 > $@ || \ - $< $(FLAG-locale-verbose) en_GB > $@ || \ - $< $(FLAG-locale-verbose) en_GB.UTF-8 > $@ + $(Q)for locale in $(call qstrip,$(UCLIBC_BUILD_MINIMAL_LOCALES)) en_US en_GB; do \ + $< $(FLAG-locale-verbose) $$locale > $@ || \ + $< $(FLAG-locale-verbose) $$locale.UTF-8 > $@ || \ + $< $(FLAG-locale-verbose) $$locale.iso8859-1 > $@ && break; \ + done $(locale_OUT)/locale_tables.h: $(locale_OUT)/gen_locale $(locale_OUT)/locales.txt @$(disp_gen) -- cgit v1.2.3 From ce7914a16a6e1d36a68346de26d713e880765c92 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 28 Oct 2009 20:49:18 +0100 Subject: remove wrong default for choice Signed-off-by: Bernhard Reutner-Fischer --- extra/Configs/Config.in | 3 --- 1 file changed, 3 deletions(-) (limited to 'extra') diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 75f87feff..02a16eed3 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1308,7 +1308,6 @@ prompt "Locale data" config UCLIBC_BUILD_ALL_LOCALE bool "All locales" depends on UCLIBC_HAS_LOCALE - default y help This builds all the locales that are available on your host-box. @@ -1316,7 +1315,6 @@ config UCLIBC_BUILD_ALL_LOCALE config UCLIBC_BUILD_MINIMAL_LOCALE bool "Only selected locales" depends on UCLIBC_HAS_LOCALE - default n help If you do not need all locales that are available on your host-box, then set this to 'Y'. @@ -1324,7 +1322,6 @@ config UCLIBC_BUILD_MINIMAL_LOCALE config UCLIBC_PREGENERATED_LOCALE_DATA bool "Use Pre-generated Locale Data" depends on UCLIBC_HAS_LOCALE - default n help Use pre-built locale data. -- cgit v1.2.3 From 7345b706ad95539779218fd198da8e8e76f08838 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 28 Oct 2009 20:56:34 +0100 Subject: Simplify kconfig wording of thread support Use a choice for thread support selection. Signed-off-by: Bernhard Reutner-Fischer --- extra/Configs/Config.in | 93 +++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 46 deletions(-) (limited to 'extra') diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 02a16eed3..1d3e153bb 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -383,69 +383,41 @@ config LDSO_GNU_HASH_SUPPORT If you want to use this new feature, answer Y -config HAS_NO_THREADS - bool - default n - -config UCLIBC_HAS_THREADS - bool "POSIX Threading support" - depends on !HAS_NO_THREADS - default y - # linuxthreads and linuxthreads.old need nanosleep() - select UCLIBC_HAS_REALTIME +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. This will increase the size of uClibc by adding a bunch of locking to critical data structures, and adding extra code to ensure that functions are properly reentrant. - If your applications require pthreads, answer Y. - -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 - depends on UCLIBC_HAS_THREADS +config HAS_NO_THREADS + bool "none" help - Say Y here if you wish to be able to debug applications that use - uClibc's pthreads library. By enabling this option, a library - named libthread_db will be built. This library will be dlopen()'d - by gdb and will allow gdb to debug the threads in your application. - - IMPORTANT NOTE! Because gdb must dlopen() the libthread_db library, - you must compile gdb with uClibc in order for pthread debugging to - work properly. - - If you are doing development and want to debug applications using - uClibc's pthread library, answer Y. Otherwise, answer N. + Disable thread support. config LINUXTHREADS_OLD - bool "Use the older (stable) version of linuxthreads" - default y - depends on UCLIBC_HAS_THREADS && !UCLIBC_HAS_THREADS_NATIVE + bool "older (stable) version of linuxthreads" + # linuxthreads and linuxthreads.old need nanosleep() + select UCLIBC_HAS_REALTIME help There are two versions of linuxthreads. The older (stable) version has been in uClibc for quite a long time but hasn't seen too many updates other than bugfixes. + +config LINUXTHREADS_NEW + bool "slightly newer version of linuxthreads" + help The new version has not been tested much, and lacks ports for arches which glibc does not support (like bfin/frv/etc...), but is based on 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) Support" - depends on UCLIBC_HAS_THREADS - default n + bool "Native POSIX Threading (NPTL)" select UCLIBC_HAS_TLS help If you want to compile uClibc with NPTL support, then answer Y. @@ -464,9 +436,38 @@ config UCLIBC_HAS_THREADS_NATIVE that way until further notice at which point this notice will disappear. Thank you for your support and for not smoking. -config LINUXTHREADS_NEW - def_bool y - depends on UCLIBC_HAS_THREADS && !LINUXTHREADS_OLD && !UCLIBC_HAS_THREADS_NATIVE +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 + depends on UCLIBC_HAS_THREADS + help + Say Y here if you wish to be able to debug applications that use + uClibc's pthreads library. By enabling this option, a library + named libthread_db will be built. This library will be dlopen()'d + by gdb and will allow gdb to debug the threads in your application. + + IMPORTANT NOTE! Because gdb must dlopen() the libthread_db library, + you must compile gdb with uClibc in order for pthread debugging to + work properly. + + If you are doing development and want to debug applications using + uClibc's pthread library, answer Y. Otherwise, answer N. + config UCLIBC_HAS_SYSLOG bool "Syslog support" -- cgit v1.2.3 From 62447c11492169462fa4b19c97413d5492ba7854 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 19 Nov 2009 17:57:37 +0100 Subject: fixup working in helptexts and spell out suggested defaults for LDSO_RUNPATH Signed-off-by: Bernhard Reutner-Fischer --- extra/Configs/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'extra') diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 1d3e153bb..7f14b9c3b 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -282,7 +282,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 +333,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 -- cgit v1.2.3 From a59d48422fc6073f254a1f9cb8580f23ab921568 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 19 Nov 2009 18:03:00 +0100 Subject: libnsl: add knob to disable it It's a dummy either way. Signed-off-by: Bernhard Reutner-Fischer --- extra/Configs/Config.in | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'extra') diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 7f14b9c3b..833d180e4 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1191,6 +1191,12 @@ config UCLIBC_HAS_RESOLV_STUB help Provide a dummy resolv library. +config UCLIBC_HAS_LIBNSL_STUB + bool "Provide libnsl stub" + default n + help + Provide a dummy nsl library. + endif -- cgit v1.2.3 From 3b547855d9745ffd59077a355995251eb06928a9 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 19 Nov 2009 18:17:06 +0100 Subject: libutil: provide knob to disable it These tty utility functions are non-standard. They usually are available on BSD and/or glibc based systems. Signed-off-by: Bernhard Reutner-Fischer --- extra/Configs/Config.in | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'extra') diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 833d180e4..13bebd37f 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1197,6 +1197,30 @@ config UCLIBC_HAS_LIBNSL_STUB help Provide a dummy nsl library. +config UCLIBC_HAS_LIBUTIL + bool "Provide libutil library and functions" + 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. + endif -- cgit v1.2.3 From 3982dd7ff251ee502ec6b5a75680a09ec60b3428 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 19 Nov 2009 18:23:41 +0100 Subject: UCLIBC_HAS_RESOLV_STUB: Rename config symbol s/UCLIBC_HAS_RESOLV_STUB/UCLIBC_HAS_LIBRESOLV_STUB/ for consistency. Signed-off-by: Bernhard Reutner-Fischer --- extra/Configs/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extra') diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 13bebd37f..419a568ac 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1185,7 +1185,7 @@ 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 -- cgit v1.2.3 From 4c5c4502d0d6ae2e6cd495b1084a6c9d34a8cab3 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 19 Nov 2009 18:49:24 +0100 Subject: DO_XSI_MATH: add config knob Signed-off-by: Bernhard Reutner-Fischer --- extra/Configs/Config.in.arch | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'extra') 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 -- cgit v1.2.3 From 5530578d87079defddaeb75843ce3e44d46bd8d0 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 19 Nov 2009 18:57:32 +0100 Subject: fix misplaced HAS_LIBUTIL knob Signed-off-by: Bernhard Reutner-Fischer --- extra/Configs/Config.in | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'extra') diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 419a568ac..b7cc8f377 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -725,6 +725,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 @@ -1197,30 +1222,6 @@ config UCLIBC_HAS_LIBNSL_STUB help Provide a dummy nsl library. -config UCLIBC_HAS_LIBUTIL - bool "Provide libutil library and functions" - 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. - endif -- cgit v1.2.3 From 64f11aa906c9df236d89f5db98132cf08c4f1393 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sat, 17 Oct 2009 00:38:07 +0200 Subject: remove ARCH_CFLAGS, ARCH_LDFLAGS and CROSS Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- extra/Configs/Config.alpha | 3 --- extra/Configs/Config.arm | 3 --- extra/Configs/Config.avr32 | 3 --- extra/Configs/Config.bfin | 3 --- extra/Configs/Config.cris | 3 --- extra/Configs/Config.e1 | 8 -------- extra/Configs/Config.frv | 3 --- extra/Configs/Config.h8300 | 3 --- extra/Configs/Config.hppa | 3 --- extra/Configs/Config.i960 | 4 ---- extra/Configs/Config.ia64 | 3 --- extra/Configs/Config.microblaze | 7 ------- extra/Configs/Config.mips | 4 ---- extra/Configs/Config.nios | 7 ------- extra/Configs/Config.nios2 | 6 ------ extra/Configs/Config.powerpc | 3 --- extra/Configs/Config.sh | 3 --- extra/Configs/Config.sh64 | 3 --- extra/Configs/Config.sparc | 3 --- extra/Configs/Config.v850 | 7 ------- extra/Configs/Config.vax | 10 ---------- extra/Configs/Config.x86_64 | 3 --- extra/Configs/Config.xtensa | 4 ---- 23 files changed, 99 deletions(-) (limited to 'extra') 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.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 - -- cgit v1.2.3 From 558b28280768bee5e408e602b8a8ddecb2c0b80e Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sat, 17 Oct 2009 00:41:08 +0200 Subject: FORCE_SHAREABLE_TEXT_SEGMENTS requires DOPIC Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- extra/Configs/Config.in | 1 + 1 file changed, 1 insertion(+) (limited to 'extra') diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index b7cc8f377..d344385c6 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 -- cgit v1.2.3 From 45ebfdf7d0bc2e1f68acd1534076342b2f3f5c52 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 20 Nov 2009 10:13:16 +0100 Subject: remove superfluous extra semicolons Signed-off-by: Bernhard Reutner-Fischer --- extra/locale/locale_mmap.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'extra') 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]; -- cgit v1.2.3 From a8697cd0367004528df656ea1bfaf1090aa59fe9 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 20 Nov 2009 20:28:49 +0100 Subject: silence rule overriding Signed-off-by: Bernhard Reutner-Fischer --- extra/config/Makefile.kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extra') 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 -- cgit v1.2.3 From f8f038ccd1980a2451a591393b1910a50ac6752b Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 20 Nov 2009 20:30:02 +0100 Subject: realclean: wipe kconfig objects Signed-off-by: Bernhard Reutner-Fischer --- extra/config/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extra') 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) \ -- cgit v1.2.3 From 0265979ae16b5ab98f95bbd29dd5aaf8d0c6f84c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 22 Nov 2009 03:17:46 -0500 Subject: remove incorrect text from abspath option Signed-off-by: Mike Frysinger --- extra/Configs/Config.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'extra') diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index d344385c6..5ef2b9f14 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1937,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 -- cgit v1.2.3 From b71274eebd68b7c68ab95c856f8075bdf4524cd7 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 22 Nov 2009 03:37:56 -0500 Subject: install_headers.sh: make more user friendly Make it easier to run this by hand and don't abort when recursive chown and chmod fail as these often aren't due to uClibc settings. Signed-off-by: Mike Frysinger --- extra/scripts/install_headers.sh | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'extra') 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 -- cgit v1.2.3