s390x: Fix BZ 512030

As obvious when inspecting the neighbourhood.

diff --git a/NEWS b/NEWS
index 0cdbea54e388b75453add576d47fd7ae608e6aba..29bf4debe37b95f61ff634b941fcc30df6de1dac 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,7 @@ are not entered into bugzilla tend to get forgotten about or ignored.
 511972  valgrind-3.26.0 tests fail to build on upcomig gcc-16:
         unrecognized command-line option
         '-Wno-alloc-size-larger-than=18446744073709551615'
+512030  s390x: bfp-convert testcase fails
 
 To see details of a given bug, visit
   https://bugs.kde.org/show_bug.cgi?id=XXXXXX

diff --git a/VEX/priv/guest_s390_helpers.c b/VEX/priv/guest_s390_helpers.c
index 3d6fec5c18af3ea3fa903b5b42a748a506e4d393..d5e683ab21596d22f8e8a52b73f0175100524d1f 100644 (file)
--- a/VEX/priv/guest_s390_helpers.c
+++ b/VEX/priv/guest_s390_helpers.c
@@ -1013,7 +1013,6 @@ decode_bfp_rounding_mode(UInt irrm)
       break;                                                          \
    case S390_BFP_ROUND_PREPARE_SHORT:                                 \
       cc = S390_CC_FOR_BFP128_UCONVERT_AUX(opcode,cc_dep1,cc_dep2,3); \
-      cc = S390_CC_FOR_BFP_UCONVERT_AUX(opcode,cc_dep1,3);            \
       break;                                                          \
    case S390_BFP_ROUND_NEAREST_EVEN:                                  \
       cc = S390_CC_FOR_BFP128_UCONVERT_AUX(opcode,cc_dep1,cc_dep2,4); \