--- old/src/hotspot/share/runtime/globals.hpp	2018-04-09 14:15:07.272207967 +0200
+++ new/src/hotspot/share/runtime/globals.hpp	2018-04-09 14:15:06.530161205 +0200
@@ -451,6 +451,12 @@
   static void verify() PRODUCT_RETURN;
 };
 
+#if INCLUDE_TRACE
+#define TRACE_ONLY(code) code
+#else
+#define TRACE_ONLY(code)
+#endif
+
 // use this for flags that are true by default in the debug version but
 // false in the optimized version, and vice versa
 #ifdef ASSERT
@@ -2983,6 +2989,17 @@
   diagnostic(bool, ShowRegistersOnAssert, false,                            \
           "On internal errors, include registers in error report.")         \
                                                                             \
+  TRACE_ONLY(product(bool, FlightRecorder, false,                           \
+          "Enable Flight Recorder"))                                        \
+                                                                            \
+  TRACE_ONLY(product(ccstr, FlightRecorderOptions, NULL,                    \
+          "Flight Recorder options"))                                       \
+                                                                            \
+  TRACE_ONLY(product(ccstr, StartFlightRecording, NULL,                     \
+          "Start flight recording with options"))                           \
+                                                                            \
+  experimental(bool, UseFastUnorderedTimeStamps, false,                     \
+          "Use platform unstable time where supported for timestamps only")
 
 #define VM_FLAGS(develop,                                                   \
                  develop_pd,                                                \