diff options
| author | Erlang/OTP <[email protected]> | 2016-07-14 11:22:31 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-07-14 11:22:31 +0200 |
| commit | e84614bb7454087cf5c249a470d2dc47b05f6d28 (patch) | |
| tree | 8ec9fbe3ef7c952718b0aae4c34f2c171cc5614b /bootstrap | |
| parent | c7d729da231c40a656725f2e9bb84c40a6bddc7d (diff) | |
| parent | 8fa0a2d96e3d5c89f68b8724a125e11fe04e993d (diff) | |
| download | otp-e84614bb7454087cf5c249a470d2dc47b05f6d28.tar.gz otp-e84614bb7454087cf5c249a470d2dc47b05f6d28.tar.bz2 otp-e84614bb7454087cf5c249a470d2dc47b05f6d28.zip | |
Merge branch 'egil/compiler/fix-literal-binary-match/ERL-190/OTP-13738' into maint-19
* egil/compiler/fix-literal-binary-match/ERL-190/OTP-13738:
Update primary bootstrap
Revert "beam_dead: Improve optimization of literal binary matching"
compiler: Test literal binary matching
Diffstat (limited to 'bootstrap')
| -rw-r--r-- | bootstrap/lib/compiler/ebin/beam_asm.beam | bin | 11428 -> 11424 bytes | |||
| -rw-r--r-- | bootstrap/lib/compiler/ebin/beam_dead.beam | bin | 13092 -> 12992 bytes | |||
| -rw-r--r-- | bootstrap/lib/compiler/ebin/compiler.app | 2 | ||||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/hipe_unified_loader.beam | bin | 13792 -> 13796 bytes |
4 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap/lib/compiler/ebin/beam_asm.beam b/bootstrap/lib/compiler/ebin/beam_asm.beam Binary files differindex c8bc82022c..38b3c31cab 100644 --- a/bootstrap/lib/compiler/ebin/beam_asm.beam +++ b/bootstrap/lib/compiler/ebin/beam_asm.beam diff --git a/bootstrap/lib/compiler/ebin/beam_dead.beam b/bootstrap/lib/compiler/ebin/beam_dead.beam Binary files differindex d2dc2f7688..c473003687 100644 --- a/bootstrap/lib/compiler/ebin/beam_dead.beam +++ b/bootstrap/lib/compiler/ebin/beam_dead.beam diff --git a/bootstrap/lib/compiler/ebin/compiler.app b/bootstrap/lib/compiler/ebin/compiler.app index 53891c7260..283fcb7478 100644 --- a/bootstrap/lib/compiler/ebin/compiler.app +++ b/bootstrap/lib/compiler/ebin/compiler.app @@ -19,7 +19,7 @@ {application, compiler, [{description, "ERTS CXC 138 10"}, - {vsn, "6.0.3"}, + {vsn, "7.0"}, {modules, [ beam_a, beam_asm, diff --git a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam Binary files differindex 5a2f294951..f6715adbfe 100644 --- a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam +++ b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam |