diff options
author | Rickard Green <rickard@erlang.org> | 2021-11-22 11:39:50 +0100 |
---|---|---|
committer | Rickard Green <rickard@erlang.org> | 2021-11-22 11:39:50 +0100 |
commit | d56d92b11d1fdaa87285de95780abfb391e35992 (patch) | |
tree | 894c73fbb008968b3f046c576a879507cf6de65d /erts/include | |
parent | 9cb7668e84dd5fe106d917681c2a7daf2d9f5d74 (diff) | |
parent | 58c1d469138c9f9bccca8ea2d42e028d2ef2933f (diff) | |
download | erlang-d56d92b11d1fdaa87285de95780abfb391e35992.tar.gz |
Merge branch 'maint'
* maint:
Fix C++ compiler error on Raspberry Pi 4
Diffstat (limited to 'erts/include')
-rw-r--r-- | erts/include/internal/gcc/ethr_atomic.h | 4 | ||||
-rw-r--r-- | erts/include/internal/gcc/ethr_dw_atomic.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/erts/include/internal/gcc/ethr_atomic.h b/erts/include/internal/gcc/ethr_atomic.h index eb6b4fb286..f57613bc2b 100644 --- a/erts/include/internal/gcc/ethr_atomic.h +++ b/erts/include/internal/gcc/ethr_atomic.h @@ -551,10 +551,10 @@ ETHR_NATMC_FUNC__(cmpxchg_acqb)(ETHR_ATMC_T__ *var, static ETHR_INLINE ETHR_AINT_T__ ETHR_NATMC_FUNC__(cmpxchg_mb)(ETHR_ATMC_T__ *var, - ETHR_AINT_T__ new, + ETHR_AINT_T__ new_val, ETHR_AINT_T__ old) { - return __sync_val_compare_and_swap(&var->value, old, new); + return __sync_val_compare_and_swap(&var->value, old, new_val); } #endif /* ETHR_HAVE___sync_val_compare_and_swap */ diff --git a/erts/include/internal/gcc/ethr_dw_atomic.h b/erts/include/internal/gcc/ethr_dw_atomic.h index eb597d5a4d..70b414438b 100644 --- a/erts/include/internal/gcc/ethr_dw_atomic.h +++ b/erts/include/internal/gcc/ethr_dw_atomic.h @@ -229,12 +229,12 @@ ethr_native_su_dw_atomic_cmpxchg_acqb(ethr_native_dw_atomic_t *var, static ETHR_INLINE ETHR_NATIVE_SU_DW_SINT_T ethr_native_su_dw_atomic_cmpxchg_mb(ethr_native_dw_atomic_t *var, - ETHR_NATIVE_SU_DW_SINT_T new, + ETHR_NATIVE_SU_DW_SINT_T new_val, ETHR_NATIVE_SU_DW_SINT_T old) { ethr_native_dw_ptr_t p = (ethr_native_dw_ptr_t) ETHR_DW_NATMC_MEM__(var); ETHR_DW_DBG_ALIGNED__(p); - return __sync_val_compare_and_swap(p, old, new); + return __sync_val_compare_and_swap(p, old, new_val); } #endif /* ETHR_HAVE___sync_val_compare_and_swap */ |