Andrew MacLeod did some digging and foudn that this test was changed from using #if to using a runtime if and abort() because the LOCK_FREE macros resolved to runtime calls at one point. However, they later got changed to predefined macros, and so can be changed back to using #if.
This should fix the regression on Solaris, where the mismatched abort() declaration causes it to FAIL. PR libstdc++/78465 * testsuite/29_atomics/headers/atomic/macros.cc: Replace runtime tests with preprocessor conditions. Tested x86_64-linux, committed to trunk.
commit e6dcd511c9d9641e15f637cf1337149abf97c1e4 Author: Jonathan Wakely <jwak...@redhat.com> Date: Tue Nov 22 16:17:52 2016 +0000 PR78465 Remove runtime tests for <atomic> macros PR libstdc++/78465 * testsuite/29_atomics/headers/atomic/macros.cc: Replace runtime tests with preprocessor conditions. diff --git a/libstdc++-v3/testsuite/29_atomics/headers/atomic/macros.cc b/libstdc++-v3/testsuite/29_atomics/headers/atomic/macros.cc index 9ef8c78..4cb3e1a 100644 --- a/libstdc++-v3/testsuite/29_atomics/headers/atomic/macros.cc +++ b/libstdc++-v3/testsuite/29_atomics/headers/atomic/macros.cc @@ -1,4 +1,4 @@ -// { dg-do compile { target c++11 } } +// { dg-do preprocess { target c++11 } } // Copyright (C) 2008-2016 Free Software Foundation, Inc. // @@ -21,42 +21,61 @@ #ifndef ATOMIC_BOOL_LOCK_FREE # error "ATOMIC_BOOL_LOCK_FREE must be a macro" +#elif ATOMIC_BOOL_LOCK_FREE != 1 && ATOMIC_BOOL_LOCK_FREE != 2 +# error "ATOMIC_BOOL_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_CHAR_LOCK_FREE # error "ATOMIC_CHAR_LOCK_FREE must be a macro" +#elif ATOMIC_CHAR_LOCK_FREE != 1 && ATOMIC_CHAR_LOCK_FREE != 2 +# error "ATOMIC_CHAR_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_CHAR16_T_LOCK_FREE # error "ATOMIC_CHAR16_T_LOCK_FREE must be a macro" +#elif ATOMIC_CHAR16_T_LOCK_FREE != 1 && ATOMIC_CHAR16_T_LOCK_FREE != 2 #endif #ifndef ATOMIC_CHAR32_T_LOCK_FREE # error "ATOMIC_CHAR32_T_LOCK_FREE must be a macro" +#elif ATOMIC_CHAR32_T_LOCK_FREE != 1 && ATOMIC_CHAR32_T_LOCK_FREE != 2 +# error "ATOMIC_CHAR32_T_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_WCHAR_T_LOCK_FREE # error "ATOMIC_WCHAR_T_LOCK_FREE must be a macro" +#elif ATOMIC_WCHAR_T_LOCK_FREE != 1 && ATOMIC_WCHAR_T_LOCK_FREE != 2 +# error "ATOMIC_WCHAR_T_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_SHORT_LOCK_FREE # error "ATOMIC_SHORT_LOCK_FREE must be a macro" +#elif ATOMIC_SHORT_LOCK_FREE != 1 && ATOMIC_SHORT_LOCK_FREE != 2 +# error "ATOMIC_SHORT_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_INT_LOCK_FREE # error "ATOMIC_INT_LOCK_FREE must be a macro" +#elif ATOMIC_INT_LOCK_FREE != 1 && ATOMIC_INT_LOCK_FREE != 2 +# error "ATOMIC_INT_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_LONG_LOCK_FREE # error "ATOMIC_LONG_LOCK_FREE must be a macro" +#elif ATOMIC_LONG_LOCK_FREE != 1 && ATOMIC_LONG_LOCK_FREE != 2 +# error "ATOMIC_LONG_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_LLONG_LOCK_FREE # error "ATOMIC_LLONG_LOCK_FREE must be a macro" +#elif ATOMIC_LLONG_LOCK_FREE != 1 && ATOMIC_LLONG_LOCK_FREE != 2 +# error "ATOMIC_LLONG_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_POINTER_LOCK_FREE # error "ATOMIC_POINTER_LOCK_FREE must be a macro" +#elif ATOMIC_POINTER_LOCK_FREE != 1 && ATOMIC_POINTER_LOCK_FREE != 2 +# error "ATOMIC_POINTER_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_FLAG_INIT @@ -66,49 +85,3 @@ #ifndef ATOMIC_VAR_INIT #error "ATOMIC_VAR_INIT_must_be_a_macro" #endif - - -extern void abort(void); - -int main () -{ -#if (ATOMIC_BOOL_LOCK_FREE != 1 && ATOMIC_BOOL_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_CHAR_LOCK_FREE != 1 && ATOMIC_CHAR_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_CHAR16_T_LOCK_FREE != 1 && ATOMIC_CHAR16_T_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_CHAR32_T_LOCK_FREE != 1 && ATOMIC_CHAR32_T_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_WCHAR_T_LOCK_FREE != 1 && ATOMIC_WCHAR_T_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_SHORT_LOCK_FREE != 1 && ATOMIC_SHORT_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_INT_LOCK_FREE != 1 && ATOMIC_INT_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_LONG_LOCK_FREE != 1 && ATOMIC_LONG_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_LLONG_LOCK_FREE != 1 && ATOMIC_LLONG_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_POINTER_LOCK_FREE != 1 && ATOMIC_POINTER_LOCK_FREE != 2) - abort (); -#endif -}