diff options
| author | John Högberg <[email protected]> | 2018-11-23 09:58:00 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-11-23 09:58:00 +0100 |
| commit | f8b185e6cc50ea3799eef4e3c395f82e935125c8 (patch) | |
| tree | 9aca7f683018788d382355dd9e89cc2bb50be460 /erts | |
| parent | 29735661d6d2ef79c32d6c9b3429148f1c628bf4 (diff) | |
| parent | 9103097e3480b5fa8737205793df56c6288f5733 (diff) | |
| download | otp-f8b185e6cc50ea3799eef4e3c395f82e935125c8.tar.gz otp-f8b185e6cc50ea3799eef4e3c395f82e935125c8.tar.bz2 otp-f8b185e6cc50ea3799eef4e3c395f82e935125c8.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/notes.xml | 20 | ||||
| -rw-r--r-- | erts/vsn.mk | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index f384adcf52..2a823d9fe7 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,26 @@ </header> <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 10.1.3</title> + + <section><title>Improvements and New Features</title> + <list> + <item> + <p>Added an optional <c>./configure</c> flag to compile + the emulator with spectre mitigation: + <c>--with-spectre-mitigation</c></p> + <p>Note that this requires a recent version of GCC with + support for spectre mitigation and the + <c>--mindirect-branch=thunk</c> flag, such as + <c>8.1</c>.</p> + <p> + Own Id: OTP-15430 Aux Id: ERIERL-237 </p> + </item> + </list> + </section> + +</section> + <section><title>Erts 10.1.2</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/vsn.mk b/erts/vsn.mk index 241d5a3b85..643a8a2e76 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.1.2 +VSN = 10.1.3 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |