src/cpu/x86/vm/bytes_x86.hpp

rev 11647 : 8161258: Simplify including platform files.
Summary: Include patform files with macros cpu_header() etc. Do various cleanups of macro usages. Remove _64/_32 from adlc generated files and platform .hpp files. Merge stubRoutines_x86*.hpp. Remove empty mutex_<os>* files.
Reviewed-by: dholmes, coleenp, kbarrett

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2010, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2016, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 24,33 ****
--- 24,34 ----
  
  #ifndef CPU_X86_VM_BYTES_X86_HPP
  #define CPU_X86_VM_BYTES_X86_HPP
  
  #include "memory/allocation.hpp"
+ #include "utilities/macros.hpp"
  
  class Bytes: AllStatic {
   private:
  #ifndef AMD64
    // Helper function for swap_u8
*** 68,89 ****
    static inline u2   swap_u2(u2 x);                   // compiler-dependent implementation
    static inline u4   swap_u4(u4 x);                   // compiler-dependent implementation
    static inline u8   swap_u8(u8 x);
  };
  
- 
  // The following header contains the implementations of swap_u2, swap_u4, and swap_u8[_base]
! #ifdef TARGET_OS_ARCH_linux_x86
! # include "bytes_linux_x86.inline.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_solaris_x86
! # include "bytes_solaris_x86.inline.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_windows_x86
! # include "bytes_windows_x86.inline.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_bsd_x86
! # include "bytes_bsd_x86.inline.hpp"
! #endif
! 
  
  #endif // CPU_X86_VM_BYTES_X86_HPP
--- 69,77 ----
    static inline u2   swap_u2(u2 x);                   // compiler-dependent implementation
    static inline u4   swap_u4(u4 x);                   // compiler-dependent implementation
    static inline u8   swap_u8(u8 x);
  };
  
  // The following header contains the implementations of swap_u2, swap_u4, and swap_u8[_base]
! #include OS_CPU_HEADER_INLINE(bytes)
  
  #endif // CPU_X86_VM_BYTES_X86_HPP