RFR: 8256486: Linux/Windows-x86 builds broken after JDK-8254231 [v6]
Jorn Vernee
jvernee at openjdk.java.net
Tue Nov 24 13:35:17 UTC 2020
> JDK-8254231 breaks the Linux and Windows x86 (32-bit) builds. This contains the needed changes to get it working again.
>
> Perhaps the most interesting change is adding the `JNI_ENTRY_CPP_NOENV` macro. Using just JNI_ENTRY was causing a linkage failure, due to the declaration of the function in the class not having the same linkage specifiers. It looks like we can't just specify C linkage for class member functions.
>
> However, in this case C linkage is not required, so I've added the new macro which doesn't have `extern "C"`. I've also dropped the `JNIEnv*` parameter, since it was not being used, but causing extra work for the caller.
>
> Other than that, it's just about adding default definitions for missing functions, and moving around some code in MacroAssembler to be in the correct `#ifdef` blocks.
>
> Testing: `make images` on Linux and Windows x86_32 platforms.
Jorn Vernee has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains 10 additional commits since the last revision:
- Merge branch 'master' into Linker_32bit-fixes_Simpler
- Remove JNI_ENTRY_CPP_NOENV
- - Move reset_last_Java_frame
- Use the Unimplemented() macro instead of hlt()
- Merge branch 'master' into Linker_32bit-fixes_Simpler
- Remove UnsupportedPlatform test
- Remove unneeded cast
- Remove Stuff that makes the jdk_foreign tests pass
- fix test warnings
- - Fix 32-bit build errors and tests
- Add negative test for 32-bit platform.
- Change CABI to fail more lazily when running on an unsupported platform.
- Change CLinker layouts to be null on unsupported platforms, instead of failing when initializing the class
- Added note to CLinker about failure to initialize on unsupported platforms
-------------
Changes:
- all: https://git.openjdk.java.net/jdk/pull/1266/files
- new: https://git.openjdk.java.net/jdk/pull/1266/files/6ea9b3e3..960021ba
Webrevs:
- full: https://webrevs.openjdk.java.net/?repo=jdk&pr=1266&range=05
- incr: https://webrevs.openjdk.java.net/?repo=jdk&pr=1266&range=04-05
Stats: 2931 lines in 100 files changed: 1501 ins; 855 del; 575 mod
Patch: https://git.openjdk.java.net/jdk/pull/1266.diff
Fetch: git fetch https://git.openjdk.java.net/jdk pull/1266/head:pull/1266
PR: https://git.openjdk.java.net/jdk/pull/1266
More information about the core-libs-dev
mailing list