chore(upstream): merge upstream changes into main (#132)

Author: LouisBrunner

NEWS

@@ -55,11 +55,14 @@ are not entered into bugzilla tend to get forgotten about or ignored.
         even though it's generated by --gen-suppressions=yes
 498422  s390x: Fix VLRL and VSTRL insns
 498492  none/tests/amd64/lzcnt64 crashes on FreeBSD compiled with clang
+498942  s390x: Rework s390_disasm interface
 499183  FreeBSD: differences in avx-vmovq output
 499212  mmap() with MAP_ALIGNED() returns unaligned pointer
 501119  memcheck/tests/pointer-trace fails when run on NFS filesystem
 501194  Fix ML_(check_macho_and_get_rw_loads) so that it is correct for any number of segment commands
-501348 glibc built with -march=x86-64-v3 does not work due to ld.so memcmp
+501348  glibc built with -march=x86-64-v3 does not work due to ld.so memcmp
+501479  Illumos DRD pthread_mutex_init wrapper errors
+501365  syscall userfaultfd not wrapped
 
 
 To see details of a given bug, visit

VEX/priv/guest_s390_defs.h

@@ -34,6 +34,7 @@
 #include "libvex_basictypes.h"        // offsetof
 #include "guest_generic_bb_to_IR.h"   // DisResult
 #include "libvex_guest_s390x.h"       // VexGuestS390XState
+#include "main_util.h"                // STATIC_ASSERT
 
 
 /* Convert one s390 insn to IR.  See the type DisOneInstrFn in