Index: Tools/scripts/h2py.py
===================================================================
--- Tools/scripts/h2py.py
+++ Tools/scripts/h2py.py	2008-12-17 23:24:56.000000000 +0100
@@ -29,7 +29,7 @@
   '^[\t ]*#[\t ]*define[\t ]+'
   '([a-zA-Z0-9_]+)\(([_a-zA-Z][_a-zA-Z0-9]*)\)[\t ]+')
 
-p_include = re.compile('^[\t ]*#[\t ]*include[\t ]+<([a-zA-Z0-9_/\.]+)')
+p_include = re.compile('^[\t ]*#[\t ]*include[\t ]+<([-a-zA-Z0-9_/\.]+)')
 
 p_comment = re.compile(r'/\*([^*]+|\*+[^/])*(\*+/)?')
 p_cpp_comment = re.compile('//.*')
@@ -40,6 +40,16 @@
 
 p_hex = re.compile(r"0x([0-9a-fA-F]+)L?")
 
+### FIXME
+#
+# We really need to handle bi-arch asm headers. Otherwise, we will end
+# up into generating double definitions and finally the wrong ones are
+# to be used afterwards.
+#
+# p_ifarch, p_else, p_endif, if_depth, what else is needed?
+#
+###
+
 filedict = {}
 importable = {}