diff options
| author | Rickard Green <[email protected]> | 2014-11-25 19:34:50 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-11-25 19:34:50 +0100 |
| commit | 7c14d7b35f3fe6df4ab44a30ba1e3c6dac00a70b (patch) | |
| tree | d0aa0b00417515de605691f86b5f9c5f8dbf9033 /erts/include/internal/ethread.h | |
| parent | 23c0cebf707e61a0f2b9e9eb472d7cf3ad4eb94f (diff) | |
| parent | 26e93069d53a44e274bc7c5f871fa8a7bd1dd94b (diff) | |
| download | otp-7c14d7b35f3fe6df4ab44a30ba1e3c6dac00a70b.tar.gz otp-7c14d7b35f3fe6df4ab44a30ba1e3c6dac00a70b.tar.bz2 otp-7c14d7b35f3fe6df4ab44a30ba1e3c6dac00a70b.zip | |
Merge branch 'maint'
* maint:
Implement support for double word atomics using libatomic_ops
Improve usage of libatomic_ops for word size atomics
Optimize atomic ops with release barrier for 32-bit PowerPC
Diffstat (limited to 'erts/include/internal/ethread.h')
| -rw-r--r-- | erts/include/internal/ethread.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h index 72c054b588..ad5d05704c 100644 --- a/erts/include/internal/ethread.h +++ b/erts/include/internal/ethread.h @@ -364,8 +364,8 @@ extern ethr_runtime_t ethr_runtime__; # include "sparc64/ethread.h" # endif # endif -# include "gcc/ethread.h" # include "libatomic_ops/ethread.h" +# include "gcc/ethread.h" # endif # elif defined(ETHR_HAVE_LIBATOMIC_OPS) # include "libatomic_ops/ethread.h" |