From 96d28dc7d32fe10abb8ce832f08bf4fa3a5e3d9d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 6 May 2007 13:42:10 +0000 Subject: [PATCH] Introduce an OBSOLETE config option, to mask-out legacy stuff. --- config/binutils.in | 8 ++++++++ config/cc_core_gcc.in | 14 ++++++++++++++ config/cc_gcc.in | 19 +++++++++++++++++++ config/global.in | 10 ++++++++++ config/kernel.in | 2 +- config/kernel_linux.in | 4 +++- config/libc_glibc.in | 18 ++++++++++++++++++ config/libc_uClibc.in | 5 +++++ 8 files changed, 78 insertions(+), 2 deletions(-) diff --git a/config/binutils.in b/config/binutils.in index 24889fdd..7270376e 100644 --- a/config/binutils.in +++ b/config/binutils.in @@ -12,34 +12,42 @@ choice config BINUTILS_V_2_11_2 bool prompt "2.11.2" + depends on OBSOLETE config BINUTILS_V_2_13_90 bool prompt "2.13.90" + depends on OBSOLETE config BINUTILS_V_2_14 bool prompt "2.14" + depends on OBSOLETE config BINUTILS_V_2_14_90 bool prompt "2.14.90" + depends on OBSOLETE config BINUTILS_V_2_14_92 bool prompt "2.14.92" + depends on OBSOLETE config BINUTILS_V_2_15 bool prompt "2.15" + depends on OBSOLETE config BINUTILS_V_2_15_90 bool prompt "2.15.90" + depends on OBSOLETE config BINUTILS_V_2_15_91 bool prompt "2.15.91" + depends on OBSOLETE config BINUTILS_V_2_16 bool diff --git a/config/cc_core_gcc.in b/config/cc_core_gcc.in index 454f8877..7719e83e 100644 --- a/config/cc_core_gcc.in +++ b/config/cc_core_gcc.in @@ -7,34 +7,42 @@ choice config CC_CORE_V_2_95_3 bool prompt "2.95.3" + depends on OBSOLETE config CC_CORE_V_3_2_3 bool prompt "3.2.3" + depends on OBSOLETE config CC_CORE_V_3_3 bool prompt "3.3" + depends on OBSOLETE config CC_CORE_V_3_3_1 bool prompt "3.3.1" + depends on OBSOLETE config CC_CORE_V_3_3_2 bool prompt "3.3.2" + depends on OBSOLETE config CC_CORE_V_3_3_3 bool prompt "3.3.3" + depends on OBSOLETE config CC_CORE_V_3_3_4 bool prompt "3.3.4" + depends on OBSOLETE config CC_CORE_V_3_3_5 bool prompt "3.3.5" + depends on OBSOLETE config CC_CORE_V_3_3_6 bool @@ -43,26 +51,32 @@ config CC_CORE_V_3_3_6 config CC_CORE_V_3_4_0 bool prompt "3.4.0" + depends on OBSOLETE config CC_CORE_V_3_4_1 bool prompt "3.4.1" + depends on OBSOLETE config CC_CORE_V_3_4_2 bool prompt "3.4.2" + depends on OBSOLETE config CC_CORE_V_3_4_3 bool prompt "3.4.3" + depends on OBSOLETE config CC_CORE_V_3_4_4 bool prompt "3.4.4" + depends on OBSOLETE config CC_CORE_V_3_4_5 bool prompt "3.4.5" + depends on OBSOLETE config CC_CORE_V_3_4_6 bool diff --git a/config/cc_gcc.in b/config/cc_gcc.in index d9222397..2cad0bed 100644 --- a/config/cc_gcc.in +++ b/config/cc_gcc.in @@ -7,34 +7,42 @@ choice config CC_V_2_95_3 bool prompt "2.95.3" + depends on OBSOLETE config CC_V_3_2_3 bool prompt "3.2.3" + depends on OBSOLETE config CC_V_3_3 bool prompt "3.3" + depends on OBSOLETE config CC_V_3_3_1 bool prompt "3.3.1" + depends on OBSOLETE config CC_V_3_3_2 bool prompt "3.3.2" + depends on OBSOLETE config CC_V_3_3_3 bool prompt "3.3.3" + depends on OBSOLETE config CC_V_3_3_4 bool prompt "3.3.4" + depends on OBSOLETE config CC_V_3_3_5 bool prompt "3.3.5" + depends on OBSOLETE config CC_V_3_3_6 bool @@ -43,26 +51,36 @@ config CC_V_3_3_6 config CC_V_3_4_0 bool prompt "3.4.0" + depends on OBSOLETE config CC_V_3_4_1 bool prompt "3.4.1" + depends on OBSOLETE config CC_V_3_4_2 bool prompt "3.4.2" + depends on OBSOLETE config CC_V_3_4_3 bool prompt "3.4.3" + depends on OBSOLETE config CC_V_3_4_4 bool prompt "3.4.4" + depends on OBSOLETE config CC_V_3_4_5 bool prompt "3.4.5" + depends on OBSOLETE + +config CC_V_3_4_6 + bool + prompt "3.4.6" config CC_V_4_0_0 bool @@ -117,6 +135,7 @@ config CC_VERSION default "3.4.3" if CC_V_3_4_3 default "3.4.4" if CC_V_3_4_4 default "3.4.5" if CC_V_3_4_5 + default "3.4.6" if CC_V_3_4_6 default "4.0.0" if CC_V_4_0_0 default "4.0.1" if CC_V_4_0_1 default "4.0.2" if CC_V_4_0_2 diff --git a/config/global.in b/config/global.in index 3b227c0b..a3416cfd 100644 --- a/config/global.in +++ b/config/global.in @@ -16,6 +16,16 @@ config EXPERIMENTAL - unfinished, in which case you could try hacking it and send me the result - non-existant, in which case you could also try hacking it in and send the result +config OBSOLETE + bool + prompt "Use obsolete features" + default n + help + If you set this to Y, you will be able to select obsolete features. + + Such obsolete features are the use of old kernel headers, old + gcc versions, etc... + config PARALLEL_JOBS int prompt "Number of parallel jobs" diff --git a/config/kernel.in b/config/kernel.in index 964a25e8..770f496c 100644 --- a/config/kernel.in +++ b/config/kernel.in @@ -16,7 +16,7 @@ config KERNEL_LINUX config KERNEL_CYGWIN bool prompt "cygwin" - depends on ARCH_x86 || ARCH_x86_64 + depends on EXPERIMENTAL && ( ARCH_x86 || ARCH_x86_64 ) help Build a toolchain targeting systems running Windows/cygwin as a kernel. diff --git a/config/kernel_linux.in b/config/kernel_linux.in index 4d74961f..93943009 100644 --- a/config/kernel_linux.in +++ b/config/kernel_linux.in @@ -14,6 +14,7 @@ config KERNEL_LINUX_HEADERS_INSTALL config KERNEL_LINUX_HEADERS_SANITISED bool prompt "Mazur's sanitized headers (OBSOLETE)" + depends on OBSOLETE help M. Mazur used to maintain a tree of sanitised headers, but it is now obsoleted by the headers_install rule (above), and has not seen eny @@ -21,7 +22,8 @@ config KERNEL_LINUX_HEADERS_SANITISED config KERNEL_LINUX_HEADERS_COPY bool - prompt "pure kernel headers (NOT RECOMMENDED)" + prompt "pure kernel headers (REALLY OBSOLETE)" + depends on OBSOLETE help This will simply copy the kernel headers to the toolchain. diff --git a/config/libc_glibc.in b/config/libc_glibc.in index 74892db9..f158abf2 100644 --- a/config/libc_glibc.in +++ b/config/libc_glibc.in @@ -7,74 +7,92 @@ choice config LIBC_V_1_09_1 bool prompt "1.09.1" + depends on OBSOLETE config LIBC_V_2_0_1 bool prompt "2.0.1" + depends on OBSOLETE config LIBC_V_2_0_6 bool prompt "2.0.6" + depends on OBSOLETE config LIBC_V_2_1_1 bool prompt "2.1.1" + depends on OBSOLETE config LIBC_V_2_1_2 bool prompt "2.1.2" + depends on OBSOLETE config LIBC_V_2_1_3 bool prompt "2.1.3" + depends on OBSOLETE config LIBC_V_2_2 bool prompt "2.2" + depends on OBSOLETE config LIBC_V_2_2_1 bool prompt "2.2.1" + depends on OBSOLETE config LIBC_V_2_2_2 bool prompt "2.2.2" + depends on OBSOLETE config LIBC_V_2_2_3 bool prompt "2.2.3" + depends on OBSOLETE config LIBC_V_2_2_4 bool prompt "2.2.4" + depends on OBSOLETE config LIBC_V_2_2_5 bool prompt "2.2.5" + depends on OBSOLETE config LIBC_V_2_3 bool prompt "2.3" + depends on OBSOLETE config LIBC_V_2_3_1 bool prompt "2.3.1" + depends on OBSOLETE config LIBC_V_2_3_2 bool prompt "2.3.2" + depends on OBSOLETE config LIBC_V_2_3_3 bool prompt "2.3.3" + depends on OBSOLETE config LIBC_V_2_3_4 bool prompt "2.3.4" + depends on OBSOLETE config LIBC_V_2_3_5 bool prompt "2.3.5" + depends on OBSOLETE config LIBC_V_2_3_6 bool diff --git a/config/libc_uClibc.in b/config/libc_uClibc.in index 85334247..256047e1 100644 --- a/config/libc_uClibc.in +++ b/config/libc_uClibc.in @@ -15,22 +15,27 @@ config LIBC_V_specific_date config LIBC_V_0_9_26 bool prompt "0.9.26" + depends on OBSOLETE config LIBC_V_0_9_27 bool prompt "0.9.27" + depends on OBSOLETE config LIBC_V_0_9_28 bool prompt "0.9.28" + depends on OBSOLETE config LIBC_V_0_9_28_1 bool prompt "0.9.28.1" + depends on OBSOLETE config LIBC_V_0_9_28_2 bool prompt "0.9.28.2" + depends on OBSOLETE config LIBC_V_0_9_28_3 bool