aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2012-09-13 14:36:48 +0200
committerSverker Eriksson <[email protected]>2012-09-13 14:47:44 +0200
commit89ca0448e93beed780bc4c233529ce73063e8337 (patch)
tree64f054b29e956a59fb5346ca8d50505e5e38a90f
parent29357da654450954af1b6ad8492a05b055031a25 (diff)
parentb29ecbdba1502b46bcdf556639813e6f5efbba55 (diff)
downloadotp-89ca0448e93beed780bc4c233529ce73063e8337.tar.gz
otp-89ca0448e93beed780bc4c233529ce73063e8337.tar.bz2
otp-89ca0448e93beed780bc4c233529ce73063e8337.zip
Merge branch 'sverk/gcc-atomic-config-bug' into maint
* sverk/gcc-atomic-config-bug: erts: Fix gcc atomic bug in ethread.h OTP-10418
-rw-r--r--erts/include/internal/ethread.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h
index 142c26c0ca..e1885c627a 100644
--- a/erts/include/internal/ethread.h
+++ b/erts/include/internal/ethread.h
@@ -355,10 +355,8 @@ extern ethr_runtime_t ethr_runtime__;
# include "sparc64/ethread.h"
# endif
# endif
-#if 0
# include "gcc/ethread.h"
# include "libatomic_ops/ethread.h"
-#endif
# endif
# elif defined(ETHR_HAVE_LIBATOMIC_OPS)
# include "libatomic_ops/ethread.h"