src/share/vm/runtime/osThread.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, 2012, 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.
*** 27,36 ****
--- 27,37 ----
  
  #include "runtime/frame.hpp"
  #include "runtime/handles.hpp"
  #include "runtime/javaFrameAnchor.hpp"
  #include "runtime/objectMonitor.hpp"
+ #include "utilities/macros.hpp"
  
  // The OSThread class holds OS-specific thread information.  It is equivalent
  // to the sys_thread_t structure of the classic JVM implementation.
  
  // The thread states represented by the ThreadState values are platform-specific
*** 94,118 ****
  
    // For java intrinsics:
    static ByteSize interrupted_offset()            { return byte_offset_of(OSThread, _interrupted); }
  
    // Platform dependent stuff
! #ifdef TARGET_OS_FAMILY_linux
! # include "osThread_linux.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_solaris
! # include "osThread_solaris.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_windows
! # include "osThread_windows.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_aix
! # include "osThread_aix.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_bsd
! # include "osThread_bsd.hpp"
! #endif
  
   public:
    static ByteSize thread_id_offset()              { return byte_offset_of(OSThread, _thread_id); }
    static size_t thread_id_size()                  { return sizeof(thread_id_t); }
  
--- 95,105 ----
  
    // For java intrinsics:
    static ByteSize interrupted_offset()            { return byte_offset_of(OSThread, _interrupted); }
  
    // Platform dependent stuff
! #include OS_HEADER(osThread)
  
   public:
    static ByteSize thread_id_offset()              { return byte_offset_of(OSThread, _thread_id); }
    static size_t thread_id_size()                  { return sizeof(thread_id_t); }