diff --git a/src/native/external/libunwind-version.txt b/src/native/external/libunwind-version.txt
index 4c0f4bdf5b3d0b..6577433e74aab0 100644
--- a/src/native/external/libunwind-version.txt
+++ b/src/native/external/libunwind-version.txt
@@ -11,3 +11,4 @@ Revert https://github.com/libunwind/libunwind/commit/ec03043244082b8f552881ba9fb
 Apply https://github.com/libunwind/libunwind/pull/734
 Apply https://github.com/libunwind/libunwind/pull/758
 Apply https://github.com/libunwind/libunwind/pull/741
+Apply https://github.com/libunwind/libunwind/pull/931
diff --git a/src/native/external/libunwind/include/libunwind_i.h b/src/native/external/libunwind/include/libunwind_i.h
index 4140d88a10c65d..1970b15b8ae39d 100644
--- a/src/native/external/libunwind/include/libunwind_i.h
+++ b/src/native/external/libunwind/include/libunwind_i.h
@@ -437,6 +437,6 @@ static inline void invalidate_edi (struct elf_dyn_info *edi)
 # define DWARF_VAL_LOC(c,v)     DWARF_NULL_LOC
 #endif
 
-#define UNW_ALIGN(x,a) (((x)+(a)-1UL)&~((a)-1UL))
+#define UNW_ALIGN(x,a) (((size_t)(x) + (size_t)(a) - 1) & ~((size_t)(a) - 1))
 
 #endif /* libunwind_i_h */