Skip to content
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.

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

[23.1] Backport: Minor JNI and libchelper fixes #737

Merged
merged 2 commits into from
May 22, 2024

Conversation

zakkak
Copy link
Collaborator

@zakkak zakkak commented May 20, 2024

Backport of oracle#7955

  • Fix missing headers in libchelper.
  • Fix potentially pending JNI exceptions.

Resolves build issues like:

[7/10] CC src/getThreadId.o
FAILED: src/getThreadId.o 
gcc -MMD -MF src/getThreadId.o.d -I/home/zakkak/code/mandrel/substratevm/src/com.oracle.svm.native.libchelper/include  -fdebug-prefix-map=/home/zakkak/code/mandrel=mandrel -fdebug-prefix-map=/home/zakkak/code/mandrel/substratevm/mxbuild/jdk21=jdk21 -fdebug-prefix-map=/home/zakkak/jvms/jdk-21.0.4+2=jdk-21.0.4+2 -gno-record-gcc-switches -g -gdwarf-4 -fPIC -O2 -D_LITTLE_ENDIAN -ffunction-sections -fdata-sections -fvisibility=hidden -D_FORTIFY_SOURCE=0 -c /home/zakkak/code/mandrel/substratevm/src/com.oracle.svm.native.libchelper/src/getThreadId.c -o src/getThreadId.o
/home/zakkak/code/mandrel/substratevm/src/com.oracle.svm.native.libchelper/src/getThreadId.c: In function ‘getThreadId’:
/home/zakkak/code/mandrel/substratevm/src/com.oracle.svm.native.libchelper/src/getThreadId.c:39:17: error: implicit declaration of function ‘syscall’ [-Wimplicit-function-declaration]
   39 |   return (pid_t)syscall(SYS_gettid);
      |                 ^~~~~~~
ninja: build stopped: subcommand failed.
, -2)

@zakkak zakkak added this to the 23.1.4.0-Final milestone May 20, 2024
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label May 20, 2024
@zakkak zakkak requested a review from jerboaa May 20, 2024 13:44
@jerboaa
Copy link
Collaborator

jerboaa commented May 21, 2024

Two failing checks are due to #732. I guess we should investigate a fix for this or see passing checks with 21.0.3 (JDK 21 GA).

@zakkak
Copy link
Collaborator Author

zakkak commented May 21, 2024

Two failing checks are due to #732. I guess we should investigate a fix for this

I plan to do this in another PR

or see passing checks with 21.0.3 (JDK 21 GA).

I scheduled https://github.com/graalvm/mandrel/actions/runs/9179917652

@zakkak
Copy link
Collaborator Author

zakkak commented May 22, 2024

I scheduled https://github.com/graalvm/mandrel/actions/runs/9179917652

CI looks good. Merging.

@zakkak zakkak merged commit 49b4215 into graalvm:mandrel/23.1 May 22, 2024
17 of 19 checks passed
@zakkak zakkak deleted the 2024-05-20-23.1-backports branch May 22, 2024 06:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
affects/JDK21 affects/23.1 backport OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants