diff options
| author | Rickard Green <[email protected]> | 2014-11-25 19:24:35 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-11-25 19:24:35 +0100 |
| commit | 91d8aa57c11688395b5b966f65d2a78d1985dcf1 (patch) | |
| tree | 75a30fb6c612c2a390f043a23e69d9e4c1a13d14 /erts/include/internal/ethread.h | |
| parent | 0ab1d950b2ead9611cb31abd6a612ef378ff5b88 (diff) | |
| parent | d642dc89e098b572d1b7419fc98c36f324d8407e (diff) | |
| download | otp-91d8aa57c11688395b5b966f65d2a78d1985dcf1.tar.gz otp-91d8aa57c11688395b5b966f65d2a78d1985dcf1.tar.bz2 otp-91d8aa57c11688395b5b966f65d2a78d1985dcf1.zip | |
Merge branch 'rickard/libatomic_ops_improvements/OTP-12302' into maint
* rickard/libatomic_ops_improvements/OTP-12302:
Implement support for double word atomics using libatomic_ops
Improve usage of libatomic_ops for word size atomics
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" |