diff options
| author | Erlang/OTP <[email protected]> | 2019-01-08 14:39:42 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-01-08 14:39:42 +0100 |
| commit | 680d8315dc6d1a20092dafe40498f718103f863a (patch) | |
| tree | 6baf64d1ab0243ed56a1b2f8bef80bf76110035e /erts/emulator/beam/beam_emu.c | |
| parent | 75196853fcda05f4d76f852a7b9b976c4e31b655 (diff) | |
| parent | 3a812a499f9a40951f1ba6b7315473c5e149fd8b (diff) | |
| download | otp-680d8315dc6d1a20092dafe40498f718103f863a.tar.gz otp-680d8315dc6d1a20092dafe40498f718103f863a.tar.bz2 otp-680d8315dc6d1a20092dafe40498f718103f863a.zip | |
Merge branch 'john/erts/spectre-configure-flag/OTP-15430/ERIERL-237' into maint-19
* 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 1ad13c32e3..0f6e6533fc 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -1227,6 +1227,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(void) { static int init_done = 0; |