diff options
author | Lukas Larsson <[email protected]> | 2019-05-29 11:23:01 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2019-05-29 11:23:01 +0200 |
commit | b13b267d419f5c3e1ef940d40100bec39f32dbaa (patch) | |
tree | 1ed442fc070717c00117c1ccecd70202c62235ea /erts | |
parent | 8a3cbfaec6e4691d80b2161ccc6b9935fd9d74cc (diff) | |
parent | 6fbba67a925bdc8653577d77432cec507f850681 (diff) | |
download | otp-b13b267d419f5c3e1ef940d40100bec39f32dbaa.tar.gz otp-b13b267d419f5c3e1ef940d40100bec39f32dbaa.tar.bz2 otp-b13b267d419f5c3e1ef940d40100bec39f32dbaa.zip |
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r-- | erts/configure.in | 2 | ||||
-rw-r--r-- | erts/emulator/beam/erl_sched_spec_pre_alloc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/configure.in b/erts/configure.in index 10a006d812..3a043c940d 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -676,7 +676,7 @@ elif test "X$PROFILE_INSTR_GENERATE" = "Xtrue" -a "X$PROFILE_INSTR_USE" = "Xtrue PROFILE_COMPILER=clang AC_MSG_RESULT([yes, using -fprofile-instr-generate]) else - if $enable_pgo = yes; then + if test $enable_pgo = yes; then AC_MSG_ERROR(cannot use PGO with this compiler) else AC_MSG_RESULT([no]) diff --git a/erts/emulator/beam/erl_sched_spec_pre_alloc.h b/erts/emulator/beam/erl_sched_spec_pre_alloc.h index 74cc966cbe..6f715ae80d 100644 --- a/erts/emulator/beam/erl_sched_spec_pre_alloc.h +++ b/erts/emulator/beam/erl_sched_spec_pre_alloc.h @@ -49,7 +49,7 @@ do { \ #endif #ifdef DEBUG -extern Uint erts_no_schedulers; +extern Uint ERTS_WRITE_UNLIKELY(erts_no_schedulers); #endif #define ERTS_SSPA_FORCE_THR_CHECK_PROGRESS 10 |