src/share/vm/runtime/vmStructs.cpp

*** 184,212 ****
  #include "opto/parse.hpp"
  #include "opto/regalloc.hpp"
  #include "opto/rootnode.hpp"
  #include "opto/subnode.hpp"
  #include "opto/vectornode.hpp"
! #ifdef TARGET_ARCH_MODEL_x86_32
  # include "adfiles/adGlobals_x86_32.hpp"
! #endif
! #ifdef TARGET_ARCH_MODEL_x86_64
  # include "adfiles/adGlobals_x86_64.hpp"
! #endif
! #ifdef TARGET_ARCH_MODEL_sparc
  # include "adfiles/adGlobals_sparc.hpp"
! #endif
! #ifdef TARGET_ARCH_MODEL_zero
  # include "adfiles/adGlobals_zero.hpp"
! #endif
! #ifdef TARGET_ARCH_MODEL_arm
! # include "adfiles/adGlobals_arm.hpp"
! #endif
! #ifdef TARGET_ARCH_MODEL_ppc_32
! # include "adfiles/adGlobals_ppc_32.hpp"
! #endif
! #ifdef TARGET_ARCH_MODEL_ppc_64
  # include "adfiles/adGlobals_ppc_64.hpp"
  #endif
  #endif // COMPILER2
  
  // Note: the cross-product of (c1, c2, product, nonproduct, ...),
--- 184,204 ----
  #include "opto/parse.hpp"
  #include "opto/regalloc.hpp"
  #include "opto/rootnode.hpp"
  #include "opto/subnode.hpp"
  #include "opto/vectornode.hpp"
! #if defined ADGLOBALS_MD_HPP
! # include ADGLOBALS_MD_HPP
! #elif defined TARGET_ARCH_MODEL_x86_32
  # include "adfiles/adGlobals_x86_32.hpp"
! #elif defined TARGET_ARCH_MODEL_x86_64
  # include "adfiles/adGlobals_x86_64.hpp"
! #elif defined TARGET_ARCH_MODEL_sparc
  # include "adfiles/adGlobals_sparc.hpp"
! #elif defined TARGET_ARCH_MODEL_zero
  # include "adfiles/adGlobals_zero.hpp"
! #elif defined TARGET_ARCH_MODEL_ppc_64
  # include "adfiles/adGlobals_ppc_64.hpp"
  #endif
  #endif // COMPILER2
  
  // Note: the cross-product of (c1, c2, product, nonproduct, ...),