1.1 --- a/src/share/vm/runtime/globals.hpp Tue Nov 23 15:01:43 2010 -0500 1.2 +++ b/src/share/vm/runtime/globals.hpp Tue Nov 23 13:22:55 2010 -0800 1.3 @@ -22,6 +22,86 @@ 1.4 * 1.5 */ 1.6 1.7 +#ifndef SHARE_VM_RUNTIME_GLOBALS_HPP 1.8 +#define SHARE_VM_RUNTIME_GLOBALS_HPP 1.9 + 1.10 +#include "utilities/debug.hpp" 1.11 +#ifdef TARGET_ARCH_x86 1.12 +# include "globals_x86.hpp" 1.13 +#endif 1.14 +#ifdef TARGET_ARCH_sparc 1.15 +# include "globals_sparc.hpp" 1.16 +#endif 1.17 +#ifdef TARGET_ARCH_zero 1.18 +# include "globals_zero.hpp" 1.19 +#endif 1.20 +#ifdef TARGET_OS_FAMILY_linux 1.21 +# include "globals_linux.hpp" 1.22 +#endif 1.23 +#ifdef TARGET_OS_FAMILY_solaris 1.24 +# include "globals_solaris.hpp" 1.25 +#endif 1.26 +#ifdef TARGET_OS_FAMILY_windows 1.27 +# include "globals_windows.hpp" 1.28 +#endif 1.29 +#ifdef TARGET_OS_ARCH_linux_x86 1.30 +# include "globals_linux_x86.hpp" 1.31 +#endif 1.32 +#ifdef TARGET_OS_ARCH_linux_sparc 1.33 +# include "globals_linux_sparc.hpp" 1.34 +#endif 1.35 +#ifdef TARGET_OS_ARCH_linux_zero 1.36 +# include "globals_linux_zero.hpp" 1.37 +#endif 1.38 +#ifdef TARGET_OS_ARCH_solaris_x86 1.39 +# include "globals_solaris_x86.hpp" 1.40 +#endif 1.41 +#ifdef TARGET_OS_ARCH_solaris_sparc 1.42 +# include "globals_solaris_sparc.hpp" 1.43 +#endif 1.44 +#ifdef TARGET_OS_ARCH_windows_x86 1.45 +# include "globals_windows_x86.hpp" 1.46 +#endif 1.47 +#ifdef COMPILER1 1.48 +#ifdef TARGET_ARCH_x86 1.49 +# include "c1_globals_x86.hpp" 1.50 +#endif 1.51 +#ifdef TARGET_ARCH_sparc 1.52 +# include "c1_globals_sparc.hpp" 1.53 +#endif 1.54 +#ifdef TARGET_OS_FAMILY_linux 1.55 +# include "c1_globals_linux.hpp" 1.56 +#endif 1.57 +#ifdef TARGET_OS_FAMILY_solaris 1.58 +# include "c1_globals_solaris.hpp" 1.59 +#endif 1.60 +#ifdef TARGET_OS_FAMILY_windows 1.61 +# include "c1_globals_windows.hpp" 1.62 +#endif 1.63 +#endif 1.64 +#ifdef COMPILER2 1.65 +#ifdef TARGET_ARCH_x86 1.66 +# include "c2_globals_x86.hpp" 1.67 +#endif 1.68 +#ifdef TARGET_ARCH_sparc 1.69 +# include "c2_globals_sparc.hpp" 1.70 +#endif 1.71 +#ifdef TARGET_OS_FAMILY_linux 1.72 +# include "c2_globals_linux.hpp" 1.73 +#endif 1.74 +#ifdef TARGET_OS_FAMILY_solaris 1.75 +# include "c2_globals_solaris.hpp" 1.76 +#endif 1.77 +#ifdef TARGET_OS_FAMILY_windows 1.78 +# include "c2_globals_windows.hpp" 1.79 +#endif 1.80 +#endif 1.81 +#ifdef SHARK 1.82 +#ifdef TARGET_ARCH_zero 1.83 +# include "shark_globals_zero.hpp" 1.84 +#endif 1.85 +#endif 1.86 + 1.87 #if !defined(COMPILER1) && !defined(COMPILER2) && !defined(SHARK) 1.88 define_pd_global(bool, BackgroundCompilation, false); 1.89 define_pd_global(bool, UseTLAB, false); 1.90 @@ -3676,3 +3756,5 @@ 1.91 RUNTIME_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG, DECLARE_LP64_PRODUCT_FLAG) 1.92 1.93 RUNTIME_OS_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_NOTPRODUCT_FLAG) 1.94 + 1.95 +#endif // SHARE_VM_RUNTIME_GLOBALS_HPP