diff --git a/src/arch/sparc/remote_gdb.hh b/src/arch/sparc/remote_gdb.hh
index 46aa03a93..6531e0f61 100644
--- a/src/arch/sparc/remote_gdb.hh
+++ b/src/arch/sparc/remote_gdb.hh
@@ -53,8 +53,7 @@ class RemoteGDB : public BaseRemoteGDB
         RegF0 = 32,
         RegPc = 64, RegNpc, RegState, RegFsr, RegFprs, RegY,
         /*RegState contains data in same format as tstate */
-        Reg32Y = 64, Reg32Psr = 65, Reg32Tbr = 66, Reg32Pc = 67,
-        Reg32Npc = 68, Reg32Fsr = 69, Reg32Csr = 70,
+        Reg32Y = 64, Reg32Psr, Reg32Pc, Reg32Npc, Reg32Fsr, Reg32Csr,
         NumGDBRegs
     };