Merge tag 'pull-request-2022-07-20' of https://gitlab.com/thuth/qemu into staging

* Fixes for s390x floating point vector instructions

# gpg: Signature made Wed 20 Jul 2022 08:14:50 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* tag 'pull-request-2022-07-20' of https://gitlab.com/thuth/qemu:
  tests/tcg/s390x: test signed vfmin/vfmax
  target/s390x: fix NaN propagation rules
  target/s390x: fix handling of zeroes in vfmin/vfmax

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
#	fpu/softfloat-specialize.c.inc

diff --cc fpu/softfloat-specialize.c.inc
index 9096fb302bc97131694e0835537f30e184008d95,a43ff5e02ef01acbe14a386bffafaaf0460e88c0..1610472cfc478e4b48fba5645590a4f35fdd641f
--- 1/fpu/softfloat-specialize.c.inc
--- 2/fpu/softfloat-specialize.c.inc
+++ b/fpu/softfloat-specialize.c.inc
@@@ -390,8 -390,8 +390,8 @@@ bool float32_is_signaling_nan(float32 a
  static int pickNaN(FloatClass a_cls, FloatClass b_cls,
                     bool aIsLargerSignificand, float_status *status)
  {
- #if defined(TARGET_ARM) || defined(TARGET_MIPS) || defined(TARGET_HPPA) \
-     || defined(TARGET_LOONGARCH64)
+ #if defined(TARGET_ARM) || defined(TARGET_MIPS) || defined(TARGET_HPPA) || \
 -    defined(TARGET_S390X)
++    defined(TARGET_LOONGARCH64) || defined(TARGET_S390X)
      /* ARM mandated NaN propagation rules (see FPProcessNaNs()), take
       * the first of:
       *  1. A if it is signaling