I guess the proper fix is to revert the expand_mult_highpart_adjust
change, and do the adjustment instead at its call sites in
expand_mult_highpart_optab; the following patch implements this.
Bootstrapped/regtested on s390-ibm-linux and s390x-ibm-linux;
fixes 5 ACATS test cases on s390.
OK?
Yes, thanks.