[GNU-692]
1 regression 2 fixes
Details: https://ci.linaro.org/job/tcwg_gdb_check--master-aarch64-build/3028/artifact/artifacts/notify/mail-body.txt/*view*/