diff options
| author | Rickard Green <[email protected]> | 2013-04-19 23:04:24 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-04-21 22:04:57 +0200 |
| commit | e550cd4842f4bd9d2555fceb47ec3064e0037372 (patch) | |
| tree | 285e59e239912e059a0c571493d97b47bee88543 /erts/preloaded | |
| parent | ad7231b1b5227f2ba9baa58c1c436ff9a95d2c67 (diff) | |
| download | otp-e550cd4842f4bd9d2555fceb47ec3064e0037372.tar.gz otp-e550cd4842f4bd9d2555fceb47ec3064e0037372.tar.bz2 otp-e550cd4842f4bd9d2555fceb47ec3064e0037372.zip | |
Add 'frmptr' emulator type
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 93468 -> 93496 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 684659cca1..8a0d5dd087 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 8e4a471a82..4b28e5bcf8 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(); |