8268119: Rename copy_os_cpu.inline.hpp files to copy_os_cpu.hpp

Reviewed-by: kbarrett, coleenp

src/hotspot/cpu/aarch64/copy_aarch64.hpp

@@ -26,11 +26,7 @@
 #ifndef CPU_AARCH64_COPY_AARCH64_HPP
 #define CPU_AARCH64_COPY_AARCH64_HPP
 
-// Inline functions for memory copy and fill.
+#include OS_CPU_HEADER(copy)
-
-// Contains inline asm implementations
-#include OS_CPU_HEADER_INLINE(copy)
-
 
 static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) {
   julong* to = (julong*) tohw;

src/hotspot/cpu/arm/copy_arm.hpp

@@ -25,12 +25,7 @@
 #ifndef CPU_ARM_COPY_ARM_HPP
 #define CPU_ARM_COPY_ARM_HPP
 
-#include "utilities/macros.hpp"
+#include OS_CPU_HEADER(copy)
-
-// Inline functions for memory copy and fill.
-
-// Contains inline asm implementations
-#include OS_CPU_HEADER_INLINE(copy)
 
 static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) {
   juint* to = (juint*)tohw;

src/hotspot/cpu/x86/copy_x86.hpp

@@ -25,10 +25,7 @@
 #ifndef CPU_X86_COPY_X86_HPP
 #define CPU_X86_COPY_X86_HPP
 
-// Inline functions for memory copy and fill.
+#include OS_CPU_HEADER(copy)
-
-// Contains inline asm implementations
-#include OS_CPU_HEADER_INLINE(copy)
 
 static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) {
 #ifdef AMD64

src/hotspot/os_cpu/bsd_aarch64/copy_bsd_aarch64.hpp

@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_AARCH64_COPY_BSD_AARCH64_INLINE_HPP
+#ifndef OS_CPU_BSD_AARCH64_COPY_BSD_AARCH64_HPP
-#define OS_CPU_BSD_AARCH64_COPY_BSD_AARCH64_INLINE_HPP
+#define OS_CPU_BSD_AARCH64_COPY_BSD_AARCH64_HPP
 
 #define COPY_SMALL(from, to, count)                                     \
 {                                                                       \
@@ -186,4 +186,4 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t
   _Copy_arrayof_conjoint_jlongs(from, to, count);
 }
 
-#endif // OS_CPU_BSD_AARCH64_COPY_BSD_AARCH64_INLINE_HPP
+#endif // OS_CPU_BSD_AARCH64_COPY_BSD_AARCH64_HPP

src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.hpp

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_X86_COPY_BSD_X86_INLINE_HPP
+#ifndef OS_CPU_BSD_X86_COPY_BSD_X86_HPP
-#define OS_CPU_BSD_X86_COPY_BSD_X86_INLINE_HPP
+#define OS_CPU_BSD_X86_COPY_BSD_X86_HPP
 
 static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
 #ifdef AMD64
@@ -306,4 +306,4 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t
 #endif // AMD64
 }
 
-#endif // OS_CPU_BSD_X86_COPY_BSD_X86_INLINE_HPP
+#endif // OS_CPU_BSD_X86_COPY_BSD_X86_HPP

src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.hpp

@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_INLINE_HPP
+#ifndef OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_INLINE_HPP
+#define OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_HPP
 
 #define COPY_SMALL(from, to, count)                                     \
 {                                                                       \
@@ -185,4 +185,4 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t
   _Copy_arrayof_conjoint_jlongs(from, to, count);
 }
 
-#endif // OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_INLINE_HPP
+#endif // OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_HPP

src/hotspot/os_cpu/linux_arm/copy_linux_arm.hpp

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ARM_COPY_LINUX_ARM_INLINE_HPP
+#ifndef OS_CPU_LINUX_ARM_COPY_LINUX_ARM_HPP
-#define OS_CPU_LINUX_ARM_COPY_LINUX_ARM_INLINE_HPP
+#define OS_CPU_LINUX_ARM_COPY_LINUX_ARM_HPP
 
 static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
   _Copy_conjoint_words(from, to, count * HeapWordSize);
@@ -92,4 +92,4 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t
   pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count);
 }
 
-#endif // OS_CPU_LINUX_ARM_COPY_LINUX_ARM_INLINE_HPP
+#endif // OS_CPU_LINUX_ARM_COPY_LINUX_ARM_HPP

src/hotspot/os_cpu/linux_x86/copy_linux_x86.hpp

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_X86_COPY_LINUX_X86_INLINE_HPP
+#ifndef OS_CPU_LINUX_X86_COPY_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_COPY_LINUX_X86_INLINE_HPP
+#define OS_CPU_LINUX_X86_COPY_LINUX_X86_HPP
 
 static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
 #ifdef AMD64
@@ -306,4 +306,4 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t
 #endif // AMD64
 }
 
-#endif // OS_CPU_LINUX_X86_COPY_LINUX_X86_INLINE_HPP
+#endif // OS_CPU_LINUX_X86_COPY_LINUX_X86_HPP

src/hotspot/os_cpu/windows_aarch64/copy_windows_aarch64.hpp

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_WINDOWS_AARCH64_COPY_WINDOWS_AARCH64_INLINE_HPP
+#ifndef OS_CPU_WINDOWS_AARCH64_COPY_WINDOWS_AARCH64_HPP
-#define OS_CPU_WINDOWS_AARCH64_COPY_WINDOWS_AARCH64_INLINE_HPP
+#define OS_CPU_WINDOWS_AARCH64_COPY_WINDOWS_AARCH64_HPP
 
 #include <string.h>
 
@@ -155,4 +155,4 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t
  pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count);
 }
 
-#endif // OS_CPU_WINDOWS_AARCH64_COPY_WINDOWS_AARCH64_INLINE_HPP
+#endif // OS_CPU_WINDOWS_AARCH64_COPY_WINDOWS_AARCH64_HPP

src/hotspot/os_cpu/windows_x86/copy_windows_x86.hpp

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_WINDOWS_X86_COPY_WINDOWS_X86_INLINE_HPP
+#ifndef OS_CPU_WINDOWS_X86_COPY_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_COPY_WINDOWS_X86_INLINE_HPP
+#define OS_CPU_WINDOWS_X86_COPY_WINDOWS_X86_HPP
 
 static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
   (void)memmove(to, from, count * HeapWordSize);
@@ -190,4 +190,4 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t
   pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count);
 }
 
-#endif // OS_CPU_WINDOWS_X86_COPY_WINDOWS_X86_INLINE_HPP
+#endif // OS_CPU_WINDOWS_X86_COPY_WINDOWS_X86_HPP