From 4ef6286f11161370e7d77102ec23df58a11a7e47 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 13 May 2007 21:11:27 +0000
Subject: Remove dead entries for components not yet integrated: cygwin kernel,
 tcc... Some fixups in config entries, to avoid warnings when parsed by the
 kconfig parser.


diff --git a/config/cc.in b/config/cc.in
index 1412a0f..27d9d69 100644
--- a/config/cc.in
+++ b/config/cc.in
@@ -16,16 +16,6 @@ config CC_USE_CORE
 
       You most probably don't need that.
 
-config CC_CORE_GCC
-    bool
-    default y if ! CC_USE_CORE && CC_GCC
-    default n if CC_USE_CORE || ! CC_GCC
-
-config CC_CORE_TCC
-    bool
-    default y if ! CC_USE_CORE && CC_TCC
-    default n if CC_USE_CORE || ! CC_TCC
-
 choice
     bool
     prompt "Core C compiler:"
@@ -35,11 +25,6 @@ config CC_CORE_GCC
     bool
     prompt "gcc"
 
-#config CC_CORE_TCC
-#    bool
-#    prompt "tcc (EXPERIMENTAL)"
-#    depends on EXPERIMENTAL
-
 endchoice
 
 config CC_CORE_VERSION
@@ -48,16 +33,11 @@ config CC_CORE_VERSION
 config CC_CORE
     string
     default "gcc" if CC_CORE_GCC
-    default "tcc" if CC_CORE_TCC
 
 if CC_CORE_GCC && CC_USE_CORE
 source config/cc_core_gcc.in
 endif
 
-if CC_CORE_TCC && CC_USE_CORE
-source config/cc_core_tcc.in
-endif
-
 comment "Final C compiler"
 
 choice
@@ -75,12 +55,6 @@ config CC_GCC
     select CC_SUPPORT_OBJC
     select CC_SUPPORT_OBJCXX
 
-#config CC_TCC
-#    bool
-#    prompt "tcc (EXPERIMENTAL)"
-#    select CC_LANG_C
-#    depends on EXPERIMENTAL
-
 endchoice
 
 config CC_VERSION
@@ -89,16 +63,11 @@ config CC_VERSION
 config CC
     string
     default "gcc" if CC_GCC
-    default "tcc" if CC_TCC
 
 if CC_GCC
 source config/cc_gcc.in
 endif
 
-if CC_GCC
-source config/cc_tcc.in
-endif
-
 config CC_SUPPORT_CXX
     bool
 
diff --git a/config/cc_core_tcc.in b/config/cc_core_tcc.in
deleted file mode 100644
index e69de29..0000000
diff --git a/config/cc_tcc.in b/config/cc_tcc.in
deleted file mode 100644
index e69de29..0000000
diff --git a/config/global.in b/config/global.in
index ee23a5d..00c5b10 100644
--- a/config/global.in
+++ b/config/global.in
@@ -242,8 +242,8 @@ config LOG_SEE_TOOLS_WARN
     default n
     depends on ! LOG_ERROR
     help
-      If you say Y here, then you will have see the warning lines from
-      the components builds.
+      If you say Y here, then you will see the warning lines from the
+      components builds.
 
       It should suffice to say N here, as those will anyway be visible
       in the log file (if you want one).
diff --git a/config/kernel.in b/config/kernel.in
index 770f496..2eaf4e3 100644
--- a/config/kernel.in
+++ b/config/kernel.in
@@ -13,13 +13,6 @@ config KERNEL_LINUX
     help
       Build a toolchain targeting systems running Linux as a kernel.
 
-config KERNEL_CYGWIN
-    bool
-    prompt "cygwin"
-    depends on EXPERIMENTAL && ( ARCH_x86 || ARCH_x86_64 )
-    help
-      Build a toolchain targeting systems running Windows/cygwin as a kernel.
-
 endchoice
 
 config KERNEL_VERSION
@@ -29,8 +22,4 @@ if KERNEL_LINUX
 source config/kernel_linux.in
 endif
 
-if KERNEL_CYGWIN
-source config/kernel_cygwin.in
-endif
-
 endmenu
diff --git a/config/kernel_cygwin.in b/config/kernel_cygwin.in
deleted file mode 100644
index 1edac59..0000000
--- a/config/kernel_cygwin.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# Cygwin 'kernel' options
-
-config KERNEL
-    string
-    default "cygwin"
diff --git a/config/toolchain.in b/config/toolchain.in
index fee1db1..a17d151 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -103,7 +103,6 @@ config CANADIAN
     bool
     prompt "Canadian (EXPERIMENTAL)"
     depends on EXPERIMENTAL
-    default n
     help
       Build a canadian-toolchain.
       See docs/overview.txt
diff --git a/scripts/build/cc_core_tcc.sh b/scripts/build/cc_core_tcc.sh
deleted file mode 100644
index e69de29..0000000
diff --git a/scripts/build/cc_tcc.sh b/scripts/build/cc_tcc.sh
deleted file mode 100644
index e69de29..0000000
diff --git a/scripts/build/kernel_cygwin.sh b/scripts/build/kernel_cygwin.sh
deleted file mode 100644
index e69de29..0000000
diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh
index dfe0c80..848395a 100755
--- a/scripts/crosstool.sh
+++ b/scripts/crosstool.sh
@@ -114,7 +114,7 @@ CT_CC_FILE="${CT_CC}-${CT_CC_VERSION}"
 CT_LIBC_FILE="${CT_LIBC}-${CT_LIBC_VERSION}"
 [ "${CT_ARCH_FLOAT_SW_LIBFLOAT}" = "y" ] && CT_LIBFLOAT_FILE="libfloat-990616"
 
-# Kludge: If any of the configured options needs CT_TARGET or CT_TOP_DIR,
+# Kludge: If any of the configured options needs CT_TARGET,
 # then rescan the options file now:
 . "${CT_TOP_DIR}/.config"
 
-- 
cgit v0.10.2-6-g49f6