--- old/src/hotspot/os/linux/globals_linux.hpp	2020-04-05 21:34:55.282095918 -0700
+++ new/src/hotspot/os/linux/globals_linux.hpp	2020-04-05 21:34:54.934082818 -0700
@@ -26,65 +26,57 @@
 #define OS_LINUX_GLOBALS_LINUX_HPP
 
 //
-// Defines Linux specific flags. They are not available on other platforms.
+// Declare Linux specific flags. They are not available on other platforms.
 //
-#define RUNTIME_OS_FLAGS(develop, \
-                         develop_pd, \
-                         product, \
-                         product_pd, \
-                         diagnostic, \
-                         diagnostic_pd, \
-                         notproduct, \
-                         range, \
-                         constraint) \
-                                                                        \
-  product(bool, UseOprofile, false,                                     \
-        "enable support for Oprofile profiler")                         \
-                                                                        \
-  /*  NB: The default value of UseLinuxPosixThreadCPUClocks may be   */ \
-  /* overridden in Arguments::parse_each_vm_init_arg.                */ \
-  product(bool, UseLinuxPosixThreadCPUClocks, true,                     \
-          "enable fast Linux Posix clocks where available")             \
-                                                                        \
-  product(bool, UseHugeTLBFS, false,                                    \
-          "Use MAP_HUGETLB for large pages")                            \
-                                                                        \
-  product(bool, UseTransparentHugePages, false,                         \
-          "Use MADV_HUGEPAGE for large pages")                          \
-                                                                        \
-  product(bool, LoadExecStackDllInVMThread, true,                       \
-          "Load DLLs with executable-stack attribute in the VM Thread") \
-                                                                        \
-  product(bool, UseSHM, false,                                          \
-          "Use SYSV shared memory for large pages")                     \
-                                                                        \
-  product(bool, UseContainerSupport, true,                              \
-          "Enable detection and runtime container configuration support") \
-                                                                        \
-  product(bool, PreferContainerQuotaForCPUCount, true,                  \
-          "Calculate the container CPU availability based on the value" \
-          " of quotas (if set), when true. Otherwise, use the CPU"      \
-          " shares value, provided it is less than quota.")             \
-                                                                        \
-  product(bool, AdjustStackSizeForTLS, false,                           \
-          "Increase the thread stack size to include space for glibc "  \
-          "static thread-local storage (TLS) if true")                  \
-                                                                        \
-  diagnostic(bool, DumpPrivateMappingsInCore, true,                     \
-          "If true, sets bit 2 of /proc/PID/coredump_filter, thus "     \
-          "resulting in file-backed private mappings of the process to "\
-          "be dumped into the corefile.")                               \
-                                                                        \
-  diagnostic(bool, DumpSharedMappingsInCore, true,                      \
-          "If true, sets bit 3 of /proc/PID/coredump_filter, thus "     \
-          "resulting in file-backed shared mappings of the process to " \
-          "be dumped into the corefile.")                               \
-                                                                        \
-  diagnostic(bool, UseCpuAllocPath, false,                              \
-             "Use CPU_ALLOC code path in os::active_processor_count ")
+#include "runtime/flags/jvmFlag.hpp"
+PRODUCT_FLAG(bool,     UseOprofile, false, JVMFlag::DEFAULT,
+                       "enable support for Oprofile profiler");
+
+
+    //   NB: The default value of UseLinuxPosixThreadCPUClocks may be   
+    //  overridden in Arguments::parse_each_vm_init_arg.                
+PRODUCT_FLAG(bool,     UseLinuxPosixThreadCPUClocks, true, JVMFlag::DEFAULT,
+                       "enable fast Linux Posix clocks where available");
+
+PRODUCT_FLAG(bool,     UseHugeTLBFS, false, JVMFlag::DEFAULT,
+                       "Use MAP_HUGETLB for large pages");
+
+PRODUCT_FLAG(bool,     UseTransparentHugePages, false, JVMFlag::DEFAULT,
+                       "Use MADV_HUGEPAGE for large pages");
+
+PRODUCT_FLAG(bool,     LoadExecStackDllInVMThread, true, JVMFlag::DEFAULT,
+                       "Load DLLs with executable-stack attribute in the VM Thread");
+
+PRODUCT_FLAG(bool,     UseSHM, false, JVMFlag::DEFAULT,
+                       "Use SYSV shared memory for large pages");
+
+PRODUCT_FLAG(bool,     UseContainerSupport, true, JVMFlag::DEFAULT,
+                       "Enable detection and runtime container configuration support");
+
+PRODUCT_FLAG(bool,     PreferContainerQuotaForCPUCount, true, JVMFlag::DEFAULT,
+                       "Calculate the container CPU availability based on the value"
+                       " of quotas (if set), when true. Otherwise, use the CPU"
+                       " shares value, provided it is less than quota.");
+
+PRODUCT_FLAG(bool,     AdjustStackSizeForTLS, false, JVMFlag::DEFAULT,
+                       "Increase the thread stack size to include space for glibc "
+                       "static thread-local storage (TLS) if true");
+
+PRODUCT_FLAG(bool,     DumpPrivateMappingsInCore, true, JVMFlag::DIAGNOSTIC,
+                       "If true, sets bit 2 of /proc/PID/coredump_filter, thus "
+                       "resulting in file-backed private mappings of the process to "
+                       "be dumped into the corefile.");
+
+PRODUCT_FLAG(bool,     DumpSharedMappingsInCore, true, JVMFlag::DIAGNOSTIC,
+                       "If true, sets bit 3 of /proc/PID/coredump_filter, thus "
+                       "resulting in file-backed shared mappings of the process to "
+                       "be dumped into the corefile.");
+
+PRODUCT_FLAG(bool,     UseCpuAllocPath, false, JVMFlag::DIAGNOSTIC,
+                       "Use CPU_ALLOC code path in os::active_processor_count ");
 
 //
-// Defines Linux-specific default values. The flags are available on all
+// Define Linux-specific default values. The flags are available on all
 // platforms, but they may have different default values on other platforms.
 //
 define_pd_global(bool, UseLargePages, false);