I've committed the attached (with a hesatant ok from MarkK) (HEAD and 
branch).

What GDB needs is something that works regardless of the compiler.

Andrew