gdb patch #130349:  6800 fixes