summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/binutils/binutils.in12
-rw-r--r--config/cc/gcc.in23
-rw-r--r--config/companion_libs/gmp.in12
-rw-r--r--config/companion_libs/mpc.in6
-rw-r--r--config/companion_libs/mpfr.in12
-rw-r--r--config/debug/duma.in24
-rw-r--r--config/debug/ltrace.in13
-rw-r--r--config/debug/strace.in18
-rw-r--r--config/libc/eglibc.in24
-rw-r--r--config/libc/glibc.in32
-rw-r--r--config/libc/uClibc.in12
-rw-r--r--samples/i686-unknown-mingw32/crosstool.config1
12 files changed, 2 insertions, 187 deletions
diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index 98b1a8a..a11e532 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -40,16 +40,6 @@ config BINUTILS_V_2_18a
prompt "2.18a"
select BINUTILS_2_18_or_later
-config BINUTILS_V_2_17a
- bool
- prompt "2.17a (OBSOLETE)"
- depends on OBSOLETE
-
-config BINUTILS_V_2_16_1a
- bool
- prompt "2.16.1a (OBSOLETE)"
- depends on OBSOLETE
-
config BINUTILS_CUSTOM
bool
prompt "Custom binutils"
@@ -80,8 +70,6 @@ config BINUTILS_VERSION
default "2.20.1a" if BINUTILS_V_2_20_1a
default "2.19.1a" if BINUTILS_V_2_19_1a
default "2.18a" if BINUTILS_V_2_18a
- default "2.17a" if BINUTILS_V_2_17a
- default "2.16.1a" if BINUTILS_V_2_16_1a
default "custom" if BINUTILS_CUSTOM
config BINUTILS_2_22_or_later
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index bcadb96..11b2c97 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -194,29 +194,13 @@ config CC_V_4_2_4
prompt "4.2.4"
select CC_GCC_4_2
-config CC_V_4_2_3
- bool
- prompt "4.2.3 (OBSOLETE)"
- select CC_GCC_4_2
- depends on OBSOLETE
-
+# We need that one, it's the only version with avr32 support
+# because we have a patch for it
config CC_V_4_2_2
bool
prompt "4.2.2"
select CC_GCC_4_2
-config CC_V_4_2_1
- bool
- prompt "4.2.1 (OBSOLETE)"
- select CC_GCC_4_2
- depends on OBSOLETE
-
-config CC_V_4_2_0
- bool
- prompt "4.2.0 (OBSOLETE)"
- select CC_GCC_4_2
- depends on OBSOLETE
-
config CC_V_4_1_2
bool
prompt "4.1.2 (OBSOLETE)"
@@ -431,10 +415,7 @@ config CC_VERSION
default "4.3.1" if CC_V_4_3_1
default "4.3.0" if CC_V_4_3_0
default "4.2.4" if CC_V_4_2_4
- default "4.2.3" if CC_V_4_2_3
default "4.2.2" if CC_V_4_2_2
- default "4.2.1" if CC_V_4_2_1
- default "4.2.0" if CC_V_4_2_0
default "4.1.2" if CC_V_4_1_2
default "4.0.4" if CC_V_4_0_4
default "3.4.6" if CC_V_3_4_6
diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in
index 608752a..86f528d 100644
--- a/config/companion_libs/gmp.in
+++ b/config/companion_libs/gmp.in
@@ -26,16 +26,6 @@ config GMP_V_4_3_0
bool
prompt "4.3.0"
-config GMP_V_4_2_4
- bool
- prompt "4.2.4 (OBSOLETE)"
- depends on OBSOLETE
-
-config GMP_V_4_2_2
- bool
- prompt "4.2.2 (OBSOLETE)"
- depends on OBSOLETE
-
endchoice
config GMP_VERSION
@@ -47,5 +37,3 @@ config GMP_VERSION
default "4.3.2" if GMP_V_4_3_2
default "4.3.1" if GMP_V_4_3_1
default "4.3.0" if GMP_V_4_3_0
- default "4.2.4" if GMP_V_4_2_4
- default "4.2.2" if GMP_V_4_2_2
diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in
index 966fce7..b7d7252 100644
--- a/config/companion_libs/mpc.in
+++ b/config/companion_libs/mpc.in
@@ -23,11 +23,6 @@ config MPC_V_0_7
bool
prompt "0.7"
-config MPC_V_0_6
- bool
- prompt "0.6 (OBSOLETE)"
- depends on OBSOLETE
-
endchoice
config MPC_VERSION
@@ -38,4 +33,3 @@ config MPC_VERSION
default "0.8.2" if MPC_V_0_8_2
default "0.8.1" if MPC_V_0_8_1
default "0.7" if MPC_V_0_7
- default "0.6" if MPC_V_0_6
diff --git a/config/companion_libs/mpfr.in b/config/companion_libs/mpfr.in
index ae01a8d..1b8eddf 100644
--- a/config/companion_libs/mpfr.in
+++ b/config/companion_libs/mpfr.in
@@ -30,16 +30,6 @@ config MPFR_V_2_4_0
bool
prompt "2.4.0"
-config MPFR_V_2_3_2
- bool
- prompt "2.3.2 (OBSOLETE)"
- depends on OBSOLETE
-
-config MPFR_V_2_3_1
- bool
- prompt "2.3.1 (OBSOLETE)"
- depends on OBSOLETE
-
endchoice
config MPFR_VERSION
@@ -52,5 +42,3 @@ config MPFR_VERSION
default "2.4.2" if MPFR_V_2_4_2
default "2.4.1" if MPFR_V_2_4_1
default "2.4.0" if MPFR_V_2_4_0
- default "2.3.2" if MPFR_V_2_3_2
- default "2.3.1" if MPFR_V_2_3_1
diff --git a/config/debug/duma.in b/config/debug/duma.in
index 6daee78..374339d 100644
--- a/config/debug/duma.in
+++ b/config/debug/duma.in
@@ -26,26 +26,6 @@ config DUMA_V_2_5_15
bool
prompt "2_5_15"
-config DUMA_V_2_5_14
- bool
- prompt "2_5_14 (OBSOLETE)"
- depends on OBSOLETE
-
-config DUMA_V_2_5_12
- bool
- prompt "2_5_12 (OBSOLETE)"
- depends on OBSOLETE
-
-config DUMA_V_2_5_8
- bool
- prompt "2_5_8 (OBSOLETE)"
- depends on OBSOLETE
-
-config DUMA_V_2_5_1
- bool
- prompt "2_5_1 (OBSOLETE)"
- depends on OBSOLETE
-
endchoice
config DUMA_VERSION
@@ -53,7 +33,3 @@ config DUMA_VERSION
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
default "2_5_15" if DUMA_V_2_5_15
- default "2_5_14" if DUMA_V_2_5_14
- default "2_5_12" if DUMA_V_2_5_12
- default "2_5_8" if DUMA_V_2_5_8
- default "2_5_1" if DUMA_V_2_5_1
diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index 90f0810..6b27121 100644
--- a/config/debug/ltrace.in
+++ b/config/debug/ltrace.in
@@ -24,16 +24,6 @@ config LTRACE_V_0_5_2
bool
prompt "0.5.2"
-config LTRACE_V_0_5
- bool
- prompt "0.5 (OBSOLETE)"
- depends on OBSOLETE
-
-config LTRACE_V_0_4
- bool
- prompt "0.4 (OBSOLETE)"
- depends on OBSOLETE
-
endchoice
config LTRACE_VERSION
@@ -42,9 +32,6 @@ config LTRACE_VERSION
# CT_INSERT_VERSION_STRING_BELOW
default "0.5.3" if LTRACE_V_0_5_3
default "0.5.2" if LTRACE_V_0_5_2
- default "0.5.1" if LTRACE_V_0_5_1
- default "0.5" if LTRACE_V_0_5
- default "0.4" if LTRACE_V_0_4
config LTRACE_0_5_3_or_later
bool
diff --git a/config/debug/strace.in b/config/debug/strace.in
index 63d5317..d736a7a 100644
--- a/config/debug/strace.in
+++ b/config/debug/strace.in
@@ -27,21 +27,6 @@ config STRACE_V_4_5_18
bool
prompt "4.5.18"
-config STRACE_V_4_5_17
- bool
- prompt "4.5.17 (OBSOLETE)"
- depends on OBSOLETE
-
-config STRACE_V_4_5_16
- bool
- prompt "4.5.16 (OBSOLETE)"
- depends on OBSOLETE
-
-config STRACE_V_4_5_15
- bool
- prompt "4.5.15 (OBSOLETE)"
- depends on OBSOLETE
-
endchoice
config STRACE_VERSION
@@ -52,6 +37,3 @@ config STRACE_VERSION
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
- default "4.5.17" if STRACE_V_4_5_17
- default "4.5.16" if STRACE_V_4_5_16
- default "4.5.15" if STRACE_V_4_5_15
diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in
index 4f6ed12..1dd2c97 100644
--- a/config/libc/eglibc.in
+++ b/config/libc/eglibc.in
@@ -59,26 +59,6 @@ config LIBC_EGLIBC_V_2_9
prompt "2_9"
select LIBC_EGLIBC_2_9_or_later
-config LIBC_EGLIBC_V_2_8
- bool
- prompt "2_8 (OBSOLETE)"
- depends on OBSOLETE
-
-config LIBC_EGLIBC_V_2_7
- bool
- prompt "2_7 (OBSOLETE)"
- depends on OBSOLETE
-
-config LIBC_EGLIBC_V_2_6
- bool
- prompt "2_6 (OBSOLETE)"
- depends on OBSOLETE
-
-config LIBC_EGLIBC_V_2_5
- bool
- prompt "2_5 (OBSOLETE)"
- depends on OBSOLETE
-
config LIBC_EGLIBC_V_TRUNK
bool
prompt "'trunk'"
@@ -100,10 +80,6 @@ config LIBC_VERSION
default "2_11" if LIBC_EGLIBC_V_2_11
default "2_10" if LIBC_EGLIBC_V_2_10
default "2_9" if LIBC_EGLIBC_V_2_9
- default "2_8" if LIBC_EGLIBC_V_2_8
- default "2_7" if LIBC_EGLIBC_V_2_7
- default "2_6" if LIBC_EGLIBC_V_2_6
- default "2_5" if LIBC_EGLIBC_V_2_5
default "trunk" if LIBC_EGLIBC_V_TRUNK
config LIBC_EGLIBC_2_16_or_later
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 70780a3..2710b82 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -55,33 +55,6 @@ config LIBC_GLIBC_V_2_8
bool
prompt "2.8"
-config LIBC_GLIBC_V_2_7
- bool
- prompt "2.7 (OBSOLETE)"
- depends on OBSOLETE
-
-config LIBC_GLIBC_V_2_6_1
- bool
- prompt "2.6.1 (OBSOLETE)"
- depends on OBSOLETE
-
-config LIBC_GLIBC_V_2_6
- bool
- prompt "2.6 (OBSOLETE)"
- depends on OBSOLETE
-
-config LIBC_GLIBC_V_2_5_1
- bool
- prompt "2.5.1 (OBSOLETE)"
- depends on OBSOLETE
- select LIBC_SUPPORT_LINUXTHREADS
-
-config LIBC_GLIBC_V_2_5
- bool
- prompt "2.5 (OBSOLETE)"
- depends on OBSOLETE
- select LIBC_SUPPORT_LINUXTHREADS
-
endchoice
config LIBC_VERSION
@@ -98,8 +71,3 @@ config LIBC_VERSION
default "2.10.1" if LIBC_GLIBC_V_2_10_1
default "2.9" if LIBC_GLIBC_V_2_9
default "2.8" if LIBC_GLIBC_V_2_8
- default "2.7" if LIBC_GLIBC_V_2_7
- default "2.6.1" if LIBC_GLIBC_V_2_6_1
- default "2.6" if LIBC_GLIBC_V_2_6
- default "2.5.1" if LIBC_GLIBC_V_2_5_1
- default "2.5" if LIBC_GLIBC_V_2_5
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index 2ca056b..d13796a 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -73,16 +73,6 @@ config LIBC_UCLIBC_V_0_9_30
prompt "0.9.30"
select LIBC_UCLIBC_0_9_30_or_later
-config LIBC_UCLIBC_V_0_9_29
- bool
- prompt "0.9.29 (OBSOLETE)"
- depends on OBSOLETE
-
-config LIBC_UCLIBC_V_0_9_28_3
- bool
- prompt "0.9.28.3 (OBSOLETE)"
- depends on OBSOLETE
-
config LIBC_UCLIBC_CUSTOM
bool
prompt "Custom uClibc"
@@ -118,8 +108,6 @@ config LIBC_VERSION
default "0.9.30.2" if LIBC_UCLIBC_V_0_9_30_2
default "0.9.30.1" if LIBC_UCLIBC_V_0_9_30_1
default "0.9.30" if LIBC_UCLIBC_V_0_9_30
- default "0.9.29" if LIBC_UCLIBC_V_0_9_29
- default "0.9.28.3" if LIBC_UCLIBC_V_0_9_28_3
default "custom" if LIBC_UCLIBC_CUSTOM
config LIBC_UCLIBC_0_9_32_or_later
diff --git a/samples/i686-unknown-mingw32/crosstool.config b/samples/i686-unknown-mingw32/crosstool.config
index f6f8dd2..8f62c7a 100644
--- a/samples/i686-unknown-mingw32/crosstool.config
+++ b/samples/i686-unknown-mingw32/crosstool.config
@@ -3,7 +3,6 @@ CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
CT_ARCH_ARCH="i686"
-CT_ARCH_32=y
CT_ARCH_x86=y
CT_KERNEL_windows=y
CT_BINUTILS_V_2_21_1a=y