diff options
| author | Björn Gustavsson <[email protected]> | 2016-10-05 15:06:09 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-10-05 15:06:09 +0200 |
| commit | 7af3910bb06433f7c9182db11d853823f202c2b6 (patch) | |
| tree | 5fd0b1fe04e670123f9b31381e195ed5ce55d1cf /bootstrap/lib/compiler/ebin | |
| parent | ef6f8da5d027055a36c70196df69dfbb7b464800 (diff) | |
| parent | 497330a828089b465ac026551edf33fb947ae2f6 (diff) | |
| download | otp-7af3910bb06433f7c9182db11d853823f202c2b6.tar.gz otp-7af3910bb06433f7c9182db11d853823f202c2b6.tar.bz2 otp-7af3910bb06433f7c9182db11d853823f202c2b6.zip | |
Merge branch 'maint'
* maint:
Update primary bootstrap
beam_block: Avoid unsafe inclusion of get_map_elements in blocks
Diffstat (limited to 'bootstrap/lib/compiler/ebin')
| -rw-r--r-- | bootstrap/lib/compiler/ebin/beam_block.beam | bin | 9484 -> 9188 bytes | |||
| -rw-r--r-- | bootstrap/lib/compiler/ebin/beam_dict.beam | bin | 5292 -> 5292 bytes | |||
| -rw-r--r-- | bootstrap/lib/compiler/ebin/beam_jump.beam | bin | 10028 -> 10052 bytes | |||
| -rw-r--r-- | bootstrap/lib/compiler/ebin/beam_split.beam | bin | 2496 -> 2312 bytes | |||
| -rw-r--r-- | bootstrap/lib/compiler/ebin/beam_utils.beam | bin | 13720 -> 13788 bytes | |||
| -rw-r--r-- | bootstrap/lib/compiler/ebin/compile.beam | bin | 39512 -> 39512 bytes | |||
| -rw-r--r-- | bootstrap/lib/compiler/ebin/compiler.app | 2 | ||||
| -rw-r--r-- | bootstrap/lib/compiler/ebin/sys_core_dsetel.beam | bin | 7180 -> 7232 bytes | |||
| -rw-r--r-- | bootstrap/lib/compiler/ebin/sys_core_fold.beam | bin | 52520 -> 52544 bytes | |||
| -rw-r--r-- | bootstrap/lib/compiler/ebin/v3_codegen.beam | bin | 56480 -> 56480 bytes |
10 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap/lib/compiler/ebin/beam_block.beam b/bootstrap/lib/compiler/ebin/beam_block.beam Binary files differindex b6a4b6f10f..95846cdda9 100644 --- a/bootstrap/lib/compiler/ebin/beam_block.beam +++ b/bootstrap/lib/compiler/ebin/beam_block.beam diff --git a/bootstrap/lib/compiler/ebin/beam_dict.beam b/bootstrap/lib/compiler/ebin/beam_dict.beam Binary files differindex e1c3602ad9..665512eae1 100644 --- a/bootstrap/lib/compiler/ebin/beam_dict.beam +++ b/bootstrap/lib/compiler/ebin/beam_dict.beam diff --git a/bootstrap/lib/compiler/ebin/beam_jump.beam b/bootstrap/lib/compiler/ebin/beam_jump.beam Binary files differindex 37eea2d744..16db9eb358 100644 --- a/bootstrap/lib/compiler/ebin/beam_jump.beam +++ b/bootstrap/lib/compiler/ebin/beam_jump.beam diff --git a/bootstrap/lib/compiler/ebin/beam_split.beam b/bootstrap/lib/compiler/ebin/beam_split.beam Binary files differindex 4a63468419..524e9a3078 100644 --- a/bootstrap/lib/compiler/ebin/beam_split.beam +++ b/bootstrap/lib/compiler/ebin/beam_split.beam diff --git a/bootstrap/lib/compiler/ebin/beam_utils.beam b/bootstrap/lib/compiler/ebin/beam_utils.beam Binary files differindex 739ec88f36..52c25a2ec6 100644 --- a/bootstrap/lib/compiler/ebin/beam_utils.beam +++ b/bootstrap/lib/compiler/ebin/beam_utils.beam diff --git a/bootstrap/lib/compiler/ebin/compile.beam b/bootstrap/lib/compiler/ebin/compile.beam Binary files differindex 632ac0d5d1..86d7a86aa2 100644 --- a/bootstrap/lib/compiler/ebin/compile.beam +++ b/bootstrap/lib/compiler/ebin/compile.beam diff --git a/bootstrap/lib/compiler/ebin/compiler.app b/bootstrap/lib/compiler/ebin/compiler.app index e3d95c151b..5842aff4f1 100644 --- a/bootstrap/lib/compiler/ebin/compiler.app +++ b/bootstrap/lib/compiler/ebin/compiler.app @@ -72,5 +72,5 @@ {registered, []}, {applications, [kernel, stdlib]}, {env, []}, - {runtime_dependencies, ["stdlib-2.5","kernel-4.0","hipe-3.12","erts-7.0", + {runtime_dependencies, ["stdlib-2.5","kernel-4.0","hipe-3.12","erts-9.0", "crypto-3.6"]}]}. diff --git a/bootstrap/lib/compiler/ebin/sys_core_dsetel.beam b/bootstrap/lib/compiler/ebin/sys_core_dsetel.beam Binary files differindex 81da8b62c5..47b804d61d 100644 --- a/bootstrap/lib/compiler/ebin/sys_core_dsetel.beam +++ b/bootstrap/lib/compiler/ebin/sys_core_dsetel.beam diff --git a/bootstrap/lib/compiler/ebin/sys_core_fold.beam b/bootstrap/lib/compiler/ebin/sys_core_fold.beam Binary files differindex 31e00cc063..48171c8fd2 100644 --- a/bootstrap/lib/compiler/ebin/sys_core_fold.beam +++ b/bootstrap/lib/compiler/ebin/sys_core_fold.beam diff --git a/bootstrap/lib/compiler/ebin/v3_codegen.beam b/bootstrap/lib/compiler/ebin/v3_codegen.beam Binary files differindex 8066908032..8a6b8d912c 100644 --- a/bootstrap/lib/compiler/ebin/v3_codegen.beam +++ b/bootstrap/lib/compiler/ebin/v3_codegen.beam |