src/share/vm/utilities/globalDefinitions.hpp

*** 20,29 ****
--- 20,44 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
+ #ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
+ #define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
+ 
+ #ifdef TARGET_COMPILER_gcc
+ # include "utilities/globalDefinitions_gcc.hpp"
+ #endif
+ #ifdef TARGET_COMPILER_visCPP
+ # include "utilities/globalDefinitions_visCPP.hpp"
+ #endif
+ #ifdef TARGET_COMPILER_sparcWorks
+ # include "utilities/globalDefinitions_sparcWorks.hpp"
+ #endif
+ 
+ #include "utilities/macros.hpp"
+ 
  // This file holds all globally used constants & types, class (forward)
  // declarations and a few frequently used utility functions.
  
  //----------------------------------------------------------------------------------------------------
  // Constants
*** 302,312 ****
  extern int LogMinObjAlignment;
  extern int LogMinObjAlignmentInBytes;
  
  // Machine dependent stuff
  
! #include "incls/_globalDefinitions_pd.hpp.incl"
  
  // The byte alignment to be used by Arena::Amalloc.  See bugid 4169348.
  // Note: this value must be a power of 2
  
  #define ARENA_AMALLOC_ALIGNMENT (2*BytesPerWord)
--- 317,336 ----
  extern int LogMinObjAlignment;
  extern int LogMinObjAlignmentInBytes;
  
  // Machine dependent stuff
  
! #ifdef TARGET_ARCH_x86
! # include "globalDefinitions_x86.hpp"
! #endif
! #ifdef TARGET_ARCH_sparc
! # include "globalDefinitions_sparc.hpp"
! #endif
! #ifdef TARGET_ARCH_zero
! # include "globalDefinitions_zero.hpp"
! #endif
! 
  
  // The byte alignment to be used by Arena::Amalloc.  See bugid 4169348.
  // Note: this value must be a power of 2
  
  #define ARENA_AMALLOC_ALIGNMENT (2*BytesPerWord)
*** 1215,1219 ****
--- 1239,1245 ----
  #   define ENABLE_ZAP_DEAD_LOCALS
  #endif /* COMPILER2 */
  # endif /* ASSERT */
  
  #define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0]))
+ 
+ #endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP