changeset 1498:e05c0f6eacd2 arch64-jdk8u60-b24

Merge
author adinn
date Mon, 20 Jul 2015 15:30:59 +0100
parents 51d325277cba (diff) 371f3f83f773 (current diff)
children e24662df037a
files .hgtags src/jdk/nashorn/internal/codegen/Compiler.java src/jdk/nashorn/internal/codegen/types/BooleanType.java src/jdk/nashorn/internal/objects/Global.java src/jdk/nashorn/internal/parser/AbstractParser.java src/jdk/nashorn/internal/runtime/Context.java src/jdk/nashorn/internal/runtime/ScriptObject.java src/jdk/nashorn/internal/runtime/ScriptRuntime.java src/jdk/nashorn/internal/runtime/WithObject.java src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
diffstat 1 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jul 15 11:52:53 2015 -0700
+++ b/.hgtags	Mon Jul 20 15:30:59 2015 +0100
@@ -194,6 +194,7 @@
 5759f600fcf7b51ccc6cc8229be980e2153f8675 jdk8-b82
 053d7c55dc8272b58b8bb870dc92a4acf896d52a jdk8-b83
 999cc1bf55203f51b2985feae6378932667ecff2 jdk8-b84
+e0378f0a50dafdcfb7b04f6401d320f89884baa1 aarch64-20130813
 e0378f0a50dafdcfb7b04f6401d320f89884baa1 jdk8-b85
 002ad9d6735f36d1204e133324c73058c8abb1b0 jdk8-b86
 774aeaa89bc15f4365e3c2fc36f6a3a0da70ba28 jdk8-b87
@@ -219,6 +220,8 @@
 f35e1255024b66f7cf82517798f45f6e194e5567 jdk8-b107
 445ad3f6d3b4ba62ebc483323e1919110a304053 jdk8-b108
 6ec2f9e5ed5bd60c2900976e6a54fdcac2f37e9e jdk8-b109
+4d291109480a3f99d18ef98398479a245f68ebf2 preview_rc1
+b35e0d2e2a246475b6ca01820e20fda98c72fde6 preview_rc2
 d49a8c2173f5f90c9a39cc4af8e03cfa8f35ee4c jdk8-b110
 75fd3486e584f20475c064a2cd4d01ac6406a511 jdk8-b111
 6a4fdb3bb4e34af4c5bb8db467bb01e13b1a7e31 jdk8-b112
@@ -239,11 +242,16 @@
 7346abe2ea03134e1aee3b3d0fccb047235bd221 jdk8-b125
 095263db862da23fa04d57c7e93e553831132449 jdk8-b126
 fdfbb745caf0e54775a44e66e39d3025785e0528 jdk8-b127
+74c7c73b5861fc0057d03e422cdae5804336b53e jdk8_b128_aarch64_rc1
+985186a59257081b502b4238954193c80e85e964 jdk8_b128_aarch64_rc3
+2c537124115925820ae5f07b8722d6936ff20535 jdk8_b128_aarch64_rc4
+348b85f9c40f647e4f88fd0ce43c6fd4c8b73f8b jdk8_b128_aarch64_992
 73cbad0c5d28b8f6e12f634aceeb2b3b4ad09553 jdk8-b128
 9cc3fd32fbabdd8b06771d11a319c9802e118612 jdk8-b129
 f87eba70e9ee96255137c389db7cb4e2480e53e7 jdk8-b130
 cca9748cfec7025ac0ddcdede9e5724fa676ad13 jdk8-b131
 5dbdae28a6f3dae3913b118c128bcb1f803317ac jdk8-b132
+b11cabd5de45b0fd555764751dbe703b2cb60567 jdk8_final
 13ca8f1a9eba716295fb7d9c2ddad81390931919 jdk8u5-b01
 7e7cb9977a3d1244384ffa454a4890764a07b042 jdk8u5-b02
 2abeb654b57f306f73f3f73bdfa05f93bce2a1f3 jdk8u5-b03
@@ -343,7 +351,7 @@
 c6dd08613a440ed8d0f1b14b85911d6f3826e1d4 jdk8u31-b33
 f2925491b61b22ac42f8c30ee9c6723ffa401a4c jdk8u40-b00
 62468d841b842769d875bd97d10370585c296eb7 jdk8u40-b01
-b476c69c820ac1e05071f4de5abab8e2dff80e87 jdk8u40-b02
+bdd9c38d1e61edbf770b8733b70a37d0cf0e7055 jdk8u40-b02
 a2e0a985764b5afd5f316429bfab4f44bf150f7f jdk8u40-b03
 34c17c95665419ed76a98f5cf1210ed58eb2eca3 jdk8u40-b04
 2d75c391f61f31538b4c3dcc9778fc6742125ec4 jdk8u40-b05
@@ -353,9 +361,9 @@
 6a8ecdeae4a9a438eed637b5a5d0d18fddb9f711 jdk8u40-b09
 076b1f38a5ccd4692a6f93939a7fc03bc1a1bbb4 jdk8u40-b10
 57c7b273277e00f7a98fafb18ff07aa3245808f0 jdk8u40-b11
-375a3a3256d041fe7334638a95e69b4c11d6104b jdk8u40-b12
-d60fbb5343c186abbf92b0259e67efb3b71377b4 jdk8u40-b13
-7e34104c55cafa0b579be3a480dda383c616a378 jdk8u40-b14
+4f97f0da29eb78c8234ada7b7cb874a494ee653e jdk8u40-b12-aarch64
+af0397959d778072cca638774c9b53ed3787fcfb jdk8u40-b12-aarch64-1262
+e67a19f29c7095700105ca2b09b8bb21ad02e078 jdk8u40-b12-aarch64-1263
 fc37699ddc0ed41d4ab5da821211a6d2648c8883 jdk8u40-b15
 e079f3f6d536510b1ab3589b1038d893d78302ac jdk8u40-b16
 88e22262fdb26e3154a1034c2413415e97b9a86a jdk8u40-b17