erts: Remove ERTS_SMP and USE_THREAD defines

This refactor was done using the unifdef tool like this:
    for file in $(find erts/ -name *.[ch]); do unifdef -t -f defile -o $file $file; done

where defile contained:
    #define ERTS_SMP 1
    #define USE_THREADS 1
    #define DDLL_SMP 1
    #define ERTS_HAVE_SMP_EMU 1
    #define SMP 1
    #define ERL_BITS_REENTRANT 1
    #define ERTS_USE_ASYNC_READY_Q 1
    #define FDBLOCK 1
    #undef ERTS_POLL_NEED_ASYNC_INTERRUPT_SUPPORT
    #define ERTS_POLL_ASYNC_INTERRUPT_SUPPORT 0
    #define ERTS_POLL_USE_WAKEUP_PIPE 1
    #define ERTS_POLL_USE_UPDATE_REQUESTS_QUEUE 1
    #undef ERTS_HAVE_PLAIN_EMU
    #undef ERTS_SIGNAL_STATE

1 files changed, 0 insertions, 605 deletions

diff --git a/erts/emulator/beam/erl_threads.h b/erts/emulator/beam/erl_threads.h
index 3fdf29d678..55e8254de2 100644
--- a/erts/emulator/beam/erl_threads.h
+++ b/erts/emulator/beam/erl_threads.h
@@ -262,7 +262,6 @@
 #include "erl_lock_flags.h"
 #include "erl_term.h"
 
-#ifdef USE_THREADS
 
 #define ETHR_TRY_INLINE_FUNCS
 #include "ethread.h"
@@ -405,70 +404,6 @@ __decl_noreturn void  __noreturn erts_thr_fatal_error(int, char *);
 #  define ERTS_HAVE_REC_MTX_INIT	ETHR_HAVE_ETHR_REC_MUTEX_INIT
 #endif
 
-#else /* #ifdef USE_THREADS */
-
-#define ERTS_THR_MEMORY_BARRIER
-#define ERTS_THR_WRITE_MEMORY_BARRIER
-#define ERTS_THR_READ_MEMORY_BARRIER
-#define ERTS_THR_DATA_DEPENDENCY_READ_MEMORY_BARRIER
-
-#define ERTS_THR_OPTS_DEFAULT_INITER 0
-typedef int erts_thr_opts_t;
-typedef int erts_thr_init_data_t;
-typedef int erts_thr_late_init_data_t;
-typedef int erts_tid_t;
-typedef int erts_mtx_t;
-typedef int erts_cnd_t;
-#define ERTS_RWMTX_OPT_DEFAULT_INITER {0}
-#define ERTS_RWMTX_TYPE_NORMAL 0
-#define ERTS_RWMTX_TYPE_FREQUENT_READ 0
-#define ERTS_RWMTX_TYPE_EXTREMELY_FREQUENT_READ 0
-#define ERTS_RWMTX_LONG_LIVED 0
-#define ERTS_RWMTX_SHORT_LIVED 0
-#define ERTS_RWMTX_UNKNOWN_LIVED 0
-typedef struct {
-    char type;
-    char lived;
-    int main_spincount;
-    int aux_spincount;
-} erts_rwmtx_opt_t;
-typedef int erts_rwmtx_t;
-typedef int erts_tsd_key_t;
-typedef int erts_tse_t;
-
-typedef struct { SWord sint[2]; } erts_dw_aint_t;
-typedef SWord erts_aint_t;
-typedef Sint32 erts_aint32_t;
-typedef Sint64 erts_aint64_t;
-
-#define erts_dw_atomic_t erts_dw_aint_t
-#define erts_atomic_t erts_aint_t
-#define erts_atomic32_t erts_aint32_t
-#define erts_atomic64_t erts_aint64_t
-
-#if __GNUC__ > 2
-typedef struct { } erts_spinlock_t;
-typedef struct { } erts_rwlock_t;
-#else
-typedef struct { int gcc_is_buggy; } erts_spinlock_t;
-typedef struct { int gcc_is_buggy; } erts_rwlock_t;
-#endif
-
-#ifdef WORDS_BIGENDIAN
-#define ERTS_DW_AINT_LOW_WORD 1
-#define ERTS_DW_AINT_HIGH_WORD 0
-#else
-#define ERTS_DW_AINT_LOW_WORD 0
-#define ERTS_DW_AINT_HIGH_WORD 1
-#endif
-
-#define ERTS_MTX_INITER			0
-#define ERTS_CND_INITER			0
-#define ERTS_THR_INIT_DATA_DEF_INITER	0
-
-#define ERTS_HAVE_REC_MTX_INIT		1
-
-#endif /* #ifdef USE_THREADS */
 
 #define erts_no_dw_atomic_t erts_dw_aint_t
 #define erts_no_atomic_t erts_aint_t
@@ -670,13 +605,10 @@ ERTS_GLB_INLINE void erts_thr_sigmask(int how, const sigset_t *set,
 				      sigset_t *oset);
 ERTS_GLB_INLINE void erts_thr_sigwait(const sigset_t *set, int *sig);
 
-#ifdef USE_THREADS
 ERTS_GLB_INLINE void erts_thr_kill(erts_tid_t tid, int sig);
-#endif
 
 #endif /* #ifdef HAVE_ETHR_SIG_FUNCS */
 
-#ifdef USE_THREADS
 
 ERTS_GLB_INLINE erts_aint_t
 erts_atomic_read_bset_nob(erts_atomic_t *var,
@@ -1684,379 +1616,6 @@ erts_atomic64_read_dirty(erts_atomic64_t *var)
 
 #endif /* ARCH_32 */
 
-#else /* !USE_THREADS */
-
-/* Double word size atomics */
-
-#define erts_dw_atomic_init_nob erts_no_dw_atomic_set
-#define erts_dw_atomic_set_nob erts_no_dw_atomic_set
-#define erts_dw_atomic_read_nob erts_no_dw_atomic_read
-#define erts_dw_atomic_cmpxchg_nob erts_no_dw_atomic_cmpxchg
-
-#define erts_dw_atomic_init_mb erts_no_dw_atomic_init
-#define erts_dw_atomic_set_mb erts_no_dw_atomic_set
-#define erts_dw_atomic_read_mb erts_no_dw_atomic_read
-#define erts_dw_atomic_cmpxchg_mb erts_no_dw_atomic_cmpxchg
-
-#define erts_dw_atomic_init_acqb erts_no_dw_atomic_init
-#define erts_dw_atomic_set_acqb erts_no_dw_atomic_set
-#define erts_dw_atomic_read_acqb erts_no_dw_atomic_read
-#define erts_dw_atomic_cmpxchg_acqb erts_no_dw_atomic_cmpxchg
-
-#define erts_dw_atomic_init_relb erts_no_dw_atomic_init
-#define erts_dw_atomic_set_relb erts_no_dw_atomic_set
-#define erts_dw_atomic_read_relb erts_no_dw_atomic_read
-#define erts_dw_atomic_cmpxchg_relb erts_no_dw_atomic_cmpxchg
-
-#define erts_dw_atomic_init_ddrb erts_no_dw_atomic_init
-#define erts_dw_atomic_set_ddrb erts_no_dw_atomic_set
-#define erts_dw_atomic_read_ddrb erts_no_dw_atomic_read
-#define erts_dw_atomic_cmpxchg_ddrb erts_no_dw_atomic_cmpxchg
-
-#define erts_dw_atomic_init_rb erts_no_dw_atomic_init
-#define erts_dw_atomic_set_rb erts_no_dw_atomic_set
-#define erts_dw_atomic_read_rb erts_no_dw_atomic_read
-#define erts_dw_atomic_cmpxchg_rb erts_no_dw_atomic_cmpxchg
-
-#define erts_dw_atomic_init_wb erts_no_dw_atomic_init
-#define erts_dw_atomic_set_wb erts_no_dw_atomic_set
-#define erts_dw_atomic_read_wb erts_no_dw_atomic_read
-#define erts_dw_atomic_cmpxchg_wb erts_no_dw_atomic_cmpxchg
-
-#define erts_dw_atomic_set_dirty erts_no_dw_atomic_set
-#define erts_dw_atomic_read_dirty erts_no_dw_atomic_read
-
-/* Word size atomics */
-
-#define erts_atomic_init_nob erts_no_atomic_set
-#define erts_atomic_set_nob erts_no_atomic_set
-#define erts_atomic_read_nob erts_no_atomic_read
-#define erts_atomic_inc_read_nob erts_no_atomic_inc_read
-#define erts_atomic_dec_read_nob erts_no_atomic_dec_read
-#define erts_atomic_inc_nob erts_no_atomic_inc
-#define erts_atomic_dec_nob erts_no_atomic_dec
-#define erts_atomic_add_read_nob erts_no_atomic_add_read
-#define erts_atomic_add_nob erts_no_atomic_add
-#define erts_atomic_read_bor_nob erts_no_atomic_read_bor
-#define erts_atomic_read_band_nob erts_no_atomic_read_band
-#define erts_atomic_xchg_nob erts_no_atomic_xchg
-#define erts_atomic_cmpxchg_nob erts_no_atomic_cmpxchg
-#define erts_atomic_read_bset_nob erts_no_atomic_read_bset
-
-#define erts_atomic_init_mb erts_no_atomic_set
-#define erts_atomic_set_mb erts_no_atomic_set
-#define erts_atomic_read_mb erts_no_atomic_read
-#define erts_atomic_inc_read_mb erts_no_atomic_inc_read
-#define erts_atomic_dec_read_mb erts_no_atomic_dec_read
-#define erts_atomic_inc_mb erts_no_atomic_inc
-#define erts_atomic_dec_mb erts_no_atomic_dec
-#define erts_atomic_add_read_mb erts_no_atomic_add_read
-#define erts_atomic_add_mb erts_no_atomic_add
-#define erts_atomic_read_bor_mb erts_no_atomic_read_bor
-#define erts_atomic_read_band_mb erts_no_atomic_read_band
-#define erts_atomic_xchg_mb erts_no_atomic_xchg
-#define erts_atomic_cmpxchg_mb erts_no_atomic_cmpxchg
-#define erts_atomic_read_bset_mb erts_no_atomic_read_bset
-
-#define erts_atomic_init_acqb erts_no_atomic_set
-#define erts_atomic_set_acqb erts_no_atomic_set
-#define erts_atomic_read_acqb erts_no_atomic_read
-#define erts_atomic_inc_read_acqb erts_no_atomic_inc_read
-#define erts_atomic_dec_read_acqb erts_no_atomic_dec_read
-#define erts_atomic_inc_acqb erts_no_atomic_inc
-#define erts_atomic_dec_acqb erts_no_atomic_dec
-#define erts_atomic_add_read_acqb erts_no_atomic_add_read
-#define erts_atomic_add_acqb erts_no_atomic_add
-#define erts_atomic_read_bor_acqb erts_no_atomic_read_bor
-#define erts_atomic_read_band_acqb erts_no_atomic_read_band
-#define erts_atomic_xchg_acqb erts_no_atomic_xchg
-#define erts_atomic_cmpxchg_acqb erts_no_atomic_cmpxchg
-#define erts_atomic_read_bset_acqb erts_no_atomic_read_bset
-
-#define erts_atomic_init_relb erts_no_atomic_set
-#define erts_atomic_set_relb erts_no_atomic_set
-#define erts_atomic_read_relb erts_no_atomic_read
-#define erts_atomic_inc_read_relb erts_no_atomic_inc_read
-#define erts_atomic_dec_read_relb erts_no_atomic_dec_read
-#define erts_atomic_inc_relb erts_no_atomic_inc
-#define erts_atomic_dec_relb erts_no_atomic_dec
-#define erts_atomic_add_read_relb erts_no_atomic_add_read
-#define erts_atomic_add_relb erts_no_atomic_add
-#define erts_atomic_read_bor_relb erts_no_atomic_read_bor
-#define erts_atomic_read_band_relb erts_no_atomic_read_band
-#define erts_atomic_xchg_relb erts_no_atomic_xchg
-#define erts_atomic_cmpxchg_relb erts_no_atomic_cmpxchg
-#define erts_atomic_read_bset_relb erts_no_atomic_read_bset
-
-#define erts_atomic_init_ddrb erts_no_atomic_set
-#define erts_atomic_set_ddrb erts_no_atomic_set
-#define erts_atomic_read_ddrb erts_no_atomic_read
-#define erts_atomic_inc_read_ddrb erts_no_atomic_inc_read
-#define erts_atomic_dec_read_ddrb erts_no_atomic_dec_read
-#define erts_atomic_inc_ddrb erts_no_atomic_inc
-#define erts_atomic_dec_ddrb erts_no_atomic_dec
-#define erts_atomic_add_read_ddrb erts_no_atomic_add_read
-#define erts_atomic_add_ddrb erts_no_atomic_add
-#define erts_atomic_read_bor_ddrb erts_no_atomic_read_bor
-#define erts_atomic_read_band_ddrb erts_no_atomic_read_band
-#define erts_atomic_xchg_ddrb erts_no_atomic_xchg
-#define erts_atomic_cmpxchg_ddrb erts_no_atomic_cmpxchg
-#define erts_atomic_read_bset_ddrb erts_no_atomic_read_bset
-
-#define erts_atomic_init_rb erts_no_atomic_set
-#define erts_atomic_set_rb erts_no_atomic_set
-#define erts_atomic_read_rb erts_no_atomic_read
-#define erts_atomic_inc_read_rb erts_no_atomic_inc_read
-#define erts_atomic_dec_read_rb erts_no_atomic_dec_read
-#define erts_atomic_inc_rb erts_no_atomic_inc
-#define erts_atomic_dec_rb erts_no_atomic_dec
-#define erts_atomic_add_read_rb erts_no_atomic_add_read
-#define erts_atomic_add_rb erts_no_atomic_add
-#define erts_atomic_read_bor_rb erts_no_atomic_read_bor
-#define erts_atomic_read_band_rb erts_no_atomic_read_band
-#define erts_atomic_xchg_rb erts_no_atomic_xchg
-#define erts_atomic_cmpxchg_rb erts_no_atomic_cmpxchg
-#define erts_atomic_read_bset_rb erts_no_atomic_read_bset
-
-#define erts_atomic_init_wb erts_no_atomic_set
-#define erts_atomic_set_wb erts_no_atomic_set
-#define erts_atomic_read_wb erts_no_atomic_read
-#define erts_atomic_inc_read_wb erts_no_atomic_inc_read
-#define erts_atomic_dec_read_wb erts_no_atomic_dec_read
-#define erts_atomic_inc_wb erts_no_atomic_inc
-#define erts_atomic_dec_wb erts_no_atomic_dec
-#define erts_atomic_add_read_wb erts_no_atomic_add_read
-#define erts_atomic_add_wb erts_no_atomic_add
-#define erts_atomic_read_bor_wb erts_no_atomic_read_bor
-#define erts_atomic_read_band_wb erts_no_atomic_read_band
-#define erts_atomic_xchg_wb erts_no_atomic_xchg
-#define erts_atomic_cmpxchg_wb erts_no_atomic_cmpxchg
-#define erts_atomic_read_bset_wb erts_no_atomic_read_bset
-
-#define erts_atomic_set_dirty erts_no_atomic_set
-#define erts_atomic_read_dirty erts_no_atomic_read
-
-/* 32-bit atomics */
-
-#define erts_atomic32_init_nob erts_no_atomic32_set
-#define erts_atomic32_set_nob erts_no_atomic32_set
-#define erts_atomic32_read_nob erts_no_atomic32_read
-#define erts_atomic32_inc_read_nob erts_no_atomic32_inc_read
-#define erts_atomic32_dec_read_nob erts_no_atomic32_dec_read
-#define erts_atomic32_inc_nob erts_no_atomic32_inc
-#define erts_atomic32_dec_nob erts_no_atomic32_dec
-#define erts_atomic32_add_read_nob erts_no_atomic32_add_read
-#define erts_atomic32_add_nob erts_no_atomic32_add
-#define erts_atomic32_read_bor_nob erts_no_atomic32_read_bor
-#define erts_atomic32_read_band_nob erts_no_atomic32_read_band
-#define erts_atomic32_xchg_nob erts_no_atomic32_xchg
-#define erts_atomic32_cmpxchg_nob erts_no_atomic32_cmpxchg
-#define erts_atomic32_read_bset_nob erts_no_atomic32_read_bset
-
-#define erts_atomic32_init_mb erts_no_atomic32_set
-#define erts_atomic32_set_mb erts_no_atomic32_set
-#define erts_atomic32_read_mb erts_no_atomic32_read
-#define erts_atomic32_inc_read_mb erts_no_atomic32_inc_read
-#define erts_atomic32_dec_read_mb erts_no_atomic32_dec_read
-#define erts_atomic32_inc_mb erts_no_atomic32_inc
-#define erts_atomic32_dec_mb erts_no_atomic32_dec
-#define erts_atomic32_add_read_mb erts_no_atomic32_add_read
-#define erts_atomic32_add_mb erts_no_atomic32_add
-#define erts_atomic32_read_bor_mb erts_no_atomic32_read_bor
-#define erts_atomic32_read_band_mb erts_no_atomic32_read_band
-#define erts_atomic32_xchg_mb erts_no_atomic32_xchg
-#define erts_atomic32_cmpxchg_mb erts_no_atomic32_cmpxchg
-#define erts_atomic32_read_bset_mb erts_no_atomic32_read_bset
-
-#define erts_atomic32_init_acqb erts_no_atomic32_set
-#define erts_atomic32_set_acqb erts_no_atomic32_set
-#define erts_atomic32_read_acqb erts_no_atomic32_read
-#define erts_atomic32_inc_read_acqb erts_no_atomic32_inc_read
-#define erts_atomic32_dec_read_acqb erts_no_atomic32_dec_read
-#define erts_atomic32_inc_acqb erts_no_atomic32_inc
-#define erts_atomic32_dec_acqb erts_no_atomic32_dec
-#define erts_atomic32_add_read_acqb erts_no_atomic32_add_read
-#define erts_atomic32_add_acqb erts_no_atomic32_add
-#define erts_atomic32_read_bor_acqb erts_no_atomic32_read_bor
-#define erts_atomic32_read_band_acqb erts_no_atomic32_read_band
-#define erts_atomic32_xchg_acqb erts_no_atomic32_xchg
-#define erts_atomic32_cmpxchg_acqb erts_no_atomic32_cmpxchg
-#define erts_atomic32_read_bset_acqb erts_no_atomic32_read_bset
-
-#define erts_atomic32_init_relb erts_no_atomic32_set
-#define erts_atomic32_set_relb erts_no_atomic32_set
-#define erts_atomic32_read_relb erts_no_atomic32_read
-#define erts_atomic32_inc_read_relb erts_no_atomic32_inc_read
-#define erts_atomic32_dec_read_relb erts_no_atomic32_dec_read
-#define erts_atomic32_inc_relb erts_no_atomic32_inc
-#define erts_atomic32_dec_relb erts_no_atomic32_dec
-#define erts_atomic32_add_read_relb erts_no_atomic32_add_read
-#define erts_atomic32_add_relb erts_no_atomic32_add
-#define erts_atomic32_read_bor_relb erts_no_atomic32_read_bor
-#define erts_atomic32_read_band_relb erts_no_atomic32_read_band
-#define erts_atomic32_xchg_relb erts_no_atomic32_xchg
-#define erts_atomic32_cmpxchg_relb erts_no_atomic32_cmpxchg
-#define erts_atomic32_read_bset_relb erts_no_atomic32_read_bset
-
-#define erts_atomic32_init_ddrb erts_no_atomic32_set
-#define erts_atomic32_set_ddrb erts_no_atomic32_set
-#define erts_atomic32_read_ddrb erts_no_atomic32_read
-#define erts_atomic32_inc_read_ddrb erts_no_atomic32_inc_read
-#define erts_atomic32_dec_read_ddrb erts_no_atomic32_dec_read
-#define erts_atomic32_inc_ddrb erts_no_atomic32_inc
-#define erts_atomic32_dec_ddrb erts_no_atomic32_dec
-#define erts_atomic32_add_read_ddrb erts_no_atomic32_add_read
-#define erts_atomic32_add_ddrb erts_no_atomic32_add
-#define erts_atomic32_read_bor_ddrb erts_no_atomic32_read_bor
-#define erts_atomic32_read_band_ddrb erts_no_atomic32_read_band
-#define erts_atomic32_xchg_ddrb erts_no_atomic32_xchg
-#define erts_atomic32_cmpxchg_ddrb erts_no_atomic32_cmpxchg
-#define erts_atomic32_read_bset_ddrb erts_no_atomic32_read_bset
-
-#define erts_atomic32_init_rb erts_no_atomic32_set
-#define erts_atomic32_set_rb erts_no_atomic32_set
-#define erts_atomic32_read_rb erts_no_atomic32_read
-#define erts_atomic32_inc_read_rb erts_no_atomic32_inc_read
-#define erts_atomic32_dec_read_rb erts_no_atomic32_dec_read
-#define erts_atomic32_inc_rb erts_no_atomic32_inc
-#define erts_atomic32_dec_rb erts_no_atomic32_dec
-#define erts_atomic32_add_read_rb erts_no_atomic32_add_read
-#define erts_atomic32_add_rb erts_no_atomic32_add
-#define erts_atomic32_read_bor_rb erts_no_atomic32_read_bor
-#define erts_atomic32_read_band_rb erts_no_atomic32_read_band
-#define erts_atomic32_xchg_rb erts_no_atomic32_xchg
-#define erts_atomic32_cmpxchg_rb erts_no_atomic32_cmpxchg
-#define erts_atomic32_read_bset_rb erts_no_atomic32_read_bset
-
-#define erts_atomic32_init_wb erts_no_atomic32_set
-#define erts_atomic32_set_wb erts_no_atomic32_set
-#define erts_atomic32_read_wb erts_no_atomic32_read
-#define erts_atomic32_inc_read_wb erts_no_atomic32_inc_read
-#define erts_atomic32_dec_read_wb erts_no_atomic32_dec_read
-#define erts_atomic32_inc_wb erts_no_atomic32_inc
-#define erts_atomic32_dec_wb erts_no_atomic32_dec
-#define erts_atomic32_add_read_wb erts_no_atomic32_add_read
-#define erts_atomic32_add_wb erts_no_atomic32_add
-#define erts_atomic32_read_bor_wb erts_no_atomic32_read_bor
-#define erts_atomic32_read_band_wb erts_no_atomic32_read_band
-#define erts_atomic32_xchg_wb erts_no_atomic32_xchg
-#define erts_atomic32_cmpxchg_wb erts_no_atomic32_cmpxchg
-#define erts_atomic32_read_bset_wb erts_no_atomic32_read_bset
-
-#define erts_atomic32_set_dirty erts_no_atomic32_set
-#define erts_atomic32_read_dirty erts_no_atomic32_read
-
-/* 64-bit atomics */
-
-#define erts_atomic64_init_nob erts_no_atomic64_set
-#define erts_atomic64_set_nob erts_no_atomic64_set
-#define erts_atomic64_read_nob erts_no_atomic64_read
-#define erts_atomic64_inc_read_nob erts_no_atomic64_inc_read
-#define erts_atomic64_dec_read_nob erts_no_atomic64_dec_read
-#define erts_atomic64_inc_nob erts_no_atomic64_inc
-#define erts_atomic64_dec_nob erts_no_atomic64_dec
-#define erts_atomic64_add_read_nob erts_no_atomic64_add_read
-#define erts_atomic64_add_nob erts_no_atomic64_add
-#define erts_atomic64_read_bor_nob erts_no_atomic64_read_bor
-#define erts_atomic64_read_band_nob erts_no_atomic64_read_band
-#define erts_atomic64_xchg_nob erts_no_atomic64_xchg
-#define erts_atomic64_cmpxchg_nob erts_no_atomic64_cmpxchg
-#define erts_atomic64_read_bset_nob erts_no_atomic64_read_bset
-
-#define erts_atomic64_init_mb erts_no_atomic64_set
-#define erts_atomic64_set_mb erts_no_atomic64_set
-#define erts_atomic64_read_mb erts_no_atomic64_read
-#define erts_atomic64_inc_read_mb erts_no_atomic64_inc_read
-#define erts_atomic64_dec_read_mb erts_no_atomic64_dec_read
-#define erts_atomic64_inc_mb erts_no_atomic64_inc
-#define erts_atomic64_dec_mb erts_no_atomic64_dec
-#define erts_atomic64_add_read_mb erts_no_atomic64_add_read
-#define erts_atomic64_add_mb erts_no_atomic64_add
-#define erts_atomic64_read_bor_mb erts_no_atomic64_read_bor
-#define erts_atomic64_read_band_mb erts_no_atomic64_read_band
-#define erts_atomic64_xchg_mb erts_no_atomic64_xchg
-#define erts_atomic64_cmpxchg_mb erts_no_atomic64_cmpxchg
-#define erts_atomic64_read_bset_mb erts_no_atomic64_read_bset
-
-#define erts_atomic64_init_acqb erts_no_atomic64_set
-#define erts_atomic64_set_acqb erts_no_atomic64_set
-#define erts_atomic64_read_acqb erts_no_atomic64_read
-#define erts_atomic64_inc_read_acqb erts_no_atomic64_inc_read
-#define erts_atomic64_dec_read_acqb erts_no_atomic64_dec_read
-#define erts_atomic64_inc_acqb erts_no_atomic64_inc
-#define erts_atomic64_dec_acqb erts_no_atomic64_dec
-#define erts_atomic64_add_read_acqb erts_no_atomic64_add_read
-#define erts_atomic64_add_acqb erts_no_atomic64_add
-#define erts_atomic64_read_bor_acqb erts_no_atomic64_read_bor
-#define erts_atomic64_read_band_acqb erts_no_atomic64_read_band
-#define erts_atomic64_xchg_acqb erts_no_atomic64_xchg
-#define erts_atomic64_cmpxchg_acqb erts_no_atomic64_cmpxchg
-#define erts_atomic64_read_bset_acqb erts_no_atomic64_read_bset
-
-#define erts_atomic64_init_relb erts_no_atomic64_set
-#define erts_atomic64_set_relb erts_no_atomic64_set
-#define erts_atomic64_read_relb erts_no_atomic64_read
-#define erts_atomic64_inc_read_relb erts_no_atomic64_inc_read
-#define erts_atomic64_dec_read_relb erts_no_atomic64_dec_read
-#define erts_atomic64_inc_relb erts_no_atomic64_inc
-#define erts_atomic64_dec_relb erts_no_atomic64_dec
-#define erts_atomic64_add_read_relb erts_no_atomic64_add_read
-#define erts_atomic64_add_relb erts_no_atomic64_add
-#define erts_atomic64_read_bor_relb erts_no_atomic64_read_bor
-#define erts_atomic64_read_band_relb erts_no_atomic64_read_band
-#define erts_atomic64_xchg_relb erts_no_atomic64_xchg
-#define erts_atomic64_cmpxchg_relb erts_no_atomic64_cmpxchg
-#define erts_atomic64_read_bset_relb erts_no_atomic64_read_bset
-
-#define erts_atomic64_init_ddrb erts_no_atomic64_set
-#define erts_atomic64_set_ddrb erts_no_atomic64_set
-#define erts_atomic64_read_ddrb erts_no_atomic64_read
-#define erts_atomic64_inc_read_ddrb erts_no_atomic64_inc_read
-#define erts_atomic64_dec_read_ddrb erts_no_atomic64_dec_read
-#define erts_atomic64_inc_ddrb erts_no_atomic64_inc
-#define erts_atomic64_dec_ddrb erts_no_atomic64_dec
-#define erts_atomic64_add_read_ddrb erts_no_atomic64_add_read
-#define erts_atomic64_add_ddrb erts_no_atomic64_add
-#define erts_atomic64_read_bor_ddrb erts_no_atomic64_read_bor
-#define erts_atomic64_read_band_ddrb erts_no_atomic64_read_band
-#define erts_atomic64_xchg_ddrb erts_no_atomic64_xchg
-#define erts_atomic64_cmpxchg_ddrb erts_no_atomic64_cmpxchg
-#define erts_atomic64_read_bset_ddrb erts_no_atomic64_read_bset
-
-#define erts_atomic64_init_rb erts_no_atomic64_set
-#define erts_atomic64_set_rb erts_no_atomic64_set
-#define erts_atomic64_read_rb erts_no_atomic64_read
-#define erts_atomic64_inc_read_rb erts_no_atomic64_inc_read
-#define erts_atomic64_dec_read_rb erts_no_atomic64_dec_read
-#define erts_atomic64_inc_rb erts_no_atomic64_inc
-#define erts_atomic64_dec_rb erts_no_atomic64_dec
-#define erts_atomic64_add_read_rb erts_no_atomic64_add_read
-#define erts_atomic64_add_rb erts_no_atomic64_add
-#define erts_atomic64_read_bor_rb erts_no_atomic64_read_bor
-#define erts_atomic64_read_band_rb erts_no_atomic64_read_band
-#define erts_atomic64_xchg_rb erts_no_atomic64_xchg
-#define erts_atomic64_cmpxchg_rb erts_no_atomic64_cmpxchg
-#define erts_atomic64_read_bset_rb erts_no_atomic64_read_bset
-
-#define erts_atomic64_init_wb erts_no_atomic64_set
-#define erts_atomic64_set_wb erts_no_atomic64_set
-#define erts_atomic64_read_wb erts_no_atomic64_read
-#define erts_atomic64_inc_read_wb erts_no_atomic64_inc_read
-#define erts_atomic64_dec_read_wb erts_no_atomic64_dec_read
-#define erts_atomic64_inc_wb erts_no_atomic64_inc
-#define erts_atomic64_dec_wb erts_no_atomic64_dec
-#define erts_atomic64_add_read_wb erts_no_atomic64_add_read
-#define erts_atomic64_add_wb erts_no_atomic64_add
-#define erts_atomic64_read_bor_wb erts_no_atomic64_read_bor
-#define erts_atomic64_read_band_wb erts_no_atomic64_read_band
-#define erts_atomic64_xchg_wb erts_no_atomic64_xchg
-#define erts_atomic64_cmpxchg_wb erts_no_atomic64_cmpxchg
-#define erts_atomic64_read_bset_wb erts_no_atomic64_read_bset
-
-#define erts_atomic64_set_dirty erts_no_atomic64_set
-#define erts_atomic64_read_dirty erts_no_atomic64_read
-
-#endif /* !USE_THREADS */
 
 #include "erl_msacc.h"
 
@@ -2065,110 +1624,83 @@ erts_atomic64_read_dirty(erts_atomic64_t *var)
 ERTS_GLB_INLINE void
 erts_thr_init(erts_thr_init_data_t *id)
 {
-#ifdef USE_THREADS
     int res = ethr_init(id);
     if (res)
 	erts_thr_fatal_error(res, "initialize thread library");
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_thr_late_init(erts_thr_late_init_data_t *id)
 {
-#ifdef USE_THREADS
     int res = ethr_late_init(id);
     if (res)
 	erts_thr_fatal_error(res, "complete initialization of thread library");
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_thr_create(erts_tid_t *tid, void * (*func)(void *), void *arg,
 		erts_thr_opts_t *opts)
 {
-#ifdef USE_THREADS
     int res = ethr_thr_create(tid, func, arg, opts);
     if (res)
 	erts_thr_fatal_error(res, "create thread");
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_thr_join(erts_tid_t tid, void **thr_res)
 {
-#ifdef USE_THREADS
     int res = ethr_thr_join(tid, thr_res);
     if (res)
 	erts_thr_fatal_error(res, "join thread");
-#endif
 }
 
 
 ERTS_GLB_INLINE void
 erts_thr_detach(erts_tid_t tid)
 {
-#ifdef USE_THREADS
     int res = ethr_thr_detach(tid);
     if (res)
 	erts_thr_fatal_error(res, "detach thread");
-#endif
 }
 
 
 ERTS_GLB_INLINE void
 erts_thr_exit(void *res)
 {
-#ifdef USE_THREADS
     ethr_thr_exit(res);
     erts_thr_fatal_error(0, "terminate thread");
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_thr_install_exit_handler(void (*exit_handler)(void))
 {
-#ifdef USE_THREADS
     int res = ethr_install_exit_handler(exit_handler);
     if (res != 0)
 	erts_thr_fatal_error(res, "install thread exit handler");
-#endif
 }
 
 ERTS_GLB_INLINE erts_tid_t
 erts_thr_self(void)
 {
-#ifdef USE_THREADS
     return ethr_self();
-#else
-    return 0;
-#endif
 }
 
 ERTS_GLB_INLINE int
 erts_thr_getname(erts_tid_t tid, char *buf, size_t len)
 {
-#ifdef USE_THREADS
     return ethr_getname(tid, buf, len);
-#else
-    return -1;
-#endif
 }
 
 
 ERTS_GLB_INLINE int
 erts_equal_tids(erts_tid_t x, erts_tid_t y)
 {
-#ifdef USE_THREADS
     return ethr_equal_tids(x, y);
-#else
-    return 1;
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_mtx_init(erts_mtx_t *mtx, char *name, Eterm extra, erts_lock_flags_t flags)
 {
-#ifdef USE_THREADS
     int res = ethr_mutex_init(&mtx->mtx);
     if (res) {
         erts_thr_fatal_error(res, "initialize mutex");
@@ -2185,13 +1717,11 @@ erts_mtx_init(erts_mtx_t *mtx, char *name, Eterm extra, erts_lock_flags_t flags)
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_init_ref_x(&mtx->lcnt, name, extra, flags);
 #endif
-#endif /* USE_THREADS */
 }
 
 ERTS_GLB_INLINE void
 erts_mtx_init_locked(erts_mtx_t *mtx, char *name, Eterm extra, erts_lock_flags_t flags)
 {
-#ifdef USE_THREADS
     erts_mtx_init(mtx, name, extra, flags);
 
     ethr_mutex_lock(&mtx->mtx);
@@ -2201,13 +1731,11 @@ erts_mtx_init_locked(erts_mtx_t *mtx, char *name, Eterm extra, erts_lock_flags_t
     #ifdef ERTS_ENABLE_LOCK_COUNT
         erts_lcnt_trylock(&mtx->lcnt, 1);
     #endif
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_mtx_destroy(erts_mtx_t *mtx)
 {
-#ifdef USE_THREADS
     int res;
 
     ASSERT(!(mtx->flags & ERTS_LOCK_FLAGS_PROPERTY_STATIC));
@@ -2230,7 +1758,6 @@ erts_mtx_destroy(erts_mtx_t *mtx)
 #endif
 	    erts_thr_fatal_error(res, "destroy mutex");
     }
-#endif
 }
 
 ERTS_GLB_INLINE int
@@ -2240,7 +1767,6 @@ erts_mtx_trylock_x(erts_mtx_t *mtx, char *file, unsigned int line)
 erts_mtx_trylock(erts_mtx_t *mtx)
 #endif
 {
-#ifdef USE_THREADS
     int res;
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
@@ -2262,9 +1788,6 @@ erts_mtx_trylock(erts_mtx_t *mtx)
     erts_lcnt_trylock(&mtx->lcnt, res);
 #endif    
     return res;
-#else
-    return 0;
-#endif
 
 }
 
@@ -2275,7 +1798,6 @@ erts_mtx_lock_x(erts_mtx_t *mtx, char *file, unsigned int line)
 erts_mtx_lock(erts_mtx_t *mtx)
 #endif
 {
-#ifdef USE_THREADS
 #ifdef ERTS_ENABLE_LOCK_CHECK
 #ifdef ERTS_ENABLE_LOCK_POSITION
     erts_lc_lock_x(&mtx->lc, file, line);
@@ -2290,13 +1812,11 @@ erts_mtx_lock(erts_mtx_t *mtx)
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_post_x(&mtx->lcnt, file, line);
 #endif
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_mtx_unlock(erts_mtx_t *mtx)
 {
-#ifdef USE_THREADS
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_unlock(&mtx->lc);
 #endif
@@ -2304,7 +1824,6 @@ erts_mtx_unlock(erts_mtx_t *mtx)
     erts_lcnt_unlock(&mtx->lcnt);
 #endif
     ethr_mutex_unlock(&mtx->mtx);
-#endif
 }
 
 ERTS_GLB_INLINE int
@@ -2324,17 +1843,14 @@ erts_lc_mtx_is_locked(erts_mtx_t *mtx)
 ERTS_GLB_INLINE void
 erts_cnd_init(erts_cnd_t *cnd)
 {
-#ifdef USE_THREADS
     int res = ethr_cond_init(cnd);
     if (res)
 	erts_thr_fatal_error(res, "initialize condition variable");
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_cnd_destroy(erts_cnd_t *cnd)
 {
-#ifdef USE_THREADS
     int res = ethr_cond_destroy(cnd);
     if (res != 0) {
 #ifdef ERTS_THR_HAVE_BUSY_DESTROY_BUG
@@ -2347,13 +1863,11 @@ erts_cnd_destroy(erts_cnd_t *cnd)
 #endif
 	    erts_thr_fatal_error(res, "destroy condition variable");
     }
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_cnd_wait(erts_cnd_t *cnd, erts_mtx_t *mtx)
 {
-#ifdef USE_THREADS
     int res;
     ERTS_MSACC_PUSH_AND_SET_STATE(ERTS_MSACC_STATE_SLEEP);
 #ifdef ERTS_ENABLE_LOCK_CHECK
@@ -2375,7 +1889,6 @@ erts_cnd_wait(erts_cnd_t *cnd, erts_mtx_t *mtx)
     if (res != 0 && res != EINTR)
 	erts_thr_fatal_error(res, "wait on condition variable");
     ERTS_MSACC_POP_STATE();
-#endif
 }
 
 /*
@@ -2391,18 +1904,14 @@ erts_cnd_wait(erts_cnd_t *cnd, erts_mtx_t *mtx)
 ERTS_GLB_INLINE void
 erts_cnd_signal(erts_cnd_t *cnd)
 {
-#ifdef USE_THREADS
     ethr_cond_signal(cnd);
-#endif
 }
 
 
 ERTS_GLB_INLINE void
 erts_cnd_broadcast(erts_cnd_t *cnd)
 {
-#ifdef USE_THREADS
     ethr_cond_broadcast(cnd);
-#endif
 }
 
 /* rwmutex */
@@ -2410,7 +1919,6 @@ erts_cnd_broadcast(erts_cnd_t *cnd)
 ERTS_GLB_INLINE void
 erts_rwmtx_set_reader_group(int no)
 {
-#ifdef USE_THREADS
     int res;
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_check_no_locked_of_type(ERTS_LC_FLG_LT_RWMUTEX);
@@ -2418,13 +1926,11 @@ erts_rwmtx_set_reader_group(int no)
     res = ethr_rwmutex_set_reader_group(no);
     if (res != 0)
 	erts_thr_fatal_error(res, "set reader group");
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_rwmtx_init_opt(erts_rwmtx_t *rwmtx, erts_rwmtx_opt_t *opt,
                     char *name, Eterm extra, erts_lock_flags_t flags) {
-#ifdef USE_THREADS
     int res = ethr_rwmutex_init_opt(&rwmtx->rwmtx, opt);
     if (res != 0) {
         erts_thr_fatal_error(res, "initialize rwmutex");
@@ -2441,7 +1947,6 @@ erts_rwmtx_init_opt(erts_rwmtx_t *rwmtx, erts_rwmtx_opt_t *opt,
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_init_ref_x(&rwmtx->lcnt, name, extra, flags);
 #endif
-#endif /* USE_THREADS */
 }
 
 ERTS_GLB_INLINE void
@@ -2453,7 +1958,6 @@ erts_rwmtx_init(erts_rwmtx_t *rwmtx, char *name, Eterm extra,
 ERTS_GLB_INLINE void
 erts_rwmtx_destroy(erts_rwmtx_t *rwmtx)
 {
-#ifdef USE_THREADS
     int res;
 
     ASSERT(!(rwmtx->flags & ERTS_LOCK_FLAGS_PROPERTY_STATIC));
@@ -2476,7 +1980,6 @@ erts_rwmtx_destroy(erts_rwmtx_t *rwmtx)
 #endif
 	    erts_thr_fatal_error(res, "destroy rwmutex");
     }
-#endif
 }
 
 ERTS_GLB_INLINE int
@@ -2486,7 +1989,6 @@ erts_rwmtx_tryrlock_x(erts_rwmtx_t *rwmtx, char *file, unsigned int line)
 erts_rwmtx_tryrlock(erts_rwmtx_t *rwmtx)
 #endif
 {
-#ifdef USE_THREADS
     int res;
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
@@ -2509,9 +2011,6 @@ erts_rwmtx_tryrlock(erts_rwmtx_t *rwmtx)
 #endif
     
     return res;
-#else
-    return 0;
-#endif
 }
 
 ERTS_GLB_INLINE void
@@ -2521,7 +2020,6 @@ erts_rwmtx_rlock_x(erts_rwmtx_t *rwmtx, char *file, unsigned int line)
 erts_rwmtx_rlock(erts_rwmtx_t *rwmtx)
 #endif
 {
-#ifdef USE_THREADS
 #ifdef ERTS_ENABLE_LOCK_CHECK
 #ifdef ERTS_ENABLE_LOCK_POSITION
     erts_lc_lock_flg_x(&rwmtx->lc, ERTS_LC_FLG_LO_READ,file,line);
@@ -2536,13 +2034,11 @@ erts_rwmtx_rlock(erts_rwmtx_t *rwmtx)
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_post_x(&rwmtx->lcnt, file, line);
 #endif
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_rwmtx_runlock(erts_rwmtx_t *rwmtx)
 {
-#ifdef USE_THREADS
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_unlock_flg(&rwmtx->lc, ERTS_LC_FLG_LO_READ);
 #endif
@@ -2550,7 +2046,6 @@ erts_rwmtx_runlock(erts_rwmtx_t *rwmtx)
     erts_lcnt_unlock_opt(&rwmtx->lcnt, ERTS_LOCK_OPTION_READ);
 #endif
     ethr_rwmutex_runlock(&rwmtx->rwmtx);
-#endif
 }
 
 
@@ -2561,7 +2056,6 @@ erts_rwmtx_tryrwlock_x(erts_rwmtx_t *rwmtx, char *file, unsigned int line)
 erts_rwmtx_tryrwlock(erts_rwmtx_t *rwmtx)
 #endif
 {
-#ifdef USE_THREADS
     int res;
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
@@ -2584,9 +2078,6 @@ erts_rwmtx_tryrwlock(erts_rwmtx_t *rwmtx)
 #endif
     
     return res;
-#else
-    return 0;
-#endif
 }
 
 ERTS_GLB_INLINE void
@@ -2596,7 +2087,6 @@ erts_rwmtx_rwlock_x(erts_rwmtx_t *rwmtx, char *file, unsigned int line)
 erts_rwmtx_rwlock(erts_rwmtx_t *rwmtx)
 #endif
 {
-#ifdef USE_THREADS
 #ifdef ERTS_ENABLE_LOCK_CHECK
 #ifdef ERTS_ENABLE_LOCK_POSITION
     erts_lc_lock_flg_x(&rwmtx->lc, ERTS_LC_FLG_LO_READ_WRITE,file,line);
@@ -2611,13 +2101,11 @@ erts_rwmtx_rwlock(erts_rwmtx_t *rwmtx)
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_post_x(&rwmtx->lcnt, file, line);
 #endif
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_rwmtx_rwunlock(erts_rwmtx_t *rwmtx)
 {
-#ifdef USE_THREADS
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_unlock_flg(&rwmtx->lc, ERTS_LC_FLG_LO_READ_WRITE);
 #endif
@@ -2625,7 +2113,6 @@ erts_rwmtx_rwunlock(erts_rwmtx_t *rwmtx)
     erts_lcnt_unlock_opt(&rwmtx->lcnt, ERTS_LOCK_OPTION_RDWR);
 #endif
     ethr_rwmutex_rwunlock(&rwmtx->rwmtx);
-#endif
 }
 
 #if 0 /* The following rwmtx function names are
@@ -3009,7 +2496,6 @@ erts_no_atomic64_read_bset(erts_no_atomic64_t *var,
 ERTS_GLB_INLINE void
 erts_spinlock_init(erts_spinlock_t *lock, char *name, Eterm extra, erts_lock_flags_t flags)
 {
-#ifdef USE_THREADS
     int res = ethr_spinlock_init(&lock->slck);
     if (res) {
         erts_thr_fatal_error(res, "init spinlock");
@@ -3026,13 +2512,11 @@ erts_spinlock_init(erts_spinlock_t *lock, char *name, Eterm extra, erts_lock_fla
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_init_ref_x(&lock->lcnt, name, extra, flags);
 #endif
-#endif /* USE_THREADS */
 }
 
 ERTS_GLB_INLINE void
 erts_spinlock_destroy(erts_spinlock_t *lock)
 {
-#ifdef USE_THREADS
     int res;
 
     ASSERT(!(lock->flags & ERTS_LOCK_FLAGS_PROPERTY_STATIC));
@@ -3055,15 +2539,11 @@ erts_spinlock_destroy(erts_spinlock_t *lock)
 #endif
 	    erts_thr_fatal_error(res, "destroy rwlock");
     }
-#else
-    (void)lock;
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_spin_unlock(erts_spinlock_t *lock)
 {
-#ifdef USE_THREADS
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_unlock(&lock->lc);
 #endif
@@ -3071,9 +2551,6 @@ erts_spin_unlock(erts_spinlock_t *lock)
     erts_lcnt_unlock(&lock->lcnt);
 #endif
     ethr_spin_unlock(&lock->slck);
-#else
-    (void)lock;
-#endif
 }
 
 ERTS_GLB_INLINE void
@@ -3083,7 +2560,6 @@ erts_spin_lock_x(erts_spinlock_t *lock, char *file, unsigned int line)
 erts_spin_lock(erts_spinlock_t *lock)
 #endif
 {
-#ifdef USE_THREADS
 #ifdef ERTS_ENABLE_LOCK_CHECK
 #ifdef ERTS_ENABLE_LOCK_POSITION
     erts_lc_lock_x(&lock->lc,file,line);
@@ -3098,9 +2574,6 @@ erts_spin_lock(erts_spinlock_t *lock)
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_post_x(&lock->lcnt, file, line);
 #endif
-#else
-    (void)lock;
-#endif
 }
 
 ERTS_GLB_INLINE int
@@ -3122,7 +2595,6 @@ erts_lc_spinlock_is_locked(erts_spinlock_t *lock)
 ERTS_GLB_INLINE void
 erts_rwlock_init(erts_rwlock_t *lock, char *name, Eterm extra, erts_lock_flags_t flags)
 {
-#ifdef USE_THREADS
     int res = ethr_rwlock_init(&lock->rwlck);
     if (res) {
         erts_thr_fatal_error(res, "init rwlock");
@@ -3139,13 +2611,11 @@ erts_rwlock_init(erts_rwlock_t *lock, char *name, Eterm extra, erts_lock_flags_t
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_init_ref_x(&lock->lcnt, name, extra, flags);
 #endif
-#endif /* USE_THREADS */
 }
 
 ERTS_GLB_INLINE void
 erts_rwlock_destroy(erts_rwlock_t *lock)
 {
-#ifdef USE_THREADS
     int res;
 
     ASSERT(!(lock->flags & ERTS_LOCK_FLAGS_PROPERTY_STATIC));
@@ -3168,15 +2638,11 @@ erts_rwlock_destroy(erts_rwlock_t *lock)
 #endif
 	    erts_thr_fatal_error(res, "destroy rwlock");
     }
-#else
-    (void)lock;
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_read_unlock(erts_rwlock_t *lock)
 {
-#ifdef USE_THREADS
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_unlock_flg(&lock->lc, ERTS_LC_FLG_LO_READ);
 #endif
@@ -3184,9 +2650,6 @@ erts_read_unlock(erts_rwlock_t *lock)
     erts_lcnt_unlock_opt(&lock->lcnt, ERTS_LOCK_OPTION_READ);
 #endif
     ethr_read_unlock(&lock->rwlck);
-#else
-    (void)lock;
-#endif
 }
 
 ERTS_GLB_INLINE void
@@ -3196,7 +2659,6 @@ erts_read_lock_x(erts_rwlock_t *lock, char *file, unsigned int line)
 erts_read_lock(erts_rwlock_t *lock)
 #endif
 {
-#ifdef USE_THREADS
 #ifdef ERTS_ENABLE_LOCK_CHECK
 #ifdef ERTS_ENABLE_LOCK_POSITION
     erts_lc_lock_flg_x(&lock->lc, ERTS_LC_FLG_LO_READ,file,line);
@@ -3211,15 +2673,11 @@ erts_read_lock(erts_rwlock_t *lock)
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_post_x(&lock->lcnt, file, line);
 #endif
-#else
-    (void)lock;
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_write_unlock(erts_rwlock_t *lock)
 {
-#ifdef USE_THREADS
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_unlock_flg(&lock->lc, ERTS_LC_FLG_LO_READ_WRITE);
 #endif
@@ -3227,9 +2685,6 @@ erts_write_unlock(erts_rwlock_t *lock)
     erts_lcnt_unlock_opt(&lock->lcnt, ERTS_LOCK_OPTION_RDWR);
 #endif
     ethr_write_unlock(&lock->rwlck);
-#else
-    (void)lock;
-#endif
 }
 
 ERTS_GLB_INLINE void
@@ -3239,7 +2694,6 @@ erts_write_lock_x(erts_rwlock_t *lock, char *file, unsigned int line)
 erts_write_lock(erts_rwlock_t *lock)
 #endif
 {
-#ifdef USE_THREADS
 #ifdef ERTS_ENABLE_LOCK_CHECK
 #ifdef ERTS_ENABLE_LOCK_POSITION
     erts_lc_lock_flg_x(&lock->lc, ERTS_LC_FLG_LO_READ_WRITE,file,line);
@@ -3254,9 +2708,6 @@ erts_write_lock(erts_rwlock_t *lock)
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_post_x(&lock->lcnt, file, line);
 #endif
-#else
-    (void)lock;
-#endif
 }
 
 ERTS_GLB_INLINE int
@@ -3290,125 +2741,90 @@ erts_lc_rwlock_is_rwlocked(erts_rwlock_t *lock)
 ERTS_GLB_INLINE void
 erts_tsd_key_create(erts_tsd_key_t *keyp, char *keyname)
 {
-#ifdef USE_THREADS
     int res = ethr_tsd_key_create(keyp, keyname);
     if (res)
 	erts_thr_fatal_error(res, "create thread specific data key");
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_tsd_key_delete(erts_tsd_key_t key)
 {
-#ifdef USE_THREADS
     int res = ethr_tsd_key_delete(key);
     if (res)
 	erts_thr_fatal_error(res, "delete thread specific data key");
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_tsd_set(erts_tsd_key_t key, void *value)
 {
-#ifdef USE_THREADS
     int res = ethr_tsd_set(key, value);
     if (res)
 	erts_thr_fatal_error(res, "set thread specific data");
-#endif
 }
 
 ERTS_GLB_INLINE void *
 erts_tsd_get(erts_tsd_key_t key)
 {
-#ifdef USE_THREADS
     return ethr_tsd_get(key);
-#else
-    return NULL;
-#endif
 }
 
 ERTS_GLB_INLINE erts_tse_t *erts_tse_fetch(void)
 {
-#ifdef USE_THREADS
     return (erts_tse_t *) ethr_get_ts_event();
-#else
-    return (erts_tse_t *) NULL;
-#endif
 }
 
 ERTS_GLB_INLINE void erts_tse_return(erts_tse_t *ep)
 {
-#ifdef USE_THREADS
     ethr_leave_ts_event(ep);
-#endif
 }
 
 ERTS_GLB_INLINE void erts_tse_prepare_timed(erts_tse_t *ep)
 {
-#ifdef USE_THREADS
     int res = ethr_event_prepare_timed(&((ethr_ts_event *) ep)->event);
     if (res != 0)
 	erts_thr_fatal_error(res, "prepare timed");
-#endif
 }
 
 ERTS_GLB_INLINE void erts_tse_set(erts_tse_t *ep)
 {
-#ifdef USE_THREADS
     ethr_event_set(&((ethr_ts_event *) ep)->event);
-#endif
 }
 
 ERTS_GLB_INLINE void erts_tse_reset(erts_tse_t *ep)
 {
-#ifdef USE_THREADS
     ethr_event_reset(&((ethr_ts_event *) ep)->event);
-#endif
 }
 
 ERTS_GLB_INLINE int erts_tse_wait(erts_tse_t *ep)
 {
-#ifdef USE_THREADS
     int res;
     ERTS_MSACC_PUSH_AND_SET_STATE(ERTS_MSACC_STATE_SLEEP);
     res = ethr_event_wait(&((ethr_ts_event *) ep)->event);
     ERTS_MSACC_POP_STATE();
     return res;
-#else
-    return ENOTSUP;
-#endif
 }
 
 ERTS_GLB_INLINE int erts_tse_swait(erts_tse_t *ep, int spincount)
 {
-#ifdef USE_THREADS
     int res;
     ERTS_MSACC_PUSH_AND_SET_STATE(ERTS_MSACC_STATE_SLEEP);
     res = ethr_event_swait(&((ethr_ts_event *) ep)->event, spincount);
     ERTS_MSACC_POP_STATE();
     return res;
-#else
-    return ENOTSUP;
-#endif
 }
 
 ERTS_GLB_INLINE int erts_tse_twait(erts_tse_t *ep, Sint64 tmo)
 {
-#ifdef USE_THREADS
     int res;
     ERTS_MSACC_PUSH_AND_SET_STATE(ERTS_MSACC_STATE_SLEEP);
     res = ethr_event_twait(&((ethr_ts_event *) ep)->event,
                            (ethr_sint64_t) tmo);
     ERTS_MSACC_POP_STATE();
     return res;
-#else
-    return ENOTSUP;
-#endif
 }
 
 ERTS_GLB_INLINE int erts_tse_stwait(erts_tse_t *ep, int spincount, Sint64 tmo)
 {
-#ifdef USE_THREADS
     int res;
     ERTS_MSACC_PUSH_AND_SET_STATE(ERTS_MSACC_STATE_SLEEP);
     res = ethr_event_stwait(&((ethr_ts_event *) ep)->event,
@@ -3416,49 +2832,34 @@ ERTS_GLB_INLINE int erts_tse_stwait(erts_tse_t *ep, int spincount, Sint64 tmo)
                             (ethr_sint64_t) tmo);
     ERTS_MSACC_POP_STATE();
     return res;
-#else
-    return ENOTSUP;
-#endif
 }
 
 ERTS_GLB_INLINE int erts_tse_is_tmp(erts_tse_t *ep)
 {
-#ifdef USE_THREADS
     return (ep->iflgs & ETHR_TS_EV_TMP) == ETHR_TS_EV_TMP;
-#else
-    return 0;
-#endif
 }
 
 ERTS_GLB_INLINE void erts_thr_set_main_status(int on, int no)
 {
-#ifdef USE_THREADS
     int res = ethr_set_main_thr_status(on, no);
     if (res != 0)
 	erts_thr_fatal_error(res, "set thread main status");
-#endif
 }
 
 ERTS_GLB_INLINE int erts_thr_get_main_status(void)
 {
-#ifdef USE_THREADS
     int main_status;
     int res = ethr_get_main_thr_status(&main_status);
     if (res != 0)
 	erts_thr_fatal_error(res, "get thread main status");
     return main_status;
-#else
-    return 1;
-#endif
 }
 
 ERTS_GLB_INLINE void erts_thr_yield(void)
 {
-#ifdef USE_THREADS
     int res = ETHR_YIELD();
     if (res != 0)
 	erts_thr_fatal_error(res, "yield");
-#endif    
 }
 
 
@@ -3466,34 +2867,28 @@ ERTS_GLB_INLINE void erts_thr_yield(void)
 
 ERTS_GLB_INLINE void
 erts_thr_kill(erts_tid_t tid, int sig) {
-#ifdef USE_THREADS
   int res = ethr_kill((ethr_tid)tid, sig);
   if (res)
     erts_thr_fatal_error(res, "killing thread");
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_thr_sigmask(int how, const sigset_t *set, sigset_t *oset)
 {
-#ifdef USE_THREADS
     int res = ethr_sigmask(how, set, oset);
     if (res)
 	erts_thr_fatal_error(res, "get or set signal mask");
-#endif
 }
 
 ERTS_GLB_INLINE void
 erts_thr_sigwait(const sigset_t *set, int *sig)
 {
-#ifdef USE_THREADS
     int res;
     do {
 	res = ethr_sigwait(set, sig);
     } while (res == EINTR);
     if (res)
 	erts_thr_fatal_error(res, "to wait for signal");
-#endif
 }
 
 #endif /* #ifdef HAVE_ETHR_SIG_FUNCS */