--- a/src/hotspot/share/compiler/abstractDisassembler.cpp	Wed May 22 21:33:58 2019 +0300
+++ b/src/hotspot/share/compiler/abstractDisassembler.cpp	Thu May 23 00:21:39 2019 +0800
@@ -44,26 +44,10 @@
 bool AbstractDisassembler::_show_structs       = false;
 bool AbstractDisassembler::_show_comment       = false;
 bool AbstractDisassembler::_show_block_comment = false;
-#if defined(ARM) || defined(AARCH64)
-bool AbstractDisassembler::_show_bytes  = false; // set "true" to see what's in memory bit by bit
-                                                 // might prove cumbersome because instr_len is hard to find on arm
-#endif
-#if defined(PPC)
-bool AbstractDisassembler::_show_bytes  = false;  // set "true" to see what's in memory bit by bit
-#endif
-#if defined(S390)
-bool AbstractDisassembler::_show_bytes  = false;  // set "true" to see what's in memory bit by bit
-#endif
-#if defined(SPARC)
-bool AbstractDisassembler::_show_bytes  = false; // set "true" to see what's in memory bit by bit
-#endif
-#if defined(X86)
-bool AbstractDisassembler::_show_bytes  = false; // set "true" to see what's in memory bit by bit
-                                                 // might prove cumbersome because instr_len is hard to find on x86
-#endif
-#if defined(ZERO)
-bool AbstractDisassembler::_show_bytes  = false; // set "true" to see what's in memory bit by bit
-#endif
+
+// set "true" to see what's in memory bit by bit
+// might prove cumbersome on platforms where instr_len is hard to find out
+bool AbstractDisassembler::_show_bytes         = false;
 
 // Return #bytes printed. Callers may use that for output alignment.
 // Print instruction address, and offset from blob begin.

--- a/src/hotspot/share/compiler/disassembler.cpp	Wed May 22 21:33:58 2019 +0300
+++ b/src/hotspot/share/compiler/disassembler.cpp	Thu May 23 00:21:39 2019 +0800
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "asm/assembler.inline.hpp"
+#include "asm/macroAssembler.hpp"
 #include "ci/ciUtilities.hpp"
 #include "classfile/javaClasses.hpp"
 #include "code/codeCache.hpp"