diff --git a/include/boost/config/compiler/clang.hpp b/include/boost/config/compiler/clang.hpp
index 496f764f..52b23d9d 100644
--- a/include/boost/config/compiler/clang.hpp
+++ b/include/boost/config/compiler/clang.hpp
@@ -256,8 +256,7 @@
 #  define BOOST_NO_CXX14_BINARY_LITERALS
 #endif
 
-#if !__has_feature(__cxx_decltype_auto__) || (__clang_major__ < 4)
-// This fails with debug info enabled for clang 3.5:
+#if !__has_feature(__cxx_decltype_auto__)
 #  define BOOST_NO_CXX14_DECLTYPE_AUTO
 #endif
 
diff --git a/include/boost/config/stdlib/libcpp.hpp b/include/boost/config/stdlib/libcpp.hpp
index 0181369c..e5e5c349 100644
--- a/include/boost/config/stdlib/libcpp.hpp
+++ b/include/boost/config/stdlib/libcpp.hpp
@@ -106,7 +106,7 @@
 #define BOOST_NO_CXX17_ITERATOR_TRAITS
 #define BOOST_NO_CXX17_STD_INVOKE      // Invoke support is incomplete (no invoke_result)
 
-#if ((_LIBCPP_VERSION <= 1101) || (_LIBCPP_VERSION == 7000)) && !defined(BOOST_NO_CXX11_THREAD_LOCAL)
+#if (_LIBCPP_VERSION <= 1101) && !defined(BOOST_NO_CXX11_THREAD_LOCAL)
 // This is a bit of a sledgehammer, because really it's just libc++abi that has no
 // support for thread_local, leading to linker errors such as
 // "undefined reference to `__cxa_thread_atexit'".  It is fixed in the