[llvm-branch-commits] [libunwind] a4aca5a - [libunwind] fix build errors on x32 and mips n32 (#194310)

[Douglas Yung via llvm-branch-commits]

Author: Alex Rønne Petersen
Date: 2026-05-04T16:55:02Z
New Revision: a4aca5a91cc3cd7e990e24218b02025f573cee2b

URL: https://github.com/llvm/llvm-project/commit/a4aca5a91cc3cd7e990e24218b02025f573cee2b
DIFF: https://github.com/llvm/llvm-project/commit/a4aca5a91cc3cd7e990e24218b02025f573cee2b.diff

LOG: [libunwind] fix build errors on x32 and mips n32 (#194310)

(cherry picked from commit 06ddfcf0ca9cdb1481fff3cff6f73d5c26d45ffe)

Added: 
    

Modified: 
    libunwind/src/AddressSpace.hpp
    libunwind/src/DwarfParser.hpp

Removed: 
    


################################################################################
diff  --git a/libunwind/src/AddressSpace.hpp b/libunwind/src/AddressSpace.hpp
index 52477b16b355a..3711189f57b1d 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<pint_t>(targetAddr)};
   int found = dl_iterate_phdr(findUnwindSectionsByPhdr, &cb_data);
   return static_cast<bool>(found);
 #endif

diff  --git a/libunwind/src/DwarfParser.hpp b/libunwind/src/DwarfParser.hpp
index 22de49023cb45..8e080fb33c5f8 100644
--- a/libunwind/src/DwarfParser.hpp
+++ b/libunwind/src/DwarfParser.hpp
@@ -477,7 +477,7 @@ bool CFI_Parser<A>::parseFDEInstructions(
       {cieInfo.cieInstructions, cieInfo.cieStart + cieInfo.cieLength,
        (pint_t)(-1)},
       {fdeInfo.fdeInstructions, fdeInfo.fdeStart + fdeInfo.fdeLength,
-       upToPC - fdeInfo.pcStart}};
+       static_cast<pint_t>(upToPC) - fdeInfo.pcStart}};
 
   for (const auto &info : parseInfoArray) {
     pint_t p = info.instructions;