[PATCH 0/2] Fixes for PR 123548

[Alfie Richards]

Hi all,

Here's two patches fixing PR 123548.
I'm not sure which approach is better.

Both bootstrapped and reg tested on aarch64-linux-gnu.

Are either okay for master and backport to active branches?

Kind regards,
Alfie