diff --git a/base/glibc/glibc.conf b/base/glibc/glibc.conf
index 9f435c606..28e9b4215 100644
--- a/base/glibc/glibc.conf
+++ b/base/glibc/glibc.conf
@@ -66,7 +66,12 @@ if [ $SDECFG_PKG_GLIBC_TLS = 1 ]; then
 	var_append glibc_addons "," "nptl"
 	var_append extraconfopt " " "--with-tls"
 	var_append extraconfopt " " "--with-__thread"
-else
+
+	if atstage cross ; then
+		var_append configcache ' ' "libc_cv_forced_unwind=yes"
+		var_append configcache ' ' "libc_cv_c_cleanup=yes"
+	fi
+else    
 	var_append glibc_addons "," "linuxthreads"
 	var_append extraconfopt " " "--without-__thread"
 	var_append extraconfopt " " "--disable-sanity-checks"