diff -r 8bea4144b21c -r 9807daeb47c4 src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,11 +23,11 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_ASSEMBLER_AARCH64_INLINE_HPP
-#define CPU_AARCH64_VM_ASSEMBLER_AARCH64_INLINE_HPP
+#ifndef CPU_AARCH64_ASSEMBLER_AARCH64_INLINE_HPP
+#define CPU_AARCH64_ASSEMBLER_AARCH64_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/codeBuffer.hpp"
 #include "code/codeCache.hpp"
 
-#endif // CPU_AARCH64_VM_ASSEMBLER_AARCH64_INLINE_HPP
+#endif // CPU_AARCH64_ASSEMBLER_AARCH64_INLINE_HPP