Could you check the patch below?
I can only currently try it on GNU/Linux and I can confirm that it doesn't
break behaviour there.
Maybe Chad Brown or Leo could test it on a Mac. I suspect that FSF GDB on
Mac would still also work but it would be good to check this too.
If there are no problems then please commit this change.