6 files changed, 42 insertions, 1 deletions
diff --git a/config/backend.in b/config/backend.in
index 3a3e1d6..acf2580 100644
--- a/config/backend.in
+++ b/config/backend.in
@@ -8,6 +8,8 @@ config BACKEND
     bool
     default y if IS_A_BACKEND = "y" || IS_A_BACKEND = "Y"
 
+if BACKEND
+
 config BACKEND_ARCH
     string
     option env="CT_BACKEND_ARCH"
@@ -19,3 +21,5 @@ config BACKEND_KERNEL
 config BACKEND_LIBC
     string
     option env="CT_BACKEND_LIBC"
+
+endif #if BACKEND
diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index 5ef69b5..821e606 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -25,6 +25,11 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config BINUTILS_V_2_25_1
+    bool
+    prompt "2.25.1"
+    select BINUTILS_2_25_1_or_later
+
 config BINUTILS_LINARO_V_2_25
     bool
     prompt "linaro-2.25.0-2015.01-2"
@@ -111,6 +116,7 @@ config BINUTILS_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "2.25.1" if BINUTILS_V_2_25_1
     default "linaro-2.25.0-2015.01-2" if BINUTILS_LINARO_V_2_25
     default "2.25" if BINUTILS_V_2_25
     default "linaro-2.24.0-2014.11-2" if BINUTILS_LINARO_V_2_24
@@ -125,6 +131,10 @@ config BINUTILS_VERSION
     default "2.18a" if BINUTILS_V_2_18a
     default "custom" if BINUTILS_CUSTOM
 
+config BINUTILS_2_25_1_or_later
+    bool
+    select BINUTILS_2_25_or_later
+
 config BINUTILS_2_25_or_later
     bool
     select BINUTILS_2_24_or_later
diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
index fb19938..cbad638 100644
--- a/config/cc/gcc.in.2
+++ b/config/cc/gcc.in.2
@@ -165,7 +165,7 @@ config CC_CXA_ATEXIT
     bool
     prompt "Use __cxa_atexit"
     default y
-    depends on ! BARE_METAL
+    depends on ! BARE_METAL || LIBC_PROVIDES_CXA_ATEXIT
     help
       If you get the missing symbol "__cxa_atexit" when building C++ programs,
       you might want to try disabling this option.
diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in
index c42d7df..6fb522a 100644
--- a/config/companion_libs/cloog.in
+++ b/config/companion_libs/cloog.in
@@ -9,6 +9,11 @@ if ISL
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config CLOOG_V_0_18_4
+    bool
+    prompt "0.18.4"
+    select CLOOG_0_18_4_or_later
+
 config CLOOG_V_0_18_1
     bool
     prompt "0.18.1"
@@ -36,10 +41,15 @@ config CLOOG_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "0.18.4" if CLOOG_V_0_18_4
     default "0.18.1" if CLOOG_V_0_18_1
     default "0.18.0" if CLOOG_V_0_18_0
     default "0.15.11" if CLOOG_V_0_15_11
 
+config CLOOG_0_18_4_or_later
+    bool
+    select CLOOG_0_18_or_later
+
 config CLOOG_0_18_or_later
     bool
 
diff --git a/config/companion_libs/isl.in b/config/companion_libs/isl.in
index 443f872..4f6ee36 100644
--- a/config/companion_libs/isl.in
+++ b/config/companion_libs/isl.in
@@ -6,23 +6,36 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config ISL_V_0_15
+    bool
+    prompt "0.15"
+    depends on CLOOG_0_18_4_or_later
+    select ISL_V_0_15_or_later
+
 config ISL_V_0_14
     bool
     prompt "0.14"
+    depends on CLOOG_0_18_4_or_later
     select ISL_V_0_14_or_later
 
 config ISL_V_0_12_2
     bool
     prompt "0.12.2"
+    depends on ! CLOOG_0_18_4_or_later
     select ISL_V_0_12_or_later
 
 config ISL_V_0_11_1
     bool
     prompt "0.11.1"
+    depends on ! CLOOG_0_18_4_or_later
     depends on ! CC_GCC_5_1_or_later
 
 endchoice
 
+config ISL_V_0_15_or_later
+    bool
+    select ISL_V_0_14_or_later
+
 config ISL_V_0_14_or_later
     bool
     select ISL_V_0_12_or_later
@@ -34,6 +47,7 @@ config ISL_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "0.15" if ISL_V_0_15
     default "0.14" if ISL_V_0_14
     default "0.12.2" if ISL_V_0_12_2
     default "0.11.1" if ISL_V_0_11_1
diff --git a/config/libc.in b/config/libc.in
index ca597c8..4cc7530 100644
--- a/config/libc.in
+++ b/config/libc.in
@@ -35,6 +35,9 @@ config LIBC_SUPPORT_THREADS_LT
 config LIBC_SUPPORT_THREADS_NONE
     bool
 
+config LIBC_PROVIDES_CXA_ATEXIT
+    bool
+
 # C libraries should provide other values
 config THREADS
     string