Skip to content

gdb: backport patch for musl 1.2.4 #229673

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.

Sign up for GitHub

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

Merged
alyssais merged 1 commit into from
May 7, 2023
Merged

gdb: backport patch for musl 1.2.4 #229673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkgs/development/tools/misc/gdb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ stdenv.mkDerivation rec {

patches = [
./debug-info-from-env.patch

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

@Mic92 Mic92 May 3, 2023

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

@alyssais alyssais May 3, 2023

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.

hash = "sha256-/+UYjiOxrszJy1x8xavs63/ptNZ+ISIAQhG+i86VDpA=";
})
] ++ lib.optionals stdenv.isDarwin [
./darwin-target-match.patch
];
Expand Down