1.1 --- a/src/share/vm/interpreter/abstractInterpreter.hpp Fri Feb 20 17:05:39 2015 +0000 1.2 +++ b/src/share/vm/interpreter/abstractInterpreter.hpp Tue Feb 24 15:04:52 2015 -0500 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 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 @@ -30,22 +30,15 @@ 1.11 #include "runtime/thread.inline.hpp" 1.12 #include "runtime/vmThread.hpp" 1.13 #include "utilities/top.hpp" 1.14 -#ifdef TARGET_ARCH_x86 1.15 +#if defined INTERP_MASM_MD_HPP 1.16 +# include INTERP_MASM_MD_HPP 1.17 +#elif defined TARGET_ARCH_x86 1.18 # include "interp_masm_x86.hpp" 1.19 -#endif 1.20 -#ifdef TARGET_ARCH_MODEL_sparc 1.21 +#elif defined TARGET_ARCH_MODEL_sparc 1.22 # include "interp_masm_sparc.hpp" 1.23 -#endif 1.24 -#ifdef TARGET_ARCH_MODEL_zero 1.25 +#elif defined TARGET_ARCH_MODEL_zero 1.26 # include "interp_masm_zero.hpp" 1.27 -#endif 1.28 -#ifdef TARGET_ARCH_MODEL_arm 1.29 -# include "interp_masm_arm.hpp" 1.30 -#endif 1.31 -#ifdef TARGET_ARCH_MODEL_ppc_32 1.32 -# include "interp_masm_ppc_32.hpp" 1.33 -#endif 1.34 -#ifdef TARGET_ARCH_MODEL_ppc_64 1.35 +#elif defined TARGET_ARCH_MODEL_ppc_64 1.36 # include "interp_masm_ppc_64.hpp" 1.37 #endif 1.38