aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_init.c
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-10-27 16:44:58 +0100
committerBjörn-Egil Dahlberg <[email protected]>2014-10-27 16:44:58 +0100
commit405281de217231b820b4e6106cf7c253415d4aee (patch)
tree8fd333e6d657a063543abf4c31f845de657efe6a /erts/emulator/beam/erl_init.c
parent229d21e6d143532fb6415203d928652b6fa602e0 (diff)
parenta5ce823283d36eda4788c55b0b9b645577473983 (diff)
downloadotp-405281de217231b820b4e6106cf7c253415d4aee.tar.gz
otp-405281de217231b820b4e6106cf7c253415d4aee.tar.bz2
otp-405281de217231b820b4e6106cf7c253415d4aee.zip
Merge branch 'egil/fix-instruction-counter'
* egil/fix-instruction-counter: erts: Fix SMP for ERTS_OPCODE_COUNTER_SUPPORT erts: Add icount build type for opcode counter
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
-rw-r--r--erts/emulator/beam/erl_init.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 61f8385efc..77445ef1ff 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -161,9 +161,6 @@ int H_MIN_SIZE; /* The minimum heap grain */
int BIN_VH_MIN_SIZE; /* The minimum binary virtual*/
Uint32 erts_debug_flags; /* Debug flags. */
-#ifdef ERTS_OPCODE_COUNTER_SUPPORT
-int count_instructions;
-#endif
int erts_backtrace_depth; /* How many functions to show in a backtrace
* in error codes.
*/
@@ -1900,11 +1897,6 @@ erl_start(int argc, char **argv)
if (argv[i][2] == 0) { /* -c: documented option */
erts_disable_tolerant_timeofday = 1;
}
-#ifdef ERTS_OPCODE_COUNTER_SUPPORT
- else if (argv[i][2] == 'i') { /* -ci: undcoumented option*/
- count_instructions = 1;
- }
-#endif
break;
case 'W':
arg = get_arg(argv[i]+2, argv[i+1], &i);