From e550cd4842f4bd9d2555fceb47ec3064e0037372 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Fri, 19 Apr 2013 23:04:24 +0200
Subject: Add 'frmptr' emulator type

---
 erts/emulator/Makefile.in         | 13 ++++++++++---
 erts/emulator/beam/erl_bif_info.c |  6 ++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 133ecd69e4..6c42faf34e 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -48,6 +48,7 @@ CREATE_DIRS=
 
 LDFLAGS=@LDFLAGS@
 ARFLAGS=rc
+OMIT_OMIT_FP=no
 
 ifeq ($(TYPE),debug)
 PURIFY =
@@ -113,6 +114,13 @@ TYPEMARKER = .lcnt
 TYPE_FLAGS = @CFLAGS@ -DERTS_ENABLE_LOCK_COUNT
 else
 
+ifeq ($(TYPE),frmptr)
+PURIFY = 
+OMIT_OMIT_FP=yes
+TYPEMARKER = .frmptr
+TYPE_FLAGS = @CFLAGS@ -DERTS_FRMPTR
+else
+
 # If type isn't one of the above, it *is* opt type...
 override TYPE=opt
 PURIFY =
@@ -126,6 +134,7 @@ endif
 endif
 endif
 endif
+endif
 
 #
 # NOTE: When adding a new type update ERL_BUILD_TYPE_MARKER in sys/unix/sys.c
@@ -219,8 +228,6 @@ LIB_PREFIX=lib
 LIB_SUFFIX=.a
 endif
 
-OMIT_OMIT_FP=no
-
 ifeq (@EMU_LOCK_CHECKING@,yes)
 NO_INLINE_FUNCTIONS=true
 endif
@@ -238,7 +245,7 @@ ifeq ($(NO_INLINE_FUNCTIONS),true)
 GEN_OPT_FLGS = $(OPT_LEVEL) -fno-inline-functions
 else
 ifeq ($(OMIT_OMIT_FP),yes)
-GEN_OPT_FLGS = $(OPT_LEVEL)
+GEN_OPT_FLGS = $(OPT_LEVEL) -fno-omit-frame-pointer
 else
 GEN_OPT_FLGS = $(OPT_LEVEL) -fomit-frame-pointer
 endif
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
-- 
cgit v1.2.3