stable_lines = set()
# copy experimental section as is
experimental_lines = []
+ # copy internal section as is
+ internal_lines = []
in_experimental = False
+ in_internal = False
has_stable = False
# gather all functions
if match:
# whatever section this was, it's not active any more
in_experimental = False
+ in_internal = False
continue
# if we're in the middle of experimental section, we need to copy
experimental_lines += [line]
continue
+ # if we're in the middle of internal section, we need to copy
+ # the section verbatim, so just add the line
+ if in_internal:
+ internal_lines += [line]
+ continue
+
# skip empty lines
if not line:
continue
cur_section = match.group("version")
# is it experimental?
in_experimental = cur_section == "EXPERIMENTAL"
- if not in_experimental:
+ # is it internal?
+ in_internal = cur_section == "INTERNAL"
+ if not in_experimental and not in_internal:
has_stable = True
continue
if match:
stable_lines.add(match.group("func"))
- return has_stable, stable_lines, experimental_lines
+ return has_stable, stable_lines, experimental_lines, internal_lines
-def __generate_stable_abi(f_out, abi_version, lines):
+def __generate_stable_abi(f_out, abi_major, lines):
# print ABI version header
- print("DPDK_{} {{".format(abi_version), file=f_out)
+ print("DPDK_{} {{".format(abi_major), file=f_out)
# print global section if it exists
if lines:
# end section
print("};", file=f_out)
+def __generate_internal_abi(f_out, lines):
+ # start internal section
+ print("INTERNAL {", file=f_out)
+
+ # print all internal lines as they were
+ for line in lines:
+ # don't print empty whitespace
+ if not line:
+ print("", file=f_out)
+ else:
+ print("\t{}".format(line), file=f_out)
+
+ # end section
+ print("};", file=f_out)
def __main():
+ if sys.version_info.major < 3:
+ print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr)
+ print("Please use Python 3 instead", file=sys.stderr)
+
arg_parser = argparse.ArgumentParser(
description='Merge versions in linker version script.')
file=sys.stderr)
arg_parser.print_help()
sys.exit(1)
+ abi_major = parsed.abi_version.split('.')[0]
with open(parsed.map_file) as f_in:
- has_stable, stable_lines, experimental_lines = __parse_map_file(f_in)
+ has_stable, stable_lines, experimental_lines, internal_lines = __parse_map_file(f_in)
with open(parsed.map_file, 'w') as f_out:
need_newline = has_stable and experimental_lines
if has_stable:
- __generate_stable_abi(f_out, parsed.abi_version, stable_lines)
+ __generate_stable_abi(f_out, abi_major, stable_lines)
if need_newline:
# separate sections with a newline
print(file=f_out)
if experimental_lines:
__generate_experimental_abi(f_out, experimental_lines)
+ if internal_lines:
+ if has_stable or experimental_lines:
+ # separate sections with a newline
+ print(file=f_out)
+ __generate_internal_abi(f_out, internal_lines)
if __name__ == "__main__":