diff options
| author | Björn Gustavsson <[email protected]> | 2015-01-16 09:37:24 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-01-16 09:37:24 +0100 |
| commit | 75ff0fcd414d56845264f2e3f3ecff5826dd57a1 (patch) | |
| tree | 1620b9ca5b6fc7144a568c15839a3c1a1999d1d1 /bootstrap | |
| parent | 96b532f4e4aad9f2cf4cee5bcf39845fbb89d2ad (diff) | |
| parent | 50a92094372b45c9864afe3418b79605da549122 (diff) | |
| download | otp-75ff0fcd414d56845264f2e3f3ecff5826dd57a1.tar.gz otp-75ff0fcd414d56845264f2e3f3ecff5826dd57a1.tar.bz2 otp-75ff0fcd414d56845264f2e3f3ecff5826dd57a1.zip | |
Merge branch 'maint'
* maint:
Update primary bootstrap
beam_bool: Correct live calculation for GC BIFs
beam_bool: Correct indentation for try...catch
sys_core_fold: Correct optimization of 'case'
Conflicts:
bootstrap/bin/start.boot
bootstrap/bin/start_clean.boot
bootstrap/lib/compiler/ebin/beam_asm.beam
bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
Diffstat (limited to 'bootstrap')
| -rw-r--r-- | bootstrap/lib/compiler/ebin/beam_bool.beam | bin | 16340 -> 16308 bytes |
| -rw-r--r-- | bootstrap/lib/compiler/ebin/sys_core_fold.beam | bin | 50268 -> 50524 bytes |
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/io_lib_pretty.beam | bin | 15192 -> 15244 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/bootstrap/lib/compiler/ebin/beam_bool.beam b/bootstrap/lib/compiler/ebin/beam_bool.beam Binary files differindex f339e76fce..6454719448 100644 --- a/bootstrap/lib/compiler/ebin/beam_bool.beam +++ b/bootstrap/lib/compiler/ebin/beam_bool.beam diff --git a/bootstrap/lib/compiler/ebin/sys_core_fold.beam b/bootstrap/lib/compiler/ebin/sys_core_fold.beam Binary files differindex cce0ac7832..5a091fac34 100644 --- a/bootstrap/lib/compiler/ebin/sys_core_fold.beam +++ b/bootstrap/lib/compiler/ebin/sys_core_fold.beam diff --git a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam Binary files differindex 68ec08365e..8aafd0fd1e 100644 --- a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam +++ b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam |