changeset 3637:6f4d80025149 hs23.6-b02

Merge
author jcoomes
date Sat, 08 Sep 2012 08:21:47 -0700
parents cf0013b9698c 36784fde7080
children 5f67ff71653f
files .hgtags make/hotspot_version
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Sep 05 15:19:35 2012 -0700
+++ b/.hgtags	Sat Sep 08 08:21:47 2012 -0700
@@ -329,3 +329,5 @@
 21e2648677954145d0f12b91ab283e8908e80b08 hs23.4-b01
 baaa29c3d798ffe883091a5ad2ad1bf8324c49d2 jdk7u8-b05
 dc6893023f1121726178d9ac97df8ea5f170025a jdk7u10-b06
+0000000000000000000000000000000000000000 hs23.4-b01
+21e2648677954145d0f12b91ab283e8908e80b08 hs23.6-b01
--- a/make/hotspot_version	Wed Sep 05 15:19:35 2012 -0700
+++ b/make/hotspot_version	Sat Sep 08 08:21:47 2012 -0700
@@ -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	Wed Sep 05 15:19:35 2012 -0700
+++ b/make/pic.make	Sat Sep 08 08:21:47 2012 -0700
@@ -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