comparison src/share/vm/runtime/sharedRuntime.cpp @ 18009:f73af4455d7d

Merge
author asaha
date Thu, 29 May 2014 09:56:06 -0700
parents 78bbf4d43a14
children 0bf37f737702
comparison
equal deleted inserted replaced
18008:da65bbf6f89e 18009:f73af4455d7d
1 /* 1 /*
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2014, 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.
79 # include "vmreg_ppc.inline.hpp" 79 # include "vmreg_ppc.inline.hpp"
80 #endif 80 #endif
81 #ifdef COMPILER1 81 #ifdef COMPILER1
82 #include "c1/c1_Runtime1.hpp" 82 #include "c1/c1_Runtime1.hpp"
83 #endif 83 #endif
84
85 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
84 86
85 // Shared stub locations 87 // Shared stub locations
86 RuntimeStub* SharedRuntime::_wrong_method_blob; 88 RuntimeStub* SharedRuntime::_wrong_method_blob;
87 RuntimeStub* SharedRuntime::_wrong_method_abstract_blob; 89 RuntimeStub* SharedRuntime::_wrong_method_abstract_blob;
88 RuntimeStub* SharedRuntime::_ic_miss_blob; 90 RuntimeStub* SharedRuntime::_ic_miss_blob;