Fix gdb for non-003 arch's

Fix gdb for non-003 arch's #687