[GNU-692]
1 regression 4 fixes
Details: http://54.172.246.49:9090/jobs/tcwg_gnu_cross_check_gcc--master-arm-build/builds/10234/archive/artifacts/notify/mail-body.txt