diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2013-07-15 17:30:33 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2013-07-15 17:30:33 +0200 |
| commit | c6f452c340ad1749ce91c037a4820ea0feb0a644 (patch) | |
| tree | 771d4ce8009e17c42c02b0f3504f3d845e51ce8c /erts/emulator/beam/atom.names | |
| parent | 625748f78566ba8638f494fc09be4311672e473b (diff) | |
| parent | c250cec28d4cd5dbe68abd8835730eaf81aba086 (diff) | |
| download | otp-c6f452c340ad1749ce91c037a4820ea0feb0a644.tar.gz otp-c6f452c340ad1749ce91c037a4820ea0feb0a644.tar.bz2 otp-c6f452c340ad1749ce91c037a4820ea0feb0a644.zip | |
Merge branch 'egil/erts/aggregate-system-traceability/OTP-11196' into maint
* egil/erts/aggregate-system-traceability/OTP-11196:
Check for native code without loading module
Fix erlang:system_info(compile_info)
Fix system_information get_beam_name/0
Add beam dynamic libraries to system_information
Add system_information testsuite
Add system information aggregate
Refactor away ?line macro in code_SUITE
Fix tests for erts app-file
Add erts app-file
erts: Add cflags, ldflags and config.h into executable
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index eba1d0fa23..c2f32ba089 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -139,6 +139,7 @@ atom caseless atom catchlevel atom cd atom cdr +atom cflags atom characters_to_binary_int atom characters_to_list_int atom clear @@ -150,6 +151,7 @@ atom compact atom compat_rel atom compile atom compressed +atom config_h atom connect atom connected atom connection_closed @@ -301,6 +303,7 @@ atom label atom large_heap atom last_calls atom latin1 +atom ldflags atom Le='=<' atom lf atom line |