diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a95bc49..2623663 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2013-07-26  Alexander Ivchenko  <alexander.ivchenko@intel.com>
+	    Maxim Kuvyrkov  <maxim@kugelworks.com>
+
+	* lib/target-supports.exp (check_effective_target_non_bionic): New
+	effective-target test.
+	* g++.dg/tls/thread_local4.C: Disable test for Bionic.
+	* g++.dg/tls/thread_local4g.C: Ditto.
+
 2013-07-26  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/57101
diff --git a/gcc/testsuite/g++.dg/tls/thread_local4.C b/gcc/testsuite/g++.dg/tls/thread_local4.C
index acf1cae..24f2de6 100644
--- a/gcc/testsuite/g++.dg/tls/thread_local4.C
+++ b/gcc/testsuite/g++.dg/tls/thread_local4.C
@@ -4,6 +4,7 @@
 // { dg-require-effective-target c++11 }
 // { dg-require-effective-target tls_runtime }
 // { dg-require-effective-target pthread }
+// { dg-require-effective-target non_bionic }
 // { dg-options -pthread }
 // { dg-add-options tls }
 
diff --git a/gcc/testsuite/g++.dg/tls/thread_local4g.C b/gcc/testsuite/g++.dg/tls/thread_local4g.C
index f5bc3ff..f6a5d4c 100644
--- a/gcc/testsuite/g++.dg/tls/thread_local4g.C
+++ b/gcc/testsuite/g++.dg/tls/thread_local4g.C
@@ -4,6 +4,7 @@
 // { dg-require-effective-target c++11 }
 // { dg-require-effective-target tls_runtime }
 // { dg-require-effective-target pthread }
+// { dg-require-effective-target non_bionic }
 // { dg-require-cxa-atexit "" }
 // { dg-options -pthread }
 // { dg-add-options tls }
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index fe51fde..0fb135c 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -4637,6 +4637,17 @@ proc check_effective_target_newlib {} {
     }]
 }
 
+# Return true if this is NOT a Bionic target.
+
+proc check_effective_target_non_bionic {} {
+    return [check_no_compiler_messages non_bionic object {
+	#include <ctype.h>
+	#if defined (__BIONIC__)
+	#error FOO
+	#endif
+    }]
+}
+
 # Return 1 if
 #   (a) an error of a few ULP is expected in string to floating-point
 #       conversion functions; and