--- old/src/share/vm/runtime/globals.hpp	2015-10-30 19:14:57.852475842 +0100
+++ new/src/share/vm/runtime/globals.hpp	2015-10-30 19:14:57.776475839 +0100
@@ -2889,6 +2889,9 @@
   product(bool, AggressiveOpts, false,                                      \
           "Enable aggressive optimizations - see arguments.cpp")            \
                                                                             \
+  product_pd(bool, CompactStrings,                                          \
+          "Enable Strings to use single byte chars in backing store")       \
+                                                                            \
   product_pd(uintx, TypeProfileLevel,                                       \
           "=XYZ, with Z: Type profiling of arguments at call; "             \
                      "Y: Type profiling of return value at call; "          \
@@ -4256,6 +4259,9 @@
              "Use the FP register for holding the frame pointer "           \
              "and not as a general purpose register.")                      \
                                                                             \
+  diagnostic(bool, StringCharIntrinsics, true,                              \
+             "Inline String*.getChar/putChar intrinsics.")                  \
+                                                                            \
   diagnostic(bool, CheckIntrinsics, true,                                   \
              "When a class C is loaded, check that "                        \
              "(1) all intrinsics defined by the VM for class C are present "\