changeset 54306:592c4927a6b7 stats-before-this-super

Automatic merge with default
author mcimadamore
date Thu, 10 Jan 2019 22:05:40 +0100
parents 1c8429403c07 9807daeb47c4
children 74fc73813492
files src/java.desktop/share/classes/sun/awt/Graphics2Delegate.java src/java.desktop/share/classes/sun/awt/TracedEventQueue.java src/java.desktop/share/classes/sun/awt/image/BadDepthException.java src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties test/jdk/java/lang/String/AlignIndent.java test/langtools/tools/javac/RawStringLiteralLang.java test/langtools/tools/javac/RawStringLiteralLangAPI.java test/langtools/tools/javac/diags/examples/RawStringLiteral.java
diffstat 1765 files changed, 10531 insertions(+), 9614 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jan 03 21:25:14 2019 +0100
+++ b/.hgtags	Thu Jan 10 22:05:40 2019 +0100
@@ -531,3 +531,5 @@
 11033c4ada542f9c9a873314b6ecf60af19e8256 jdk-13+1
 7496df94b3b79f3da53925d2d137317715f11d97 jdk-12+25
 50677f43ac3df9a8684222b8893543c60f3aa0bd jdk-13+2
+de9fd809bb475401aad188eab2264226788aad81 jdk-12+26
+642346a11059b9f283110dc301a24ed43b76a94e jdk-13+3
--- a/make/ExplodedImageOptimize.gmk	Thu Jan 03 21:25:14 2019 +0100
+++ b/make/ExplodedImageOptimize.gmk	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
 ################################################################################
 
 PACKAGES_ATTRIBUTE_TARGET := $(JDK_OUTPUTDIR)/_packages_attribute.done
-ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module_info.class)
+ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module-info.class)
 
 $(PACKAGES_ATTRIBUTE_TARGET): $(ALL_MODULEINFO_CLASSES) $(BUILD_JIGSAW_CLASSES)
 	$(call LogInfo, Optimizing the exploded image)
--- a/make/RunTestsPrebuilt.gmk	Thu Jan 03 21:25:14 2019 +0100
+++ b/make/RunTestsPrebuilt.gmk	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -237,7 +237,8 @@
 else ifeq ($(OPENJDK_TARGET_OS), windows)
   NUM_CORES := $(NUMBER_OF_PROCESSORS)
   MEMORY_SIZE := $(shell \
-      $(EXPR) `wmic computersystem get totalphysicalmemory -value | $(GREP) = \
+      $(EXPR) `wmic computersystem get totalphysicalmemory -value \
+          | $(GREP) = | $(SED) 's/\\r//g' \
           | $(CUT) -d "=" -f 2-` / 1024 / 1024 \
   )
 endif
--- a/make/autoconf/basics.m4	Thu Jan 03 21:25:14 2019 +0100
+++ b/make/autoconf/basics.m4	Thu Jan 10 22:05:40 2019 +0100
@@ -999,7 +999,7 @@
           elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
             MAKE_EXPECTED_ENV='msys'
           elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
-            MAKE_EXPECTED_ENV='x86_64-pc-linux-gnu'
+            MAKE_EXPECTED_ENV='x86_64-.*-linux-gnu'
           else
             AC_MSG_ERROR([Unknown Windows environment])
           fi
--- a/make/autoconf/flags-cflags.m4	Thu Jan 03 21:25:14 2019 +0100
+++ b/make/autoconf/flags-cflags.m4	Thu Jan 10 22:05:40 2019 +0100
@@ -183,7 +183,8 @@
 
       # Additional warnings that are not activated by -Wall and -Wextra
       WARNINGS_ENABLE_ADDITIONAL="-Wpointer-arith -Wsign-compare \
-          -Wunused-function -Wundef -Wunused-value -Wreturn-type"
+          -Wunused-function -Wundef -Wunused-value -Wreturn-type \
+          -Wtrampolines"
       WARNINGS_ENABLE_ADDITIONAL_CXX="-Woverloaded-virtual -Wreorder"
       WARNINGS_ENABLE_ALL_CFLAGS="-Wall -Wextra -Wformat=2 $WARNINGS_ENABLE_ADDITIONAL"
       WARNINGS_ENABLE_ALL_CXXFLAGS="$WARNINGS_ENABLE_ALL_CFLAGS $WARNINGS_ENABLE_ADDITIONAL_CXX"
--- a/make/autoconf/spec.gmk.in	Thu Jan 03 21:25:14 2019 +0100
+++ b/make/autoconf/spec.gmk.in	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -729,6 +729,7 @@
 RC:=@FIXPATH@ @RC@
 DUMPBIN:=@FIXPATH@ @DUMPBIN@
 CYGPATH:=@CYGPATH@
+WSLPATH:=@WSLPATH@
 LDD:=@LDD@
 OTOOL:=@OTOOL@
 READELF:=@READELF@
--- a/make/autoconf/toolchain_windows.m4	Thu Jan 03 21:25:14 2019 +0100
+++ b/make/autoconf/toolchain_windows.m4	Thu Jan 10 22:05:40 2019 +0100
@@ -272,7 +272,26 @@
     eval USE_UCRT="\${VS_USE_UCRT_${VS_VERSION}}"
     eval VS_SUPPORTED="\${VS_SUPPORTED_${VS_VERSION}}"
     eval PLATFORM_TOOLSET="\${VS_VS_PLATFORM_NAME_${VS_VERSION}}"
-    VS_PATH="$TOOLCHAIN_PATH:$PATH"
+
+    # The TOOLCHAIN_PATH from a devkit is in Unix format. In WSL we need a
+    # windows version of the complete VS_PATH as VS_PATH_WINDOWS
+    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+      # Convert the toolchain path
+      OLDIFS="$IFS"
+      IFS=":"
+      VS_PATH_WINDOWS=""
+      for i in $TOOLCHAIN_PATH; do
+        path=$i
+        BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([path])
+        VS_PATH_WINDOWS="$VS_PATH_WINDOWS;$path"
+      done
+      IFS="$OLDIFS"
+      # Append the current path from Windows env
+      WINDOWS_PATH="`$CMD /c echo %PATH%`"
+      VS_PATH_WINDOWS="$VS_PATH_WINDOWS;$WINDOWS_PATH"
+    else
+      VS_PATH="$TOOLCHAIN_PATH:$PATH"
+    fi
 
     # Convert DEVKIT_VS_INCLUDE into windows style VS_INCLUDE so that it
     # can still be exported as INCLUDE for compiler invocations without
@@ -450,6 +469,34 @@
       . $VS_ENV_TMP_DIR/set-vs-env.sh
       # Now we have VS_PATH, VS_INCLUDE, VS_LIB. For further checking, we
       # also define VCINSTALLDIR, WindowsSdkDir and WINDOWSSDKDIR.
+
+      # In WSL, the extracted VS_PATH is Windows style. This needs to be
+      # rewritten as Unix style and the Windows style version is saved
+      # in VS_PATH_WINDOWS.
+      if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+        OLDIFS="$IFS"
+        IFS=";"
+        # Convert VS_PATH to unix style
+        VS_PATH_WINDOWS="$VS_PATH"
+        VS_PATH=""
+        for i in $VS_PATH_WINDOWS; do
+          path=$i
+          # Only process non-empty elements
+          if test "x$path" != x; then
+            IFS="$OLDIFS"
+            # Check that directory exists before calling fixup_path
+            testpath=$path
+            BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
+            if test -d "$testpath"; then
+              BASIC_FIXUP_PATH([path])
+              BASIC_APPEND_TO_PATH(VS_PATH, $path)
+            fi
+            IFS=";"
+          fi
+        done
+        IFS="$OLDIFS"
+      fi
+
     else
       # We did not find a vsvars bat file, let's hope we are run from a VS command prompt.
       AC_MSG_NOTICE([Cannot locate a valid Visual Studio installation, checking current environment])
@@ -483,29 +530,9 @@
       AC_SUBST(VS_INCLUDE)
       AC_SUBST(VS_LIB)
 
+      # Convert VS_INCLUDE into SYSROOT_CFLAGS
       OLDIFS="$IFS"
       IFS=";"
-      if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
-        # Convert VS_PATH to unix style
-        VS_PATH_WINDOWS="$VS_PATH"
-        VS_PATH=""
-        for i in $VS_PATH_WINDOWS; do
-          path=$i
-          # Only process non-empty elements
-          if test "x$path" != x; then
-            IFS="$OLDIFS"
-            # Check that directory exists before calling fixup_path
-            testpath=$path
-            BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
-            if test -d "$testpath"; then
-              BASIC_FIXUP_PATH([path])
-              BASIC_APPEND_TO_PATH(VS_PATH, $path)
-            fi
-            IFS=";"
-          fi
-        done
-      fi
-      # Convert VS_INCLUDE into SYSROOT_CFLAGS
       for i in $VS_INCLUDE; do
         ipath=$i
         # Only process non-empty elements
--- a/make/conf/jib-profiles.js	Thu Jan 03 21:25:14 2019 +0100
+++ b/make/conf/jib-profiles.js	Thu Jan 10 22:05:40 2019 +0100
@@ -386,7 +386,9 @@
             target_cpu: "x64",
             dependencies: ["devkit", "graphviz", "pandoc", "graalunit_lib"],
             configure_args: concat(common.configure_args_64bit,
-                "--enable-full-docs", "--with-zlib=system"),
+                "--enable-full-docs", "--with-zlib=system",
+                (isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu",
+                    "--build=x86_64-unknown-linux-gnu" ] : [])),
             default_make_targets: ["docs-bundles"],
         },
 
@@ -833,6 +835,13 @@
 
     var boot_jdk_platform = (input.build_os == "macosx" ? "osx" : input.build_os)
         + "-" + input.build_cpu;
+    var boot_jdk_ext = (input.build_os == "windows" ? ".zip" : ".tar.gz")
+    // If running in WSL and building for Windows, it will look like Linux,
+    // but we need a Windows boot JDK.
+    if (isWsl(input) && input.target_os == "windows") {
+        boot_jdk_platform = "windows-" + input.build_cpu;
+        boot_jdk_ext = ".zip";
+    }
 
     var makeBinDir = (input.build_os == "windows"
         ? input.get("gnumake", "install_path") + "/cygwin/bin"
@@ -846,8 +855,7 @@
             version: common.boot_jdk_version,
             build_number: "28",
             file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_"
-                + boot_jdk_platform + "_bin"
-		+ (input.build_os == "windows" ? ".zip" : ".tar.gz"),
+                + boot_jdk_platform + "_bin" + boot_jdk_ext,
             configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
             environment_path: common.boot_jdk_home + "/bin"
         },
@@ -941,7 +949,7 @@
             organization: common.organization,
             ext: "tar.gz",
             revision: "2.3.1+1.0",
-            module: "pandoc-" + input.target_platform,
+            module: "pandoc-" + input.build_platform,
             configure_args: "PANDOC=" + input.get("pandoc", "install_path") + "/pandoc/pandoc",
             environment_path: input.get("pandoc", "install_path") + "/pandoc"
         },
@@ -1181,3 +1189,13 @@
     }
     return version_numbers;
 }
+
+/**
+ * Returns true if running in Windows Subsystem for Linux. Jib does not yet
+ * detect wsl as osenv, so fall back on linux with version containing Microsoft.
+ */
+var isWsl = function (input) {
+    return ( input.build_osenv == "wsl"
+             || (input.build_os == "linux"
+                 && java.lang.System.getProperty("os.version").contains("Microsoft")));
+}
--- a/make/devkit/createWindowsDevkit2017.sh	Thu Jan 03 21:25:14 2019 +0100
+++ b/make/devkit/createWindowsDevkit2017.sh	Thu Jan 10 22:05:40 2019 +0100
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 #
 
 # This script copies parts of a Visual Studio installation into a devkit
-# suitable for building OpenJDK and OracleJDK. Needs to run in Cygwin.
+# suitable for building OpenJDK and OracleJDK. Needs to run in Cygwin or WSL.
 # erik.joelsson@oracle.com
 
 VS_VERSION="2017"
@@ -34,6 +34,8 @@
 SDK_VERSION="10"
 SDK_FULL_VERSION="10.0.16299.0"
 MSVC_DIR="Microsoft.VC141.CRT"
+MSVC_FULL_VERSION="14.12.25827"
+REDIST_FULL_VERSION="14.12.25810"
 
 SCRIPT_DIR="$(cd "$(dirname $0)" > /dev/null && pwd)"
 BUILD_DIR="${SCRIPT_DIR}/../../build/devkit"
@@ -41,22 +43,42 @@
 ################################################################################
 # Prepare settings
 
+UNAME_SYSTEM=`uname -s`
+UNAME_RELEASE=`uname -r`
+
+# Detect cygwin or WSL
+IS_CYGWIN=`echo $UNAME_SYSTEM | grep -i CYGWIN`
+IS_WSL=`echo $UNAME_RELEASE | grep Microsoft`
+if test "x$IS_CYGWIN" != "x"; then
+    BUILD_ENV="cygwin"
+elif test "x$IS_WSL" != "x"; then
+    BUILD_ENV="wsl"
+else
+    echo "Unknown environment; only Cygwin and WSL are supported."
+    exit 1
+fi
+
+if test "x$BUILD_ENV" = "xcygwin"; then
+    WINDOWS_PATH_TO_UNIX_PATH="cygpath -u"
+elif test "x$BUILD_ENV" = "xwsl"; then
+    WINDOWS_PATH_TO_UNIX_PATH="wslpath -u"
+fi
+
 # Work around the insanely named ProgramFiles(x86) env variable
-PROGRAMFILES_X86="$(cygpath "$(env | sed -n 's/^ProgramFiles(x86)=//p')")"
+PROGRAMFILES_X86="$($WINDOWS_PATH_TO_UNIX_PATH "$(cmd.exe /c set | sed -n 's/^ProgramFiles(x86)=//p' | tr -d '\r')")"
 
 # Find Visual Studio installation dir
-eval VSNNNCOMNTOOLS="\"\${VS${VS_VERSION_NUM_NODOT}COMNTOOLS}\""
+VSNNNCOMNTOOLS=`cmd.exe /c echo %VS${VS_VERSION_NUM_NODOT}COMNTOOLS% | tr -d '\r'`
 if [ -d "$VSNNNCOMNTOOLS" ]; then
-    VS_INSTALL_DIR="$(cygpath "$VSNNNCOMNTOOLS/../..")"
+    VS_INSTALL_DIR="$($WINDOWS_PATH_TO_UNIX_PATH "$VSNNNCOMNTOOLS/../..")"
 else
     VS_INSTALL_DIR="${PROGRAMFILES_X86}/Microsoft Visual Studio/2017"
-    VS_INSTALL_DIR="$(ls -d "${VS_INSTALL_DIR}/"{Community,Professional} 2>/dev/null | head -n1)"
-    VS_INSTALL_DIR="$(cygpath "$VS_INSTALL_DIR")"
+    VS_INSTALL_DIR="$(ls -d "${VS_INSTALL_DIR}/"{Community,Professional,Enterprise} 2>/dev/null | head -n1)"
 fi
 echo "VS_INSTALL_DIR: $VS_INSTALL_DIR"
 
 # Extract semantic version
-POTENTIAL_INI_FILES="Common7\IDE\wdexpress.isolation.ini Common7\IDE\devenv.isolation.ini"
+POTENTIAL_INI_FILES="Common7/IDE/wdexpress.isolation.ini Common7/IDE/devenv.isolation.ini"
 for f in $POTENTIAL_INI_FILES; do
     if [ -f "$VS_INSTALL_DIR/$f" ]; then
         VS_VERSION_SP="$(grep ^SemanticVersion= "$VS_INSTALL_DIR/$f")"
@@ -86,8 +108,8 @@
 # Copy Visual Studio files
 
 if [ ! -d $DEVKIT_ROOT/VC ]; then
-    VC_SUBDIR="VC/Tools/MSVC/14.12.25827"
-    REDIST_SUBDIR="VC/Redist/MSVC/14.12.25810"
+    VC_SUBDIR="VC/Tools/MSVC/$MSVC_FULL_VERSION"
+    REDIST_SUBDIR="VC/Redist/MSVC/$REDIST_FULL_VERSION"
     echo "Copying VC..."
     mkdir -p $DEVKIT_ROOT/VC/bin
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx64/x64" $DEVKIT_ROOT/VC/bin/
@@ -117,7 +139,7 @@
 ################################################################################
 # Copy SDK files
 
-SDK_INSTALL_DIR="$(cygpath "$PROGRAMFILES_X86/Windows Kits/$SDK_VERSION")"
+SDK_INSTALL_DIR="$PROGRAMFILES_X86/Windows Kits/$SDK_VERSION"
 echo "SDK_INSTALL_DIR: $SDK_INSTALL_DIR"
 
 if [ ! -d $DEVKIT_ROOT/$SDK_VERSION ]; then
--- a/make/hotspot/ide/CreateVSProject.gmk	Thu Jan 03 21:25:14 2019 +0100
+++ b/make/hotspot/ide/CreateVSProject.gmk	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -46,8 +46,17 @@
 
   # Helper macro to convert a unix path to a Windows path, suitable for
   # inclusion in a command line.
-  FixPath = \
-    $(strip $(subst \,\\,$(shell $(CYGPATH) -w $1)))
+  ifeq ($(OPENJDK_BUILD_OS_ENV), windows.cygwin)
+    FixPath = \
+        $(strip $(subst \,\\,$(shell $(CYGPATH) -w $1)))
+    FixLinuxExecutable = \
+        $(call FixPath, $1)
+  else ifeq ($(OPENJDK_BUILD_OS_ENV), windows.wsl)
+    FixPath = \
+        $(strip $(subst \,\\,$(shell $(WSLPATH) -w $1)))
+    FixLinuxExecutable = \
+        "%windir%\Sysnative\wsl.exe $1"
+  endif
 
   JVM_DEFINES_client := $(patsubst -D%,%, $(filter -D%, $(JVM_CFLAGS)))
   EXTRACTED_DEFINES_client := $(addprefix -define , $(JVM_DEFINES_client))
@@ -121,7 +130,7 @@
       -platformName x64 \
       -buildBase $(call FixPath, $(IDE_OUTPUTDIR)/vs-output) \
       -buildSpace $(call FixPath, $(IDE_OUTPUTDIR)) \
-      -makeBinary $(call FixPath, $(MAKE)) \
+      -makeBinary $(call FixLinuxExecutable, $(MAKE)) \
       -makeOutput $(call FixPath, $(JDK_OUTPUTDIR)/bin/server) \
       -absoluteInclude $(call FixPath, $(HOTSPOT_OUTPUTDIR)/variant-server/gensrc) \
       -absoluteSrcInclude $(call FixPath, $(HOTSPOT_OUTPUTDIR)/variant-server/gensrc) \
--- a/make/hotspot/symbols/symbols-unix	Thu Jan 03 21:25:14 2019 +0100
+++ b/make/hotspot/symbols/symbols-unix	Thu Jan 10 22:05:40 2019 +0100
@@ -81,7 +81,6 @@
 JVM_GetClassInterfaces
 JVM_GetClassMethodsCount
 JVM_GetClassModifiers
-JVM_GetClassName
 JVM_GetClassNameUTF
 JVM_GetClassSignature
 JVM_GetClassSigners
@@ -133,6 +132,7 @@
 JVM_HasReferencePendingList
 JVM_HoldsLock
 JVM_IHashCode
+JVM_InitClassName
 JVM_InitStackTraceElement
 JVM_InitStackTraceElementArray
 JVM_InitializeFromArchive
--- a/make/lib/Awt2dLibraries.gmk	Thu Jan 03 21:25:14 2019 +0100
+++ b/make/lib/Awt2dLibraries.gmk	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -519,7 +519,7 @@
       DISABLED_WARNINGS_solstudio := \
          E_STATEMENT_NOT_REACHED \
          E_END_OF_LOOP_CODE_NOT_REACHED, \
-      DISABLED_WARNINGS_microsoft := 4267 4244 4312, \
+      DISABLED_WARNINGS_microsoft := 4267 4244 4312 4819, \
       DISABLED_WARNINGS_gcc := implicit-fallthrough, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
--- a/make/scripts/pandoc-html-manpage-filter.js	Thu Jan 03 21:25:14 2019 +0100
+++ b/make/scripts/pandoc-html-manpage-filter.js	Thu Jan 10 22:05:40 2019 +0100
@@ -86,7 +86,7 @@
 function change_title(type, value) {
     if (type === 'MetaInlines') {
         if (value[0].t === 'Str') {
-            var match = value[0].c.match(/^([A-Z]+)\([0-9]+\)$/);
+            var match = value[0].c.match(/^([A-Z0-9]+)\([0-9]+\)$/);
             if (match) {
                 return MetaInlines([
                         Str("The"), Space(),
--- a/make/test/BuildMicrobenchmark.gmk	Thu Jan 03 21:25:14 2019 +0100
+++ b/make/test/BuildMicrobenchmark.gmk	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,7 @@
 # Build microbenchmark suite for the current JDK
 $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
     SETUP := MICROBENCHMARK_JAVA_COMPILER, \
-    ADD_JAVAC_FLAGS := -cp $(MICROBENCHMARK_CLASSPATH) -Xlint -Werror, \
+    ADD_JAVAC_FLAGS := -cp $(MICROBENCHMARK_CLASSPATH) -Xlint -Xlint:-processing -Werror, \
     SRC := $(MICROBENCHMARK_SRC), \
     BIN := $(MICROBENCHMARK_CLASSES), \
 ))
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_ASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_ASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_ASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_ASSEMBLER_AARCH64_HPP
 
 #include "asm/register.hpp"
 
@@ -2754,4 +2754,4 @@
 
 extern "C" void das(uint64_t start, int len);
 
-#endif // CPU_AARCH64_VM_ASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_ASSEMBLER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -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
--- a/src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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,9 +23,9 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_BYTECODES_AARCH64_HPP
-#define CPU_AARCH64_VM_BYTECODES_AARCH64_HPP
+#ifndef CPU_AARCH64_BYTECODES_AARCH64_HPP
+#define CPU_AARCH64_BYTECODES_AARCH64_HPP
 
 // No aarch64 specific bytecodes
 
-#endif // CPU_AARCH64_VM_BYTECODES_AARCH64_HPP
+#endif // CPU_AARCH64_BYTECODES_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/bytes_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/bytes_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_BYTES_AARCH64_HPP
-#define CPU_AARCH64_VM_BYTES_AARCH64_HPP
+#ifndef CPU_AARCH64_BYTES_AARCH64_HPP
+#define CPU_AARCH64_BYTES_AARCH64_HPP
 
 #include "memory/allocation.hpp"
 
@@ -63,4 +63,4 @@
 // The following header contains the implementations of swap_u2, swap_u4, and swap_u8[_base]
 #include OS_CPU_HEADER_INLINE(bytes)
 
-#endif // CPU_AARCH64_VM_BYTES_AARCH64_HPP
+#endif // CPU_AARCH64_BYTES_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C1_DEFS_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_DEFS_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_DEFS_AARCH64_HPP
+#define CPU_AARCH64_C1_DEFS_AARCH64_HPP
 
 // native word offsets from memory address (little endian)
 enum {
@@ -78,4 +78,4 @@
   pd_float_saved_as_double = false
 };
 
-#endif // CPU_AARCH64_VM_C1_DEFS_AARCH64_HPP
+#endif // CPU_AARCH64_C1_DEFS_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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,10 +23,10 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C1_FPUSTACKSIM_HPP
-#define CPU_AARCH64_VM_C1_FPUSTACKSIM_HPP
+#ifndef CPU_AARCH64_C1_FPUSTACKSIM_AARCH64_HPP
+#define CPU_AARCH64_C1_FPUSTACKSIM_AARCH64_HPP
 
 // No FPU stack on AARCH64
 class FpuStackSim;
 
-#endif // CPU_AARCH64_VM_C1_FPUSTACKSIM_HPP
+#endif // CPU_AARCH64_C1_FPUSTACKSIM_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C1_FRAMEMAP_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_FRAMEMAP_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_FRAMEMAP_AARCH64_HPP
+#define CPU_AARCH64_C1_FRAMEMAP_AARCH64_HPP
 
 //  On AArch64 the frame looks as follows:
 //
@@ -144,5 +144,4 @@
   static int last_cpu_reg()             { return pd_last_cpu_reg;  }
   static int last_byte_reg()            { return pd_last_byte_reg; }
 
-#endif // CPU_AARCH64_VM_C1_FRAMEMAP_AARCH64_HPP
-
+#endif // CPU_AARCH64_C1_FRAMEMAP_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_LIRASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_C1_LIRASSEMBLER_AARCH64_HPP
 
 // ArrayCopyStub needs access to bailout
 friend class ArrayCopyStub;
@@ -81,4 +81,4 @@
   void store_parameter(jint c,     int offset_from_esp_in_words);
   void store_parameter(jobject c,  int offset_from_esp_in_words);
 
-#endif // CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_C1_LIRASSEMBLER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C1_LINEARSCAN_HPP
-#define CPU_AARCH64_VM_C1_LINEARSCAN_HPP
+#ifndef CPU_AARCH64_C1_LINEARSCAN_AARCH64_HPP
+#define CPU_AARCH64_C1_LINEARSCAN_AARCH64_HPP
 
 inline bool LinearScan::is_processed_reg_num(int reg_num) {
   return reg_num <= FrameMap::last_cpu_reg() || reg_num >= pd_nof_cpu_regs_frame_map;
@@ -73,4 +73,4 @@
 }
 
 
-#endif // CPU_AARCH64_VM_C1_LINEARSCAN_HPP
+#endif // CPU_AARCH64_C1_LINEARSCAN_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_MACROASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_C1_MACROASSEMBLER_AARCH64_HPP
 
 using MacroAssembler::build_frame;
 using MacroAssembler::null_check;
@@ -111,4 +111,4 @@
 
   void load_parameter(int offset_in_words, Register reg);
 
-#endif // CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_C1_MACROASSEMBLER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C1_GLOBALS_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_GLOBALS_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_GLOBALS_AARCH64_HPP
+#define CPU_AARCH64_C1_GLOBALS_AARCH64_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -74,4 +74,4 @@
 define_pd_global(bool, CSEArrayLength,               false);
 define_pd_global(bool, TwoOperandLIRForm,            false );
 
-#endif // CPU_AARCH64_VM_C1_GLOBALS_AARCH64_HPP
+#endif // CPU_AARCH64_C1_GLOBALS_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C2_GLOBALS_AARCH64_HPP
-#define CPU_AARCH64_VM_C2_GLOBALS_AARCH64_HPP
+#ifndef CPU_AARCH64_C2_GLOBALS_AARCH64_HPP
+#define CPU_AARCH64_C2_GLOBALS_AARCH64_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -87,4 +87,4 @@
 
 define_pd_global(bool,  TrapBasedRangeChecks,        false); // Not needed.
 
-#endif // CPU_AARCH64_VM_C2_GLOBALS_AARCH64_HPP
+#endif // CPU_AARCH64_C2_GLOBALS_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_CODEBUFFER_AARCH64_HPP
-#define CPU_AARCH64_VM_CODEBUFFER_AARCH64_HPP
+#ifndef CPU_AARCH64_CODEBUFFER_AARCH64_HPP
+#define CPU_AARCH64_CODEBUFFER_AARCH64_HPP
 
 private:
   void pd_initialize() {}
@@ -32,4 +32,4 @@
 public:
   void flush_bundle(bool start_new_bundle) {}
 
-#endif // CPU_AARCH64_VM_CODEBUFFER_AARCH64_HPP
+#endif // CPU_AARCH64_CODEBUFFER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/copy_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/copy_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_COPY_AARCH64_HPP
-#define CPU_AARCH64_VM_COPY_AARCH64_HPP
+#ifndef CPU_AARCH64_COPY_AARCH64_HPP
+#define CPU_AARCH64_COPY_AARCH64_HPP
 
 // Inline functions for memory copy and fill.
 
@@ -56,4 +56,4 @@
   (void)memset(to, 0, count);
 }
 
-#endif // CPU_AARCH64_VM_COPY_AARCH64_HPP
+#endif // CPU_AARCH64_COPY_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/depChecker_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/depChecker_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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,9 +23,9 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_DEPCHECKER_AARCH64_HPP
-#define CPU_AARCH64_VM_DEPCHECKER_AARCH64_HPP
+#ifndef CPU_AARCH64_DEPCHECKER_AARCH64_HPP
+#define CPU_AARCH64_DEPCHECKER_AARCH64_HPP
 
 // Nothing to do on aarch64
 
-#endif // CPU_AARCH64_VM_DEPCHECKER_AARCH64_HPP
+#endif // CPU_AARCH64_DEPCHECKER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/disassembler_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/disassembler_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_DISASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_DISASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_DISASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_DISASSEMBLER_AARCH64_HPP
 
   static int pd_instruction_alignment() {
     return 1;
@@ -34,4 +34,4 @@
     return "";
   }
 
-#endif // CPU_AARCH64_VM_DISASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_DISASSEMBLER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/frame_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_FRAME_AARCH64_HPP
-#define CPU_AARCH64_VM_FRAME_AARCH64_HPP
+#ifndef CPU_AARCH64_FRAME_AARCH64_HPP
+#define CPU_AARCH64_FRAME_AARCH64_HPP
 
 #include "runtime/synchronizer.hpp"
 
@@ -160,4 +160,4 @@
 
   static jint interpreter_frame_expression_stack_direction() { return -1; }
 
-#endif // CPU_AARCH64_VM_FRAME_AARCH64_HPP
+#endif // CPU_AARCH64_FRAME_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_FRAME_AARCH64_INLINE_HPP
-#define CPU_AARCH64_VM_FRAME_AARCH64_INLINE_HPP
+#ifndef CPU_AARCH64_FRAME_AARCH64_INLINE_HPP
+#define CPU_AARCH64_FRAME_AARCH64_INLINE_HPP
 
 #include "code/codeCache.hpp"
 #include "code/vmreg.inline.hpp"
@@ -250,4 +250,4 @@
   *result_adr = obj;
 }
 
-#endif // CPU_AARCH64_VM_FRAME_AARCH64_INLINE_HPP
+#endif // CPU_AARCH64_FRAME_AARCH64_INLINE_HPP
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,4 +39,4 @@
 
 };
 
-#endif // #ifndef CPU_AARCH64_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP
-#define CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP
+#ifndef CPU_AARCH64_GLOBALDEFINITIONS_AARCH64_HPP
+#define CPU_AARCH64_GLOBALDEFINITIONS_AARCH64_HPP
 
 const int StackAlignmentInBytes  = 16;
 
@@ -53,4 +53,4 @@
 
 #define THREAD_LOCAL_POLL
 
-#endif // CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP
+#endif // CPU_AARCH64_GLOBALDEFINITIONS_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/globals_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/globals_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_GLOBALS_AARCH64_HPP
-#define CPU_AARCH64_VM_GLOBALS_AARCH64_HPP
+#ifndef CPU_AARCH64_GLOBALS_AARCH64_HPP
+#define CPU_AARCH64_GLOBALS_AARCH64_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -166,4 +166,4 @@
 #endif
 
 
-#endif // CPU_AARCH64_VM_GLOBALS_AARCH64_HPP
+#endif // CPU_AARCH64_GLOBALS_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/icache_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/icache_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_ICACHE_AARCH64_HPP
-#define CPU_AARCH64_VM_ICACHE_AARCH64_HPP
+#ifndef CPU_AARCH64_ICACHE_AARCH64_HPP
+#define CPU_AARCH64_ICACHE_AARCH64_HPP
 
 // Interface for updating the instruction cache.  Whenever the VM
 // modifies code, part of the processor instruction cache potentially
@@ -41,4 +41,4 @@
   }
 };
 
-#endif // CPU_AARCH64_VM_ICACHE_AARCH64_HPP
+#endif // CPU_AARCH64_ICACHE_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_INTERP_MASM_AARCH64_64_HPP
-#define CPU_AARCH64_VM_INTERP_MASM_AARCH64_64_HPP
+#ifndef CPU_AARCH64_INTERP_MASM_AARCH64_HPP
+#define CPU_AARCH64_INTERP_MASM_AARCH64_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "interpreter/invocationCounter.hpp"
@@ -295,4 +295,4 @@
   }
 };
 
-#endif // CPU_AARCH64_VM_INTERP_MASM_AARCH64_64_HPP
+#endif // CPU_AARCH64_INTERP_MASM_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_INTERPRETERRT_AARCH64_HPP
-#define CPU_AARCH64_VM_INTERPRETERRT_AARCH64_HPP
+#ifndef CPU_AARCH64_INTERPRETERRT_AARCH64_HPP
+#define CPU_AARCH64_INTERPRETERRT_AARCH64_HPP
 
 // This is included in the middle of class Interpreter.
 // Do not include files here.
@@ -58,4 +58,4 @@
   static Register temp();
 };
 
-#endif // CPU_AARCH64_VM_INTERPRETERRT_AARCH64_HPP
+#endif // CPU_AARCH64_INTERPRETERRT_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_JAVAFRAMEANCHOR_AARCH64_HPP
-#define CPU_AARCH64_VM_JAVAFRAMEANCHOR_AARCH64_HPP
+#ifndef CPU_AARCH64_JAVAFRAMEANCHOR_AARCH64_HPP
+#define CPU_AARCH64_JAVAFRAMEANCHOR_AARCH64_HPP
 
 private:
 
@@ -84,4 +84,4 @@
   // Assert (last_Java_sp == NULL || fp == NULL)
   void set_last_Java_fp(intptr_t* fp)                { OrderAccess::release(); _last_Java_fp = fp; }
 
-#endif // CPU_AARCH64_VM_JAVAFRAMEANCHOR_AARCH64_HPP
+#endif // CPU_AARCH64_JAVAFRAMEANCHOR_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_JNITYPES_AARCH64_HPP
-#define CPU_AARCH64_VM_JNITYPES_AARCH64_HPP
+#ifndef CPU_AARCH64_JNITYPES_AARCH64_HPP
+#define CPU_AARCH64_JNITYPES_AARCH64_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -104,4 +104,4 @@
 #undef _JNI_SLOT_OFFSET
 };
 
-#endif // CPU_AARCH64_VM_JNITYPES_AARCH64_HPP
+#endif // CPU_AARCH64_JNITYPES_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_MACROASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_MACROASSEMBLER_AARCH64_HPP
 
 #include "asm/assembler.hpp"
 
@@ -1391,4 +1391,4 @@
   Label _branches;
 };
 
-#endif // CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_MACROASSEMBLER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_INLINE_HPP
-#define CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_INLINE_HPP
+#ifndef CPU_AARCH64_MACROASSEMBLER_AARCH64_INLINE_HPP
+#define CPU_AARCH64_MACROASSEMBLER_AARCH64_INLINE_HPP
 
 #include "asm/assembler.hpp"
 
@@ -32,4 +32,4 @@
 
 #endif // ndef PRODUCT
 
-#endif // CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_INLINE_HPP
+#endif // CPU_AARCH64_MACROASSEMBLER_AARCH64_INLINE_HPP
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2108, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_NATIVEINST_AARCH64_HPP
-#define CPU_AARCH64_VM_NATIVEINST_AARCH64_HPP
+#ifndef CPU_AARCH64_NATIVEINST_AARCH64_HPP
+#define CPU_AARCH64_NATIVEINST_AARCH64_HPP
 
 #include "asm/assembler.hpp"
 #include "runtime/icache.hpp"
@@ -48,6 +48,8 @@
 // The base class for different kinds of native instruction abstractions.
 // Provides the primitive operations to manipulate code relative to this.
 
+class NativeCall;
+
 class NativeInstruction {
   friend class Relocation;
   friend bool is_NativeCallTrampolineStub_at(address);
@@ -701,4 +703,4 @@
   assert(nativeInstruction_at(addr)->is_Imm_LdSt(), "no immediate load/store found");
   return (NativeLdSt*)addr;
 }
-#endif // CPU_AARCH64_VM_NATIVEINST_AARCH64_HPP
+#endif // CPU_AARCH64_NATIVEINST_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/registerMap_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/registerMap_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_REGISTERMAP_AARCH64_HPP
-#define CPU_AARCH64_VM_REGISTERMAP_AARCH64_HPP
+#ifndef CPU_AARCH64_REGISTERMAP_AARCH64_HPP
+#define CPU_AARCH64_REGISTERMAP_AARCH64_HPP
 
 // machine-dependent implemention for register maps
   friend class frame;
@@ -42,4 +42,4 @@
   void pd_initialize() {}
   void pd_initialize_from(const RegisterMap* map) {}
 
-#endif // CPU_AARCH64_VM_REGISTERMAP_AARCH64_HPP
+#endif // CPU_AARCH64_REGISTERMAP_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/register_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/register_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_REGISTER_AARCH64_HPP
-#define CPU_AARCH64_VM_REGISTER_AARCH64_HPP
+#ifndef CPU_AARCH64_REGISTER_AARCH64_HPP
+#define CPU_AARCH64_REGISTER_AARCH64_HPP
 
 #include "asm/register.hpp"
 
@@ -258,4 +258,4 @@
   uint32_t bits() const { return _bitset; }
 };
 
-#endif // CPU_AARCH64_VM_REGISTER_AARCH64_HPP
+#endif // CPU_AARCH64_REGISTER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_RELOCINFO_AARCH64_HPP
-#define CPU_AARCH64_VM_RELOCINFO_AARCH64_HPP
+#ifndef CPU_AARCH64_RELOCINFO_AARCH64_HPP
+#define CPU_AARCH64_RELOCINFO_AARCH64_HPP
 
   // machine-dependent parts of class relocInfo
  private:
@@ -41,4 +41,4 @@
   // listed in the oop section.
   static bool mustIterateImmediateOopsInCode() { return false; }
 
-#endif // CPU_AARCH64_VM_RELOCINFO_AARCH64_HPP
+#endif // CPU_AARCH64_RELOCINFO_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_STUBROUTINES_AARCH64_HPP
-#define CPU_AARCH64_VM_STUBROUTINES_AARCH64_HPP
+#ifndef CPU_AARCH64_STUBROUTINES_AARCH64_HPP
+#define CPU_AARCH64_STUBROUTINES_AARCH64_HPP
 
 // This file holds the platform specific parts of the StubRoutines
 // definition. See stubRoutines.hpp for a description on how to
@@ -195,4 +195,4 @@
   // end trigonometric tables block
 };
 
-#endif // CPU_AARCH64_VM_STUBROUTINES_AARCH64_HPP
+#endif // CPU_AARCH64_STUBROUTINES_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1886,6 +1886,7 @@
   __ restore_locals();
   __ restore_constant_pool_cache();
   __ get_method(rmethod);
+  __ get_dispatch();
 
   // The method data pointer was incremented already during
   // call profiling. We have to restore the mdp for the current bcp.
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_TEMPLATETABLE_AARCH64_64_HPP
-#define CPU_AARCH64_VM_TEMPLATETABLE_AARCH64_64_HPP
+#ifndef CPU_AARCH64_TEMPLATETABLE_AARCH64_HPP
+#define CPU_AARCH64_TEMPLATETABLE_AARCH64_HPP
 
 static void prepare_invoke(int byte_no,
                              Register method,         // linked method (or i-klass)
@@ -39,4 +39,4 @@
   static void index_check(Register array, Register index);
   static void index_check_without_pop(Register array, Register index);
 
-#endif // CPU_AARCH64_VM_TEMPLATETABLE_AARCH64_64_HPP
+#endif // CPU_AARCH64_TEMPLATETABLE_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_VMSTRUCTS_AARCH64_HPP
-#define CPU_AARCH64_VM_VMSTRUCTS_AARCH64_HPP
+#ifndef CPU_AARCH64_VMSTRUCTS_AARCH64_HPP
+#define CPU_AARCH64_VMSTRUCTS_AARCH64_HPP
 
 // These are the CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -39,4 +39,4 @@
 
 #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // CPU_AARCH64_VM_VMSTRUCTS_AARCH64_HPP
+#endif // CPU_AARCH64_VMSTRUCTS_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_VM_VERSION_AARCH64_HPP
-#define CPU_AARCH64_VM_VM_VERSION_AARCH64_HPP
+#ifndef CPU_AARCH64_VM_VERSION_AARCH64_HPP
+#define CPU_AARCH64_VM_VERSION_AARCH64_HPP
 
 #include "runtime/globals_extension.hpp"
 #include "runtime/vm_version.hpp"
@@ -121,4 +121,4 @@
   }
 };
 
-#endif // CPU_AARCH64_VM_VM_VERSION_AARCH64_HPP
+#endif // CPU_AARCH64_VM_VERSION_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.cpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.cpp	Thu Jan 10 22:05:40 2019 +0100
@@ -50,7 +50,7 @@
   _no_of_threads = _no_of_cores;
   _no_of_sockets = _no_of_cores;
   snprintf(_cpu_name, CPU_TYPE_DESC_BUF_SIZE - 1, "AArch64");
-  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "%s", _features_string);
+  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "AArch64 %s", _features_string);
   _initialized = true;
 }
 
--- a/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_VM_VERSION_EXT_AARCH64_HPP
-#define CPU_AARCH64_VM_VM_VERSION_EXT_AARCH64_HPP
+#ifndef CPU_AARCH64_VM_VERSION_EXT_AARCH64_HPP
+#define CPU_AARCH64_VM_VERSION_EXT_AARCH64_HPP
 
 #include "utilities/macros.hpp"
 #include "vm_version_aarch64.hpp"
@@ -51,4 +51,4 @@
 
 };
 
-#endif // CPU_AARCH64_VM_VM_VERSION_EXT_AARCH64_HPP
+#endif // CPU_AARCH64_VM_VERSION_EXT_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_VMREG_AARCH64_HPP
-#define CPU_AARCH64_VM_VMREG_AARCH64_HPP
+#ifndef CPU_AARCH64_VMREG_AARCH64_HPP
+#define CPU_AARCH64_VMREG_AARCH64_HPP
 
 inline bool is_Register() {
   return (unsigned int) value() < (unsigned int) ConcreteRegisterImpl::max_gpr;
@@ -52,4 +52,4 @@
   return is_even(value());
 }
 
-#endif // CPU_AARCH64_VM_VMREG_AARCH64_HPP
+#endif // CPU_AARCH64_VMREG_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_VMREG_AARCH64_INLINE_HPP
-#define CPU_AARCH64_VM_VMREG_AARCH64_INLINE_HPP
+#ifndef CPU_AARCH64_VMREG_AARCH64_INLINE_HPP
+#define CPU_AARCH64_VMREG_AARCH64_INLINE_HPP
 
 inline VMReg RegisterImpl::as_VMReg() {
   if( this==noreg ) return VMRegImpl::Bad();
@@ -35,4 +35,4 @@
   return VMRegImpl::as_VMReg((encoding() << 1) + ConcreteRegisterImpl::max_gpr);
 }
 
-#endif // CPU_AARCH64_VM_VMREG_AARCH64_INLINE_HPP
+#endif // CPU_AARCH64_VMREG_AARCH64_INLINE_HPP
--- a/src/hotspot/cpu/arm/assembler_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/assembler_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_ASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_ASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_ASSEMBLER_ARM_HPP
+#define CPU_ARM_ASSEMBLER_ARM_HPP
 
 #include "utilities/macros.hpp"
 
@@ -326,4 +326,4 @@
 #include "assembler_arm_32.hpp"
 
 
-#endif // CPU_ARM_VM_ASSEMBLER_ARM_HPP
+#endif // CPU_ARM_ASSEMBLER_ARM_HPP
--- a/src/hotspot/cpu/arm/assembler_arm.inline.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/assembler_arm.inline.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP
-#define CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP
+#ifndef CPU_ARM_ASSEMBLER_ARM_INLINE_HPP
+#define CPU_ARM_ASSEMBLER_ARM_INLINE_HPP
 
 
-#endif // CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP
+#endif // CPU_ARM_ASSEMBLER_ARM_INLINE_HPP
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_ASSEMBLER_ARM_32_HPP
-#define CPU_ARM_VM_ASSEMBLER_ARM_32_HPP
+#ifndef CPU_ARM_ASSEMBLER_ARM_32_HPP
+#define CPU_ARM_ASSEMBLER_ARM_32_HPP
 
 // ARM Addressing Mode 1 - Data processing operands
 class AsmOperand {
@@ -1250,4 +1250,4 @@
 #endif // __SOFTFP__
 
 
-#endif // CPU_ARM_VM_ASSEMBLER_ARM_32_HPP
+#endif // CPU_ARM_ASSEMBLER_ARM_32_HPP
--- a/src/hotspot/cpu/arm/bytes_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/bytes_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_BYTES_ARM_HPP
-#define CPU_ARM_VM_BYTES_ARM_HPP
+#ifndef CPU_ARM_BYTES_ARM_HPP
+#define CPU_ARM_BYTES_ARM_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/macros.hpp"
@@ -186,4 +186,4 @@
 // The following header contains the implementations of swap_u2, swap_u4, and swap_u8
 #include OS_CPU_HEADER_INLINE(bytes)
 
-#endif // CPU_ARM_VM_BYTES_ARM_HPP
+#endif // CPU_ARM_BYTES_ARM_HPP
--- a/src/hotspot/cpu/arm/c1_Defs_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/c1_Defs_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C1_DEFS_ARM_HPP
-#define CPU_ARM_VM_C1_DEFS_ARM_HPP
+#ifndef CPU_ARM_C1_DEFS_ARM_HPP
+#define CPU_ARM_C1_DEFS_ARM_HPP
 
 // native word offsets from memory address (little endian)
 enum {
@@ -78,4 +78,4 @@
 #define CARDTABLEBARRIERSET_POST_BARRIER_HELPER
 #define GENERATE_ADDRESS_IS_PREFERRED
 
-#endif // CPU_ARM_VM_C1_DEFS_ARM_HPP
+#endif // CPU_ARM_C1_DEFS_ARM_HPP
--- a/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP
-#define CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP
+#ifndef CPU_ARM_C1_FPUSTACKSIM_ARM_HPP
+#define CPU_ARM_C1_FPUSTACKSIM_ARM_HPP
 
 // Nothing needed here
 
-#endif // CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP
+#endif // CPU_ARM_C1_FPUSTACKSIM_ARM_HPP
--- a/src/hotspot/cpu/arm/c1_FrameMap_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/c1_FrameMap_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP
-#define CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP
+#ifndef CPU_ARM_C1_FRAMEMAP_ARM_HPP
+#define CPU_ARM_C1_FRAMEMAP_ARM_HPP
 
  public:
 
@@ -108,4 +108,4 @@
     return pd_last_cpu_reg;
   }
 
-#endif // CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP
+#endif // CPU_ARM_C1_FRAMEMAP_ARM_HPP
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_C1_LIRASSEMBLER_ARM_HPP
+#define CPU_ARM_C1_LIRASSEMBLER_ARM_HPP
 
  private:
 
@@ -65,4 +65,4 @@
   void store_parameter(jint c,      int offset_from_sp_in_words);
   void store_parameter(Metadata* m, int offset_from_sp_in_words);
 
-#endif // CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP
+#endif // CPU_ARM_C1_LIRASSEMBLER_ARM_HPP
--- a/src/hotspot/cpu/arm/c1_LinearScan_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/c1_LinearScan_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP
-#define CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP
+#ifndef CPU_ARM_C1_LINEARSCAN_ARM_HPP
+#define CPU_ARM_C1_LINEARSCAN_ARM_HPP
 
 inline bool LinearScan::is_processed_reg_num(int reg_num) {
   return reg_num < pd_nof_cpu_regs_processed_in_linearscan ||
@@ -68,4 +68,4 @@
   return true;
 }
 
-#endif // CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP
+#endif // CPU_ARM_C1_LINEARSCAN_ARM_HPP
--- a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_C1_MACROASSEMBLER_ARM_HPP
+#define CPU_ARM_C1_MACROASSEMBLER_ARM_HPP
 
  private:
 
@@ -66,4 +66,4 @@
   // This platform only uses signal-based null checks. The Label is not needed.
   void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); }
 
-#endif // CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP
+#endif // CPU_ARM_C1_MACROASSEMBLER_ARM_HPP
--- a/src/hotspot/cpu/arm/c1_globals_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/c1_globals_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C1_GLOBALS_ARM_HPP
-#define CPU_ARM_VM_C1_GLOBALS_ARM_HPP
+#ifndef CPU_ARM_C1_GLOBALS_ARM_HPP
+#define CPU_ARM_C1_GLOBALS_ARM_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -70,4 +70,4 @@
 define_pd_global(bool, CSEArrayLength,               true);
 define_pd_global(bool, TwoOperandLIRForm,            false);
 
-#endif // CPU_ARM_VM_C1_GLOBALS_ARM_HPP
+#endif // CPU_ARM_C1_GLOBALS_ARM_HPP
--- a/src/hotspot/cpu/arm/c2_globals_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/c2_globals_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C2_GLOBALS_ARM_HPP
-#define CPU_ARM_VM_C2_GLOBALS_ARM_HPP
+#ifndef CPU_ARM_C2_GLOBALS_ARM_HPP
+#define CPU_ARM_C2_GLOBALS_ARM_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -108,4 +108,4 @@
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
 
-#endif // CPU_ARM_VM_C2_GLOBALS_ARM_HPP
+#endif // CPU_ARM_C2_GLOBALS_ARM_HPP
--- a/src/hotspot/cpu/arm/codeBuffer_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/codeBuffer_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_CODEBUFFER_ARM_HPP
-#define CPU_ARM_VM_CODEBUFFER_ARM_HPP
+#ifndef CPU_ARM_CODEBUFFER_ARM_HPP
+#define CPU_ARM_CODEBUFFER_ARM_HPP
 
 private:
   void pd_initialize() {}
@@ -31,4 +31,4 @@
 public:
   void flush_bundle(bool start_new_bundle) {}
 
-#endif // CPU_ARM_VM_CODEBUFFER_ARM_HPP
+#endif // CPU_ARM_CODEBUFFER_ARM_HPP
--- a/src/hotspot/cpu/arm/copy_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/copy_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_COPY_ARM_HPP
-#define CPU_ARM_VM_COPY_ARM_HPP
+#ifndef CPU_ARM_COPY_ARM_HPP
+#define CPU_ARM_COPY_ARM_HPP
 
 #include "utilities/macros.hpp"
 
@@ -56,4 +56,4 @@
   memset(to, 0, count);
 }
 
-#endif // CPU_ARM_VM_COPY_ARM_HPP
+#endif // CPU_ARM_COPY_ARM_HPP
--- a/src/hotspot/cpu/arm/depChecker_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/depChecker_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
  *
  */
 
-#ifndef CPU_ARM_VM_DEPCHECKER_ARM_HPP
-#define CPU_ARM_VM_DEPCHECKER_ARM_HPP
+#ifndef CPU_ARM_DEPCHECKER_ARM_HPP
+#define CPU_ARM_DEPCHECKER_ARM_HPP
 
 // Nothing to do
 
-#endif // CPU_ARM_VM_DEPCHECKER_ARM_HPP
+#endif // CPU_ARM_DEPCHECKER_ARM_HPP
--- a/src/hotspot/cpu/arm/disassembler_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/disassembler_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_DISASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_DISASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_DISASSEMBLER_ARM_HPP
+#define CPU_ARM_DISASSEMBLER_ARM_HPP
 
   static int pd_instruction_alignment() {
     return sizeof(int);
@@ -33,4 +33,4 @@
     return "";
   }
 
-#endif // CPU_ARM_VM_DISASSEMBLER_ARM_HPP
+#endif // CPU_ARM_DISASSEMBLER_ARM_HPP
--- a/src/hotspot/cpu/arm/frame_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/frame_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_FRAME_ARM_HPP
-#define CPU_ARM_VM_FRAME_ARM_HPP
+#ifndef CPU_ARM_FRAME_ARM_HPP
+#define CPU_ARM_FRAME_ARM_HPP
 
 #include "runtime/synchronizer.hpp"
 
@@ -118,4 +118,4 @@
 
   static jint interpreter_frame_expression_stack_direction() { return -1; }
 
-#endif // CPU_ARM_VM_FRAME_ARM_HPP
+#endif // CPU_ARM_FRAME_ARM_HPP
--- a/src/hotspot/cpu/arm/frame_arm.inline.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/frame_arm.inline.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_FRAME_ARM_INLINE_HPP
-#define CPU_ARM_VM_FRAME_ARM_INLINE_HPP
+#ifndef CPU_ARM_FRAME_ARM_INLINE_HPP
+#define CPU_ARM_FRAME_ARM_INLINE_HPP
 
 #include "code/codeCache.hpp"
 #include "code/vmreg.inline.hpp"
@@ -228,4 +228,4 @@
   *result_adr = obj;
 }
 
-#endif // CPU_ARM_VM_FRAME_ARM_INLINE_HPP
+#endif // CPU_ARM_FRAME_ARM_INLINE_HPP
--- a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,4 +43,4 @@
                             Address obj, Register new_val, Register tmp1, Register tmp2, Register tmp3, bool is_null);
 };
 
-#endif // #ifndef CPU_ARM_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_ARM_HPP
+#endif // CPU_ARM_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_ARM_HPP
--- a/src/hotspot/cpu/arm/globalDefinitions_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/globalDefinitions_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP
-#define CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP
+#ifndef CPU_ARM_GLOBALDEFINITIONS_ARM_HPP
+#define CPU_ARM_GLOBALDEFINITIONS_ARM_HPP
 
 const int StackAlignmentInBytes = 8;
 
@@ -59,4 +59,4 @@
 #endif
 #endif
 
-#endif // CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP
+#endif // CPU_ARM_GLOBALDEFINITIONS_ARM_HPP
--- a/src/hotspot/cpu/arm/globals_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/globals_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_GLOBALS_ARM_HPP
-#define CPU_ARM_VM_GLOBALS_ARM_HPP
+#ifndef CPU_ARM_GLOBALS_ARM_HPP
+#define CPU_ARM_GLOBALS_ARM_HPP
 
 //
 // Sets the default values for platform dependent flags used by the runtime system.
@@ -87,4 +87,4 @@
                    range, \
                    constraint, \
                    writeable)
-#endif // CPU_ARM_VM_GLOBALS_ARM_HPP
+#endif // CPU_ARM_GLOBALS_ARM_HPP
--- a/src/hotspot/cpu/arm/icache_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/icache_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_ICACHE_ARM_HPP
-#define CPU_ARM_VM_ICACHE_ARM_HPP
+#ifndef CPU_ARM_ICACHE_ARM_HPP
+#define CPU_ARM_ICACHE_ARM_HPP
 
 // Interface for updating the instruction cache.  Whenever the VM modifies
 // code, part of the processor instruction cache potentially has to be flushed.
@@ -37,4 +37,4 @@
   };
 };
 
-#endif // CPU_ARM_VM_ICACHE_ARM_HPP
+#endif // CPU_ARM_ICACHE_ARM_HPP
--- a/src/hotspot/cpu/arm/interp_masm_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/interp_masm_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_INTERP_MASM_ARM_HPP
-#define CPU_ARM_VM_INTERP_MASM_ARM_HPP
+#ifndef CPU_ARM_INTERP_MASM_ARM_HPP
+#define CPU_ARM_INTERP_MASM_ARM_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "interpreter/invocationCounter.hpp"
@@ -277,4 +277,4 @@
                          Register reg3 = noreg);
 };
 
-#endif // CPU_ARM_VM_INTERP_MASM_ARM_HPP
+#endif // CPU_ARM_INTERP_MASM_ARM_HPP
--- a/src/hotspot/cpu/arm/interpreterRT_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/interpreterRT_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_INTERPRETERRT_ARM_HPP
-#define CPU_ARM_VM_INTERPRETERRT_ARM_HPP
+#ifndef CPU_ARM_INTERPRETERRT_ARM_HPP
+#define CPU_ARM_INTERPRETERRT_ARM_HPP
 
 // native method calls
 
@@ -60,4 +60,4 @@
 // sharing). See normalize_fast_native_fingerprint
 #define SHARING_FAST_NATIVE_FINGERPRINTS
 
-#endif // CPU_ARM_VM_INTERPRETERRT_ARM_HPP
+#endif // CPU_ARM_INTERPRETERRT_ARM_HPP
--- a/src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP
-#define CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP
+#ifndef CPU_ARM_JAVAFRAMEANCHOR_ARM_HPP
+#define CPU_ARM_JAVAFRAMEANCHOR_ARM_HPP
 
 private:
 
@@ -83,4 +83,4 @@
   // Assert (last_Java_sp == NULL || fp == NULL)
   void set_last_Java_fp(intptr_t* fp)                { _last_Java_fp = fp; }
 
-#endif // CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP
+#endif // CPU_ARM_JAVAFRAMEANCHOR_ARM_HPP
--- a/src/hotspot/cpu/arm/jniTypes_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/jniTypes_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_JNITYPES_ARM_HPP
-#define CPU_ARM_VM_JNITYPES_ARM_HPP
+#ifndef CPU_ARM_JNITYPES_ARM_HPP
+#define CPU_ARM_JNITYPES_ARM_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -79,4 +79,4 @@
 
 };
 
-#endif // CPU_ARM_VM_JNITYPES_ARM_HPP
+#endif // CPU_ARM_JNITYPES_ARM_HPP
--- a/src/hotspot/cpu/arm/macroAssembler_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_MACROASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_MACROASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_MACROASSEMBLER_ARM_HPP
+#define CPU_ARM_MACROASSEMBLER_ARM_HPP
 
 #include "code/relocInfo.hpp"
 #include "code/relocInfo_ext.hpp"
@@ -1097,4 +1097,4 @@
 };
 
 
-#endif // CPU_ARM_VM_MACROASSEMBLER_ARM_HPP
+#endif // CPU_ARM_MACROASSEMBLER_ARM_HPP
--- a/src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP
-#define CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP
+#ifndef CPU_ARM_MACROASSEMBLER_ARM_INLINE_HPP
+#define CPU_ARM_MACROASSEMBLER_ARM_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/codeBuffer.hpp"
@@ -63,4 +63,4 @@
   }
 }
 
-#endif // CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP
+#endif // CPU_ARM_MACROASSEMBLER_ARM_INLINE_HPP
--- a/src/hotspot/cpu/arm/nativeInst_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/nativeInst_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_NATIVEINST_ARM_HPP
-#define CPU_ARM_VM_NATIVEINST_ARM_HPP
+#ifndef CPU_ARM_NATIVEINST_ARM_HPP
+#define CPU_ARM_NATIVEINST_ARM_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "runtime/icache.hpp"
@@ -33,4 +33,4 @@
 #include "nativeInst_arm_32.hpp"
 
 
-#endif // CPU_ARM_VM_NATIVEINST_ARM_HPP
+#endif // CPU_ARM_NATIVEINST_ARM_HPP
--- a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_NATIVEINST_ARM_32_HPP
-#define CPU_ARM_VM_NATIVEINST_ARM_32_HPP
+#ifndef CPU_ARM_NATIVEINST_ARM_32_HPP
+#define CPU_ARM_NATIVEINST_ARM_32_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "code/codeCache.hpp"
@@ -45,6 +45,7 @@
 // The non-raw classes are the front-end entry point, hiding potential
 // back-end extensions or the actual instructions size.
 class NativeInstruction;
+class NativeCall;
 
 class RawNativeInstruction {
  public:
@@ -428,4 +429,4 @@
   return (NativeCall *) rawNativeCall_before(return_address);
 }
 
-#endif // CPU_ARM_VM_NATIVEINST_ARM_32_HPP
+#endif // CPU_ARM_NATIVEINST_ARM_32_HPP
--- a/src/hotspot/cpu/arm/registerMap_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/registerMap_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_REGISTERMAP_ARM_HPP
-#define CPU_ARM_VM_REGISTERMAP_ARM_HPP
+#ifndef CPU_ARM_REGISTERMAP_ARM_HPP
+#define CPU_ARM_REGISTERMAP_ARM_HPP
 
 // machine-dependent implemention for register maps
   friend class frame;
@@ -41,4 +41,4 @@
   void pd_initialize() {}
   void pd_initialize_from(const RegisterMap* map) {}
 
-#endif // CPU_ARM_VM_REGISTERMAP_ARM_HPP
+#endif // CPU_ARM_REGISTERMAP_ARM_HPP
--- a/src/hotspot/cpu/arm/register_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/register_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_REGISTER_ARM_HPP
-#define CPU_ARM_VM_REGISTER_ARM_HPP
+#ifndef CPU_ARM_REGISTER_ARM_HPP
+#define CPU_ARM_REGISTER_ARM_HPP
 
 #include "asm/register.hpp"
 #include "vm_version_arm.hpp"
@@ -437,4 +437,4 @@
 #define j_rarg3  c_rarg3
 
 
-#endif // CPU_ARM_VM_REGISTER_ARM_HPP
+#endif // CPU_ARM_REGISTER_ARM_HPP
--- a/src/hotspot/cpu/arm/relocInfo_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/relocInfo_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_RELOCINFO_ARM_HPP
-#define CPU_ARM_VM_RELOCINFO_ARM_HPP
+#ifndef CPU_ARM_RELOCINFO_ARM_HPP
+#define CPU_ARM_RELOCINFO_ARM_HPP
 
  private:
 
@@ -38,4 +38,4 @@
   // listed in the oop section.
   static bool mustIterateImmediateOopsInCode() { return false; }
 
-#endif // CPU_ARM_VM_RELOCINFO_ARM_HPP
+#endif // CPU_ARM_RELOCINFO_ARM_HPP
--- a/src/hotspot/cpu/arm/stubRoutines_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/stubRoutines_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_STUBROUTINES_ARM_HPP
-#define CPU_ARM_VM_STUBROUTINES_ARM_HPP
+#ifndef CPU_ARM_STUBROUTINES_ARM_HPP
+#define CPU_ARM_STUBROUTINES_ARM_HPP
 
 // This file holds the platform specific parts of the StubRoutines
 // definition. See stubRoutines.hpp for a description on how to
@@ -60,4 +60,4 @@
   static address atomic_store_long_entry()                 { return _atomic_store_long_entry; }
 
 
-#endif // CPU_ARM_VM_STUBROUTINES_ARM_HPP
+#endif // CPU_ARM_STUBROUTINES_ARM_HPP
--- a/src/hotspot/cpu/arm/templateTable_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/templateTable_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_TEMPLATETABLE_ARM_HPP
-#define CPU_ARM_VM_TEMPLATETABLE_ARM_HPP
+#ifndef CPU_ARM_TEMPLATETABLE_ARM_HPP
+#define CPU_ARM_TEMPLATETABLE_ARM_HPP
 
   static void prepare_invoke(int byte_no,
                              Register method,         // linked method (or i-klass)
@@ -59,4 +59,4 @@
 
   static void jvmti_post_fast_field_mod(TosState state);
 
-#endif // CPU_ARM_VM_TEMPLATETABLE_ARM_HPP
+#endif // CPU_ARM_TEMPLATETABLE_ARM_HPP
--- a/src/hotspot/cpu/arm/vmStructs_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/vmStructs_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_VMSTRUCTS_ARM_HPP
-#define CPU_ARM_VM_VMSTRUCTS_ARM_HPP
+#ifndef CPU_ARM_VMSTRUCTS_ARM_HPP
+#define CPU_ARM_VMSTRUCTS_ARM_HPP
 
 // These are the CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -45,4 +45,4 @@
 
 #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // CPU_ARM_VM_VMSTRUCTS_ARM_HPP
+#endif // CPU_ARM_VMSTRUCTS_ARM_HPP
--- a/src/hotspot/cpu/arm/vm_version_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/vm_version_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_VM_VERSION_ARM_HPP
-#define CPU_ARM_VM_VM_VERSION_ARM_HPP
+#ifndef CPU_ARM_VM_VERSION_ARM_HPP
+#define CPU_ARM_VM_VERSION_ARM_HPP
 
 #include "runtime/globals_extension.hpp"
 #include "runtime/vm_version.hpp"
@@ -106,4 +106,4 @@
 
 };
 
-#endif // CPU_ARM_VM_VM_VERSION_ARM_HPP
+#endif // CPU_ARM_VM_VERSION_ARM_HPP
--- a/src/hotspot/cpu/arm/vm_version_ext_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/vm_version_ext_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_VM_VERSION_EXT_ARM_HPP
-#define CPU_ARM_VM_VM_VERSION_EXT_ARM_HPP
+#ifndef CPU_ARM_VM_VERSION_EXT_ARM_HPP
+#define CPU_ARM_VM_VERSION_EXT_ARM_HPP
 
 #include "utilities/macros.hpp"
 #include "vm_version_arm.hpp"
@@ -51,4 +51,4 @@
 
 };
 
-#endif // CPU_ARM_VM_VM_VERSION_EXT_ARM_HPP
+#endif // CPU_ARM_VM_VERSION_EXT_ARM_HPP
--- a/src/hotspot/cpu/arm/vmreg_arm.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/vmreg_arm.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_VMREG_ARM_HPP
-#define CPU_ARM_VM_VMREG_ARM_HPP
+#ifndef CPU_ARM_VMREG_ARM_HPP
+#define CPU_ARM_VMREG_ARM_HPP
 
   inline bool is_Register() {
     return (unsigned int) value() < (unsigned int) ConcreteRegisterImpl::max_gpr;
@@ -55,4 +55,4 @@
     }
   }
 
-#endif // CPU_ARM_VM_VMREG_ARM_HPP
+#endif // CPU_ARM_VMREG_ARM_HPP
--- a/src/hotspot/cpu/arm/vmreg_arm.inline.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/arm/vmreg_arm.inline.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_VMREG_ARM_INLINE_HPP
-#define CPU_ARM_VM_VMREG_ARM_INLINE_HPP
+#ifndef CPU_ARM_VMREG_ARM_INLINE_HPP
+#define CPU_ARM_VMREG_ARM_INLINE_HPP
 
 inline VMReg RegisterImpl::as_VMReg() {
   return VMRegImpl::as_VMReg(encoding() << ConcreteRegisterImpl::log_vmregs_per_gpr);
@@ -32,4 +32,4 @@
 inline VMReg FloatRegisterImpl::as_VMReg() {
   return VMRegImpl::as_VMReg((encoding() << ConcreteRegisterImpl::log_vmregs_per_fpr) + ConcreteRegisterImpl::max_gpr);
 }
-#endif // CPU_ARM_VM_VMREG_ARM_INLINE_HPP
+#endif // CPU_ARM_VMREG_ARM_INLINE_HPP
--- a/src/hotspot/cpu/ppc/assembler_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/assembler_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_ASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_ASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_ASSEMBLER_PPC_HPP
+#define CPU_PPC_ASSEMBLER_PPC_HPP
 
 #include "asm/register.hpp"
 
@@ -2450,4 +2450,4 @@
 };
 
 
-#endif // CPU_PPC_VM_ASSEMBLER_PPC_HPP
+#endif // CPU_PPC_ASSEMBLER_PPC_HPP
--- a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_ASSEMBLER_PPC_INLINE_HPP
-#define CPU_PPC_VM_ASSEMBLER_PPC_INLINE_HPP
+#ifndef CPU_PPC_ASSEMBLER_PPC_INLINE_HPP
+#define CPU_PPC_ASSEMBLER_PPC_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/codeBuffer.hpp"
@@ -1127,4 +1127,4 @@
   ori(d, d, i & 0xFFFF);
 }
 
-#endif // CPU_PPC_VM_ASSEMBLER_PPC_INLINE_HPP
+#endif // CPU_PPC_ASSEMBLER_PPC_INLINE_HPP
--- a/src/hotspot/cpu/ppc/bytes_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/bytes_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_BYTES_PPC_HPP
-#define CPU_PPC_VM_BYTES_PPC_HPP
+#ifndef CPU_PPC_BYTES_PPC_HPP
+#define CPU_PPC_BYTES_PPC_HPP
 
 #include "memory/allocation.hpp"
 
@@ -268,4 +268,4 @@
 
 #include OS_CPU_HEADER_INLINE(bytes)
 
-#endif // CPU_PPC_VM_BYTES_PPC_HPP
+#endif // CPU_PPC_BYTES_PPC_HPP
--- a/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C1_DEFS_PPC_HPP
-#define CPU_PPC_VM_C1_DEFS_PPC_HPP
+#ifndef CPU_PPC_C1_DEFS_PPC_HPP
+#define CPU_PPC_C1_DEFS_PPC_HPP
 
 // Native word offsets from memory address.
 enum {
@@ -73,4 +73,4 @@
   pd_float_saved_as_double = true
 };
 
-#endif // CPU_PPC_VM_C1_DEFS_PPC_HPP
+#endif // CPU_PPC_C1_DEFS_PPC_HPP
--- a/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C1_FPUSTACKSIM_PPC_HPP
-#define CPU_PPC_VM_C1_FPUSTACKSIM_PPC_HPP
+#ifndef CPU_PPC_C1_FPUSTACKSIM_PPC_HPP
+#define CPU_PPC_C1_FPUSTACKSIM_PPC_HPP
 
 // No FPU stack on PPC.
 class FpuStackSim;
 
-#endif // CPU_PPC_VM_C1_FPUSTACKSIM_PPC_HPP
+#endif // CPU_PPC_C1_FPUSTACKSIM_PPC_HPP
--- a/src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C1_FRAMEMAP_PPC_HPP
-#define CPU_PPC_VM_C1_FRAMEMAP_PPC_HPP
+#ifndef CPU_PPC_C1_FRAMEMAP_PPC_HPP
+#define CPU_PPC_C1_FRAMEMAP_PPC_HPP
 
  public:
 
@@ -199,4 +199,4 @@
   // R29: global TOC
   static bool reg_needs_save(Register r) { return r != R0 && r != R1 && r != R13 && r != R16 && r != R29; }
 
-#endif // CPU_PPC_VM_C1_FRAMEMAP_PPC_HPP
+#endif // CPU_PPC_C1_FRAMEMAP_PPC_HPP
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C1_LIRASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_C1_LIRASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_C1_LIRASSEMBLER_PPC_HPP
+#define CPU_PPC_C1_LIRASSEMBLER_PPC_HPP
 
  private:
 
@@ -77,4 +77,4 @@
     }
   }
 
-#endif // CPU_PPC_VM_C1_LIRASSEMBLER_PPC_HPP
+#endif // CPU_PPC_C1_LIRASSEMBLER_PPC_HPP
--- a/src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C1_LINEARSCAN_PPC_HPP
-#define CPU_PPC_VM_C1_LINEARSCAN_PPC_HPP
+#ifndef CPU_PPC_C1_LINEARSCAN_PPC_HPP
+#define CPU_PPC_C1_LINEARSCAN_PPC_HPP
 
 inline bool LinearScan::is_processed_reg_num(int reg_num) {
   assert(FrameMap::R0_opr->cpu_regnr() == FrameMap::last_cpu_reg() + 1, "wrong assumption below");
@@ -70,4 +70,4 @@
   return false;
 }
 
-#endif // CPU_PPC_VM_C1_LINEARSCAN_PPC_HPP
+#endif // CPU_PPC_C1_LINEARSCAN_PPC_HPP
--- a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C1_MACROASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_C1_MACROASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_C1_MACROASSEMBLER_PPC_HPP
+#define CPU_PPC_C1_MACROASSEMBLER_PPC_HPP
 
   void pd_init() { /* nothing to do */ }
 
@@ -90,4 +90,4 @@
 
   address call_c_with_frame_resize(address dest, int frame_resize);
 
-#endif // CPU_PPC_VM_C1_MACROASSEMBLER_PPC_HPP
+#endif // CPU_PPC_C1_MACROASSEMBLER_PPC_HPP
--- a/src/hotspot/cpu/ppc/c1_globals_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/c1_globals_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C1_GLOBALS_PPC_HPP
-#define CPU_PPC_VM_C1_GLOBALS_PPC_HPP
+#ifndef CPU_PPC_C1_GLOBALS_PPC_HPP
+#define CPU_PPC_C1_GLOBALS_PPC_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -65,4 +65,4 @@
 define_pd_global(bool,     CSEArrayLength,               true);
 define_pd_global(bool,     TwoOperandLIRForm,            false);
 
-#endif // CPU_PPC_VM_C1_GLOBALS_PPC_HPP
+#endif // CPU_PPC_C1_GLOBALS_PPC_HPP
--- a/src/hotspot/cpu/ppc/c2_globals_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/c2_globals_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C2_GLOBALS_PPC_HPP
-#define CPU_PPC_VM_C2_GLOBALS_PPC_HPP
+#ifndef CPU_PPC_C2_GLOBALS_PPC_HPP
+#define CPU_PPC_C2_GLOBALS_PPC_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -101,4 +101,4 @@
 // Ergonomics related flags
 define_pd_global(bool,     NeverActAsServerClassMachine, false);
 
-#endif // CPU_PPC_VM_C2_GLOBALS_PPC_HPP
+#endif // CPU_PPC_C2_GLOBALS_PPC_HPP
--- a/src/hotspot/cpu/ppc/codeBuffer_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/codeBuffer_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_CODEBUFFER_PPC_HPP
-#define CPU_PPC_VM_CODEBUFFER_PPC_HPP
+#ifndef CPU_PPC_CODEBUFFER_PPC_HPP
+#define CPU_PPC_CODEBUFFER_PPC_HPP
 
 private:
   void pd_initialize() {}
@@ -32,4 +32,4 @@
 public:
   void flush_bundle(bool start_new_bundle) {}
 
-#endif // CPU_PPC_VM_CODEBUFFER_PPC_HPP
+#endif // CPU_PPC_CODEBUFFER_PPC_HPP
--- a/src/hotspot/cpu/ppc/copy_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/copy_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_COPY_PPC_HPP
-#define CPU_PPC_VM_COPY_PPC_HPP
+#ifndef CPU_PPC_COPY_PPC_HPP
+#define CPU_PPC_COPY_PPC_HPP
 
 #ifndef PPC64
 #error "copy currently only implemented for PPC64"
@@ -168,4 +168,4 @@
   (void)memset(to, 0, count);
 }
 
-#endif // CPU_PPC_VM_COPY_PPC_HPP
+#endif // CPU_PPC_COPY_PPC_HPP
--- a/src/hotspot/cpu/ppc/depChecker_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/depChecker_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,9 +23,9 @@
  *
  */
 
-#ifndef CPU_PPC_VM_DEPCHECKER_PPC_HPP
-#define CPU_PPC_VM_DEPCHECKER_PPC_HPP
+#ifndef CPU_PPC_DEPCHECKER_PPC_HPP
+#define CPU_PPC_DEPCHECKER_PPC_HPP
 
 // Nothing to do on ppc64
 
-#endif // CPU_PPC_VM_DEPCHECKER_PPC_HPP
+#endif // CPU_PPC_DEPCHECKER_PPC_HPP
--- a/src/hotspot/cpu/ppc/disassembler_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/disassembler_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_DISASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_DISASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_DISASSEMBLER_PPC_HPP
+#define CPU_PPC_DISASSEMBLER_PPC_HPP
 
   static int pd_instruction_alignment() {
     return sizeof(int);
@@ -34,4 +34,4 @@
     return "ppc64";
   }
 
-#endif // CPU_PPC_VM_DISASSEMBLER_PPC_HPP
+#endif // CPU_PPC_DISASSEMBLER_PPC_HPP
--- a/src/hotspot/cpu/ppc/frame_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/frame_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_FRAME_PPC_HPP
-#define CPU_PPC_VM_FRAME_PPC_HPP
+#ifndef CPU_PPC_FRAME_PPC_HPP
+#define CPU_PPC_FRAME_PPC_HPP
 
 #include "runtime/synchronizer.hpp"
 
@@ -427,4 +427,4 @@
 
   static jint interpreter_frame_expression_stack_direction() { return -1; }
 
-#endif // CPU_PPC_VM_FRAME_PPC_HPP
+#endif // CPU_PPC_FRAME_PPC_HPP
--- a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_FRAME_PPC_INLINE_HPP
-#define CPU_PPC_VM_FRAME_PPC_INLINE_HPP
+#ifndef CPU_PPC_FRAME_PPC_INLINE_HPP
+#define CPU_PPC_FRAME_PPC_INLINE_HPP
 
 #include "code/codeCache.hpp"
 #include "code/vmreg.inline.hpp"
@@ -220,4 +220,4 @@
   *((oop*)map->location(R3->as_VMReg())) = obj;
 }
 
-#endif // CPU_PPC_VM_FRAME_PPC_INLINE_HPP
+#endif // CPU_PPC_FRAME_PPC_INLINE_HPP
--- a/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_GLOBALDEFINITIONS_PPC_HPP
-#define CPU_PPC_VM_GLOBALDEFINITIONS_PPC_HPP
+#ifndef CPU_PPC_GLOBALDEFINITIONS_PPC_HPP
+#define CPU_PPC_GLOBALDEFINITIONS_PPC_HPP
 
 #ifdef CC_INTERP
 #error "CC_INTERP is no longer supported. Removed in change 8145117."
@@ -60,4 +60,4 @@
 // Define the condition to use this -XX flag.
 #define USE_POLL_BIT_ONLY UseSIGTRAP
 
-#endif // CPU_PPC_VM_GLOBALDEFINITIONS_PPC_HPP
+#endif // CPU_PPC_GLOBALDEFINITIONS_PPC_HPP
--- a/src/hotspot/cpu/ppc/globals_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/globals_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_GLOBALS_PPC_HPP
-#define CPU_PPC_VM_GLOBALS_PPC_HPP
+#ifndef CPU_PPC_GLOBALS_PPC_HPP
+#define CPU_PPC_GLOBALS_PPC_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -207,4 +207,4 @@
   experimental(bool, UseRTMXendForLockBusy, true,                           \
           "Use RTM Xend instead of Xabort when lock busy")                  \
 
-#endif // CPU_PPC_VM_GLOBALS_PPC_HPP
+#endif // CPU_PPC_GLOBALS_PPC_HPP
--- a/src/hotspot/cpu/ppc/icache_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/icache_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_ICACHE_PPC_HPP
-#define CPU_PPC_VM_ICACHE_PPC_HPP
+#ifndef CPU_PPC_ICACHE_PPC_HPP
+#define CPU_PPC_ICACHE_PPC_HPP
 
 // Interface for updating the instruction cache.  Whenever the VM modifies
 // code, part of the processor instruction cache potentially has to be flushed.
@@ -49,4 +49,4 @@
   }
 };
 
-#endif // CPU_PPC_VM_ICACHE_PPC_HPP
+#endif // CPU_PPC_ICACHE_PPC_HPP
--- a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2017 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_INTERP_MASM_PPC_HPP
-#define CPU_PPC_VM_INTERP_MASM_PPC_HPP
+#ifndef CPU_PPC_INTERP_MASM_PPC_HPP
+#define CPU_PPC_INTERP_MASM_PPC_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "interpreter/invocationCounter.hpp"
@@ -266,4 +266,4 @@
                           NotifyMethodExitMode mode, bool check_exceptions);
 };
 
-#endif // CPU_PPC_VM_INTERP_MASM_PPC_HPP
+#endif // CPU_PPC_INTERP_MASM_PPC_HPP
--- a/src/hotspot/cpu/ppc/interpreterRT_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/interpreterRT_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2014 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_INTERPRETERRT_PPC_HPP
-#define CPU_PPC_VM_INTERPRETERRT_PPC_HPP
+#ifndef CPU_PPC_INTERPRETERRT_PPC_HPP
+#define CPU_PPC_INTERPRETERRT_PPC_HPP
 
 // This is included in the middle of class Interpreter.
 // Do not include files here.
@@ -57,4 +57,4 @@
 // A function to get the signature.
 static address get_signature(JavaThread* thread, Method* method);
 
-#endif // CPU_PPC_VM_INTERPRETERRT_PPC_HPP
+#endif // CPU_PPC_INTERPRETERRT_PPC_HPP
--- a/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2014 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_JAVAFRAMEANCHOR_PPC_HPP
-#define CPU_PPC_VM_JAVAFRAMEANCHOR_PPC_HPP
+#ifndef CPU_PPC_JAVAFRAMEANCHOR_PPC_HPP
+#define CPU_PPC_JAVAFRAMEANCHOR_PPC_HPP
 
 public:
   // Each arch must define reset, save, restore
@@ -75,4 +75,4 @@
 
   void set_last_Java_sp(intptr_t* sp) { OrderAccess::release(); _last_Java_sp = sp; }
 
-#endif // CPU_PPC_VM_JAVAFRAMEANCHOR_PPC_HPP
+#endif // CPU_PPC_JAVAFRAMEANCHOR_PPC_HPP
--- a/src/hotspot/cpu/ppc/jniTypes_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/jniTypes_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_JNITYPES_PPC_HPP
-#define CPU_PPC_VM_JNITYPES_PPC_HPP
+#ifndef CPU_PPC_JNITYPES_PPC_HPP
+#define CPU_PPC_JNITYPES_PPC_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -107,4 +107,4 @@
   static inline jdouble get_double(intptr_t *from) { return *(jdouble *)(from + 1); }
 };
 
-#endif // CPU_PPC_VM_JNITYPES_PPC_HPP
+#endif // CPU_PPC_JNITYPES_PPC_HPP
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018, SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_MACROASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_MACROASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_MACROASSEMBLER_PPC_HPP
+#define CPU_PPC_MACROASSEMBLER_PPC_HPP
 
 #include "asm/assembler.hpp"
 #include "oops/accessDecorators.hpp"
@@ -970,4 +970,4 @@
    ~SkipIfEqualZero();
 };
 
-#endif // CPU_PPC_VM_MACROASSEMBLER_PPC_HPP
+#endif // CPU_PPC_MACROASSEMBLER_PPC_HPP
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_MACROASSEMBLER_PPC_INLINE_HPP
-#define CPU_PPC_VM_MACROASSEMBLER_PPC_INLINE_HPP
+#ifndef CPU_PPC_MACROASSEMBLER_PPC_INLINE_HPP
+#define CPU_PPC_MACROASSEMBLER_PPC_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/macroAssembler.hpp"
@@ -480,4 +480,4 @@
 inline address MacroAssembler::function_entry() { return emit_fd(); }
 #endif
 
-#endif // CPU_PPC_VM_MACROASSEMBLER_PPC_INLINE_HPP
+#endif // CPU_PPC_MACROASSEMBLER_PPC_INLINE_HPP
--- a/src/hotspot/cpu/ppc/nativeInst_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/nativeInst_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_NATIVEINST_PPC_HPP
-#define CPU_PPC_VM_NATIVEINST_PPC_HPP
+#ifndef CPU_PPC_NATIVEINST_PPC_HPP
+#define CPU_PPC_NATIVEINST_PPC_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "runtime/icache.hpp"
@@ -503,4 +503,4 @@
   }
 };
 
-#endif // CPU_PPC_VM_NATIVEINST_PPC_HPP
+#endif // CPU_PPC_NATIVEINST_PPC_HPP
--- a/src/hotspot/cpu/ppc/registerMap_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/registerMap_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_REGISTERMAP_PPC_HPP
-#define CPU_PPC_VM_REGISTERMAP_PPC_HPP
+#ifndef CPU_PPC_REGISTERMAP_PPC_HPP
+#define CPU_PPC_REGISTERMAP_PPC_HPP
 
 // machine-dependent implemention for register maps
   friend class frame;
@@ -42,4 +42,4 @@
   void pd_initialize() {}
   void pd_initialize_from(const RegisterMap* map) {}
 
-#endif // CPU_PPC_VM_REGISTERMAP_PPC_HPP
+#endif // CPU_PPC_REGISTERMAP_PPC_HPP
--- a/src/hotspot/cpu/ppc/register_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/register_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_REGISTER_PPC_HPP
-#define CPU_PPC_VM_REGISTER_PPC_HPP
+#ifndef CPU_PPC_REGISTER_PPC_HPP
+#define CPU_PPC_REGISTER_PPC_HPP
 
 #include "asm/register.hpp"
 
@@ -818,4 +818,4 @@
 #define R12_scratch2   AS_REGISTER(Register, R12)
 #endif
 
-#endif // CPU_PPC_VM_REGISTER_PPC_HPP
+#endif // CPU_PPC_REGISTER_PPC_HPP
--- a/src/hotspot/cpu/ppc/relocInfo_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/relocInfo_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_RELOCINFO_PPC_HPP
-#define CPU_PPC_VM_RELOCINFO_PPC_HPP
+#ifndef CPU_PPC_RELOCINFO_PPC_HPP
+#define CPU_PPC_RELOCINFO_PPC_HPP
 
   // machine-dependent parts of class relocInfo
  private:
@@ -49,4 +49,4 @@
   // listed in the oop section.
   static bool mustIterateImmediateOopsInCode() { return false; }
 
-#endif // CPU_PPC_VM_RELOCINFO_PPC_HPP
+#endif // CPU_PPC_RELOCINFO_PPC_HPP
--- a/src/hotspot/cpu/ppc/stubRoutines_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/stubRoutines_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018, SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_STUBROUTINES_PPC_HPP
-#define CPU_PPC_VM_STUBROUTINES_PPC_HPP
+#ifndef CPU_PPC_STUBROUTINES_PPC_HPP
+#define CPU_PPC_STUBROUTINES_PPC_HPP
 
 // This file holds the platform specific parts of the StubRoutines
 // definition. See stubRoutines.hpp for a description on how to
@@ -72,4 +72,4 @@
   static juint* generate_crc_barret_constants(juint reverse_poly);
 };
 
-#endif // CPU_PPC_VM_STUBROUTINES_PPC_HPP
+#endif // CPU_PPC_STUBROUTINES_PPC_HPP
--- a/src/hotspot/cpu/ppc/templateTable_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/templateTable_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013, 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_TEMPLATETABLE_PPC_HPP
-#define CPU_PPC_VM_TEMPLATETABLE_PPC_HPP
+#ifndef CPU_PPC_TEMPLATETABLE_PPC_HPP
+#define CPU_PPC_TEMPLATETABLE_PPC_HPP
 
   static void prepare_invoke(int byte_no, Register Rmethod, Register Rret_addr, Register Rindex, Register Rrecv, Register Rflags, Register Rscratch);
   static void invokevfinal_helper(Register Rmethod, Register Rflags, Register Rscratch1, Register Rscratch2);
@@ -35,4 +35,4 @@
   static void branch_conditional(ConditionRegister crx, TemplateTable::Condition cc, Label& L, bool invert = false);
   static void if_cmp_common(Register Rfirst, Register Rsecond, Register Rscratch1, Register Rscratch2, Condition cc, bool is_jint, bool cmp0);
 
-#endif // CPU_PPC_VM_TEMPLATETABLE_PPC_HPP
+#endif // CPU_PPC_TEMPLATETABLE_PPC_HPP
--- a/src/hotspot/cpu/ppc/vmStructs_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/vmStructs_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_VMSTRUCTS_PPC_HPP
-#define CPU_PPC_VM_VMSTRUCTS_PPC_HPP
+#ifndef CPU_PPC_VMSTRUCTS_PPC_HPP
+#define CPU_PPC_VMSTRUCTS_PPC_HPP
 
 // These are the CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -38,4 +38,4 @@
 
 #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // CPU_PPC_VM_VMSTRUCTS_PPC_HPP
+#endif // CPU_PPC_VMSTRUCTS_PPC_HPP
--- a/src/hotspot/cpu/ppc/vm_version_ext_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/vm_version_ext_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_VM_VERSION_EXT_PPC_HPP
-#define CPU_PPC_VM_VM_VERSION_EXT_PPC_HPP
+#ifndef CPU_PPC_VM_VERSION_EXT_PPC_HPP
+#define CPU_PPC_VM_VERSION_EXT_PPC_HPP
 
 #include "utilities/macros.hpp"
 #include "vm_version_ppc.hpp"
@@ -59,4 +59,4 @@
   static const char* cpu_description(void);
 };
 
-#endif // CPU_PPC_VM_VM_VERSION_EXT_PPC_HPP
+#endif // CPU_PPC_VM_VERSION_EXT_PPC_HPP
--- a/src/hotspot/cpu/ppc/vm_version_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_VM_VERSION_PPC_HPP
-#define CPU_PPC_VM_VM_VERSION_PPC_HPP
+#ifndef CPU_PPC_VM_VERSION_PPC_HPP
+#define CPU_PPC_VM_VERSION_PPC_HPP
 
 #include "runtime/globals_extension.hpp"
 #include "runtime/vm_version.hpp"
@@ -123,4 +123,4 @@
   static uint64_t _dscr_val;
 };
 
-#endif // CPU_PPC_VM_VM_VERSION_PPC_HPP
+#endif // CPU_PPC_VM_VERSION_PPC_HPP
--- a/src/hotspot/cpu/ppc/vmreg_ppc.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/vmreg_ppc.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_VMREG_PPC_HPP
-#define CPU_PPC_VM_VMREG_PPC_HPP
+#ifndef CPU_PPC_VMREG_PPC_HPP
+#define CPU_PPC_VMREG_PPC_HPP
 
 inline bool is_Register() {
   return (unsigned int)value() < (unsigned int)ConcreteRegisterImpl::max_gpr;
@@ -50,4 +50,4 @@
   return is_even(value());
 }
 
-#endif // CPU_PPC_VM_VMREG_PPC_HPP
+#endif // CPU_PPC_VMREG_PPC_HPP
--- a/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_VMREG_PPC_INLINE_HPP
-#define CPU_PPC_VM_VMREG_PPC_INLINE_HPP
+#ifndef CPU_PPC_VMREG_PPC_INLINE_HPP
+#define CPU_PPC_VMREG_PPC_INLINE_HPP
 
 inline VMReg RegisterImpl::as_VMReg() {
   if (this == noreg) return VMRegImpl::Bad();
@@ -50,4 +50,4 @@
 }
 
 
-#endif // CPU_PPC_VM_VMREG_PPC_INLINE_HPP
+#endif // CPU_PPC_VMREG_PPC_INLINE_HPP
--- a/src/hotspot/cpu/s390/assembler_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/assembler_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2017 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_ASSEMBLER_S390_HPP
-#define CPU_S390_VM_ASSEMBLER_S390_HPP
+#ifndef CPU_S390_ASSEMBLER_S390_HPP
+#define CPU_S390_ASSEMBLER_S390_HPP
 
 #undef  LUCY_DBG
 
@@ -3284,4 +3284,4 @@
 
 };
 
-#endif // CPU_S390_VM_ASSEMBLER_S390_HPP
+#endif // CPU_S390_ASSEMBLER_S390_HPP
--- a/src/hotspot/cpu/s390/assembler_s390.inline.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/assembler_s390.inline.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2017 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP
-#define CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP
+#ifndef CPU_S390_ASSEMBLER_S390_INLINE_HPP
+#define CPU_S390_ASSEMBLER_S390_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/codeBuffer.hpp"
@@ -1460,4 +1460,4 @@
   return (is_equal(pc, CGIT_ZOPC, RIE_MASK) || is_equal(pc, CIT_ZOPC, RIE_MASK));
 }
 
-#endif // CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP
+#endif // CPU_S390_ASSEMBLER_S390_INLINE_HPP
--- a/src/hotspot/cpu/s390/bytes_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/bytes_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_BYTES_S390_HPP
-#define CPU_S390_VM_BYTES_S390_HPP
+#ifndef CPU_S390_BYTES_S390_HPP
+#define CPU_S390_BYTES_S390_HPP
 
 #include "memory/allocation.hpp"
 
@@ -63,4 +63,4 @@
   static inline void put_Java_u8(address p, u8 x) { put_native_u8(p, x); }
 };
 
-#endif // CPU_S390_VM_BYTES_S390_HPP
+#endif // CPU_S390_BYTES_S390_HPP
--- a/src/hotspot/cpu/s390/c1_Defs_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/c1_Defs_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_DEFS_S390_HPP
-#define CPU_S390_VM_C1_DEFS_S390_HPP
+#ifndef CPU_S390_C1_DEFS_S390_HPP
+#define CPU_S390_C1_DEFS_S390_HPP
 
 // Native word offsets from memory address (big endian).
 enum {
@@ -68,4 +68,4 @@
   pd_float_saved_as_double = false
 };
 
-#endif // CPU_S390_VM_C1_DEFS_S390_HPP
+#endif // CPU_S390_C1_DEFS_S390_HPP
--- a/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_FPUSTACKSIM_S390_HPP
-#define CPU_S390_VM_C1_FPUSTACKSIM_S390_HPP
+#ifndef CPU_S390_C1_FPUSTACKSIM_S390_HPP
+#define CPU_S390_C1_FPUSTACKSIM_S390_HPP
 
 // No FPU stack on ZARCH_64
 class FpuStackSim;
 
-#endif // CPU_S390_VM_C1_FPUSTACKSIM_S390_HPP
+#endif // CPU_S390_C1_FPUSTACKSIM_S390_HPP
--- a/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_FRAMEMAP_S390_HPP
-#define CPU_S390_VM_C1_FRAMEMAP_S390_HPP
+#ifndef CPU_S390_C1_FRAMEMAP_S390_HPP
+#define CPU_S390_C1_FRAMEMAP_S390_HPP
 
  public:
 
@@ -138,4 +138,4 @@
   static int nof_caller_save_cpu_regs() { return pd_nof_caller_save_cpu_regs_frame_map; }
   static int last_cpu_reg()             { return pd_last_cpu_reg; }
 
-#endif // CPU_S390_VM_C1_FRAMEMAP_S390_HPP
+#endif // CPU_S390_C1_FRAMEMAP_S390_HPP
--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_LIRASSEMBLER_S390_HPP
-#define CPU_S390_VM_C1_LIRASSEMBLER_S390_HPP
+#ifndef CPU_S390_C1_LIRASSEMBLER_S390_HPP
+#define CPU_S390_C1_LIRASSEMBLER_S390_HPP
 
  private:
 
@@ -52,4 +52,4 @@
     _deopt_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(64)
   };
 
-#endif // CPU_S390_VM_C1_LIRASSEMBLER_S390_HPP
+#endif // CPU_S390_C1_LIRASSEMBLER_S390_HPP
--- a/src/hotspot/cpu/s390/c1_LinearScan_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/c1_LinearScan_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_LINEARSCAN_S390_HPP
-#define CPU_S390_VM_C1_LINEARSCAN_S390_HPP
+#ifndef CPU_S390_C1_LINEARSCAN_S390_HPP
+#define CPU_S390_C1_LINEARSCAN_S390_HPP
 
 inline bool LinearScan::is_processed_reg_num(int reg_num) {
   // unallocated: Z_thread, Z_fp, Z_SP, Z_R0_scratch, Z_R1_scratch, Z_R14
@@ -61,4 +61,4 @@
   return false; // No special case behaviours.
 }
 
-#endif // CPU_S390_VM_C1_LINEARSCAN_S390_HPP
+#endif // CPU_S390_C1_LINEARSCAN_S390_HPP
--- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP
-#define CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP
+#ifndef CPU_S390_C1_MACROASSEMBLER_S390_HPP
+#define CPU_S390_C1_MACROASSEMBLER_S390_HPP
 
   void pd_init() { /* nothing to do */ }
 
@@ -98,4 +98,4 @@
   // This platform only uses signal-based null checks. The Label is not needed.
   void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); }
 
-#endif // CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP
+#endif // CPU_S390_C1_MACROASSEMBLER_S390_HPP
--- a/src/hotspot/cpu/s390/c1_globals_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/c1_globals_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_GLOBALS_S390_HPP
-#define CPU_S390_VM_C1_GLOBALS_S390_HPP
+#ifndef CPU_S390_C1_GLOBALS_S390_HPP
+#define CPU_S390_C1_GLOBALS_S390_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -70,4 +70,4 @@
 define_pd_global(bool,     CSEArrayLength,               true);
 define_pd_global(bool,     TwoOperandLIRForm,            true);
 
-#endif // CPU_S390_VM_C1_GLOBALS_S390_HPP
+#endif // CPU_S390_C1_GLOBALS_S390_HPP
--- a/src/hotspot/cpu/s390/c2_globals_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/c2_globals_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C2_GLOBALS_S390_HPP
-#define CPU_S390_VM_C2_GLOBALS_S390_HPP
+#ifndef CPU_S390_C2_GLOBALS_S390_HPP
+#define CPU_S390_C2_GLOBALS_S390_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -91,4 +91,4 @@
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
 
-#endif // CPU_S390_VM_C2_GLOBALS_S390_HPP
+#endif // CPU_S390_C2_GLOBALS_S390_HPP
--- a/src/hotspot/cpu/s390/codeBuffer_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/codeBuffer_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_CODEBUFFER_S390_HPP
-#define CPU_S390_VM_CODEBUFFER_S390_HPP
+#ifndef CPU_S390_CODEBUFFER_S390_HPP
+#define CPU_S390_CODEBUFFER_S390_HPP
 
  private:
   void pd_initialize() {}
@@ -35,5 +35,4 @@
   void getCpuData(const CodeBuffer * const cb) {}
 
 #endif // CPU_S390_VM_CODEBUFFER_S390_HPP
-
-
+#endif // CPU_S390_CODEBUFFER_S390_HPP
--- a/src/hotspot/cpu/s390/copy_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/copy_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,8 +25,8 @@
 
 // Major contributions by LS
 
-#ifndef CPU_S390_VM_COPY_S390_HPP
-#define CPU_S390_VM_COPY_S390_HPP
+#ifndef CPU_S390_COPY_S390_HPP
+#define CPU_S390_COPY_S390_HPP
 
 // Inline functions for memory copy and fill.
 
@@ -1131,4 +1131,4 @@
 #endif
 }
 
-#endif // CPU_S390_VM_COPY_S390_HPP
+#endif // CPU_S390_COPY_S390_HPP
--- a/src/hotspot/cpu/s390/depChecker_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/depChecker_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,9 +23,9 @@
  *
  */
 
-#ifndef CPU_S390_VM_DEPCHECKER_S390_HPP
-#define CPU_S390_VM_DEPCHECKER_S390_HPP
+#ifndef CPU_S390_DEPCHECKER_S390_HPP
+#define CPU_S390_DEPCHECKER_S390_HPP
 
 // Nothing to do on z/Architecture
 
-#endif // CPU_S390_VM_DEPCHECKER_S390_HPP
+#endif // CPU_S390_DEPCHECKER_S390_HPP
--- a/src/hotspot/cpu/s390/disassembler_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/disassembler_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_DISASSEMBLER_S390_HPP
-#define CPU_S390_VM_DISASSEMBLER_S390_HPP
+#ifndef CPU_S390_DISASSEMBLER_S390_HPP
+#define CPU_S390_DISASSEMBLER_S390_HPP
 
   static int pd_instruction_alignment() {
     return 1;
@@ -34,4 +34,4 @@
     return "zarch";
   }
 
-#endif // CPU_S390_VM_DISASSEMBLER_S390_HPP
+#endif // CPU_S390_DISASSEMBLER_S390_HPP
--- a/src/hotspot/cpu/s390/frame_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/frame_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,8 +25,8 @@
 
 // Major contributions by ML, AHa.
 
-#ifndef CPU_S390_VM_FRAME_S390_HPP
-#define CPU_S390_VM_FRAME_S390_HPP
+#ifndef CPU_S390_FRAME_S390_HPP
+#define CPU_S390_FRAME_S390_HPP
 
 #include "runtime/synchronizer.hpp"
 
@@ -554,4 +554,4 @@
 
   static jint interpreter_frame_expression_stack_direction() { return -1; }
 
-#endif // CPU_S390_VM_FRAME_S390_HPP
+#endif // CPU_S390_FRAME_S390_HPP
--- a/src/hotspot/cpu/s390/frame_s390.inline.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_FRAME_S390_INLINE_HPP
-#define CPU_S390_VM_FRAME_S390_INLINE_HPP
+#ifndef CPU_S390_FRAME_S390_INLINE_HPP
+#define CPU_S390_FRAME_S390_INLINE_HPP
 
 #include "code/codeCache.hpp"
 #include "code/vmreg.inline.hpp"
@@ -296,4 +296,4 @@
   return fp();
 }
 
-#endif // CPU_S390_VM_FRAME_S390_INLINE_HPP
+#endif // CPU_S390_FRAME_S390_INLINE_HPP
--- a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_GLOBALDEFINITIONS_S390_HPP
-#define CPU_S390_VM_GLOBALDEFINITIONS_S390_HPP
+#ifndef CPU_S390_GLOBALDEFINITIONS_S390_HPP
+#define CPU_S390_GLOBALDEFINITIONS_S390_HPP
 
 #ifdef CC_INTERP
 #error "CC_INTERP is not supported on z/Architecture."
@@ -56,4 +56,4 @@
 
 #define THREAD_LOCAL_POLL
 
-#endif // CPU_S390_VM_GLOBALDEFINITIONS_S390_HPP
+#endif // CPU_S390_GLOBALDEFINITIONS_S390_HPP
--- a/src/hotspot/cpu/s390/globals_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/globals_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_GLOBALS_S390_HPP
-#define CPU_S390_VM_GLOBALS_S390_HPP
+#ifndef CPU_S390_GLOBALS_S390_HPP
+#define CPU_S390_GLOBALS_S390_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -128,4 +128,4 @@
   product(bool, TraceTraps, false, "Trace all traps the signal handler"       \
           "handles.")
 
-#endif // CPU_S390_VM_GLOBALS_S390_HPP
+#endif // CPU_S390_GLOBALS_S390_HPP
--- a/src/hotspot/cpu/s390/icache_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/icache_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_ICACHE_S390_HPP
-#define CPU_S390_VM_ICACHE_S390_HPP
+#ifndef CPU_S390_ICACHE_S390_HPP
+#define CPU_S390_ICACHE_S390_HPP
 
 // Interface for updating the instruction cache.  Whenever the VM modifies
 // code, part of the processor instruction cache potentially has to be flushed.
@@ -41,4 +41,4 @@
   // Use default implementation.
 };
 
-#endif // CPU_S390_VM_ICACHE_S390_HPP
+#endif // CPU_S390_ICACHE_S390_HPP
--- a/src/hotspot/cpu/s390/interp_masm_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/interp_masm_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2017 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_INTERP_MASM_ZARCH_64_64_HPP
-#define CPU_S390_VM_INTERP_MASM_ZARCH_64_64_HPP
+#ifndef CPU_S390_INTERP_MASM_S390_HPP
+#define CPU_S390_INTERP_MASM_S390_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "interpreter/invocationCounter.hpp"
@@ -330,4 +330,4 @@
   void pop_interpreter_frame(Register return_pc, Register tmp1, Register tmp2);
 };
 
-#endif // CPU_S390_VM_INTERP_MASM_ZARCH_64_64_HPP
+#endif // CPU_S390_INTERP_MASM_S390_HPP
--- a/src/hotspot/cpu/s390/interpreterRT_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/interpreterRT_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_INTERPRETERRT_S390_HPP
-#define CPU_S390_VM_INTERPRETERRT_S390_HPP
+#ifndef CPU_S390_INTERPRETERRT_S390_HPP
+#define CPU_S390_INTERPRETERRT_S390_HPP
 
 // This is included in the middle of class Interpreter.
 // Do not include files here.
@@ -62,4 +62,4 @@
 
 static address get_signature(JavaThread* thread, Method* method);
 
-#endif // CPU_S390_VM_INTERPRETERRT_S390_HPP
+#endif // CPU_S390_INTERPRETERRT_S390_HPP
--- a/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_JAVAFRAMEANCHOR_S390_HPP
-#define CPU_S390_VM_JAVAFRAMEANCHOR_S390_HPP
+#ifndef CPU_S390_JAVAFRAMEANCHOR_S390_HPP
+#define CPU_S390_JAVAFRAMEANCHOR_S390_HPP
 
  public:
 
@@ -84,4 +84,4 @@
 
   address last_Java_pc(void)          { return _last_Java_pc; }
 
-#endif // CPU_S390_VM_JAVAFRAMEANCHOR_S390_HPP
+#endif // CPU_S390_JAVAFRAMEANCHOR_S390_HPP
--- a/src/hotspot/cpu/s390/jniTypes_s390.hpp	Thu Jan 03 21:25:14 2019 +0100
+++ b/src/hotspot/cpu/s390/jniTypes_s390.hpp	Thu Jan 10 22:05:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_JNITYPES_S390_HPP
-#define CPU_S390_VM_JNITYPES_S390_HPP
+#ifndef CPU_S390_JNITYPES_S390_HPP
+#define CPU_S390_JNITYPES_S390_HPP
 
 // This file holds platform-dependent routines used to write primitive
 // jni types to the array of arguments passed into JavaCalls::call.
@@ -138,4 +138,4 @@
   }
 };