Merge branch 'rickard/frmptr' into maint

* rickard/frmptr:
  Add 'frmptr' emulator type

Conflicts:
	erts/preloaded/ebin/erlang.beam

6 files changed, 30 insertions, 4 deletions

diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 4f2f647742..2031ec3a4c 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 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
diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src
index cc7d77fd9a..f99059cb72 100644
--- a/erts/etc/unix/cerl.src
+++ b/erts/etc/unix/cerl.src
@@ -171,6 +171,11 @@ while [ $# -gt 0 ]; do
 	    cargs="$cargs -debug"
 	    TYPE=.debug
 	    ;;
+	"-frmptr")
+	    shift
+	    cargs="$cargs -frmptr"
+	    TYPE=.frmptr
+	    ;;
 	"-gdb")
 	    shift
 	    GDB=gdb
diff --git a/erts/lib_src/Makefile.in b/erts/lib_src/Makefile.in
index 0fc3ac6efc..4f0a5e5202 100644
--- a/erts/lib_src/Makefile.in
+++ b/erts/lib_src/Makefile.in
@@ -86,6 +86,12 @@ CFLAGS += -DERTS_ENABLE_LOCK_COUNT
 OMIT_FP=true
 PRE_LD=
 else
+ifeq ($(TYPE),frmptr)
+TYPE_SUFFIX = .frmptr
+CFLAGS += -DERTS_FRMPTR
+OMIT_OMIT_FP=yes
+PRE_LD=
+else
 override TYPE=opt
 OMIT_FP=true
 TYPE_SUFFIX=
@@ -98,6 +104,7 @@ endif
 endif
 endif
 endif
+endif
 
 OPSYS=@OPSYS@
 sol2CFLAGS=
@@ -110,6 +117,7 @@ ultrasparcCFLAGS=-Wa,-xarch=v8plusa
 ARCHCFLAGS=$($(ARCH)CFLAGS)
 
 ifeq ($(OMIT_OMIT_FP),yes)
+CFLAGS += -fno-omit-frame-pointer
 OMIT_FP=false
 endif
 
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index fdfbd724be..308cb99be5 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 020730efcb..7106c0a4fb 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2086,7 +2086,7 @@ tuple_to_list(_Tuple) ->
          ({allocator_sizes, Alloc}) -> [_] when %% More or less anything
       Alloc :: atom();
          (build_type) -> opt | debug | purify | quantify | purecov |
-                         gcov | valgrind | gprof | lcnt;
+                         gcov | valgrind | gprof | lcnt | frmptr;
          (c_compiler_used) -> {atom(), term()};
          (check_io) -> [_];
          (compat_rel) -> integer();