diff --git a/base/glibc/glibc.conf b/base/glibc/glibc.conf
index 776558a93..4203444ee 100644
--- a/base/glibc/glibc.conf
+++ b/base/glibc/glibc.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../glibc/glibc.conf
-# Copyright (C) 2006 - 2011 The OpenSDE Project
+# Copyright (C) 2006 - 2012 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -72,6 +72,12 @@ if [ $SDECFG_PKG_GLIBC_TLS = 1 ]; then
 	var_append glibc_addons "," "nptl"
 	var_append extraconfopt " " "--with-tls"
 	var_append extraconfopt " " "--with-__thread"
+
+	# cross-compile help
+	if ! atstage native; 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"