aboutsummaryrefslogtreecommitdiffstats
path: root/erts/lib_src
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-05-16 17:43:19 +0200
committerRickard Green <[email protected]>2013-05-16 17:43:19 +0200
commit1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9 (patch)
tree91dc0be43abc7b533f4850fa21b1ec1f9e9e5bb4 /erts/lib_src
parent1ccd23bb49fddec2ac21859e518a1568cd494b93 (diff)
parente550cd4842f4bd9d2555fceb47ec3064e0037372 (diff)
downloadotp-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/lib_src')
-rw-r--r--erts/lib_src/Makefile.in8
1 files changed, 8 insertions, 0 deletions
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