Index: tools/gdb/utils-gdb.py
===================================================================
--- tools/gdb/utils-gdb.py	(revision f58522b05a8f78072879b14d46c767b3c9209e06)
+++ tools/gdb/utils-gdb.py	(revision 2e94d94fdd1e3631b3b3f437b963922e6522db38)
@@ -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))