From e7deac3aad394325f9e6fc6fda41d34ec94a59e0 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 19 May 2017 21:58:46 -0700 Subject: Switch comp.libs/tools and debug to new framework. Signed-off-by: Alexey Neyman --- config/debug/duma.in | 20 +--- config/debug/gdb.in | 316 +------------------------------------------------ config/debug/ltrace.in | 26 +--- config/debug/strace.in | 95 +-------------- 4 files changed, 10 insertions(+), 447 deletions(-) (limited to 'config/debug') diff --git a/config/debug/duma.in b/config/debug/duma.in index f9e727b8..6039a253 100644 --- a/config/debug/duma.in +++ b/config/debug/duma.in @@ -7,6 +7,8 @@ ## help A memory bound checker, with additional features. ## help Formerly known as Electric Fence. +source "config/versions/duma.in" + config DUMA_SO bool prompt "Build a shared library" @@ -18,21 +20,3 @@ config DUMA_CUSTOM_WRAPPER prompt "Install custom D.U.M.A wrapper" default y depends on DUMA_SO - -choice - bool - prompt "D.U.M.A. version" -# Don't remove next line -# CT_INSERT_VERSION_BELOW - -config DUMA_V_2_5_15 - bool - prompt "2_5_15" - -endchoice - -config DUMA_VERSION - string -# Don't remove next line -# CT_INSERT_VERSION_STRING_BELOW - default "2_5_15" if DUMA_V_2_5_15 diff --git a/config/debug/gdb.in b/config/debug/gdb.in index b1d101b0..3fe486f5 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -2,326 +2,20 @@ ## help gdb is the GNU debugger +source "config/versions/gdb.in" + source "config/debug/gdb.in.cross" source "config/debug/gdb.in.native" source "config/debug/gdb.in.gdbserver" -comment "gdb version" - -config GDB_CUSTOM - bool - prompt "Custom gdb" - depends on EXPERIMENTAL - select GDB_8_0_or_later - help - The choosen gdb version shall be not downloaded. Instead use - a custom location to get the source. - -if GDB_CUSTOM - -config GDB_CUSTOM_LOCATION - string - prompt "Full path to custom gdb source" - help - Enter the path to the directory or tarball of your source for gcc. - - If the path is a tarball, it should extract to: -/ - where the name is this component, gcc, and the version is set - below in the custom version string. - -config GDB_CUSTOM_VERSION - string - prompt "Custom GDB version" - help - Enter the version number for your custom gdb. - -config GDB_VERSION - string - default GDB_CUSTOM_VERSION - -endif # GDB_CUSTOM - -if ! GDB_CUSTOM - -config DEBUG_GDB_SHOW_LINARO - bool - prompt "Show Linaro versions" - depends on OBSOLETE - help - Linaro is maintaining some advanced/more stable/experimental versions - of gdb, especially for the ARM architecture. - - Those versions have not been blessed by the gdb community (nor have they - been cursed either!), but they look to be pretty much stable, and even - more stable than the upstream versions. YMMV... - - If you do not know what this Linaro stuff is, then simply say 'n' here, - and rest in peace. OTOH, if you know what you are doing, you will be - able to use and enjoy :-) the Linaro versions by saying 'y' here. - - Linaro: http://www.linaro.org/ - -choice - bool - prompt "gdb version" -# Don't remove next line -# CT_INSERT_VERSION_BELOW - -config GDB_V_8_0 - bool - prompt "8.0" - select GDB_8_0_or_later - -config GDB_V_7_12_1 - bool - prompt "7.12.1" - select GDB_7_12_or_later - -config GDB_V_7_11_1 - bool - prompt "7.11.1" - select GDB_7_2_or_later - -config GDB_V_7_10_1 - bool - prompt "7.10.1 (OBSOLETE)" - select GDB_7_2_or_later - depends on OBSOLETE - -config GDB_V_7_10 - bool - prompt "7.10 (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_7_9_1 - bool - prompt "7.9.1 (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_7_9 - bool - prompt "7.9 (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_linaro_7_8 - bool - prompt "linaro-7.8-2014.09 (OBSOLETE)" - depends on DEBUG_GDB_SHOW_LINARO - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_7_8_2 - bool - prompt "7.8.2 (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - - -config GDB_V_7_8_1 - bool - prompt "7.8.1 (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_7_8 - bool - prompt "7.8 (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_linaro_7_7_1 - bool - prompt "linaro-7.7.1-2014.06 (OBSOLETE)" - depends on DEBUG_GDB_SHOW_LINARO - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_7_7_1 - bool - prompt "7.7.1 (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_linaro_7_7 - bool - prompt "linaro-7.7-2014.05 (OBSOLETE)" - depends on DEBUG_GDB_SHOW_LINARO - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_7_7 - bool - prompt "7.7 (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_linaro_7_6 - bool - prompt "linaro-7.6.1-2013.10 (OBSOLETE)" - depends on DEBUG_GDB_SHOW_LINARO - select GDB_7_2_or_later - -config GDB_V_7_6_1 - bool - prompt "7.6.1 (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_linaro_7_5 - bool - prompt "linaro-7.5-2012.12 (OBSOLETE)" - depends on DEBUG_GDB_SHOW_LINARO - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_7_5_1 - bool - prompt "7.5.1 (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_linaro_7_4 - bool - prompt "linaro-7.4-2012.06 (OBSOLETE)" - depends on DEBUG_GDB_SHOW_LINARO - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_7_4_1 - bool - prompt "7.4.1 (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_7_4 - bool - prompt "7.4 (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_linaro_7_3 - bool - prompt "linaro-7.3-2011.12 (OBSOLETE)" - depends on DEBUG_GDB_SHOW_LINARO - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_7_3_1 - bool - prompt "7.3.1 (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_7_3a - bool - prompt "7.3a (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_7_2a - bool - prompt "7.2a (OBSOLETE)" - depends on OBSOLETE - select GDB_7_2_or_later - -config GDB_V_7_1a - bool - prompt "7.1a (OBSOLETE)" - depends on OBSOLETE - select GDB_7_0_or_later - -config GDB_V_7_0_1a - bool - prompt "7.0.1a (OBSOLETE)" - depends on OBSOLETE - select GDB_7_0_or_later - -config GDB_V_7_0a - bool - prompt "7.0a (OBSOLETE)" - depends on OBSOLETE - select GDB_7_0_or_later - -config GDB_V_6_8a - bool - prompt "6.8a (OBSOLETE)" - depends on OBSOLETE - -endchoice - -endif # ! GDB_CUSTOM - -config GDB_8_0_or_later - bool - select GDB_7_12_or_later - -config GDB_7_12_or_later - bool - select GDB_7_2_or_later - -config GDB_7_2_or_later - bool - select GDB_7_0_or_later - -config GDB_7_0_or_later - bool - select GDB_HAS_PKGVERSION_BUGURL - select GDB_HAS_PYTHON - select GDB_INSTALL_GDBINIT - config GDB_HAS_PKGVERSION_BUGURL bool + default y if GDB_7_0_or_later config GDB_HAS_PYTHON bool + default y if GDB_7_0_or_later config GDB_INSTALL_GDBINIT bool - -# GDB 8.0 now requires C++ for build. GDB 7.12 offered a configure -# switch to fall back to C. -config GDB_TARGET_DISABLE_CXX_BUILD - def_bool y - depends on GDB_7_12_or_later && !GDB_8_0_or_later - -if ! GDB_CUSTOM - -config GDB_VERSION - string -# Don't remove next line -# CT_INSERT_VERSION_STRING_BELOW - default "8.0" if GDB_V_8_0 - default "7.12.1" if GDB_V_7_12_1 - default "7.11.1" if GDB_V_7_11_1 - default "7.10.1" if GDB_V_7_10_1 - default "7.10" if GDB_V_7_10 - default "7.9.1" if GDB_V_7_9_1 - default "7.9" if GDB_V_7_9 - default "7.8.2" if GDB_V_7_8_2 - default "linaro-7.8-2014.09" if GDB_V_linaro_7_8 - default "7.8.1" if GDB_V_7_8_1 - default "7.8" if GDB_V_7_8 - default "linaro-7.7.1-2014.06-1" if GDB_V_linaro_7_7_1 - default "7.7.1" if GDB_V_7_7_1 - default "linaro-7.7-2014.05" if GDB_V_linaro_7_7 - default "7.7" if GDB_V_7_7 - default "linaro-7.6.1-2013.10" if GDB_V_linaro_7_6 - default "7.6.1" if GDB_V_7_6_1 - default "linaro-7.5-2012.12" if GDB_V_linaro_7_5 - default "7.5.1" if GDB_V_7_5_1 - default "linaro-7.4-2012.06" if GDB_V_linaro_7_4 - default "7.4.1" if GDB_V_7_4_1 - default "7.4" if GDB_V_7_4 - default "linaro-7.3-2011.12" if GDB_V_linaro_7_3 - default "7.3.1" if GDB_V_7_3_1 - default "7.3a" if GDB_V_7_3a - default "7.2a" if GDB_V_7_2a - default "7.1a" if GDB_V_7_1a - default "7.0.1a" if GDB_V_7_0_1a - default "7.0a" if GDB_V_7_0a - default "6.8a" if GDB_V_6_8a - -endif # ! GDB_CUSTOM + default y if GDB_7_0_or_later diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in index fab6b81f..cb511a45 100644 --- a/config/debug/ltrace.in +++ b/config/debug/ltrace.in @@ -8,33 +8,11 @@ ## help the executed process and the signals which are received by that process. ## help It can also intercept and print the system calls executed by the program. -choice - bool - prompt "ltrace version" -# Don't remove next line -# CT_INSERT_VERSION_BELOW - -config LTRACE_V_0_7_3 - bool - prompt "0.7.3" - -config LTRACE_V_0_5_3 - bool - prompt "0.5.3 (OBSOLETE)" - depends on OBSOLETE - select LTRACE_0_5_3_CONFIGURE - -endchoice - -config LTRACE_VERSION - string -# Don't remove next line -# CT_INSERT_VERSION_STRING_BELOW - default "0.7.3" if LTRACE_V_0_7_3 - default "0.5.3" if LTRACE_V_0_5_3 +source "config/versions/ltrace.in" # Ltrace 0.5.3 had a unique hand-crafted configure script that has to be # run differently from any preceding or following releases. This serves # as a reminder to remove that code once 0.5.3 support is dropped. config LTRACE_0_5_3_CONFIGURE bool + default y if LTRACE_V_0_5_3 diff --git a/config/debug/strace.in b/config/debug/strace.in index e77702bf..8062d153 100644 --- a/config/debug/strace.in +++ b/config/debug/strace.in @@ -2,97 +2,4 @@ ## depends on ! LIBC_bionic -choice - bool - prompt "strace version" -# Don't remove next line -# CT_INSERT_VERSION_BELOW - -config STRACE_V_4_16 - bool - prompt "4.16" - -config STRACE_V_4_15 - bool - prompt "4.15" - -config STRACE_V_4_14 - bool - prompt "4.14 (OBSOLETE)" - depends on OBSOLETE - -config STRACE_V_4_13 - bool - prompt "4.13 (OBSOLETE)" - depends on OBSOLETE - -config STRACE_V_4_12 - bool - prompt "4.12 (OBSOLETE)" - depends on OBSOLETE - -config STRACE_V_4_11 - bool - prompt "4.11 (OBSOLETE)" - depends on OBSOLETE - -config STRACE_V_4_10 - bool - prompt "4.10 (OBSOLETE)" - depends on OBSOLETE - -config STRACE_V_4_9 - bool - prompt "4.9 (OBSOLETE)" - depends on OBSOLETE - -config STRACE_V_4_8 - bool - prompt "4.8 (OBSOLETE)" - depends on OBSOLETE - -config STRACE_V_4_7 - bool - prompt "4.7 (OBSOLETE)" - depends on OBSOLETE - -config STRACE_V_4_6 - bool - prompt "4.6 (OBSOLETE)" - depends on OBSOLETE - -config STRACE_V_4_5_20 - bool - prompt "4.5.20 (OBSOLETE)" - depends on OBSOLETE - -config STRACE_V_4_5_19 - bool - prompt "4.5.19 (OBSOLETE)" - depends on OBSOLETE - -config STRACE_V_4_5_18 - bool - prompt "4.5.18 (OBSOLETE)" - depends on OBSOLETE - -endchoice - -config STRACE_VERSION - string -# Don't remove next line -# CT_INSERT_VERSION_STRING_BELOW - default "4.16" if STRACE_V_4_16 - default "4.15" if STRACE_V_4_15 - default "4.14" if STRACE_V_4_14 - default "4.13" if STRACE_V_4_13 - default "4.12" if STRACE_V_4_12 - default "4.11" if STRACE_V_4_11 - default "4.10" if STRACE_V_4_10 - default "4.9" if STRACE_V_4_9 - default "4.8" if STRACE_V_4_8 - default "4.7" if STRACE_V_4_7 - default "4.6" if STRACE_V_4_6 - default "4.5.20" if STRACE_V_4_5_20 - default "4.5.19" if STRACE_V_4_5_19 - default "4.5.18" if STRACE_V_4_5_18 +source "config/versions/strace.in" -- cgit v1.2.3 From 4000e1def3d48571e52200cd0c0e0010b9ca139f Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 6 Jul 2017 00:25:30 -0700 Subject: Also upgrade non-generated config files Signed-off-by: Alexey Neyman --- config/binutils/binutils.in | 4 ++-- config/cc/gcc.in | 12 ++++++------ config/comp_tools/make.in | 2 +- config/debug/duma.in | 2 +- config/debug/gdb.in.gdbserver | 2 +- config/debug/gdb.in.native | 4 ++-- config/debug/ltrace.in | 2 +- config/debug/strace.in | 2 +- config/kernel/linux.in | 2 +- config/kernel/windows.in | 2 +- config/libc.in | 4 ++-- config/libc/avr-libc.in | 2 +- config/libc/bionic.in | 2 +- config/libc/glibc.in | 14 +++++++------- config/libc/uClibc.in | 4 ++-- config/toolchain.in | 2 +- 16 files changed, 31 insertions(+), 31 deletions(-) (limited to 'config/debug') diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in index 089301ca..908395d7 100644 --- a/config/binutils/binutils.in +++ b/config/binutils/binutils.in @@ -23,8 +23,8 @@ config BINUTILS_HAS_PKGVERSION_BUGURL # gold only suports the listed architectures config BINUTILS_GOLD_SUPPORTS_ARCH bool - default y if ARCH_arm - default y if ARCH_x86 + default y if ARCH_ARM + default y if ARCH_X86 config BINUTILS_GOLD_SUPPORT bool diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 8bf95e77..f5017578 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -1,7 +1,7 @@ # GCC options ## default y -## select CC_SUPPORT_CXX if !LIBC_none +## select CC_SUPPORT_CXX if !LIBC_NONE ## select CC_SUPPORT_FORTRAN ## select CC_SUPPORT_JAVA if !GCC_7_or_later ## select CC_SUPPORT_ADA @@ -253,7 +253,7 @@ config CC_GCC_LIBSANITIZER bool prompt "Compile libsanitizer" depends on THREADS_NATIVE - depends on ! LIBC_uClibc && ! LIBC_musl # Currently lacks required headers (like netrom.h) + depends on ! LIBC_UCLIBC && ! LIBC_MUSL # Currently lacks required headers (like netrom.h) help libsanitizer is a library which provides run-time sanitising of either or both of: @@ -267,9 +267,9 @@ config CC_GCC_LIBMPX default y prompt "Compile libmpx" depends on CC_GCC_HAS_LIBMPX - depends on ARCH_x86 + depends on ARCH_X86 # MUSL does not define libc types that GCC requires. Mingw lacks certain headers. - depends on !LIBC_musl && ! LIBC_mingw + depends on !LIBC_MUSL && ! LIBC_MINGW help Enable GCC support for Intel Memory Protection Extensions (MPX). @@ -436,6 +436,6 @@ config CC_GCC_HAS_ARCH_OPTIONS comment "archictecture-specific options" depends on CC_GCC_HAS_ARCH_OPTIONS -if ARCH_mips +if ARCH_MIPS source "config/cc/gcc.in.mips" -endif # ARCH_mips +endif # ARCH_MIPS diff --git a/config/comp_tools/make.in b/config/comp_tools/make.in index 5c9cfb3a..07331d5c 100644 --- a/config/comp_tools/make.in +++ b/config/comp_tools/make.in @@ -7,4 +7,4 @@ source "config/versions/make.in" config MAKE_GMAKE_SYMLINK bool prompt "Add gmake symlink to companion gnu/make" - depends on COMP_TOOLS_make + depends on COMP_TOOLS_MAKE diff --git a/config/debug/duma.in b/config/debug/duma.in index 6039a253..c837c65e 100644 --- a/config/debug/duma.in +++ b/config/debug/duma.in @@ -1,7 +1,7 @@ # D.U.M.A. - Detect Unintended Memory Access - Memory checker ## depends on ! BARE_METAL -## depends on ! LIBC_bionic +## depends on ! LIBC_BIONIC ## help D.U.M.A. - Detect Unintended Memory Access ## help A memory bound checker, with additional features. diff --git a/config/debug/gdb.in.gdbserver b/config/debug/gdb.in.gdbserver index db0884e7..8e999b41 100644 --- a/config/debug/gdb.in.gdbserver +++ b/config/debug/gdb.in.gdbserver @@ -5,7 +5,7 @@ config GDB_GDBSERVER prompt "gdbserver" default y depends on ! BARE_METAL - select LIBC_UCLIBC_WCHAR if LIBC_uClibc && GDB_8_0_or_later + select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC && GDB_8_0_or_later help Build and install a gdbserver for the target, to run on the target. diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native index 80b50fca..48c85756 100644 --- a/config/debug/gdb.in.native +++ b/config/debug/gdb.in.native @@ -4,9 +4,9 @@ config GDB_NATIVE bool prompt "Native gdb" depends on ! BARE_METAL - depends on ! LIBC_bionic + depends on ! LIBC_BIONIC depends on CC_LANG_CXX || !GDB_8_0_or_later - select LIBC_UCLIBC_WCHAR if LIBC_uClibc && GDB_8_0_or_later + select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC && GDB_8_0_or_later select EXPAT_TARGET select NCURSES_TARGET help diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in index cb511a45..01ad147a 100644 --- a/config/debug/ltrace.in +++ b/config/debug/ltrace.in @@ -1,7 +1,7 @@ # ltrace ## select LIBELF_TARGET -## depends on ! LIBC_bionic +## depends on ! LIBC_BIONIC ## ## help ltrace is a program that simply runs the specified command until it exits. ## help It intercepts and records the dynamic library calls which are called by diff --git a/config/debug/strace.in b/config/debug/strace.in index 8062d153..160a5181 100644 --- a/config/debug/strace.in +++ b/config/debug/strace.in @@ -1,5 +1,5 @@ # strace -## depends on ! LIBC_bionic +## depends on ! LIBC_BIONIC source "config/versions/strace.in" diff --git a/config/kernel/linux.in b/config/kernel/linux.in index 52bc9d74..b8d433ac 100644 --- a/config/kernel/linux.in +++ b/config/kernel/linux.in @@ -1,6 +1,6 @@ # Linux kernel options -## depends on ! ARCH_avr +## depends on ! ARCH_AVR ## select KERNEL_SUPPORTS_SHARED_LIBS ## help Build a toolchain targeting systems running Linux as a kernel. diff --git a/config/kernel/windows.in b/config/kernel/windows.in index 797c0237..e6497875 100644 --- a/config/kernel/windows.in +++ b/config/kernel/windows.in @@ -1,6 +1,6 @@ # windows config options -## depends on ARCH_x86 +## depends on ARCH_X86 ## depends on EXPERIMENTAL ## ## select WINDOWS diff --git a/config/libc.in b/config/libc.in index 8e990c35..c132fc69 100644 --- a/config/libc.in +++ b/config/libc.in @@ -30,7 +30,7 @@ config THREADS string default "none" if THREADS_NONE -if ! LIBC_none +if ! LIBC_NONE comment "Common C library options" @@ -106,6 +106,6 @@ config LIBC_XLDD for the native ldd. Please see the help, by running it with '--help' for more explanations. -endif # ! LIBC_none +endif # ! LIBC_NONE endmenu diff --git a/config/libc/avr-libc.in b/config/libc/avr-libc.in index 42500f0a..836fed81 100644 --- a/config/libc/avr-libc.in +++ b/config/libc/avr-libc.in @@ -1,6 +1,6 @@ # avr-libc options -## depends on ARCH_avr +## depends on ARCH_AVR ## depends on ! LINUX && ! WINDOWS && BARE_METAL ## ## select LIBC_SUPPORT_THREADS_NONE diff --git a/config/libc/bionic.in b/config/libc/bionic.in index 4d6b857a..eafc482a 100644 --- a/config/libc/bionic.in +++ b/config/libc/bionic.in @@ -1,7 +1,7 @@ # bionic options ## depends on ! WINDOWS && ! BARE_METAL -## depends on ARCH_arm || ARCH_mips || ARCH_x86 +## depends on ARCH_ARM || ARCH_MIPS || ARCH_X86 ## depends on EXPERIMENTAL ## depends on GCC_6_or_later ## diff --git a/config/libc/glibc.in b/config/libc/glibc.in index bbf893d7..363ab348 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -64,7 +64,7 @@ config GLIBC_HAS_LIBIDN_ADDON # we can find in config/arch/* config GLIBC_USE_PORTS_ADDON def_bool y - depends on ARCH_alpha || ARCH_arm || ARCH_m68k || ARCH_mips || ARCH_powerpc + depends on ARCH_ALPHA || ARCH_ARM || ARCH_M68K || ARCH_MIPS || ARCH_POWERPC depends on GLIBC_HAS_PORTS_ADDON config GLIBC_USE_PORTS_EXTERNAL @@ -99,8 +99,8 @@ config GLIBC_EXTRA_CONFIG_ARRAY config GLIBC_CONFIGPARMS string prompt "Extra config params (READ HELP)" - default "" if ! ARCH_sh - default "no-z-defs=yes" if ARCH_sh + default "" if ! ARCH_SH + default "no-z-defs=yes" if ARCH_SH help Some architectures need to set options in the file configparms. This is the case for sh3/4, which really need to set configparms @@ -179,7 +179,7 @@ config GLIBC_LOCALES Whether to build and install the libc locale files for the target, which is required in order to support internationalization. -if LIBC_glibc && GLIBC_LOCALES +if LIBC_GLIBC && GLIBC_LOCALES comment "WARNING! " comment "| The built locales will be usable if and only if the build " comment "| machine and the target: " @@ -189,9 +189,9 @@ comment "| You will have to check by yourself (for now). " comment "WARNING! " comment "| Building GLIBC locales requires that GLIBC supports " comment "| the build machine as the target. " -endif # LIBC_glibc && GLIBC_LOCALES +endif # LIBC_GLIBC && GLIBC_LOCALES -if KERNEL_linux +if KERNEL_LINUX choice GLIBC_SUPPORTED_KERNEL bool @@ -286,4 +286,4 @@ config GLIBC_MIN_KERNEL default LINUX_VERSION if GLIBC_KERNEL_VERSION_AS_HEADERS default GLIBC_MIN_KERNEL_VERSION if GLIBC_KERNEL_VERSION_CHOSEN -endif # KERNEL_linux +endif # KERNEL_LINUX diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index b384be91..e12c3fd3 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -175,7 +175,7 @@ config LIBC_UCLIBC_WCHAR config LIBC_UCLIBC_FENV bool prompt "Add support for fenv.h" - default y if ARCH_x86 + default y if ARCH_X86 help fenv.h provides functions to control the floating point environment, such as rounding mode, exceptions... @@ -193,7 +193,7 @@ config LIBC_UCLIBC_RPC help Enable support for remote procedure calls (RPC) in uClibc. -if ARCH_arm +if ARCH_ARM config LIBC_UCLIBC_USE_GNU_SUFFIX bool default y diff --git a/config/toolchain.in b/config/toolchain.in index 1b2a289e..f9a56b97 100644 --- a/config/toolchain.in +++ b/config/toolchain.in @@ -105,7 +105,7 @@ comment "Tuple completion and aliasing" config TARGET_VENDOR string prompt "Tuple's vendor string" - depends on !LIBC_avr_libc + depends on !LIBC_AVR_LIBC default "unknown" help Vendor part of the target tuple. -- cgit v1.2.3