> 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 pull request now contains 13 commits: - Merge branch 'master' into Linker_32bit-fixes_New-Master - Split out 32-bit impl from native invoker and upcall handler - Pass in thread instead of rematerializing it. - 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 - ... and 3 more: https://git.openjdk.java.net/jdk/compare/461c5fc6...5e664033 ------------- Changes: https://git.openjdk.java.net/jdk/pull/1266/files Webrev: https://webrevs.openjdk.java.net/?repo=jdk&pr=1266&range=08 Stats: 88 lines in 12 files changed: 45 ins; 27 del; 16 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