--- old/src/share/vm/runtime/globals.hpp	2015-08-12 14:09:40.000000000 +0200
+++ new/src/share/vm/runtime/globals.hpp	2015-08-12 14:09:40.000000000 +0200
@@ -647,6 +647,12 @@
   develop(bool, CleanChunkPoolAsync, falseInEmbedded,                       \
           "Clean the chunk pool asynchronously")                            \
                                                                             \
+  product(bool, ThreadLocalSafepoints, false,                               \
+          "Use thread-local safepoints instead of global polling")          \
+                                                                            \
+  product(bool, G1ElideMembar, false,                                       \
+          "Elide G1 write barrier membar using a handshake")                \
+                                                                            \
   experimental(bool, AlwaysSafeConstructors, false,                         \
           "Force safe construction, as if all fields are final.")           \
                                                                             \