--- old/src/share/vm/utilities/macros.hpp	2017-06-21 20:19:35.768834463 -0400
+++ new/src/share/vm/utilities/macros.hpp	2017-06-21 20:19:35.640827891 -0400
@@ -490,12 +490,12 @@
 #define CPU_HEADER_STEM(basename) PASTE_TOKENS(basename, INCLUDE_SUFFIX_CPU)
 #define OS_HEADER_STEM(basename) PASTE_TOKENS(basename, INCLUDE_SUFFIX_OS)
 #define OS_CPU_HEADER_STEM(basename) PASTE_TOKENS(basename, PASTE_TOKENS(INCLUDE_SUFFIX_OS, INCLUDE_SUFFIX_CPU))
-#define TARGET_COMPILER_HEADER_STEM(basename) PASTE_TOKENS(basename, INCLUDE_SUFFIX_TARGET_COMPILER)
+#define COMPILER_HEADER_STEM(basename) PASTE_TOKENS(basename, INCLUDE_SUFFIX_COMPILER)
 
 // Include platform dependent files.
 //
 // This macro constructs from basename and INCLUDE_SUFFIX_OS /
-// INCLUDE_SUFFIX_CPU / INCLUDE_SUFFIX_TARGET_COMPILER, which are set on
+// INCLUDE_SUFFIX_CPU / INCLUDE_SUFFIX_COMPILER, which are set on
 // the command line, the name of platform dependent files to be included.
 // Example: INCLUDE_SUFFIX_OS=_linux / INCLUDE_SUFFIX_CPU=_sparc
 //   CPU_HEADER_INLINE(macroAssembler) --> macroAssembler_sparc.inline.hpp
@@ -513,8 +513,8 @@
 #define OS_CPU_HEADER(basename)        XSTR(OS_CPU_HEADER_STEM(basename).hpp)
 #define OS_CPU_HEADER_INLINE(basename) XSTR(OS_CPU_HEADER_STEM(basename).inline.hpp)
 // basename<compiler>.hpp / basename<compiler>.inline.hpp
-#define TARGET_COMPILER_HEADER(basename)        XSTR(TARGET_COMPILER_HEADER_STEM(basename).hpp)
-#define TARGET_COMPILER_HEADER_INLINE(basename) XSTR(TARGET_COMPILER_HEADER_STEM(basename).inline.hpp)
+#define COMPILER_HEADER(basename)        XSTR(COMPILER_HEADER_STEM(basename).hpp)
+#define COMPILER_HEADER_INLINE(basename) XSTR(COMPILER_HEADER_STEM(basename).inline.hpp)
 
 // To use Atomic::inc(jshort* dest) and Atomic::dec(jshort* dest), the address must be specially
 // aligned, such that (*dest) occupies the upper 16 bits of an aligned 32-bit word. The best way to