On Fri, 28 Apr 2023 19:51:02 GMT, Jorn Vernee <jver...@openjdk.org> wrote:
> These changes were accidentally omitted from > https://github.com/openjdk/jdk/pull/13079 > > When building the zero VM on aarch64 and linux-x86 in our CI, compilation of > `libFallbackLinker.c` can fail because the function `ffi_get_struct_offsets` > can not be found. > > The issue is that the libffi version found on some of our build systems is > too old, and doesn't contain the required function. This patch switches away > from using the libffi found on the system, and to using a pre-built libffi > 3.4.2 package (as we already do for linux-x64-zero) > > I tried getting the linux-x86-zero build working as well, but it's broken for > other reasons. I've at least verified that it compiles `libFallbackLinker.c` > when using libffi 3.4.2 > > Testing: building linux-aarrch64-zero & linux-aarrch64-zero-debug, as well as > linux-x86-zero and linux-x86-zero-debug (the x86 builds failed for other > reasons) This pull request has now been integrated. Changeset: 4818c798 Author: Jorn Vernee <jver...@openjdk.org> URL: https://git.openjdk.org/jdk/commit/4818c798bcd0ae84cd15c7ab101902896b620016 Stats: 7 lines in 2 files changed: 4 ins; 0 del; 3 mod 8307110: zero build broken after JDK-8304265 Reviewed-by: erikj ------------- PR: https://git.openjdk.org/jdk/pull/13728