comparison src/share/vm/runtime/stubRoutines.hpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 4062efea018b
children 7848fc12602b
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
112 # include "stubRoutines_zero.hpp" 112 # include "stubRoutines_zero.hpp"
113 #endif 113 #endif
114 #ifdef TARGET_ARCH_MODEL_arm 114 #ifdef TARGET_ARCH_MODEL_arm
115 # include "stubRoutines_arm.hpp" 115 # include "stubRoutines_arm.hpp"
116 #endif 116 #endif
117 #ifdef TARGET_ARCH_MODEL_ppc 117 #ifdef TARGET_ARCH_MODEL_ppc_32
118 # include "stubRoutines_ppc.hpp" 118 # include "stubRoutines_ppc_32.hpp"
119 #endif
120 #ifdef TARGET_ARCH_MODEL_ppc_64
121 # include "stubRoutines_ppc_64.hpp"
119 #endif 122 #endif
120 123
121 124
122 static jint _verify_oop_count; 125 static jint _verify_oop_count;
123 static address _verify_oop_subroutine_entry; 126 static address _verify_oop_subroutine_entry;