Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/deoptimization.cpp @ 22851:ddce0b7cee93
8072383: resolve conflicts between open and closed ports
Summary: refactor close to remove references to closed ports
Reviewed-by: kvn, simonis, sgehwolf, dholmes
author | dlong |
---|---|
date | Tue, 24 Feb 2015 15:04:52 -0500 |
parents | 793204f5528a |
children | bf41eee321e5 |
comparison
equal
deleted
inserted
replaced
22850:34f0c0e9df21 | 22851:ddce0b7cee93 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
64 #endif | 64 #endif |
65 #ifdef TARGET_ARCH_ppc | 65 #ifdef TARGET_ARCH_ppc |
66 # include "vmreg_ppc.inline.hpp" | 66 # include "vmreg_ppc.inline.hpp" |
67 #endif | 67 #endif |
68 #ifdef COMPILER2 | 68 #ifdef COMPILER2 |
69 #ifdef TARGET_ARCH_MODEL_x86_32 | 69 #if defined AD_MD_HPP |
70 # include AD_MD_HPP | |
71 #elif defined TARGET_ARCH_MODEL_x86_32 | |
70 # include "adfiles/ad_x86_32.hpp" | 72 # include "adfiles/ad_x86_32.hpp" |
71 #endif | 73 #elif defined TARGET_ARCH_MODEL_x86_64 |
72 #ifdef TARGET_ARCH_MODEL_x86_64 | |
73 # include "adfiles/ad_x86_64.hpp" | 74 # include "adfiles/ad_x86_64.hpp" |
74 #endif | 75 #elif defined TARGET_ARCH_MODEL_sparc |
75 #ifdef TARGET_ARCH_MODEL_sparc | |
76 # include "adfiles/ad_sparc.hpp" | 76 # include "adfiles/ad_sparc.hpp" |
77 #endif | 77 #elif defined TARGET_ARCH_MODEL_zero |
78 #ifdef TARGET_ARCH_MODEL_zero | |
79 # include "adfiles/ad_zero.hpp" | 78 # include "adfiles/ad_zero.hpp" |
80 #endif | 79 #elif defined TARGET_ARCH_MODEL_ppc_64 |
81 #ifdef TARGET_ARCH_MODEL_arm | |
82 # include "adfiles/ad_arm.hpp" | |
83 #endif | |
84 #ifdef TARGET_ARCH_MODEL_ppc_32 | |
85 # include "adfiles/ad_ppc_32.hpp" | |
86 #endif | |
87 #ifdef TARGET_ARCH_MODEL_ppc_64 | |
88 # include "adfiles/ad_ppc_64.hpp" | 80 # include "adfiles/ad_ppc_64.hpp" |
89 #endif | 81 #endif |
90 #endif // COMPILER2 | 82 #endif // COMPILER2 |
91 | 83 |
92 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | 84 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC |