diff options
| author | Rickard Green <[email protected]> | 2015-03-20 22:05:10 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-20 22:05:10 +0100 |
| commit | b99ce1c3a64f24e68b8a937338546fdf60501c65 (patch) | |
| tree | f05aca3b1f87413ea9f04cd9b3569597da0f996f /erts/include/internal/ethread.h | |
| parent | 6642d62c071f94d3e76254453099e2df01f7ad0e (diff) | |
| parent | 24fa075b5c0d54f2035a2ff510a82aa19187eda4 (diff) | |
| download | otp-b99ce1c3a64f24e68b8a937338546fdf60501c65.tar.gz otp-b99ce1c3a64f24e68b8a937338546fdf60501c65.tar.bz2 otp-b99ce1c3a64f24e68b8a937338546fdf60501c65.zip | |
Merge branch 'rickard/gcc-atomics/OTP-12383'
* rickard/gcc-atomics/OTP-12383:
Improve ethread atomics based on GCC builtins
Conflicts:
erts/aclocal.m4
Diffstat (limited to 'erts/include/internal/ethread.h')
| -rw-r--r-- | erts/include/internal/ethread.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h index 0d9a4a4305..e598017ada 100644 --- a/erts/include/internal/ethread.h +++ b/erts/include/internal/ethread.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2004-2013. All Rights Reserved. + * Copyright Ericsson AB 2004-2015. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -362,6 +362,9 @@ extern ethr_runtime_t ethr_runtime__; # include "sparc64/ethread.h" # endif # endif +# if ETHR_HAVE_GCC___ATOMIC_BUILTINS +# include "gcc/ethread.h" +# endif # include "libatomic_ops/ethread.h" # include "gcc/ethread.h" # endif |