--- old/src/hotspot/share/runtime/synchronizer.hpp	2019-12-17 15:46:05.000000000 -0500
+++ new/src/hotspot/share/runtime/synchronizer.hpp	2019-12-17 15:46:05.000000000 -0500
@@ -34,7 +34,13 @@
 class ObjectMonitor;
 class ThreadsList;
 
-typedef PaddedEnd<ObjectMonitor, DEFAULT_CACHE_LINE_SIZE> PaddedObjectMonitor;
+#ifndef OM_CACHE_LINE_SIZE
+// Use DEFAULT_CACHE_LINE_SIZE if not already specified for
+// the current build platform.
+#define OM_CACHE_LINE_SIZE DEFAULT_CACHE_LINE_SIZE
+#endif
+
+typedef PaddedEnd<ObjectMonitor, OM_CACHE_LINE_SIZE> PaddedObjectMonitor;
 
 struct DeflateMonitorCounters {
   int n_in_use;              // currently associated with objects