build: generate version map file for MinGW

The MinGW build for Windows has special cases where exported
function contain additional prefix:

__emutls_v.per_lcore__*

To avoid adding those prefixed functions to the version.map file
the map_to_def.py script was modified to create a map file for MinGW
with the needed changed.

The file name was changed to map_to_win.py and lib/meson.build map output
was unified with drivers/meson.build output

Signed-off-by: Tal Shnaiderman <talshn@mellanox.com>
This commit is contained in:
Tal Shnaiderman 2020-06-29 15:37:41 +03:00 committed by Thomas Monjalon
parent 77cca7ccec
commit 309bf90bf9
5 changed files with 36 additions and 12 deletions

View file

@ -127,7 +127,6 @@ F: config/rte_config.h
F: buildtools/call-sphinx-build.py
F: buildtools/gen-pmdinfo-cfile.sh
F: buildtools/list-dir-globs.py
F: buildtools/map_to_def.py
F: buildtools/symlink-drivers-solibs.sh
Public CI
@ -341,6 +340,7 @@ M: Pallavi Kadam <pallavi.kadam@intel.com>
M: Ranjit Menon <ranjit.menon@intel.com>
F: lib/librte_eal/windows/
F: lib/librte_eal/rte_eal_exports.def
F: buildtools/map_to_win.py
F: doc/guides/windows_gsg/
Windows memory allocation

View file

@ -10,12 +10,21 @@
def is_function_line(ln):
return ln.startswith('\t') and ln.endswith(';\n') and ":" not in ln
# MinGW keeps the original .map file but replaces per_lcore* to __emutls_v.per_lcore*
def create_mingw_map_file(input_map, output_map):
with open(input_map) as f_in, open(output_map, 'w') as f_out:
f_out.writelines([lines.replace('per_lcore', '__emutls_v.per_lcore') for lines in f_in.readlines()])
def main(args):
if not args[1].endswith('version.map') or \
not args[2].endswith('exports.def'):
not args[2].endswith('exports.def') and \
not args[2].endswith('mingw.map'):
return 1
if args[2].endswith('mingw.map'):
create_mingw_map_file(args[1], args[2])
return 0
# special case, allow override if an def file already exists alongside map file
override_file = join(dirname(args[1]), basename(args[2]))
if exists(override_file):

View file

@ -9,14 +9,14 @@ list_dir_globs = find_program('list-dir-globs.py')
check_symbols = find_program('check-symbols.sh')
ldflags_ibverbs_static = find_program('options-ibverbs-static.sh')
# set up map-to-def script using python, either built-in or external
# set up map-to-win script using python, either built-in or external
python3 = import('python').find_installation(required: false)
if python3.found()
py3 = [python3]
else
py3 = ['meson', 'runpython']
endif
map_to_def_cmd = py3 + files('map_to_def.py')
map_to_win_cmd = py3 + files('map_to_win.py')
sphinx_wrapper = py3 + files('call-sphinx-build.py')
# stable ABI always starts with "DPDK_"

View file

@ -156,16 +156,22 @@ foreach class:dpdk_driver_classes
implib = 'lib' + lib_name + '.dll.a'
def_file = custom_target(lib_name + '_def',
command: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'],
command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
input: version_map,
output: '@0@_exports.def'.format(lib_name))
lk_deps = [version_map, def_file]
mingw_map = custom_target(lib_name + '_mingw',
command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
input: version_map,
output: '@0@_mingw.map'.format(lib_name))
lk_deps = [version_map, def_file, mingw_map]
if is_windows
if is_ms_linker
lk_args = ['-Wl,/def:' + def_file.full_path(),
'-Wl,/implib:drivers\\' + implib]
else
lk_args = []
lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
endif
else
lk_args = ['-Wl,--version-script=' + version_map]

View file

@ -146,19 +146,28 @@ foreach l:libraries
meson.current_source_dir(), dir_name, name)
implib = dir_name + '.dll.a'
def_file = custom_target(name + '_def',
command: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'],
def_file = custom_target(libname + '_def',
command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
input: version_map,
output: 'rte_@0@_exports.def'.format(name))
output: '@0@_exports.def'.format(libname))
mingw_map = custom_target(libname + '_mingw',
command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
input: version_map,
output: '@0@_mingw.map'.format(libname))
if is_ms_linker
lk_args = ['-Wl,/def:' + def_file.full_path(),
'-Wl,/implib:lib\\' + implib]
else
lk_args = ['-Wl,--version-script=' + version_map]
if is_windows
lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
else
lk_args = ['-Wl,--version-script=' + version_map]
endif
endif
lk_deps = [version_map, def_file]
lk_deps = [version_map, def_file, mingw_map]
if not is_windows
# on unix systems check the output of the
# check-symbols.sh script, using it as a