diff options
author | Rickard Green <[email protected]> | 2013-07-10 15:08:16 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2013-07-10 15:08:16 +0200 |
commit | a8e229046356fadaa217d1a1606fde750d1e8aa1 (patch) | |
tree | 82600f7c06ddbacb0e976989b9251171a2658097 /erts/emulator/beam/beam_emu.c | |
parent | 393a6c033b7291679eab525cd599024de8b28eec (diff) | |
parent | 75f57c5f9a3bd03cb16e1663d40ea98bbb3ed487 (diff) | |
download | otp-a8e229046356fadaa217d1a1606fde750d1e8aa1.tar.gz otp-a8e229046356fadaa217d1a1606fde750d1e8aa1.tar.bz2 otp-a8e229046356fadaa217d1a1606fde750d1e8aa1.zip |
Merge branch 'maint'
* maint:
Add test cases for native atomics and jump table
Refuse to build SMP runtime by default without native atomics
Make information about use of jump table available via system_info BIF
Make ethread library information available via system_info BIF
Make emulator arguments available via the system_info BIF
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
-rw-r--r-- | erts/emulator/beam/beam_emu.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 5781009f58..da36c4437e 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -6256,3 +6256,12 @@ erts_current_reductions(Process *current, Process *p) } } +int +erts_beam_jump_table(void) +{ +#if defined(NO_JUMP_TABLE) + return 0; +#else + return 1; +#endif +} |