diff -r efdbe9b904ad -r f96fcd9e1e1b src/share/vm/utilities/ostream.cpp
--- a/src/share/vm/utilities/ostream.cpp	Tue Feb 23 18:58:36 2016 -0500
+++ b/src/share/vm/utilities/ostream.cpp	Thu Jun 14 09:15:08 2018 -0700
@@ -277,7 +277,7 @@
   size_t limit = (len + 16) / 16 * 16;
   for (size_t i = 0; i < limit; ++i) {
     if (i % 16 == 0) {
-      indent().print(SIZE_FORMAT_HEX_W(07)":", i);
+      indent().print(SIZE_FORMAT_HEX_W(07) ":", i);
     }
     if (i % 2 == 0) {
       print(" ");
@@ -945,7 +945,7 @@
     // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if
     // we ever get round to introduce that method on the os class
     xs->head("hotspot_log version='%d %d'"
-             " process='%d' time_ms='"INT64_FORMAT"'",
+             " process='%d' time_ms='" INT64_FORMAT "'",
              LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
              os::current_process_id(), (int64_t)time_ms);
     // Write VM version header immediately.