Skip to content

[release/10.0] Fix elfreader for android #119191

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
jeffschwMSFT merged 3 commits into from
Sep 1, 2025
Merged

[release/10.0] Fix elfreader for android #119191

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
788c28a
Fix elfreader for android.
thaystg Aug 28, 2025
74a850a
Update src/coreclr/debug/dbgutil/elfreader.cpp
thaystg Aug 28, 2025
2bdd935
Update src/coreclr/debug/dbgutil/elfreader.cpp
thaystg Aug 28, 2025
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
5 changes: 2 additions & 3 deletions src/coreclr/debug/dbgutil/elfreader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,8 @@ ElfReader::PopulateForSymbolLookup(uint64_t baseAddress)
// Enumerate program headers searching for the PT_DYNAMIC header, etc.
if (!EnumerateProgramHeaders(
baseAddress,
#if defined(TARGET_LINUX_MUSL) || defined(TARGET_RISCV64)
// On musl based platforms (Alpine) and RISCV64 (VisionFive2 board),
// the below dynamic entries for hash,
#if defined(TARGET_LINUX_MUSL) || defined(TARGET_RISCV64) || defined(TARGET_ANDROID)
// On some platforms, the below dynamic entries for hash,
// string table, etc. are RVAs instead of absolute address like on all
// other Linux distros. Get the "loadbias" (basically the base address
// of the module) and add to these RVAs.
Expand Down
Loading