Merge
authortonyp
Fri, 25 Feb 2011 08:17:30 -0800
changeset 8339 6dc629275c16
parent 8338 af72756ed180 (current diff)
parent 8336 6698077ad7d3 (diff)
child 8340 52f13adb146a
Merge
--- a/hotspot/src/share/vm/runtime/globals.hpp	Fri Feb 25 10:58:03 2011 -0500
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Fri Feb 25 08:17:30 2011 -0800
@@ -2667,25 +2667,6 @@
   product(bool, UseStringCache, false,                                      \
           "Enable String cache capabilities on String.java")                \
                                                                             \
-  /* byte strings */                                                        \
-  product(bool, UseCompressedStrings, false,                                \
-          "Enable byte-valued strings")                                     \
-                                                                            \
-  product(bool, SpecialStringCompress, true,                                \
-          "special version of string compress")                             \
-                                                                            \
-  product(bool, SpecialStringInflate, true,                                 \
-          "special version of string inflate")                              \
-                                                                            \
-  product(bool, SpecialStringCompareToCC, true,                             \
-          "special version of string compareToCC")                          \
-                                                                            \
-  product(bool, SpecialStringIndexOfCC, true,                               \
-          "special version of string indexOfCC")                            \
-                                                                            \
-  product(bool, SpecialStringEqualsCC, true,                                \
-          "special version of string equalsCC")                             \
-                                                                            \
   /* statistics */                                                          \
   develop(bool, CountCompiledCalls, false,                                  \
           "counts method invocations")                                      \