aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2015-02-05 09:50:01 +0100
committerBjörn Gustavsson <[email protected]>2015-02-05 09:50:01 +0100
commit431c196486ebc3d6cc684419d8594eb26deaf846 (patch)
treebb7406385d38d3ce172559c52d532174c5377a65 /bootstrap
parentc1e8eefea2822145100ce05453e8054ea29f4672 (diff)
parentf3a8efa2e4fa6f3f64ee38939103bfd55e78bc51 (diff)
downloadotp-431c196486ebc3d6cc684419d8594eb26deaf846.tar.gz
otp-431c196486ebc3d6cc684419d8594eb26deaf846.tar.bz2
otp-431c196486ebc3d6cc684419d8594eb26deaf846.zip
Merge branch 'maint'
* maint: Update primary bootstrap Correct unsafe optimization of '==' and '/=' Conflicts: bootstrap/lib/compiler/ebin/sys_core_fold.beam
Diffstat (limited to 'bootstrap')
-rw-r--r--bootstrap/lib/compiler/ebin/sys_core_fold.beambin50220 -> 50256 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/bootstrap/lib/compiler/ebin/sys_core_fold.beam b/bootstrap/lib/compiler/ebin/sys_core_fold.beam
index 60ac13b7d1..9d743a56aa 100644
--- a/bootstrap/lib/compiler/ebin/sys_core_fold.beam
+++ b/bootstrap/lib/compiler/ebin/sys_core_fold.beam
Binary files differ