aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-11-23 09:41:28 +0100
committerJohn Högberg <[email protected]>2018-11-23 09:41:28 +0100
commit9c114233473ed834623df96fb0d102472d93385c (patch)
tree98a0f56203a9dbf5baf62f169e17406e9fcd1489 /erts/emulator/beam
parent9ac4cc58aaa1cf190ca1f69f1b578eaba6b1f671 (diff)
parent29735661d6d2ef79c32d6c9b3429148f1c628bf4 (diff)
downloadotp-9c114233473ed834623df96fb0d102472d93385c.tar.gz
otp-9c114233473ed834623df96fb0d102472d93385c.tar.bz2
otp-9c114233473ed834623df96fb0d102472d93385c.zip
Merge branch 'maint'
* maint: Allow disabling retpoline in interpreter loop Add a ./configure flag for spectre mitigation
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/beam_emu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index aa61a2d7f9..2e4d1f8f48 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -579,6 +579,7 @@ init_emulator(void)
* the instructions' C labels to the loader.
* The second call starts execution of BEAM code. This call never returns.
*/
+ERTS_NO_RETPOLINE
void process_main(Eterm * x_reg_array, FloatDef* f_reg_array)
{
static int init_done = 0;