diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-10-27 16:44:58 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-10-27 16:44:58 +0100 |
| commit | 405281de217231b820b4e6106cf7c253415d4aee (patch) | |
| tree | 8fd333e6d657a063543abf4c31f845de657efe6a /erts/lib_src | |
| parent | 229d21e6d143532fb6415203d928652b6fa602e0 (diff) | |
| parent | a5ce823283d36eda4788c55b0b9b645577473983 (diff) | |
| download | otp-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/lib_src')
| -rw-r--r-- | erts/lib_src/Makefile.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/lib_src/Makefile.in b/erts/lib_src/Makefile.in index b680c03b1d..d0ebab49d8 100644 --- a/erts/lib_src/Makefile.in +++ b/erts/lib_src/Makefile.in @@ -92,6 +92,11 @@ CFLAGS += -DERTS_FRMPTR OMIT_OMIT_FP=yes PRE_LD= else +ifeq ($(TYPE),icount) +TYPE_SUFFIX = .icount +CFLAGS += -DERTS_OPCODE_COUNTER_SUPPORT +PRE_LD= +else override TYPE=opt OMIT_FP=true TYPE_SUFFIX= @@ -105,6 +110,7 @@ endif endif endif endif +endif OPSYS=@OPSYS@ sol2CFLAGS= |