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 diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in index 089301c..908395d 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 8bf95e7..f501757 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 5c9cfb3..07331d5 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 6039a25..c837c65 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 db0884e..8e999b4 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 80b50fc..48c8575 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 cb511a4..01ad147 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 8062d15..160a518 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 52bc9d7..b8d433a 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 797c023..e649787 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 8e990c3..c132fc6 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 42500f0..836fed8 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 4d6b857..eafc482 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 bbf893d..363ab34 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 b384be9..e12c3fd 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 1b2a289..f9a56b9 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 v0.10.2-6-g49f6