Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/71771/?format=api
{ "id": 71771, "url": "http://patches.dpdk.org/api/patches/71771/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200618211546.24496-10-talshn@mellanox.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200618211546.24496-10-talshn@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200618211546.24496-10-talshn@mellanox.com", "date": "2020-06-18T21:15:46", "name": "[v6,9/9] build: generate version.map file for MingW on Windows", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "204c397b5741ae2b738c568eed46e2f37e6c45db", "submitter": { "id": 1669, "url": "http://patches.dpdk.org/api/people/1669/?format=api", "name": "Tal Shnaiderman", "email": "talshn@mellanox.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200618211546.24496-10-talshn@mellanox.com/mbox/", "series": [ { "id": 10512, "url": "http://patches.dpdk.org/api/series/10512/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=10512", "date": "2020-06-18T21:15:37", "name": "Windows bus/pci support", "version": 6, "mbox": "http://patches.dpdk.org/series/10512/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/71771/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/71771/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 2C32FA04F1;\n\tThu, 18 Jun 2020 23:17:54 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id CD7EC1BEF2;\n\tThu, 18 Jun 2020 23:16:54 +0200 (CEST)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by dpdk.org (Postfix) with ESMTP id AD6C21B5E1\n for <dev@dpdk.org>; Thu, 18 Jun 2020 23:16:42 +0200 (CEST)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n talshn@mellanox.com) with SMTP; 19 Jun 2020 00:16:37 +0300", "from l-wincomp04-vm.labs.mlnx (l-wincomp04-vm.mtl.labs.mlnx\n [10.237.1.5])\n by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 05ILGaFC006303;\n Fri, 19 Jun 2020 00:16:37 +0300" ], "From": "talshn@mellanox.com", "To": "dev@dpdk.org", "Cc": "thomas@monjalon.net, pallavi.kadam@intel.com, dmitry.kozliuk@gmail.com,\n david.marchand@redhat.com, grive@u256.net, ranjit.menon@intel.com,\n navasile@linux.microsoft.com, harini.ramakrishnan@microsoft.com,\n ocardona@microsoft.com, anatoly.burakov@intel.com, fady@mellanox.com,\n bruce.richardson@intel.com, Tal Shnaiderman <talshn@mellanox.com>", "Date": "Fri, 19 Jun 2020 00:15:46 +0300", "Message-Id": "<20200618211546.24496-10-talshn@mellanox.com>", "X-Mailer": "git-send-email 2.16.1.windows.4", "In-Reply-To": "<20200618211546.24496-1-talshn@mellanox.com>", "References": "<20200609103139.22168-2-talshn@mellanox.com>\n <20200618211546.24496-1-talshn@mellanox.com>", "Subject": "[dpdk-dev] [PATCH v6 9/9] build: generate version.map file for\n\tMingW on Windows", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Tal Shnaiderman <talshn@mellanox.com>\n\nThe MingW build for Windows has special cases where exported\nfunction contain additional prefix:\n\n__emutls_v.per_lcore__*\n\nTo avoid adding those prefixed functions to the version.map file\nthe map_to_def.py script was modified to create a map file for Mingw\nwith the needed changed.\n\nThe file name was changed to map_to_win.py\n\nSigned-off-by: Tal Shnaiderman <talshn@mellanox.com>\n---\n buildtools/{map_to_def.py => map_to_win.py} | 21 ++++++++++++++++-----\n buildtools/meson.build | 4 ++--\n drivers/meson.build | 12 +++++++++---\n lib/meson.build | 15 ++++++++++++---\n 4 files changed, 39 insertions(+), 13 deletions(-)\n rename buildtools/{map_to_def.py => map_to_win.py} (51%)", "diff": "diff --git a/buildtools/map_to_def.py b/buildtools/map_to_win.py\nsimilarity index 51%\nrename from buildtools/map_to_def.py\nrename to buildtools/map_to_win.py\nindex 6775b54a9d..dfb0748159 100644\n--- a/buildtools/map_to_def.py\n+++ b/buildtools/map_to_win.py\n@@ -13,23 +13,34 @@ def is_function_line(ln):\n \n def main(args):\n if not args[1].endswith('version.map') or \\\n- not args[2].endswith('exports.def'):\n+ not args[2].endswith('exports.def') and \\\n+ not args[2].endswith('mingw.map'):\n return 1\n \n # special case, allow override if an def file already exists alongside map file\n+# for mingw also replace per_lcore__* to __emutls_v.per_lcore__*\n override_file = join(dirname(args[1]), basename(args[2]))\n if exists(override_file):\n with open(override_file) as f_in:\n- functions = f_in.readlines()\n+ lines = f_in.readlines()\n+ if args[2].endswith('mingw.map'):\n+ lines = [l.replace('per_lcore__', '__emutls_v.per_lcore__') for l in lines]\n+ functions = lines\n \n # generate def file from map file.\n-# This works taking indented lines only which end with a \";\" and which don't\n+# For clang this works taking indented lines only which end with a \";\" and which don't\n # have a colon in them, i.e. the lines defining functions only.\n+# mingw keeps the original .map file but replaces per_lcore__* to __emutls_v.per_lcore__*\n else:\n with open(args[1]) as f_in:\n- functions = [ln[:-2] + '\\n' for ln in sorted(f_in.readlines())\n+ lines = f_in.readlines()\n+ if args[2].endswith('mingw.map'):\n+ lines = [l.replace('per_lcore__', '__emutls_v.per_lcore__') for l in lines]\n+ functions = lines\n+ else:\n+ functions = [ln[:-2] + '\\n' for ln in sorted(lines)\n if is_function_line(ln)]\n- functions = [\"EXPORTS\\n\"] + functions\n+ functions = [\"EXPORTS\\n\"] + functions\n \n with open(args[2], 'w') as f_out:\n f_out.writelines(functions)\ndiff --git a/buildtools/meson.build b/buildtools/meson.build\nindex d5f8291beb..f9d2fdf74b 100644\n--- a/buildtools/meson.build\n+++ b/buildtools/meson.build\n@@ -9,14 +9,14 @@ list_dir_globs = find_program('list-dir-globs.py')\n check_symbols = find_program('check-symbols.sh')\n ldflags_ibverbs_static = find_program('options-ibverbs-static.sh')\n \n-# set up map-to-def script using python, either built-in or external\n+# set up map-to-win script using python, either built-in or external\n python3 = import('python').find_installation(required: false)\n if python3.found()\n \tpy3 = [python3]\n else\n \tpy3 = ['meson', 'runpython']\n endif\n-map_to_def_cmd = py3 + files('map_to_def.py')\n+map_to_win_cmd = py3 + files('map_to_win.py')\n sphinx_wrapper = py3 + files('call-sphinx-build.py')\n \n # stable ABI always starts with \"DPDK_\"\ndiff --git a/drivers/meson.build b/drivers/meson.build\nindex 646a7d5eb5..b25a368531 100644\n--- a/drivers/meson.build\n+++ b/drivers/meson.build\n@@ -152,16 +152,22 @@ foreach class:dpdk_driver_classes\n \t\t\timplib = 'lib' + lib_name + '.dll.a'\n \n \t\t\tdef_file = custom_target(lib_name + '_def',\n-\t\t\t\tcommand: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'],\n+\t\t\t\tcommand: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],\n \t\t\t\tinput: version_map,\n \t\t\t\toutput: '@0@_exports.def'.format(lib_name))\n-\t\t\tlk_deps = [version_map, def_file]\n+\n+\t\t\tmingw_map = custom_target(name + '_mingw',\n+\t\t\t\tcommand: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],\n+\t\t\t\tinput: version_map,\n+\t\t\t\toutput: '@0@_mingw.map'.format(name))\n+\n+\t\t\tlk_deps = [version_map, def_file, mingw_map]\n \t\t\tif is_windows\n \t\t\t\tif is_ms_linker\n \t\t\t\t\tlk_args = ['-Wl,/def:' + def_file.full_path(),\n \t\t\t\t\t\t'-Wl,/implib:drivers\\\\' + implib]\n \t\t\t\telse\n-\t\t\t\t\tlk_args = []\n+\t\t\t\t\tlk_args = ['-Wl,--version-script=' + mingw_map.full_path()]\n \t\t\t\tendif\n \t\t\telse\n \t\t\t\tlk_args = ['-Wl,--version-script=' + version_map]\ndiff --git a/lib/meson.build b/lib/meson.build\nindex a8fd317a18..9f6c85a3e1 100644\n--- a/lib/meson.build\n+++ b/lib/meson.build\n@@ -150,18 +150,27 @@ foreach l:libraries\n \t\t\timplib = dir_name + '.dll.a'\n \n \t\t\tdef_file = custom_target(name + '_def',\n-\t\t\t\tcommand: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'],\n+\t\t\t\tcommand: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],\n \t\t\t\tinput: version_map,\n \t\t\t\toutput: 'rte_@0@_exports.def'.format(name))\n \n+\t\t\tmingw_map = custom_target(name + '_mingw',\n+\t\t\t\tcommand: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],\n+\t\t\t\tinput: version_map,\n+\t\t\t\toutput: 'rte_@0@_mingw.map'.format(name))\n+\n \t\t\tif is_ms_linker\n \t\t\t\tlk_args = ['-Wl,/def:' + def_file.full_path(),\n \t\t\t\t\t'-Wl,/implib:lib\\\\' + implib]\n \t\t\telse\n-\t\t\t\tlk_args = ['-Wl,--version-script=' + version_map]\n+\t\t\t\tif is_windows\n+\t\t\t\t\tlk_args = ['-Wl,--version-script=' + mingw_map.full_path()]\n+\t\t\t\telse\n+\t\t\t\t\tlk_args = ['-Wl,--version-script=' + version_map]\n+\t\t\t\tendif\n \t\t\tendif\n \n-\t\t\tlk_deps = [version_map, def_file]\n+\t\t\tlk_deps = [version_map, def_file, mingw_map]\n \t\t\tif not is_windows\n \t\t\t\t# on unix systems check the output of the\n \t\t\t\t# check-symbols.sh script, using it as a\n", "prefixes": [ "v6", "9/9" ] }