aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/common
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-04-20 16:10:37 +0200
committerSverker Eriksson <[email protected]>2016-04-20 16:10:37 +0200
commit42a1166b47721cd444dbe8c70a04125d842a27c9 (patch)
tree274cad0504b7b03750fea93ea9b03bf60eed0a63 /erts/etc/common
parentaee7c8eec5219cd1b29db34748d2b2a60701a0c3 (diff)
parentb3c7a581070180750a368ddf3bd55db1bafc11ea (diff)
downloadotp-42a1166b47721cd444dbe8c70a04125d842a27c9.tar.gz
otp-42a1166b47721cd444dbe8c70a04125d842a27c9.tar.bz2
otp-42a1166b47721cd444dbe8c70a04125d842a27c9.zip
Merge branch 'sverker/hipe-code-alloc'
Diffstat (limited to 'erts/etc/common')
-rw-r--r--erts/etc/common/erlexec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 086c5af8c7..82a0303f86 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -74,6 +74,7 @@ static const char plusM_au_allocs[]= {
'R', /* driver_alloc */
'S', /* sl_alloc */
'T', /* temp_alloc */
+ 'X', /* exec_alloc */
'Z', /* test_alloc */
'\0'
};
@@ -123,6 +124,7 @@ static char *plusM_other_switches[] = {
"Ytp",
"Ytt",
"Iscs",
+ "Xscs",
NULL
};