aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-04-19 23:04:24 +0200
committerRickard Green <[email protected]>2013-04-21 22:04:57 +0200
commite550cd4842f4bd9d2555fceb47ec3064e0037372 (patch)
tree285e59e239912e059a0c571493d97b47bee88543 /erts/emulator/beam
parentad7231b1b5227f2ba9baa58c1c436ff9a95d2c67 (diff)
downloadotp-e550cd4842f4bd9d2555fceb47ec3064e0037372.tar.gz
otp-e550cd4842f4bd9d2555fceb47ec3064e0037372.tar.bz2
otp-e550cd4842f4bd9d2555fceb47ec3064e0037372.zip
Add 'frmptr' emulator type
Diffstat (limited to 'erts/emulator/beam')
-rwxr-xr-xerts/emulator/beam/erl_bif_info.c6
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 379d3eecc6..59843649f0 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
@@ -2096,6 +2099,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