Index: src/debug/genmap.py
===================================================================
--- src/debug/genmap.py	(revision ab08b4244b9dfd556f4d25b75dd22cb1192d66b9)
+++ src/debug/genmap.py	(revision 4533601fda687d5bb82b7297dab6960ee8eddd68)
@@ -6,6 +6,8 @@
 
 symline = re.compile(r'(0x[a-f0-9]+)\s+([^\s]+)$')
-symtabfmt = "<Q32s"
-MAXSTRING=31
+fileline = re.compile(r'[^\s]+\s+0x[a-f0-9]+\s+0x[a-f0-9]+\s+([^\s]+\.o)$')
+
+MAXSTRING=63
+symtabfmt = "<Q%ds" % (MAXSTRING+1)
 
 def read_symbols(inp):
@@ -18,4 +20,5 @@
 
     symtable = {}
+    filename = ''
     while 1:
         line = inp.readline()
@@ -25,8 +28,12 @@
             break
         line = line.strip()
-        # Search only for symbols
+        # Search for file name
+        res = fileline.match(line)
+        if res:
+            filename = res.group(1)
+        # Search for symbols
         res = symline.match(line)
         if res:
-            symtable[int(res.group(1),16)] = res.group(2)
+            symtable[int(res.group(1),16)] = filename + ':' + res.group(2)
     return symtable