diff options
| author | John Högberg <[email protected]> | 2018-11-20 15:55:47 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-11-20 15:55:47 +0100 |
| commit | da9268d342e3f0f21b43fb55788f6e60aac55e71 (patch) | |
| tree | d2f0adfb44aad2b5d103ac29a8be011b376788b9 /erts/emulator/beam/beam_emu.c | |
| parent | f2c1d537dc28ffbde5d42aedec70bf4c6574c3ea (diff) | |
| parent | 3a812a499f9a40951f1ba6b7315473c5e149fd8b (diff) | |
| download | otp-da9268d342e3f0f21b43fb55788f6e60aac55e71.tar.gz otp-da9268d342e3f0f21b43fb55788f6e60aac55e71.tar.bz2 otp-da9268d342e3f0f21b43fb55788f6e60aac55e71.zip | |
Merge branch 'john/erts/spectre-configure-flag/OTP-15430/ERIERL-237' into john/erts/spectre-configure-flag-otp_20/OTP-15430/ERIERL-237
* john/erts/spectre-configure-flag/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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index b4e6c35579..7db0938b39 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -1237,6 +1237,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; |