diff options
| author | Erlang/OTP <[email protected]> | 2019-02-14 12:34:45 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-02-14 12:34:45 +0100 |
| commit | 38808e9d5ad96af3d47fde4683f01050b448e238 (patch) | |
| tree | 45e8f77070bebcc4dadee7c1d208dce6865df86c /erts/emulator | |
| parent | 8e3ed72989170224dea97db61b7feec74d9865ce (diff) | |
| parent | da9268d342e3f0f21b43fb55788f6e60aac55e71 (diff) | |
| download | otp-38808e9d5ad96af3d47fde4683f01050b448e238.tar.gz otp-38808e9d5ad96af3d47fde4683f01050b448e238.tar.bz2 otp-38808e9d5ad96af3d47fde4683f01050b448e238.zip | |
Merge branch 'john/erts/spectre-configure-flag-otp_20/OTP-15430/ERIERL-237' into maint-20
* 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.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; |