[GNU-1813]
2 regressions 4 fixes
Details: https://ci.linaro.org/job/tcwg_gcc_check--master-aarch64-build/4596/artifact/artifacts/notify/mail-body.txt/*view*/