--- old/src/hotspot/cpu/s390/globals_s390.hpp	2020-04-05 21:34:47.841815852 -0700
+++ new/src/hotspot/cpu/s390/globals_s390.hpp	2020-04-05 21:34:47.493802753 -0700
@@ -76,46 +76,50 @@
 // 8146801 (Short Array Allocation): No performance work done here yet.
 define_pd_global(intx, InitArrayShortSize, 1*BytesPerLong);
 
-#define ARCH_FLAGS(develop,      \
-                   product,      \
-                   diagnostic,   \
-                   experimental, \
-                   notproduct,   \
-                   range,        \
-                   constraint)   \
-                                                                              \
-  /* Reoptimize code-sequences of calls at runtime, e.g. replace an */        \
-  /* indirect call by a direct call.                                */        \
-  product(bool, ReoptimizeCallSequences, true,                                \
-          "Reoptimize code-sequences of calls at runtime.")                   \
-                                                                              \
-  product(bool, UseByteReverseInstruction, true,                              \
-          "Use byte reverse instruction.")                                    \
-                                                                              \
-  product(bool, ExpandLoadingBaseDecode, true, "Expand the assembler "        \
-          "instruction required to load the base from DecodeN nodes during "  \
-          "matching.")                                                        \
-  product(bool, ExpandLoadingBaseDecode_NN, true, "Expand the assembler "     \
-          "instruction required to load the base from DecodeN_NN nodes "      \
-          "during matching.")                                                 \
-  product(bool, ExpandLoadingBaseEncode, true, "Expand the assembler "        \
-          "instruction required to load the base from EncodeP nodes during "  \
-          "matching.")                                                        \
-  product(bool, ExpandLoadingBaseEncode_NN, true, "Expand the assembler "     \
-          "instruction required to load the base from EncodeP_NN nodes "      \
-          "during matching.")                                                 \
-                                                                              \
-  /* Seems to pay off with 2 pages already. */                                \
-  product(size_t, MVCLEThreshold, +2*(4*K),                                   \
-          "Threshold above which page-aligned MVCLE copy/init is used.")      \
-                                                                              \
-  product(bool, PreferLAoverADD, false,                                       \
-          "Use LA/LAY instructions over ADD instructions (z/Architecture).")  \
-                                                                              \
-  develop(bool, ZapEmptyStackFields, false, "Write 0x0101... to empty stack"  \
-          " fields. Use this to ease stack debugging.")                       \
-                                                                              \
-  product(bool, TraceTraps, false, "Trace all traps the signal handler"       \
-          "handles.")
+#include "runtime/flags/jvmFlag.hpp"
+
+    //  Reoptimize code-sequences of calls at runtime, e.g. replace an 
+    //  indirect call by a direct call.                                
+PRODUCT_FLAG(bool,     ReoptimizeCallSequences, true, JVMFlag::DEFAULT,
+                       "Reoptimize code-sequences of calls at runtime.");
+
+PRODUCT_FLAG(bool,     UseByteReverseInstruction, true, JVMFlag::DEFAULT,
+                       "Use byte reverse instruction.");
+
+PRODUCT_FLAG(bool,     ExpandLoadingBaseDecode, true, JVMFlag::DEFAULT,
+                       "Expand the assembler "
+                       "instruction required to load the base from DecodeN nodes during "
+                       "matching.");
+
+PRODUCT_FLAG(bool,     ExpandLoadingBaseDecode_NN, true, JVMFlag::DEFAULT,
+                       "Expand the assembler "
+                       "instruction required to load the base from DecodeN_NN nodes "
+                       "during matching.");
+
+PRODUCT_FLAG(bool,     ExpandLoadingBaseEncode, true, JVMFlag::DEFAULT,
+                       "Expand the assembler "
+                       "instruction required to load the base from EncodeP nodes during "
+                       "matching.");
+
+PRODUCT_FLAG(bool,     ExpandLoadingBaseEncode_NN, true, JVMFlag::DEFAULT,
+                       "Expand the assembler "
+                       "instruction required to load the base from EncodeP_NN nodes "
+                       "during matching.");
+
+
+    //  Seems to pay off with 2 pages already. 
+PRODUCT_FLAG(size_t,   MVCLEThreshold, +2*(4*K), JVMFlag::DEFAULT,
+                       "Threshold above which page-aligned MVCLE copy/init is used.");
+
+PRODUCT_FLAG(bool,     PreferLAoverADD, false, JVMFlag::DEFAULT,
+                       "Use LA/LAY instructions over ADD instructions (z/Architecture).");
+
+DEVELOP_FLAG(bool,     ZapEmptyStackFields, false, JVMFlag::DEFAULT,
+                       "Write 0x0101... to empty stack"
+                       " fields. Use this to ease stack debugging.");
+
+PRODUCT_FLAG(bool,     TraceTraps, false, JVMFlag::DEFAULT,
+                       "Trace all traps the signal handler"
+                       "handles.");
 
 #endif // CPU_S390_GLOBALS_S390_HPP