8236772: Fix build for windows 32-bit after 8212160 and 8234331

Reviewed-by: clanger
openjdk · Jan 8, 2020 · d6a2a079d16feead9ec5b897d098f659271dbc64 · d6a2a07
1 parent b81bfcb
commit d6a2a079d16feead9ec5b897d098f659271dbc64
Unified Split

Showing with 3 additions and 2 deletions.

+1 −1 src/hotspot/share/utilities/count_leading_zeros.hpp

+2 −1 test/hotspot/jtreg/serviceability/jvmti/CompiledMethodLoad/libCompiledZombie.cpp
diff --git a/src/hotspot/share/utilities/count_leading_zeros.hpp b/src/hotspot/share/utilities/count_leading_zeros.hpp
@@ -108,8 +108,8 @@ template <typename T> struct CountLeadingZerosImpl<T, 4> {
 
 template <typename T> struct CountLeadingZerosImpl<T, 8> {
   static unsigned doit(T v) {
-    unsigned long index;
 #ifdef _LP64
+    unsigned long index;
     _BitScanReverse64(&index, v);
     return 63u - index;
 #else

diff --git a/test/hotspot/jtreg/serviceability/jvmti/CompiledMethodLoad/libCompiledZombie.cpp b/test/hotspot/jtreg/serviceability/jvmti/CompiledMethodLoad/libCompiledZombie.cpp
@@ -67,7 +67,8 @@ void JNICALL VMInit(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
     jvmti->RunAgentThread(agent_thread, GenerateEventsThread, NULL, JVMTI_THREAD_NORM_PRIORITY);
 }
 
-jint Agent_OnLoad(JavaVM* vm, char* options, void* reserved) {
+JNIEXPORT
+jint JNICALL Agent_OnLoad(JavaVM* vm, char* options, void* reserved) {
     jvmtiEnv* jvmti;
     vm->GetEnv((void**)&jvmti, JVMTI_VERSION_1_0);