From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Mon, 30 Oct 2023 22:12:40 +0000 (+0900)
Subject: Merge tag 'pull-lu-20231030' of https://gitlab.com/rth7680/qemu into staging
X-Git-Tag: v8.2.0~91
X-Git-Url: https://git.proxmox.com/?p=mirror_qemu.git;a=commitdiff_plain;h=516fffc9933cb21fad41ca8f7bf465d238d4d375

Merge tag 'pull-lu-20231030' of https://gitlab.com/rth7680/qemu into staging

linux-user: Fix guest signal remapping after adjusting SIGABRT
linux-user: Implement VDSOs

* tag 'pull-lu-20231030' of https://gitlab.com/rth7680/qemu: (21 commits)
  build: Add update-linux-vdso makefile rule
  linux-user: Show vdso address in /proc/pid/maps
  linux-user/s390x: Add vdso
  linux-user/s390x: Rename __SIGNAL_FRAMESIZE to STACK_FRAME_OVERHEAD
  linux-user/ppc: Add vdso
  linux-user/loongarch64: Add vdso
  linux-user/riscv: Add vdso
  linux-user/hppa: Add vdso
  linux-user/arm: Add vdso
  linux-user/aarch64: Add vdso
  linux-user/x86_64: Add vdso
  linux-user/i386: Add vdso
  linux-user: Add gen-vdso tool
  linux-user: Load vdso image if available
  linux-user: Replace bprm->fd with bprm->src.fd
  linux-user: Use ImageSource in load_symbols
  linux-user: Use ImageSource in load_elf_image
  linux-user: Do not clobber bprm_buf swapping ehdr
  linux-user: Tidy loader_exec
  linux-user: Introduce imgsrc_read, imgsrc_read_alloc
  ...

Conflicts:
  linux-user/arm/signal.c
  Fix an #include context conflict.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

516fffc9933cb21fad41ca8f7bf465d238d4d375
diff --cc linux-user/arm/signal.c
index 4020601c54,e19b514f17..f77f692c63
--- a/linux-user/arm/signal.c
+++ b/linux-user/arm/signal.c
@@@ -21,7 -21,7 +21,8 @@@
  #include "user-internals.h"
  #include "signal-common.h"
  #include "linux-user/trace.h"
 +#include "target/arm/cpu-features.h"
+ #include "vdso-asmoffset.h"
  
  struct target_sigcontext {
      abi_ulong trap_no;