diff options
| author | Sverker Eriksson <[email protected]> | 2018-02-12 13:33:29 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-02-12 13:33:29 +0100 |
| commit | 7d390f2dd10f7a746a45a8c5b82af55f86e41f52 (patch) | |
| tree | 85abb79ad1b6754f504e60debfdecd057b9afd20 /erts/etc | |
| parent | cd9b6371a13c37f8f82586fcd82f212d306d8fad (diff) | |
| parent | 06e88d07a4719a0e15b4e666b16347fad463cee6 (diff) | |
| download | otp-7d390f2dd10f7a746a45a8c5b82af55f86e41f52.tar.gz otp-7d390f2dd10f7a746a45a8c5b82af55f86e41f52.tar.bz2 otp-7d390f2dd10f7a746a45a8c5b82af55f86e41f52.zip | |
Merge 'sverker/maint-20/alloc-n-migration/ERIERL-88'
into 'sverker/master/alloc-n-migration/ERIERL-88'
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/common/erlexec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index f7c8c27d53..f7774c6e2e 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -80,6 +80,8 @@ static char *plusM_au_alloc_switches[] = { "as", "asbcst", "acul", + "acnl", + "acfml", "e", "t", "lmbcs", |