From da174f962671f3af97a6df61c88cfc4391be7d1d Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Fri, 7 Feb 2025 09:18:56 -0700
Subject: [PATCH] Fixes for 32-bit builds

---
 src/ld_so/dso.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ld_so/dso.rs b/src/ld_so/dso.rs
index 8a949367a3..8f2ec4b623 100644
--- a/src/ld_so/dso.rs
+++ b/src/ld_so/dso.rs
@@ -612,19 +612,19 @@ impl DSO {
                 elf::DT_RELA => rela_offset = Some(ptr.cast::<Rela>()),
                 elf::DT_RELASZ => rela_len = Some(val as usize / size_of::<Rela>()),
                 elf::DT_RELAENT => {
-                    assert_eq!(val, size_of::<Rela>() as u64)
+                    assert_eq!(val, size_of::<Rela>() as _)
                 }
 
                 elf::DT_REL => rel_ptr = Some(ptr.cast::<Rel>()),
                 elf::DT_RELSZ => rel_len = Some(val as usize / size_of::<Rel>()),
                 elf::DT_RELENT => {
-                    assert_eq!(val, size_of::<Rel>() as u64)
+                    assert_eq!(val, size_of::<Rel>() as _)
                 }
 
                 DT_RELR => relr_ptr = Some(ptr.cast::<Relr>()),
                 DT_RELRSZ => relr_len = Some(val as usize / size_of::<Relr>()),
                 DT_RELRENT => {
-                    assert_eq!(val, size_of::<Relr>() as u64)
+                    assert_eq!(val, size_of::<Relr>() as _)
                 }
 
                 elf::DT_PLTREL => {
@@ -659,7 +659,7 @@ impl DSO {
         let dynstrtab = StringTable::new(
             &*mmap,
             strtab_offset as u64,
-            strtab_offset as u64 + strtab_size,
+            strtab_offset as u64 + strtab_size as u64,
         );
 
         let get_str = |entry: &Dyn| {