comparison src/share/vm/runtime/relocator.hpp @ 7066:7d815d842ee0

Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 23 Nov 2012 11:50:27 +0100
parents da91efe96a93
children
comparison
equal deleted inserted replaced
7065:cfacf5d5bade 7066:7d815d842ee0
1 /* 1 /*
2 * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2012, 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.
24 24
25 #ifndef SHARE_VM_RUNTIME_RELOCATOR_HPP 25 #ifndef SHARE_VM_RUNTIME_RELOCATOR_HPP
26 #define SHARE_VM_RUNTIME_RELOCATOR_HPP 26 #define SHARE_VM_RUNTIME_RELOCATOR_HPP
27 27
28 #include "interpreter/bytecodes.hpp" 28 #include "interpreter/bytecodes.hpp"
29 #include "oops/methodOop.hpp" 29 #include "oops/method.hpp"
30 #ifdef TARGET_ARCH_x86 30 #ifdef TARGET_ARCH_x86
31 # include "bytes_x86.hpp" 31 # include "bytes_x86.hpp"
32 #endif 32 #endif
33 #ifdef TARGET_ARCH_sparc 33 #ifdef TARGET_ARCH_sparc
34 # include "bytes_sparc.hpp" 34 # include "bytes_sparc.hpp"