From 06ddfcf0ca9cdb1481fff3cff6f73d5c26d45ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Mon, 27 Apr 2026 15:32:47 +0200 Subject: [PATCH] [libunwind] fix build errors on x32 and mips n32 (#194310) --- libunwind/src/AddressSpace.hpp | 2 +- libunwind/src/DwarfParser.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libunwind/src/AddressSpace.hpp b/libunwind/src/AddressSpace.hpp index 52477b16b355..3711189f57b1 100644 --- a/libunwind/src/AddressSpace.hpp +++ b/libunwind/src/AddressSpace.hpp @@ -666,7 +666,7 @@ inline bool LocalAddressSpace::findUnwindSections( return true; } #endif - dl_iterate_cb_data cb_data = {this, &info, targetAddr}; + dl_iterate_cb_data cb_data = {this, &info, static_cast(targetAddr)}; int found = dl_iterate_phdr(findUnwindSectionsByPhdr, &cb_data); return static_cast(found); #endif diff --git a/libunwind/src/DwarfParser.hpp b/libunwind/src/DwarfParser.hpp index 22de49023cb4..8e080fb33c5f 100644 --- a/libunwind/src/DwarfParser.hpp +++ b/libunwind/src/DwarfParser.hpp @@ -477,7 +477,7 @@ bool CFI_Parser::parseFDEInstructions( {cieInfo.cieInstructions, cieInfo.cieStart + cieInfo.cieLength, (pint_t)(-1)}, {fdeInfo.fdeInstructions, fdeInfo.fdeStart + fdeInfo.fdeLength, - upToPC - fdeInfo.pcStart}}; + static_cast(upToPC) - fdeInfo.pcStart}}; for (const auto &info : parseInfoArray) { pint_t p = info.instructions;