diff options
| author | Björn Gustavsson <[email protected]> | 2010-08-20 08:26:21 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-08-20 08:26:21 +0200 |
| commit | b709d5626e6b7f3df869ecf7aefa5158cbbac70c (patch) | |
| tree | f6f7ff8b0cb0a081f883e6b7db725ebd3b3e4355 /lib | |
| parent | 5d50784c2700c30c9b4e651f3732e1fc5a7250d4 (diff) | |
| parent | 1abdce9f382edd044142fe2a9b2a2dd02ff85225 (diff) | |
| download | otp-b709d5626e6b7f3df869ecf7aefa5158cbbac70c.tar.gz otp-b709d5626e6b7f3df869ecf7aefa5158cbbac70c.tar.bz2 otp-b709d5626e6b7f3df869ecf7aefa5158cbbac70c.zip | |
Merge branch 'bjorn/remove-elib_malloc/OTP-8764' into dev
* bjorn/remove-elib_malloc/OTP-8764:
erts: Remove broken elib_malloc
erts: Remove the unused mem_drv driver
erts: Remove stray pre-ISO-C compatibility macros
erts: Remove unused decl.h
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/hipe/cerl/erl_bif_types.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl index 1f0247a040..6eeeab3610 100644 --- a/lib/hipe/cerl/erl_bif_types.erl +++ b/lib/hipe/cerl/erl_bif_types.erl @@ -1638,7 +1638,6 @@ type(erlang, system_info, 1, Xs) -> t_non_neg_integer()])])); ['allocator'] -> t_tuple([t_sup([t_atom('undefined'), - t_atom('elib_malloc'), t_atom('glibc')]), t_list(t_integer()), t_list(t_atom()), @@ -1659,9 +1658,8 @@ type(erlang, system_info, 1, Xs) -> t_binary(); ['dist_ctrl'] -> t_list(t_tuple([t_atom(), t_sup([t_pid(), t_port])])); - ['elib_malloc'] -> - t_sup([t_atom('false'), - t_list(t_tuple([t_atom(), t_any()]))]); + %% elib_malloc is intentionally not included, + %% because it scheduled for removal in R15. ['endian'] -> t_endian(); ['fullsweep_after'] -> |