Changeset 5e3eea10 in mainline for kernel/tools/genmap.py

Timestamp:

2011-03-22T19:55:06Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e7ffdd3

Parents:

c3f95d8 (diff), 432f68a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/tools/genmap.py (modified) (1 diff)

kernel/tools/genmap.py

@@ -100 +100 @@
                         for addr, symbol in symbols:
                                 value = fname + ':' + symbol
-                                data = struct.pack(symtabfmt, addr + offset, value[:MAXSTRING])
+                                value_bytes = value.encode('ascii')
+                                data = struct.pack(symtabfmt, addr + offset, value_bytes[:MAXSTRING])
                                 out.write(data)
                         
-        out.write(struct.pack(symtabfmt, 0, ''))
+        out.write(struct.pack(symtabfmt, 0, b''))
 
 def main():