From: Peter Maydell Date: Wed, 20 Jul 2022 13:13:32 +0000 (+0100) Subject: Merge tag 'pull-request-2022-07-20' of https://gitlab.com/thuth/qemu into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f45fd24c90767240735c6161c39699ad86fc38fa;p=qemu.git 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 " [full] # gpg: aka "Thomas Huth " [full] # gpg: aka "Thomas Huth " [full] # gpg: aka "Thomas Huth " [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 # Conflicts: # fpu/softfloat-specialize.c.inc --- f45fd24c90767240735c6161c39699ad86fc38fa diff --cc fpu/softfloat-specialize.c.inc index 9096fb302b,a43ff5e02e..1610472cfc --- a/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