From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 14 Feb 2020 16:54:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.0-pull-request... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=71cd1bccf3bfc4a77434595c3e987daa4e8ff574;p=qemu.git

Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.0-pull-request' into staging

Implement TARGET_SO_PEERSEC
Fix rt signals management

# gpg: Signature made Thu 13 Feb 2020 12:20:50 GMT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/linux-user-for-5.0-pull-request:
  linux-user: implement TARGET_SO_PEERSEC
  linux-user: fix use of SIGRTMIN
  linux-user: fix TARGET_NSIG and _NSIG uses
  linux-user: cleanup signal.c
  linux-user: add missing TARGET_SIGRTMIN for hppa

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

# Conflicts:
#	linux-user/signal.c
---

71cd1bccf3bfc4a77434595c3e987daa4e8ff574
diff --cc linux-user/signal.c
index 02f860ecb9,046159dd0c..94259dd070
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@@ -509,8 -560,8 +560,8 @@@ void signal_init(void
      act.sa_flags = SA_SIGINFO;
      act.sa_sigaction = host_signal_handler;
      for(i = 1; i <= TARGET_NSIG; i++) {
 -#ifdef TARGET_GPROF
 +#ifdef CONFIG_GPROF
-         if (i == SIGPROF) {
+         if (i == TARGET_SIGPROF) {
              continue;
          }
  #endif