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

gdb: backport patch for musl 1.2.4 #229673

Merged
merged 1 commit into from
May 7, 2023
Merged

Conversation

alyssais
Copy link
Member

@alyssais alyssais commented May 3, 2023

Description of changes

See #229439.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@alyssais alyssais added the 6.topic: musl Running or building packages with musl libc label May 3, 2023
@alyssais alyssais mentioned this pull request May 3, 2023
47 tasks
@ofborg ofborg bot requested review from globin, lsix and nbp May 3, 2023 14:29

# Backport musl fix
(fetchpatch {
url = "https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=2e977d9901393ea1bacbe1896af0929e968bc811";
Copy link
Member

Choose a reason for hiding this comment

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

That seems a fix but does this actually related to musl?

Subject: [PATCH] gdbserver/linux-low.cc: Fix a typo in ternary operator

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes. The new musl removes the LFS64 functions, e.g. pread64. gdb has a path for if those functions don't exist, but it had a typo that caused it not to compile, which this patch fixes.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Built on

  • x86_64-linux
  • powerpc64le-linux
  • mips64el-linux-gnuabi64
  • mips64el-linux-gnuabin32 (needs boost)
  • aarch64-linux

Rolled eyes at

  • crimes concealed by the C preprocessor

@alyssais alyssais merged commit ad28c1e into NixOS:staging May 7, 2023
@alyssais alyssais deleted the gdb-musl-1.2.4 branch May 7, 2023 21:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants