diff options
| author | Rickard Green <[email protected]> | 2013-05-16 17:43:19 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-05-16 17:43:19 +0200 |
| commit | 1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9 (patch) | |
| tree | 91dc0be43abc7b533f4850fa21b1ec1f9e9e5bb4 /erts/emulator/beam/erl_bif_info.c | |
| parent | 1ccd23bb49fddec2ac21859e518a1568cd494b93 (diff) | |
| parent | e550cd4842f4bd9d2555fceb47ec3064e0037372 (diff) | |
| download | otp-1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9.tar.gz otp-1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9.tar.bz2 otp-1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9.zip | |
Merge branch 'rickard/frmptr' into maint
* rickard/frmptr:
Add 'frmptr' emulator type
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
| -rwxr-xr-x | erts/emulator/beam/erl_bif_info.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 581818f899..54eefe8d12 100755 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -114,6 +114,9 @@ static char erts_system_version[] = ("Erlang " ERLANG_OTP_RELEASE #ifdef VALGRIND " [valgrind-compiled]" #endif +#ifdef ERTS_FRMPTR + " [frame-pointer]" +#endif #ifdef USE_DTRACE " [dtrace]" #endif @@ -2042,6 +2045,9 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1) #elif defined(ERTS_ENABLE_LOCK_COUNT) ERTS_DECL_AM(lcnt); BIF_RET(AM_lcnt); +#elif defined(ERTS_FRMPTR) + ERTS_DECL_AM(frmptr); + BIF_RET(AM_frmptr); #else BIF_RET(am_opt); #endif |