Toolchain: eglibc: consolidate eglibc option groups

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>

6 files changed, 237 insertions, 40 deletions

diff --git a/kconfig/eglibc.kconfig b/kconfig/eglibc.kconfig
index 7e6ccf8..2dcadcb 100644
--- a/kconfig/eglibc.kconfig
+++ b/kconfig/eglibc.kconfig
@@ -41,7 +41,7 @@ config EMBTK_EGLIBC_SVN_REVISION
 	int "EGLIBC SVN revision to checkout"
 	help
 	 EGLIBC svn revision to use.
-	default 8849
+	default 9224
 
 config EMBTK_EGLIBC_BRANCH_STRING
 	string
diff --git a/kconfig/option-groups.def-2.9 b/kconfig/option-groups.def-2.9
index 7e10599..960ee55 100644
--- a/kconfig/option-groups.def-2.9
+++ b/kconfig/option-groups.def-2.9
@@ -410,12 +410,24 @@ config OPTION_EGLIBC_LIBM
        resulting EGLIBC installation.
 
 config OPTION_EGLIBC_LOCALES
-   bool "Locale definitions"
-   help
-       This option group includes all locale definitions other than
-       that for the "C" locale.  If this option group is omitted, then
-       only the "C" locale is supported.
+	bool "Locale definitions"
+	help
+		This option group includes all locale definitions other than
+		that for the "C" locale.  If this option group is omitted, then
+		only the "C" locale is supported.
+
+		With OPTION_EGLIBC_LOCALE_CODE disabled, the following
+		functions are omitted from libc:
 
+		duplocale   localeconv  nl_langinfo    rpmatch  strfmon_l
+		freelocale  newlocale   nl_langinfo_l  strfmon  uselocale
+
+		Furthermore, only the LC_CTYPE and LC_TIME categories of the
+		standard "C" locale are available.
+
+		The OPTION_EGLIBC_CATGETS option group depends on this option
+		group; if you disable OPTION_EGLIBC_LOCALE_CODE, you must also
+		disable OPTION_EGLIBC_CATGETS.
 
 config OPTION_EGLIBC_NSSWITCH
 	default y
@@ -620,6 +632,114 @@ config OPTION_EGLIBC_WORDEXP
         performing word expansion in the manner of the shell, and the
         accompanying 'wordfree' function.
 
+config OPTION_POSIX_C_LANG_WIDE_CHAR
+	bool "ISO C library wide character functions, excluding I/O"
+	help
+		This option group includes the functions defined by the ISO C
+		standard for working with wide and multibyte characters in
+		memory.  Functions for reading and writing wide and multibyte
+		characters from and to files call in the
+		OPTION_POSIX_WIDE_CHAR_DEVICE_IO option group.
+
+		This option group includes the following functions:
+
+		btowc         mbsinit       wcscspn       wcstoll
+		iswalnum      mbsrtowcs     wcsftime      wcstombs
+		iswalpha      mbstowcs      wcslen        wcstoul
+		iswblank      mbtowc        wcsncat       wcstoull
+		iswcntrl      swprintf      wcsncmp       wcstoumax
+		iswctype      swscanf       wcsncpy       wcsxfrm
+		iswdigit      towctrans     wcspbrk       wctob
+		iswgraph      towlower      wcsrchr       wctomb
+		iswlower      towupper      wcsrtombs     wctrans
+		iswprint      vswprintf     wcsspn        wctype
+		iswpunct      vswscanf      wcsstr        wmemchr
+		iswspace      wcrtomb       wcstod        wmemcmp
+		iswupper      wcscat        wcstof        wmemcpy
+		iswxdigit     wcschr        wcstoimax     wmemmove
+		mblen         wcscmp        wcstok        wmemset
+		mbrlen        wcscoll       wcstol
+		mbrtowc       wcscpy        wcstold
+
+config OPTION_EGLIBC_LOCALE_CODE
+	bool "Locale functions"
+	depends on OPTION_POSIX_C_LANG_WIDE_CHAR
+	help
+		This option group includes locale support functions, programs,
+		and libraries.  With OPTION_EGLIBC_LOCALE_FUNCTIONS disabled,
+		EGLIBC supports only the 'C' locale (also known as 'POSIX'),
+		and ignores the settings of the 'LANG' and 'LC_*' environment
+		variables.
+
+		With OPTION_EGLIBC_LOCALE_CODE disabled, the following
+		functions are omitted from libc:
+
+		duplocale   localeconv  nl_langinfo    rpmatch  strfmon_l
+		freelocale  newlocale   nl_langinfo_l  strfmon  uselocale
+
+		Furthermore, only the LC_CTYPE and LC_TIME categories of the
+		standard "C" locale are available.
+
+		The OPTION_EGLIBC_CATGETS option group depends on this option
+		group; if you disable OPTION_EGLIBC_LOCALE_CODE, you must also
+		disable OPTION_EGLIBC_CATGETS.
+
+config OPTION_EGLIBC_CATGETS
+	bool "Functions for accessing message catalogs"
+	depends on OPTION_EGLIBC_LOCALE_CODE
+	help
+		This option group includes functions for accessing message
+		catalogs: catopen, catclose, and catgets.
+
+		This option group depends on the OPTION_EGLIBC_LOCALE_CODE
+		option group; if you disable that, you must also disable this.
+
+config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+	bool "Input and output functions for wide characters"
+	depends on OPTION_POSIX_C_LANG_WIDE_CHAR
+	help
+		This option group includes functions for reading and writing
+		wide characters to and from <stdio.h> streams.
+
+		This option group includes the following functions:
+
+		fgetwc        fwprintf      putwchar      vwscanf
+		fgetws        fwscanf       ungetwc       wprintf
+		fputwc        getwc         vfwprintf     wscanf
+		fputws        getwchar      vfwscanf
+		fwide         putwc         vwprintf
+
+		This option group further includes the following unlocked
+		variants of the above functions:
+
+		fgetwc_unlocked           getwc_unlocked
+		fgetws_unlocked           getwchar_unlocked
+		fputwc_unlocked           putwc_unlocked
+		fputws_unlocked           putwchar_unlocked
+
+		Note that the GNU standard C++ library, 'libstdc++.so', uses
+		some of these functions; you will not be able to link or run
+		C++ programs if you disable this option group.
+
+		This option group also affects the behavior of the following
+		functions:
+
+		fdopen
+		fopen
+		fopen64
+		freopen
+		freopen64
+
+		These functions all take an OPENTYPE parameter which may
+		contain a string of the form ",ccs=CHARSET", indicating that
+		the underlying file uses the character set named CHARSET.
+		This produces a wide-oriented stream, which is only useful
+		when the functions included in this option group are present.
+		If the user attempts to open a file specifying a character set
+		in the OPENTYPE parameter, and EGLIBC was built with this
+		option group disabled, the function returns NULL, and sets
+		errno to EINVAL.
+
 config OPTION_POSIX_REGEXP
     default y
     bool "Regular expressions"
diff --git a/kconfig/option-groups.def-trunk b/kconfig/option-groups.def-trunk
index d337bb6..ac92413 100644
--- a/kconfig/option-groups.def-trunk
+++ b/kconfig/option-groups.def-trunk
@@ -460,6 +460,26 @@ config OPTION_EGLIBC_LOCALES
 		that for the "C" locale.  If this option group is omitted, then
 		only the "C" locale is supported.
 
+config OPTION_EGLIBC_MEMUSAGE
+	bool "Memory profiling library"
+	default y
+	help
+		This option group includes the `libmemusage' library and
+		the `memusage' and `memusagestat' utilities.
+		These components provide memory profiling functions.
+
+		config OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE
+
+		Libmemusage library buffers the profiling data in memory
+		before writing it out to disk.  By default, the library
+		allocates 1.5M buffer, which can be substantial for some
+		systems.  OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE option
+		allows to change the default buffer size.  It specifies
+		the number of entries the buffer should have.
+		On most architectures one buffer entry amounts to 48 bytes,
+		so setting this option to the value of 512 will reduce the size
+		of the memory buffer to 24K.
+
 config OPTION_EGLIBC_NSSWITCH
 	bool "Name service switch (nsswitch) support"
 	default y
diff --git a/mk/eglibc-2.10-options.mk b/mk/eglibc-2.10-options.mk
index 0c36a68..2cf53ab 100644
--- a/mk/eglibc-2.10-options.mk
+++ b/mk/eglibc-2.10-options.mk
@@ -1,4 +1,4 @@
-#########################################################################################
+################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
 # Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
 #
@@ -14,23 +14,43 @@
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-#########################################################################################
+################################################################################
 #
 # \file         eglibc-2.10-options.mk
-# \brief	eglibc-2.10-options.mk. Here we define options supported by eglibc-2.9
+# \brief	eglibc-2.10-options.mk. Here we define options supported by
+# \brief	eglibc-2.10
 # \author       GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
 # \date         May 2009
-#########################################################################################
+################################################################################
 
-EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6 OPTION_EGLIBC_BACKTRACE OPTION_EGLIBC_BSD \
-		OPTION_EGLIBC_CXX_TESTS OPTION_EGLIBC_CATGETS OPTION_EGLIBC_CHARSETS \
-		OPTION_EGLIBC_DB_ALIASES OPTION_EGLIBC_ENVZ OPTION_EGLIBC_FCVT \
-		OPTION_EGLIBC_FMTMSG OPTION_EGLIBC_FSTAB OPTION_EGLIBC_FTRAVERSE \
-		OPTION_EGLIBC_GETLOGIN OPTION_EGLIBC_INET OPTION_EGLIBC_LIBM \
-		OPTION_EGLIBC_LOCALES OPTION_EGLIBC_LOCALE_CODE OPTION_EGLIBC_NIS \
-		OPTION_EGLIBC_NSSWITCH OPTION_EGLIBC_RCMD OPTION_EGLIBC_SPAWN \
-		OPTION_EGLIBC_STREAMS OPTION_EGLIBC_SUNRPC OPTION_EGLIBC_UTMP \
-		OPTION_EGLIBC_UTMPX OPTION_EGLIBC_WORDEXP OPTION_POSIX_C_LANG_WIDE_CHAR \
-		OPTION_POSIX_REGEXP OPTION_POSIX_REGEXP_GLIBC \
+EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6		\
+		OPTION_EGLIBC_BACKTRACE			\
+		OPTION_EGLIBC_BSD			\
+		OPTION_EGLIBC_CXX_TESTS			\
+		OPTION_EGLIBC_CATGETS			\
+		OPTION_EGLIBC_CHARSETS			\
+		OPTION_EGLIBC_DB_ALIASES		\
+		OPTION_EGLIBC_ENVZ			\
+		OPTION_EGLIBC_FCVT			\
+		OPTION_EGLIBC_FMTMSG			\
+		OPTION_EGLIBC_FSTAB			\
+		OPTION_EGLIBC_FTRAVERSE			\
+		OPTION_EGLIBC_GETLOGIN			\
+		OPTION_EGLIBC_INET			\
+		OPTION_EGLIBC_LIBM			\
+		OPTION_EGLIBC_LOCALES			\
+		OPTION_EGLIBC_LOCALE_CODE		\
+		OPTION_EGLIBC_NIS			\
+		OPTION_EGLIBC_NSSWITCH			\
+		OPTION_EGLIBC_RCMD			\
+		OPTION_EGLIBC_SPAWN			\
+		OPTION_EGLIBC_STREAMS			\
+		OPTION_EGLIBC_SUNRPC			\
+		OPTION_EGLIBC_UTMP			\
+		OPTION_EGLIBC_UTMPX			\
+		OPTION_EGLIBC_WORDEXP			\
+		OPTION_POSIX_C_LANG_WIDE_CHAR		\
+		OPTION_POSIX_REGEXP			\
+		OPTION_POSIX_REGEXP_GLIBC		\
 		OPTION_POSIX_WIDE_CHAR_DEVICE_IO
 
diff --git a/mk/eglibc-2.9-options.mk b/mk/eglibc-2.9-options.mk
index aae7947..ec640dd 100644
--- a/mk/eglibc-2.9-options.mk
+++ b/mk/eglibc-2.9-options.mk
@@ -23,13 +23,29 @@
 # \date         May 2009
 ################################################################################
 
-EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6 OPTION_EGLIBC_BACKTRACE \
-		OPTION_EGLIBC_BSD OPTION_EGLIBC_BSD OPTION_EGLIBC_CXX_TESTS\
-		OPTION_EGLIBC_CHARSETS OPTION_EGLIBC_DB_ALIASES OPTION_EGLIBC_ENVZ \
-		OPTION_EGLIBC_FSTAB OPTION_EGLIBC_GETLOGIN OPTION_EGLIBC_INET \
-		OPTION_EGLIBC_LIBM OPTION_EGLIBC_LOCALES \
-		OPTION_EGLIBC_NIS OPTION_EGLIBC_NSSWITCH OPTION_EGLIBC_RCMD \
-		OPTION_EGLIBC_SPAWN OPTION_EGLIBC_STREAMS OPTION_EGLIBC_SUNRPC \
-		OPTION_EGLIBC_UTMP OPTION_EGLIBC_UTMPX OPTION_EGLIBC_WORDEXP \
-		OPTION_POSIX_REGEXP
+EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6		\
+		OPTION_EGLIBC_BACKTRACE			\
+		OPTION_EGLIBC_BSD			\
+		OPTION_EGLIBC_CXX_TESTS			\
+		OPTION_EGLIBC_CHARSETS			\
+		OPTION_EGLIBC_DB_ALIASES		\
+		OPTION_EGLIBC_ENVZ			\
+		OPTION_EGLIBC_FSTAB			\
+		OPTION_EGLIBC_GETLOGIN			\
+		OPTION_EGLIBC_INET			\
+		OPTION_EGLIBC_LIBM			\
+		OPTION_EGLIBC_LOCALES			\
+		OPTION_EGLIBC_LOCALE_CODE		\
+		OPTION_EGLIBC_NIS			\
+		OPTION_EGLIBC_NSSWITCH			\
+		OPTION_EGLIBC_RCMD			\
+		OPTION_EGLIBC_SPAWN			\
+		OPTION_EGLIBC_STREAMS			\
+		OPTION_EGLIBC_SUNRPC			\
+		OPTION_EGLIBC_UTMP			\
+		OPTION_EGLIBC_UTMPX			\
+		OPTION_EGLIBC_WORDEXP			\
+		OPTION_POSIX_C_LANG_WIDE_CHAR		\
+		OPTION_POSIX_REGEXP			\
+		OPTION_POSIX_WIDE_CHAR_DEVICE_IO
 
diff --git a/mk/eglibc-trunk-options.mk b/mk/eglibc-trunk-options.mk
index f5ec9ac..eb3ab9d 100644
--- a/mk/eglibc-trunk-options.mk
+++ b/mk/eglibc-trunk-options.mk
@@ -23,15 +23,36 @@
 # \date         August 2009
 ################################################################################
 
-EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6 OPTION_EGLIBC_BACKTRACE \
-	OPTION_EGLIBC_BIG_MACROS OPTION_EGLIBC_BSD OPTION_EGLIBC_CXX_TESTS \
-	OPTION_EGLIBC_CATGETS OPTION_EGLIBC_CHARSETS OPTION_EGLIBC_DB_ALIASES \
-	OPTION_EGLIBC_ENVZ OPTION_EGLIBC_FCVT OPTION_EGLIBC_FMTMSG \
-	OPTION_EGLIBC_FSTAB OPTION_EGLIBC_FTRAVERSE OPTION_EGLIBC_GETLOGIN \
-	OPTION_EGLIBC_INET OPTION_EGLIBC_LIBM OPTION_EGLIBC_LOCALES \
-	OPTION_EGLIBC_LOCALE_CODE OPTION_EGLIBC_NIS OPTION_EGLIBC_NSSWITCH \
-	OPTION_EGLIBC_RCMD OPTION_EGLIBC_SPAWN OPTION_EGLIBC_STREAMS \
-	OPTION_EGLIBC_SUNRPC OPTION_EGLIBC_UTMPX OPTION_EGLIBC_WORDEXP \
-	OPTION_POSIX_C_LANG_WIDE_CHAR OPTION_POSIX_REGEXP \
-	OPTION_POSIX_REGEXP_GLIBC OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6		\
+		OPTION_EGLIBC_BACKTRACE			\
+		OPTION_EGLIBC_BIG_MACROS		\
+		OPTION_EGLIBC_BSD			\
+		OPTION_EGLIBC_CXX_TESTS			\
+		OPTION_EGLIBC_CATGETS			\
+		OPTION_EGLIBC_CHARSETS			\
+		OPTION_EGLIBC_DB_ALIASES		\
+		OPTION_EGLIBC_ENVZ			\
+		OPTION_EGLIBC_FCVT			\
+		OPTION_EGLIBC_FMTMSG			\
+		OPTION_EGLIBC_FSTAB			\
+		OPTION_EGLIBC_FTRAVERSE			\
+		OPTION_EGLIBC_GETLOGIN			\
+		OPTION_EGLIBC_INET			\
+		OPTION_EGLIBC_LIBM			\
+		OPTION_EGLIBC_LOCALES			\
+		OPTION_EGLIBC_LOCALE_CODE		\
+		OPTION_EGLIBC_MEMUSAGE			\
+		OPTION_EGLIBC_NIS			\
+		OPTION_EGLIBC_NSSWITCH			\
+		OPTION_EGLIBC_RCMD			\
+		OPTION_EGLIBC_SPAWN			\
+		OPTION_EGLIBC_STREAMS			\
+		OPTION_EGLIBC_SUNRPC			\
+		OPTION_EGLIBC_UTMP			\
+		OPTION_EGLIBC_UTMPX			\
+		OPTION_EGLIBC_WORDEXP			\
+		OPTION_POSIX_C_LANG_WIDE_CHAR		\
+		OPTION_POSIX_REGEXP			\
+		OPTION_POSIX_REGEXP_GLIBC		\
+		OPTION_POSIX_WIDE_CHAR_DEVICE_IO