# HG changeset patch
# User coleenp
# Date 1322764961 18000
# Node ID 81a08cd7f6a12099e69bb0d49212ecaecd8efd01
# Parent  1d090cf33da637bcf616097c0ad85433d8c58452# Parent  358eca91be4898f5f29c3c456d3cb539a71d7320
Merge

diff -r 1d090cf33da6 -r 81a08cd7f6a1 make/linux/makefiles/mapfile-vers-debug
--- a/make/linux/makefiles/mapfile-vers-debug	Mon Nov 21 10:22:04 2011 -0500
+++ b/make/linux/makefiles/mapfile-vers-debug	Thu Dec 01 13:42:41 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 1d090cf33da6 -r 81a08cd7f6a1 make/linux/makefiles/mapfile-vers-product
--- a/make/linux/makefiles/mapfile-vers-product	Mon Nov 21 10:22:04 2011 -0500
+++ b/make/linux/makefiles/mapfile-vers-product	Thu Dec 01 13:42:41 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 1d090cf33da6 -r 81a08cd7f6a1 make/solaris/makefiles/mapfile-vers
--- a/make/solaris/makefiles/mapfile-vers	Mon Nov 21 10:22:04 2011 -0500
+++ b/make/solaris/makefiles/mapfile-vers	Thu Dec 01 13:42:41 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 1d090cf33da6 -r 81a08cd7f6a1 src/share/vm/runtime/globals.cpp
diff -r 1d090cf33da6 -r 81a08cd7f6a1 src/share/vm/runtime/globals.hpp
diff -r 1d090cf33da6 -r 81a08cd7f6a1 src/share/vm/runtime/globals_extension.hpp