Unverified Commit 06ddfcf0 authored by Alex Rønne Petersen's avatar Alex Rønne Petersen Committed by GitHub
Browse files

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

parent 82425768

libunwind/src/AddressSpace.hpp

+1 −1
Original line number Diff line number Diff line
@@ -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

libunwind/src/DwarfParser.hpp

+1 −1
Original line number Diff line number Diff line
@@ -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;