Hi Tom, can I merge this into 3.8 and 3.9? Joerg
On Sun, Sep 04, 2016 at 12:44:10AM -0000, Joerg Sonnenberger via cfe-commits wrote: > Author: joerg > Date: Sat Sep 3 19:44:10 2016 > New Revision: 280607 > > URL: http://llvm.org/viewvc/llvm-project?rev=280607&view=rev > Log: > PR 27200: Fix names of the atomic lock-free macros. > > Modified: > cfe/trunk/lib/Headers/stdatomic.h > > Modified: cfe/trunk/lib/Headers/stdatomic.h > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/stdatomic.h?rev=280607&r1=280606&r2=280607&view=diff > ============================================================================== > --- cfe/trunk/lib/Headers/stdatomic.h (original) > +++ cfe/trunk/lib/Headers/stdatomic.h Sat Sep 3 19:44:10 2016 > @@ -45,18 +45,18 @@ extern "C" { > #define ATOMIC_CHAR16_T_LOCK_FREE __GCC_ATOMIC_CHAR16_T_LOCK_FREE > #define ATOMIC_CHAR32_T_LOCK_FREE __GCC_ATOMIC_CHAR32_T_LOCK_FREE > #define ATOMIC_WCHAR_T_LOCK_FREE __GCC_ATOMIC_WCHAR_T_LOCK_FREE > -#define ATOMIC_SHORT_T_LOCK_FREE __GCC_ATOMIC_SHORT_T_LOCK_FREE > -#define ATOMIC_INT_T_LOCK_FREE __GCC_ATOMIC_INT_T_LOCK_FREE > -#define ATOMIC_LONG_T_LOCK_FREE __GCC_ATOMIC_LONG_T_LOCK_FREE > -#define ATOMIC_LLONG_T_LOCK_FREE __GCC_ATOMIC_LLONG_T_LOCK_FREE > -#define ATOMIC_POINTER_T_LOCK_FREE __GCC_ATOMIC_POINTER_T_LOCK_FREE > +#define ATOMIC_SHORT_LOCK_FREE __GCC_ATOMIC_SHORT_LOCK_FREE > +#define ATOMIC_INT_LOCK_FREE __GCC_ATOMIC_INT_LOCK_FREE > +#define ATOMIC_LONG_LOCK_FREE __GCC_ATOMIC_LONG_LOCK_FREE > +#define ATOMIC_LLONG_LOCK_FREE __GCC_ATOMIC_LLONG_LOCK_FREE > +#define ATOMIC_POINTER_LOCK_FREE __GCC_ATOMIC_POINTER_LOCK_FREE > > /* 7.17.2 Initialization */ > > #define ATOMIC_VAR_INIT(value) (value) > #define atomic_init __c11_atomic_init > > -/* 7.17.3 Order and consistency */ > +/* 7.17.3 Order and consistency */. > > typedef enum memory_order { > memory_order_relaxed = __ATOMIC_RELAXED, > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
