OpenJDK / jdk / jdk
changeset 57622:c9537fcd9b5c
8236772: Fix build for windows 32-bit after 8212160 and 8234331.
Reviewed-by: clanger
| author | goetz |
|---|---|
| date | Wed, 08 Jan 2020 14:22:30 +0100 |
| parents | e92c90eaaaf4 |
| children | 087ad80a9489 |
| files | src/hotspot/share/utilities/count_leading_zeros.hpp test/hotspot/jtreg/serviceability/jvmti/CompiledMethodLoad/libCompiledZombie.cpp |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/utilities/count_leading_zeros.hpp Fri Jan 10 07:21:32 2020 -0500 +++ b/src/hotspot/share/utilities/count_leading_zeros.hpp Wed Jan 08 14:22:30 2020 +0100 @@ -108,8 +108,8 @@ template <typename T> struct CountLeadingZerosImpl<T, 8> { static unsigned doit(T v) { +#ifdef _LP64 unsigned long index; -#ifdef _LP64 _BitScanReverse64(&index, v); return 63u - index; #else
--- a/test/hotspot/jtreg/serviceability/jvmti/CompiledMethodLoad/libCompiledZombie.cpp Fri Jan 10 07:21:32 2020 -0500 +++ b/test/hotspot/jtreg/serviceability/jvmti/CompiledMethodLoad/libCompiledZombie.cpp Wed Jan 08 14:22:30 2020 +0100 @@ -67,7 +67,8 @@ 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);