src/share/vm/asm/macroAssembler.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) 2012, 2013, 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) 2012, 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,49 ****
  
  #ifndef SHARE_VM_ASM_MACROASSEMBLER_HPP
  #define SHARE_VM_ASM_MACROASSEMBLER_HPP
  
  #include "asm/assembler.hpp"
  
! #ifdef TARGET_ARCH_x86
! # include "macroAssembler_x86.hpp"
! #endif
! #ifdef TARGET_ARCH_sparc
! # include "macroAssembler_sparc.hpp"
! #endif
! #ifdef TARGET_ARCH_zero
! # include "assembler_zero.hpp"
! #endif
! #ifdef TARGET_ARCH_arm
! # include "macroAssembler_arm.hpp"
! #endif
! #ifdef TARGET_ARCH_ppc
! # include "macroAssembler_ppc.hpp"
! #endif
! #ifdef TARGET_ARCH_aarch64
! # include "macroAssembler_aarch64.hpp"
! #endif
  
  #endif // SHARE_VM_ASM_MACROASSEMBLER_HPP
--- 24,33 ----
  
  #ifndef SHARE_VM_ASM_MACROASSEMBLER_HPP
  #define SHARE_VM_ASM_MACROASSEMBLER_HPP
  
  #include "asm/assembler.hpp"
+ #include "utilities/macros.hpp"
  
! #include CPU_HEADER(macroAssembler)
  
  #endif // SHARE_VM_ASM_MACROASSEMBLER_HPP