Index: tools/gdb/utils-gdb.py
===================================================================
--- tools/gdb/utils-gdb.py	(revision 160f1aac26e1a30b211a4a3ff5d2e52834ae3c0e)
+++ tools/gdb/utils-gdb.py	(revision affb51b97db0d5e8efa1adb8ac738b63fed78e16)
@@ -159,5 +159,5 @@
 
 		# if we already saw the root, then go forward
-		my_next = self.curr['_X4link']['_X4nextPY13__tE_generic__1']
+		my_next = self.curr['_X4linkS5dlink_S9processor__1']['_X4nextPY13__tE_generic__1']
 		self.curr = my_next.cast(cfa_t.processor_ptr)
 
@@ -355,5 +355,5 @@
 		))
 		tls = tls_for_proc( processor )
-		thrd = tls['_X11this_threadVPS7thread$_1']
+		thrd = thread_for_proc( processor )
 		if thrd != 0x0:
 			tname = '{} {}'.format(thrd['self_cor']['name'].string(), str(thrd))