# HG changeset patch
# User tonyp
# Date 1323106000 18000
# Node ID e37aedaedccdd7cb69a91caf32dd7f8e9ba3af1e
# Parent  cf4dd13bbcd3370b5152cda879dc7bc2431e465a# Parent  4406629aa157cd17744b80c4f05ae73c6b3636e7
Merge

diff -r 4406629aa157 -r e37aedaedccd .hgtags
--- a/.hgtags	Fri Dec 02 12:39:23 2011 -0800
+++ b/.hgtags	Mon Dec 05 12:26:40 2011 -0500
@@ -200,3 +200,5 @@
 b92ca8e229d29004f840c67e620833d23a346761 jdk8-b13
 088d09a130ff02d8f5f05e92256baabe412f0439 jdk8-b14
 6c2a55d4902f202e1c2de1df17b7da083a2c31e8 hs23-b06
+fde2a39ed7f39233b287fbc278f437aac06c275b jdk8-b15
+6de8c9ba5907e4c5ca05ac4b8d84a8e2cbd92399 hs23-b07
diff -r 4406629aa157 -r e37aedaedccd make/hotspot_version
--- a/make/hotspot_version	Fri Dec 02 12:39:23 2011 -0800
+++ b/make/hotspot_version	Mon Dec 05 12:26:40 2011 -0500
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=23
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=07
+HS_BUILD_NUMBER=08
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8
diff -r 4406629aa157 -r e37aedaedccd make/linux/makefiles/mapfile-vers-debug
--- a/make/linux/makefiles/mapfile-vers-debug	Fri Dec 02 12:39:23 2011 -0800
+++ b/make/linux/makefiles/mapfile-vers-debug	Mon Dec 05 12:26:40 2011 -0500
@@ -1,7 +1,3 @@
-#
-# @(#)mapfile-vers-debug	1.18 07/10/25 16:47:35
-#
-
 #
 # Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -221,6 +217,7 @@
                 JVM_SetArrayElement;
                 JVM_SetClassSigners;
                 JVM_SetLength;
+                JVM_SetNativeThreadName;
                 JVM_SetPrimitiveArrayElement;
                 JVM_SetProtectionDomain;
                 JVM_SetSockOpt;
diff -r 4406629aa157 -r e37aedaedccd make/linux/makefiles/mapfile-vers-product
--- a/make/linux/makefiles/mapfile-vers-product	Fri Dec 02 12:39:23 2011 -0800
+++ b/make/linux/makefiles/mapfile-vers-product	Mon Dec 05 12:26:40 2011 -0500
@@ -1,7 +1,3 @@
-#
-# @(#)mapfile-vers-product	1.19 08/02/12 10:56:37
-#
-
 #
 # Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -221,6 +217,7 @@
                 JVM_SetArrayElement;
                 JVM_SetClassSigners;
                 JVM_SetLength;
+                JVM_SetNativeThreadName;
                 JVM_SetPrimitiveArrayElement;
                 JVM_SetProtectionDomain;
                 JVM_SetSockOpt;
diff -r 4406629aa157 -r e37aedaedccd make/solaris/makefiles/mapfile-vers
--- a/make/solaris/makefiles/mapfile-vers	Fri Dec 02 12:39:23 2011 -0800
+++ b/make/solaris/makefiles/mapfile-vers	Mon Dec 05 12:26:40 2011 -0500
@@ -1,7 +1,3 @@
-#
-# @(#)mapfile-vers	1.32 07/10/25 16:47:36
-#
-
 #
 # Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -221,6 +217,7 @@
 		JVM_SetArrayElement;
 		JVM_SetClassSigners;
 		JVM_SetLength;
+                JVM_SetNativeThreadName;
 		JVM_SetPrimitiveArrayElement;
 		JVM_SetProtectionDomain;
 		JVM_SetSockOpt;
diff -r 4406629aa157 -r e37aedaedccd src/share/vm/runtime/globals.cpp
diff -r 4406629aa157 -r e37aedaedccd src/share/vm/runtime/globals.hpp
diff -r 4406629aa157 -r e37aedaedccd src/share/vm/runtime/globals_extension.hpp