diff options
| author | Sverker Eriksson <[email protected]> | 2010-11-26 15:25:25 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2010-11-26 15:25:25 +0100 |
| commit | 47b934a0eddc8e8cef5d1da6b08d4f698bc81528 (patch) | |
| tree | e99a7a29ff53aa5a6f26e91e267822bf3e88670a /erts/emulator/beam/erl_alloc.c | |
| parent | e64306910f2e0d25c4327068ab02b24270be697d (diff) | |
| parent | cacb1e539b2ed8ac684245db7d27597719d4a9d3 (diff) | |
| download | otp-47b934a0eddc8e8cef5d1da6b08d4f698bc81528.tar.gz otp-47b934a0eddc8e8cef5d1da6b08d4f698bc81528.tar.bz2 otp-47b934a0eddc8e8cef5d1da6b08d4f698bc81528.zip | |
Merge branch 'sverker/halfword-testcases/OTP-8884' into dev
* sverker/halfword-testcases/OTP-8884:
NIF 64-bit integer get/make bugfix for halfword emulator.
Teach erl_alloc.c not to disable internal allocators for halfword
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index 07b4167b27..7793f60f4f 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -1348,6 +1348,13 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init) argv[j++] = argv[i]; } *argc = j; +#if HALFWORD_HEAP + /* If halfword heap, silently ignore any disabling of internal + allocators */ + for (i = 0; i < aui_sz; ++i) + aui[i]->enable = 1; +#endif + } |