Skip to content

8339783: Implement JEP 479: Remove the Windows 32-bit x86 Port #21744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 38 commits into from
Closed

8339783: Implement JEP 479: Remove the Windows 32-bit x86 Port #21744

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
a18d19c
8339783: Implementation of JEP 479: Remove the Windows 32-bit x86 Port
magicus Oct 28, 2024
5c98695
Remove FIXME for issue resolved in JDK-8343167
magicus Oct 29, 2024
d5280f6
Remove FIXMEs on x86 code that will soon go away anyway
magicus Oct 29, 2024
bcf821d
Restore PLATFORM_CHECK_DEPRECATION
magicus Oct 29, 2024
c6b8771
Use #error for unknown CPU
magicus Oct 29, 2024
6b07b7d
Merge branch 'master' into impl-JEP-479
magicus Oct 29, 2024
0167582
Update VirtualMachineImpl_openProcess since it only needs to care abo…
magicus Oct 29, 2024
bfca62e
Fix NativeLookup::lookup_entry
magicus Oct 29, 2024
d7ceff4
Remove windows-only code guarded by _LP64.
magicus Oct 29, 2024
c69e804
Remove win32-specific implementation of MacroAssembler::get_thread
magicus Oct 29, 2024
fdec8b1
Remove thread_ptr_offset remnants
magicus Oct 29, 2024
e567307
Clean up old Windows workarounds in adlc
magicus Oct 29, 2024
afb5097
adlc build were missing _CRT_DECLARE_NONSTDC_NAMES
magicus Oct 29, 2024
9df6cb9
IS_WIN64 is never used and can be completely removed
magicus Oct 29, 2024
7eb46c3
adlc need _CRT_NONSTDC_NO_WARNINGS as well... *sigh*
magicus Oct 29, 2024
3556bec
Fix 32/64-bit confusion in comment in VirtualMachineImpl.c
magicus Oct 29, 2024
341de0b
Restore comment on calling conventions
magicus Oct 30, 2024
0fff097
Error in os_windows.cpp for unknown cpu
magicus Oct 30, 2024
fe8ba08
No need to check for LP64 inside a #ifdef _WINDOWS anymore
magicus Nov 1, 2024
ec7e19b
Remove windows-32-bit code in CompilerConfig::ergo_initialize
magicus Nov 1, 2024
68d6fe5
Remove superfluous check for 64-bit on Windows in MacroAssembler::cal…
magicus Nov 1, 2024
c6dce38
Restore code in adlc.hpp
magicus Nov 4, 2024
d89bc56
Make JNICALL an empty define on all platforms
magicus Nov 4, 2024
fbd91ad
Remove __stdcall notation
magicus Nov 4, 2024
dccf1a1
Replace WIN32 with _WINDOWS in sharedRuntimeTrans.cpp
magicus Nov 4, 2024
6432343
Also remove __stdcall on tests
magicus Nov 4, 2024
82fbc51
Also remove __cdecl
magicus Nov 4, 2024
b5a481d
Also restore ADLC_CFLAGS_WARNINGS changes that are not needed any longer
magicus Nov 4, 2024
466a1a7
buildJniFunctionName is now identical on Windows and Unix, so unify it
magicus Nov 4, 2024
88d89e7
Fix build_agent_function_name to not handle "@"-stdcall style names
magicus Nov 4, 2024
6f690d0
[JNI/JVM/AGENT]_[ONLOAD/ONUNLOAD/ONATTACH]_SYMBOLS are now identical …
magicus Nov 4, 2024
48d722b
JVM_EnqueueOperation do not need __stdcall name lookup anymore
magicus Nov 4, 2024
699c641
Merge branch 'master' into impl-JEP-479
magicus Nov 4, 2024
40291b9
Update copyright years
magicus Nov 4, 2024
9b10e74
fix: jvm_md.h was included, but not jvm.h...
magicus Nov 4, 2024
de3c773
Remove FIXME
magicus Nov 6, 2024
a9d56f2
Merge branch 'master' into impl-JEP-479
magicus Nov 8, 2024
445515e
Inline buildJniFunctionName
magicus Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/hotspot/os/posix/include/jvm_md.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,6 @@
#include <stddef.h> /* For ptrdiff_t */
#include <stdint.h> /* For uintptr_t */

#define JNI_ONLOAD_SYMBOLS {"JNI_OnLoad"}
#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
#define JVM_ONLOAD_SYMBOLS {"JVM_OnLoad"}
#define AGENT_ONLOAD_SYMBOLS {"Agent_OnLoad"}
#define AGENT_ONUNLOAD_SYMBOLS {"Agent_OnUnload"}
#define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"}

#define JNI_LIB_PREFIX "lib"
#ifdef __APPLE__
#define JNI_LIB_SUFFIX ".dylib"
Expand Down
7 changes: 0 additions & 7 deletions src/hotspot/os/windows/include/jvm_md.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@

typedef int socklen_t;

#define JNI_ONLOAD_SYMBOLS {"_JNI_OnLoad@8", "JNI_OnLoad"}
#define JNI_ONUNLOAD_SYMBOLS {"_JNI_OnUnload@8", "JNI_OnUnload"}
#define JVM_ONLOAD_SYMBOLS {"_JVM_OnLoad@12", "JVM_OnLoad"}
#define AGENT_ONLOAD_SYMBOLS {"_Agent_OnLoad@12", "Agent_OnLoad"}
#define AGENT_ONUNLOAD_SYMBOLS {"_Agent_OnUnload@4", "Agent_OnUnload"}
#define AGENT_ONATTACH_SYMBOLS {"_Agent_OnAttach@12", "Agent_OnAttach"}

#define JNI_LIB_PREFIX ""
#define JNI_LIB_SUFFIX ".dll"

Expand Down
7 changes: 7 additions & 0 deletions src/hotspot/share/include/jvm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1160,6 +1160,13 @@ JVM_GetClassFileVersion(JNIEnv *env, jclass current);
JNIEXPORT jboolean JNICALL
JVM_PrintWarningAtDynamicAgentLoad(void);

#define JNI_ONLOAD_SYMBOLS {"JNI_OnLoad"}
#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
#define JVM_ONLOAD_SYMBOLS {"JVM_OnLoad"}
#define AGENT_ONLOAD_SYMBOLS {"Agent_OnLoad"}
#define AGENT_ONUNLOAD_SYMBOLS {"Agent_OnUnload"}
#define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"}

/*
* This structure is used by the launcher to get the default thread
* stack size from the VM using JNI_GetDefaultJavaVMInitArgs() with a
Expand Down