aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/beam_emu.c
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-11-23 09:41:08 +0100
committerJohn Högberg <[email protected]>2018-11-23 09:41:08 +0100
commit29735661d6d2ef79c32d6c9b3429148f1c628bf4 (patch)
treea6278173e1a2d76f588dde64732d9bab8bb58d41 /erts/emulator/beam/beam_emu.c
parentc5de54bdf5f47212b34c744b976c23e193e75fb9 (diff)
parentda9268d342e3f0f21b43fb55788f6e60aac55e71 (diff)
downloadotp-29735661d6d2ef79c32d6c9b3429148f1c628bf4.tar.gz
otp-29735661d6d2ef79c32d6c9b3429148f1c628bf4.tar.bz2
otp-29735661d6d2ef79c32d6c9b3429148f1c628bf4.zip
Merge branch 'john/erts/spectre-configure-flag-otp_20/OTP-15430/ERIERL-237' into maint
* 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/beam/beam_emu.c')
-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;