[GNU-1786]
2 regressions 2 fixes
Details: https://ci.linaro.org/job/tcwg_gnu_embed_check_gcc--master-arm_eabi-build/1189/artifact/artifacts/notify/mail-body.txt/*view*/