aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_bif_info.c
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-09-16 15:22:15 +0200
committerBjörn-Egil Dahlberg <[email protected]>2014-09-17 15:21:26 +0200
commit9c9878d6d4e99aba195177baef66067da0a2b797 (patch)
tree906a39b968ab6401551b8ea6adad837f034848a1 /erts/emulator/beam/erl_bif_info.c
parentfcd39487c552cd18c49e23137e5c3808d38e3a0a (diff)
downloadotp-9c9878d6d4e99aba195177baef66067da0a2b797.tar.gz
otp-9c9878d6d4e99aba195177baef66067da0a2b797.tar.bz2
otp-9c9878d6d4e99aba195177baef66067da0a2b797.zip
erts: Add icount build type for opcode counter
Enables ERTS_OPCODE_COUNTER_SUPPORT.
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
-rw-r--r--erts/emulator/beam/erl_bif_info.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 6efe9d9550..e3fa9e9cb7 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -115,6 +115,9 @@ static char erts_system_version[] = ("Erlang/OTP " ERLANG_OTP_RELEASE
#ifdef ERTS_ENABLE_LOCK_COUNT
" [lock-counting]"
#endif
+#ifdef ERTS_OPCODE_COUNTER_SUPPORT
+ " [instruction-counting]"
+#endif
#ifdef PURIFY
" [purify-compiled]"
#endif
@@ -2300,7 +2303,7 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
for (i = num_instructions-1; i >= 0; i--) {
res = erts_bld_cons(hpp, hszp,
erts_bld_tuple(hpp, hszp, 2,
- erts_atom_put(opc[i].name,
+ erts_atom_put((byte *)opc[i].name,
strlen(opc[i].name),
ERTS_ATOM_ENC_LATIN1,
1),