aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-08-07 09:39:53 +0200
committerFredrik Gustafsson <[email protected]>2013-08-07 09:39:53 +0200
commit3021fca734f71f8bae966ab67f1400d37f8927bc (patch)
treed62503c55c40d73930e4bf181ec0816201de22b8
parent8237ef3cb7e4845bfa266cea96f318fa3d68f682 (diff)
parent15eba817c5da7fd91dba9b176bffe908b889e3b9 (diff)
downloadotp-3021fca734f71f8bae966ab67f1400d37f8927bc.tar.gz
otp-3021fca734f71f8bae966ab67f1400d37f8927bc.tar.bz2
otp-3021fca734f71f8bae966ab67f1400d37f8927bc.zip
Merge branch 'weisslj/fix-gcc40-arm-compile-error/OTP-11214' into maint
* weisslj/fix-gcc40-arm-compile-error/OTP-11214: Fix compile error on ARM and GCC < 4.1.0
-rw-r--r--erts/include/internal/gcc/ethread.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/include/internal/gcc/ethread.h b/erts/include/internal/gcc/ethread.h
index fcfdc39441..365a3535cf 100644
--- a/erts/include/internal/gcc/ethread.h
+++ b/erts/include/internal/gcc/ethread.h
@@ -25,6 +25,9 @@
#ifndef ETHREAD_GCC_H__
#define ETHREAD_GCC_H__
+#if defined(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP32) \
+ || defined(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP64)
+
#ifndef ETHR_MEMBAR
# include "ethr_membar.h"
#endif
@@ -46,3 +49,5 @@
#endif
#endif
+
+#endif