Index: libcxxabi/test/test_exception_storage.pass.cpp =================================================================== --- libcxxabi/test/test_exception_storage.pass.cpp +++ libcxxabi/test/test_exception_storage.pass.cpp @@ -9,13 +9,16 @@ #include #include #include + +#include "test_macros.h" + +#ifndef TEST_HAS_NO_THREADS #include <__threading_support> #include +#endif #include "../src/cxa_exception.h" -#include "test_macros.h" - typedef __cxxabiv1::__cxa_eh_globals globals_t ; void *thread_code (void *parm) {