aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-11-23 09:44:30 +0100
committerErlang/OTP <[email protected]>2018-11-23 09:44:30 +0100
commitd5b77a045544a018a5a7af7c200089c5f3837d2a (patch)
tree9272f5944bad144b93bdcfab9ec0ebd945aa5a63 /erts/emulator
parentdb35a04a38f9501b921beac2c46576c5fa13e75a (diff)
parentda9268d342e3f0f21b43fb55788f6e60aac55e71 (diff)
downloadotp-d5b77a045544a018a5a7af7c200089c5f3837d2a.tar.gz
otp-d5b77a045544a018a5a7af7c200089c5f3837d2a.tar.bz2
otp-d5b77a045544a018a5a7af7c200089c5f3837d2a.zip
Merge branch 'john/erts/spectre-configure-flag-otp_20/OTP-15430/ERIERL-237' into maint-21
* john/erts/spectre-configure-flag-otp_20/OTP-15430/ERIERL-237: Allow disabling retpoline in interpreter loop Add a ./configure flag for spectre mitigation
Diffstat (limited to 'erts/emulator')
-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 ab5920a67e..e909a0b4da 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;