Mercurial > hg > graal-compiler
diff src/share/vm/utilities/globalDefinitions.hpp @ 2044:06f017f7daa7
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Fri, 07 Jan 2011 18:18:08 +0100 |
parents | 2d26b0046e0d f95d63e2154a |
children | d25d4ca69222 |
line wrap: on
line diff
--- a/src/share/vm/utilities/globalDefinitions.hpp Wed Dec 29 20:06:41 2010 +0100 +++ b/src/share/vm/utilities/globalDefinitions.hpp Fri Jan 07 18:18:08 2011 +0100 @@ -22,6 +22,21 @@ * */ +#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. @@ -304,7 +319,16 @@ // Machine dependent stuff -#include "incls/_globalDefinitions_pd.hpp.incl" +#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 @@ -1217,3 +1241,5 @@ # endif /* ASSERT */ #define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) + +#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP