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/emulator/Makefile.in | |
| 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/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 7145824f91..53fc7bd713 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -112,18 +112,24 @@ NO_INLINE_FUNCTIONS=true else ifeq ($(TYPE),lcnt) -PURIFY = +PURIFY = TYPEMARKER = .lcnt TYPE_FLAGS = @CFLAGS@ -DERTS_ENABLE_LOCK_COUNT else ifeq ($(TYPE),frmptr) -PURIFY = +PURIFY = OMIT_OMIT_FP=yes TYPEMARKER = .frmptr TYPE_FLAGS = @CFLAGS@ -DERTS_FRMPTR else +ifeq ($(TYPE),icount) +PURIFY = +TYPEMARKER = .icount +TYPE_FLAGS = @CFLAGS@ -DERTS_OPCODE_COUNTER_SUPPORT +else + # If type isn't one of the above, it *is* opt type... override TYPE=opt PURIFY = @@ -138,6 +144,7 @@ endif endif endif endif +endif comma:=, space:= |