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

comparable_patch.sh: Zero out .gnu_debuglink CRCs (#3730) #3736

Merged

Conversation

fitzsim
Copy link
Contributor

@fitzsim fitzsim commented Mar 28, 2024

This pull request replaces #3732. Instead of removing the .gnu_debuglink section, this patch set changes just the four CRC bytes in that ELF section to 0.

@github-actions github-actions bot added the documentation Issues that request updates to our documentation label Mar 28, 2024
@andrew-m-leonard
Copy link
Contributor

Looks great:

  00020040: 6c69 626e 696f 2e64 6562 7567 696e 666f  libnio.debuginfo
! 00020050: 0000 0000 0000 0000 0000 0000 0000 0000  ................
  00020060: 0000 0000 0000 0000 0000 0000 0000 0000  ................
--- 8197,8199 ----
  00020040: 6c69 626e 696f 2e64 6562 7567 696e 666f  libnio.debuginfo
! 00020050: 0000 0000 5273 e3ee 0000 0000 0000 0000  ....Rs..........
  00020060: 0000 0000 0000 0000 0000 0000 0000 0000  ................

Copy link
Contributor

@andrew-m-leonard andrew-m-leonard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just needs the "wipe" correcting...
Looks good, does the job nicely, thank you

tooling/reproducible/comparable_patch.sh Outdated Show resolved Hide resolved
@fitzsim fitzsim force-pushed the comparable-patch-zero-gnu-debuglink-crc branch 2 times, most recently from f10f4fc to 4660ca4 Compare March 28, 2024 11:10
@fitzsim
Copy link
Contributor Author

fitzsim commented Mar 28, 2024

I used the button here to rebase my pull request branch onto the master branch.

@fitzsim fitzsim force-pushed the comparable-patch-zero-gnu-debuglink-crc branch from 4660ca4 to c95aa58 Compare March 28, 2024 13:04
Copy link
Contributor

@andrew-m-leonard andrew-m-leonard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good thanks Thomas

@karianna
Copy link
Contributor

@fitzsim looks like Mac OS X 13 build is failing, likely due to an unrelated reason. Have you rebased recently?

@fitzsim fitzsim force-pushed the comparable-patch-zero-gnu-debuglink-crc branch from c95aa58 to ccedeeb Compare March 30, 2024 15:26
@fitzsim
Copy link
Contributor Author

fitzsim commented Mar 30, 2024

Hi @karianna, thank you for reviewing. I did rebase just after I originally submitted the pull request. I just now rebased again.

@fitzsim
Copy link
Contributor Author

fitzsim commented Mar 30, 2024

The assert line (line number 58 in jfrNetworkUtilization.cpp) that fails to compile on macos-13 is the same across jdk8u, jdk11u, and jdk17u. I wonder why the (macos-13, jdk11u) build fails where the (macos-14, jdk17u) and (macos-11, jdk8u) builds succeed.

@fitzsim
Copy link
Contributor Author

fitzsim commented Mar 30, 2024

#3737 is failing the same way.

@karianna karianna merged commit 59e7ee9 into adoptium:master Apr 1, 2024
21 of 22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Issues that request updates to our documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants