Skip to content

[AIX] Update backtrace to account for libc changes and fix XCOFF parsing#757

Merged
workingjubilee merged 2 commits into
rust-lang:masterfrom
amy-kwan:amy-kwan/fix-aix-v0.3.6
Jun 11, 2026
Merged

[AIX] Update backtrace to account for libc changes and fix XCOFF parsing#757
workingjubilee merged 2 commits into
rust-lang:masterfrom
amy-kwan:amy-kwan/fix-aix-v0.3.6

Conversation

@amy-kwan

Copy link
Copy Markdown
Contributor

This patch synchronizes AIX backtrace support with newer libc updates and fix type correctness issues:

  • Bump libc to 0.2.175 to pick up latest AIX-related fixes.
  • Update libc::loadquery buffer argument to use *mut c_void instead of *mut c_char, matching the current libc API.
  • Fix XCOFF section name comparison to handle Option<&[u8]>.

This patch synchronizes AIX backtrace support with newer libc updates and fix
type correctness issues:

- Bump libc to 0.2.175 to pick up latest AIX-related fixes.
- Update libc::loadquery buffer argument to use *mut c_void instead
  of *mut c_char, matching the current libc API.
- Fix XCOFF section name comparison to handle Option<&[u8]>.
@workingjubilee

Copy link
Copy Markdown
Member

Thanks! Will try to take a look soon.

@workingjubilee

Copy link
Copy Markdown
Member

rustfmt failure

@amy-kwan

amy-kwan commented Jun 4, 2026

Copy link
Copy Markdown
Contributor Author

Ah, I missed that. Thanks a lot! Just fixed them.

@workingjubilee

Copy link
Copy Markdown
Member

Yay, can merge this then.

if libc::loadquery(
libc::L_GETINFO,
buffer.as_mut_ptr().cast::<libc::c_char>(),
buffer.as_mut_ptr().cast::<libc::c_void>(),

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

though is there a reason this isn't core::ffi::c_void?

should be fine either way I s'pose.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Oops, good point. Honestly, no strong reason, I used libc::c_void since it matched the loadquery() signature.

@workingjubilee workingjubilee Jun 20, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That should just be a reexport from core so hopefully it doesn't matter (it's just nice to reduce indirection when viable).

@workingjubilee workingjubilee merged commit d902726 into rust-lang:master Jun 11, 2026
39 checks passed
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jun 21, 2026
…, r=Mark-Simulacrum

Update backtrace submodule to pick up AIX related fixes.

This change updates the backtrace submodule, primarily to pick up the AIX related fixes from rust-lang/backtrace-rs#757.
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jun 21, 2026
…, r=Mark-Simulacrum

Update backtrace submodule to pick up AIX related fixes.

This change updates the backtrace submodule, primarily to pick up the AIX related fixes from rust-lang/backtrace-rs#757.
rust-timer added a commit to rust-lang/rust that referenced this pull request Jun 22, 2026
Rollup merge of #158150 - amy-kwan:amy-kwan/Update-backtrace, r=Mark-Simulacrum

Update backtrace submodule to pick up AIX related fixes.

This change updates the backtrace submodule, primarily to pick up the AIX related fixes from rust-lang/backtrace-rs#757.
pull Bot pushed a commit to xtqqczze/rust-lang-miri that referenced this pull request Jun 22, 2026
…Simulacrum

Update backtrace submodule to pick up AIX related fixes.

This change updates the backtrace submodule, primarily to pick up the AIX related fixes from rust-lang/backtrace-rs#757.
pull Bot pushed a commit to p-avital/rust-analyzer that referenced this pull request Jun 22, 2026
…Simulacrum

Update backtrace submodule to pick up AIX related fixes.

This change updates the backtrace submodule, primarily to pick up the AIX related fixes from rust-lang/backtrace-rs#757.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants