1.1 --- a/src/share/vm/code/vmreg.hpp Fri Feb 20 17:05:39 2015 +0000
1.2 +++ b/src/share/vm/code/vmreg.hpp Tue Feb 24 15:04:52 2015 -0500
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -32,25 +32,17 @@
1.11 #ifdef COMPILER2
1.12 #include "opto/adlcVMDeps.hpp"
1.13 #include "utilities/ostream.hpp"
1.14 -#ifdef TARGET_ARCH_MODEL_x86_32
1.15 +#if defined ADGLOBALS_MD_HPP
1.16 +# include ADGLOBALS_MD_HPP
1.17 +#elif defined TARGET_ARCH_MODEL_x86_32
1.18 # include "adfiles/adGlobals_x86_32.hpp"
1.19 -#endif
1.20 -#ifdef TARGET_ARCH_MODEL_x86_64
1.21 +#elif defined TARGET_ARCH_MODEL_x86_64
1.22 # include "adfiles/adGlobals_x86_64.hpp"
1.23 -#endif
1.24 -#ifdef TARGET_ARCH_MODEL_sparc
1.25 +#elif defined TARGET_ARCH_MODEL_sparc
1.26 # include "adfiles/adGlobals_sparc.hpp"
1.27 -#endif
1.28 -#ifdef TARGET_ARCH_MODEL_zero
1.29 +#elif defined TARGET_ARCH_MODEL_zero
1.30 # include "adfiles/adGlobals_zero.hpp"
1.31 -#endif
1.32 -#ifdef TARGET_ARCH_MODEL_arm
1.33 -# include "adfiles/adGlobals_arm.hpp"
1.34 -#endif
1.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
1.36 -# include "adfiles/adGlobals_ppc_32.hpp"
1.37 -#endif
1.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
1.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
1.40 # include "adfiles/adGlobals_ppc_64.hpp"
1.41 #endif
1.42 #endif
