diff options
| author | Rickard Green <[email protected]> | 2010-11-18 10:26:32 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-11-18 10:26:32 +0100 |
| commit | c7d5e9e04ef4e68809cd0f3e3cdbba7b8a2d232a (patch) | |
| tree | 350e9216dbccb7c63db2823617196adda69faecb /erts/include/internal/ethread.h | |
| parent | b48be79573171e530d97cdf078488eb66fc23f30 (diff) | |
| parent | af0f99c6f9e59b478e5852336237d56fb8355cca (diff) | |
| download | otp-c7d5e9e04ef4e68809cd0f3e3cdbba7b8a2d232a.tar.gz otp-c7d5e9e04ef4e68809cd0f3e3cdbba7b8a2d232a.tar.bz2 otp-c7d5e9e04ef4e68809cd0f3e3cdbba7b8a2d232a.zip | |
Merge branch 'rickard/pre-pentium4-compat/OTP-8847' into dev
* rickard/pre-pentium4-compat/OTP-8847:
Allow usage of libatomic_ops when other compilers than gcc are used
Add pre pentium 4 compatibilty configure test
Fix --enable-ethread-pre-pentium4-compatibility
Diffstat (limited to 'erts/include/internal/ethread.h')
| -rw-r--r-- | erts/include/internal/ethread.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h index 4a205699bd..931d692908 100644 --- a/erts/include/internal/ethread.h +++ b/erts/include/internal/ethread.h @@ -239,6 +239,8 @@ typedef DWORD ethr_tsd_key; # include "gcc/ethread.h" # include "libatomic_ops/ethread.h" # endif +# elif defined(ETHR_HAVE_LIBATOMIC_OPS) +# include "libatomic_ops/ethread.h" # elif defined(ETHR_WIN32_THREADS) # include "win/ethread.h" # endif |