diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/29_atomics/headers/atomic/macros.cc | 67 |
2 files changed, 26 insertions, 47 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d364e2e48a8..29d6eb7b711 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2016-11-22 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/78465 + * testsuite/29_atomics/headers/atomic/macros.cc: Replace runtime tests + with preprocessor conditions. + 2016-11-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * acinclude.m4 (GLIBCXX_CHECK_MATH11_PROTO): Update comments. diff --git a/libstdc++-v3/testsuite/29_atomics/headers/atomic/macros.cc b/libstdc++-v3/testsuite/29_atomics/headers/atomic/macros.cc index 9ef8c788c75..4cb3e1ae988 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 -} |