aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-07-15 12:22:45 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-07-15 12:22:45 +0200
commit440445cfd0cbeee8f2bb86b99b6d16caf7a5c9c7 (patch)
tree5267a83e8315e93f65ccf991bc201d71cefbb10e /bootstrap
parentddfae156c2b21d5266bd6eb82bf9ca7c508226fd (diff)
parentb490fb8664ec6e5ceaadc1c74350dc666f5406d2 (diff)
downloadotp-440445cfd0cbeee8f2bb86b99b6d16caf7a5c9c7.tar.gz
otp-440445cfd0cbeee8f2bb86b99b6d16caf7a5c9c7.tar.bz2
otp-440445cfd0cbeee8f2bb86b99b6d16caf7a5c9c7.zip
Merge branch 'maint-19' into maint
Diffstat (limited to 'bootstrap')
-rw-r--r--bootstrap/lib/compiler/ebin/beam_asm.beambin11428 -> 11424 bytes
-rw-r--r--bootstrap/lib/compiler/ebin/beam_dead.beambin13092 -> 12992 bytes
-rw-r--r--bootstrap/lib/compiler/ebin/compiler.app2
-rw-r--r--bootstrap/lib/kernel/ebin/hipe_unified_loader.beambin13792 -> 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
index c8bc82022c..38b3c31cab 100644
--- a/bootstrap/lib/compiler/ebin/beam_asm.beam
+++ b/bootstrap/lib/compiler/ebin/beam_asm.beam
Binary files differ
diff --git a/bootstrap/lib/compiler/ebin/beam_dead.beam b/bootstrap/lib/compiler/ebin/beam_dead.beam
index d2dc2f7688..c473003687 100644
--- a/bootstrap/lib/compiler/ebin/beam_dead.beam
+++ b/bootstrap/lib/compiler/ebin/beam_dead.beam
Binary files differ
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
index 5a2f294951..f6715adbfe 100644
--- a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
+++ b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
Binary files differ