changeset 3641:08596d5d7dda

Merge jdk7u10-b07
author andrew
date Mon, 17 Sep 2012 16:38:06 +0100
parents b30a0aa0e0d9 40d69350d419
children ede14825dbfa
files .hgtags make/hotspot_version
diffstat 3 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Sep 17 16:06:40 2012 +0100
+++ b/.hgtags	Mon Sep 17 16:38:06 2012 +0100
@@ -335,3 +335,8 @@
 0948731ccc7fdda064f1d961d0b9d0cbf49e1369 jdk7u8-b04
 21e2648677954145d0f12b91ab283e8908e80b08 hs23.4-b01
 baaa29c3d798ffe883091a5ad2ad1bf8324c49d2 jdk7u8-b05
+dc6893023f1121726178d9ac97df8ea5f170025a jdk7u10-b06
+0000000000000000000000000000000000000000 hs23.4-b01
+21e2648677954145d0f12b91ab283e8908e80b08 hs23.6-b01
+6f4d800251492aefcf13727965e8a7feda1338d6 hs23.6-b02
+5f67ff71653f23d7fbb0e1af26502b68b37da9aa jdk7u10-b07
--- a/make/hotspot_version	Mon Sep 17 16:06:40 2012 +0100
+++ b/make/hotspot_version	Mon Sep 17 16:38:06 2012 +0100
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2012
 
 HS_MAJOR_VER=23
-HS_MINOR_VER=4
-HS_BUILD_NUMBER=01
+HS_MINOR_VER=6
+HS_BUILD_NUMBER=02
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
--- a/make/pic.make	Mon Sep 17 16:06:40 2012 +0100
+++ b/make/pic.make	Mon Sep 17 16:38:06 2012 +0100
@@ -32,7 +32,7 @@
   ifndef LP64
     PARTIAL_NONPIC=1
   endif
-  PIC_ARCH = ppc
+  PIC_ARCH = ppc arm
   ifneq ("$(filter $(PIC_ARCH),$(BUILDARCH))","")
     PARTIAL_NONPIC=0
   endif