From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com> To: talshn@mellanox.com Cc: dev@dpdk.org, thomas@monjalon.net, pallavi.kadam@intel.com, david.marchand@redhat.com, grive@u256.net, ranjit.menon@intel.com, navasile@linux.microsoft.com, harini.ramakrishnan@microsoft.com, ocardona@microsoft.com, anatoly.burakov@intel.com, fady@mellanox.com, bruce.richardson@intel.com Subject: Re: [dpdk-dev] [PATCH v6 9/9] build: generate version.map file for MingW on Windows Date: Fri, 19 Jun 2020 02:13:26 +0300 Message-ID: <20200619021326.493469cb@sovereign> (raw) In-Reply-To: <20200618211546.24496-10-talshn@mellanox.com> On Fri, 19 Jun 2020 00:15:46 +0300 talshn@mellanox.com wrote: > From: Tal Shnaiderman <talshn@mellanox.com> > > 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. Thanks for working on this. Your solution is even simpler than we discussed, see some comments inline. > > The file name was changed to map_to_win.py > > Signed-off-by: Tal Shnaiderman <talshn@mellanox.com> > --- > buildtools/{map_to_def.py => map_to_win.py} | 21 ++++++++++++++++----- > buildtools/meson.build | 4 ++-- > drivers/meson.build | 12 +++++++++--- > lib/meson.build | 15 ++++++++++++--- > 4 files changed, 39 insertions(+), 13 deletions(-) > rename buildtools/{map_to_def.py => map_to_win.py} (51%) > > diff --git a/buildtools/map_to_def.py b/buildtools/map_to_win.py > similarity index 51% > rename from buildtools/map_to_def.py > rename to buildtools/map_to_win.py > index 6775b54a9d..dfb0748159 100644 > --- a/buildtools/map_to_def.py > +++ b/buildtools/map_to_win.py > @@ -13,23 +13,34 @@ def is_function_line(ln): > > 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 > > # special case, allow override if an def file already exists alongside map file > +# for mingw also replace per_lcore__* to __emutls_v.per_lcore__* > override_file = join(dirname(args[1]), basename(args[2])) > if exists(override_file): > with open(override_file) as f_in: > - functions = f_in.readlines() > + lines = f_in.readlines() > + if args[2].endswith('mingw.map'): > + lines = [l.replace('per_lcore__', '__emutls_v.per_lcore__') for l in lines] > + functions = lines MinGW GCC linker doesn't fail on undefined symbols, so .map overrides will never be needed (and we're going to get rid of overrides soon anyway). > > # generate def file from map file. > -# This works taking indented lines only which end with a ";" and which don't > +# For clang this works taking indented lines only which end with a ";" and which don't > # have a colon in them, i.e. the lines defining functions only. > +# mingw keeps the original .map file but replaces per_lcore__* to __emutls_v.per_lcore__* > else: > with open(args[1]) as f_in: > - functions = [ln[:-2] + '\n' for ln in sorted(f_in.readlines()) > + lines = f_in.readlines() > + if args[2].endswith('mingw.map'): > + lines = [l.replace('per_lcore__', '__emutls_v.per_lcore__') for l in lines] > + functions = lines > + else: > + functions = [ln[:-2] + '\n' for ln in sorted(lines) > if is_function_line(ln)] > - functions = ["EXPORTS\n"] + functions > + functions = ["EXPORTS\n"] + functions Considering the comment above, entire logic for mingw.map is the following: if args[2].endswith('mingw.map'): with open(args[1]) as f_in, open(args[2], 'w') as f_out: f_out.writelines([...replace... for line in f_in.readlines()]) return 0 Wouldn't it be cleaner to move it to the beginning of function or even to a separate function dispatched by filename (or even script)? Motivation: soon .def logic will become more complicated and Windows-dependent (to analyze dumpbin.exe output), intertwining it with .map saves nothing and will impede. -- Dmitry Kozlyuk
next prev parent reply other threads:[~2020-06-18 23:13 UTC|newest] Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-09 10:31 [dpdk-dev] [PATCH v5 0/8] Windows bus/pci support talshn 2020-06-09 10:31 ` [dpdk-dev] [PATCH v5 1/8] eal: move OS common functions to single file talshn 2020-06-16 8:46 ` David Marchand 2020-06-18 21:15 ` [dpdk-dev] [PATCH v6 0/9] Windows bus/pci support talshn 2020-06-18 21:15 ` [dpdk-dev] [PATCH v6 1/9] eal: move OS common functions to single file talshn 2020-06-20 19:01 ` Dmitry Kozlyuk 2020-06-21 10:26 ` [dpdk-dev] [PATCH v7 0/9] Windows bus/pci support talshn 2020-06-21 10:26 ` [dpdk-dev] [PATCH v7 1/9] eal: move OS common functions to single file talshn 2020-06-22 7:55 ` [dpdk-dev] [PATCH v8 0/9] Windows bus/pci support talshn 2020-06-22 7:55 ` [dpdk-dev] [PATCH v8 1/9] eal: move OS common functions to single file talshn 2020-06-22 14:54 ` Thomas Monjalon 2020-06-23 6:45 ` Tal Shnaiderman 2020-06-23 7:16 ` Thomas Monjalon 2020-06-24 8:28 ` [dpdk-dev] [PATCH v9 00/10] Windows bus/pci support talshn 2020-06-24 8:28 ` [dpdk-dev] [PATCH v9 01/10] eal: move OS common config objects talshn 2020-06-25 14:18 ` Thomas Monjalon 2020-06-24 8:28 ` [dpdk-dev] [PATCH v9 02/10] eal: move OS common options functions talshn 2020-06-25 14:29 ` Thomas Monjalon 2020-06-24 8:28 ` [dpdk-dev] [PATCH v9 03/10] pci: use OS generic memory mapping functions talshn 2020-06-24 8:28 ` [dpdk-dev] [PATCH v9 04/10] pci: build on Windows talshn 2020-06-24 8:28 ` [dpdk-dev] [PATCH v9 05/10] pci: fix format warning " talshn 2020-06-25 12:54 ` Thomas Monjalon 2020-06-24 8:28 ` [dpdk-dev] [PATCH v9 06/10] drivers: ignore pmdinfogen generation for Windows talshn 2020-06-24 8:28 ` [dpdk-dev] [PATCH v9 07/10] drivers: fix incorrect meson import folder " talshn 2020-06-24 8:28 ` [dpdk-dev] [PATCH v9 08/10] bus/pci: introduce Windows support with stubs talshn 2020-06-24 8:28 ` [dpdk-dev] [PATCH v9 09/10] bus/pci: support Windows with bifurcated drivers talshn 2020-06-27 1:46 ` Narcisa Ana Maria Vasile 2020-06-28 12:10 ` Tal Shnaiderman 2020-06-24 8:28 ` [dpdk-dev] [PATCH v9 10/10] build: generate version.map file for MinGW on Windows talshn 2020-06-27 1:54 ` [dpdk-dev] [PATCH v9 00/10] Windows bus/pci support Narcisa Ana Maria Vasile 2020-06-28 12:32 ` Tal Shnaiderman 2020-06-29 12:37 ` [dpdk-dev] [PATCH v10 " talshn 2020-06-29 12:37 ` [dpdk-dev] [PATCH v10 01/10] eal: move OS common config objects talshn 2020-06-29 15:36 ` Tal Shnaiderman 2020-06-29 12:37 ` [dpdk-dev] [PATCH v10 02/10] eal: move OS common options functions talshn 2020-06-29 12:37 ` [dpdk-dev] [PATCH v10 03/10] pci: use OS generic memory mapping functions talshn 2020-06-29 12:37 ` [dpdk-dev] [PATCH v10 04/10] pci: build on Windows talshn 2020-06-29 12:37 ` [dpdk-dev] [PATCH v10 05/10] pci: fix format warning " talshn 2020-06-29 12:37 ` [dpdk-dev] [PATCH v10 06/10] drivers: ignore pmdinfogen generation for Windows talshn 2020-06-29 12:37 ` [dpdk-dev] [PATCH v10 07/10] drivers: fix incorrect meson import folder " talshn 2020-06-29 12:37 ` [dpdk-dev] [PATCH v10 08/10] bus/pci: introduce Windows support with stubs talshn 2020-06-29 20:40 ` Thomas Monjalon 2020-06-29 12:37 ` [dpdk-dev] [PATCH v10 09/10] bus/pci: support Windows with bifurcated drivers talshn 2020-06-29 12:37 ` [dpdk-dev] [PATCH v10 10/10] build: generate version.map file for MinGW on Windows talshn 2020-06-29 22:07 ` [dpdk-dev] [PATCH v10 00/10] Windows bus/pci support Thomas Monjalon 2020-06-22 7:55 ` [dpdk-dev] [PATCH v8 2/9] pci: use OS generic memory mapping functions talshn 2020-06-22 21:54 ` Dmitry Kozlyuk 2020-06-22 7:55 ` [dpdk-dev] [PATCH v8 3/9] pci: build on Windows talshn 2020-06-22 7:55 ` [dpdk-dev] [PATCH v8 4/9] pci: fix format warning " talshn 2020-06-22 7:55 ` [dpdk-dev] [PATCH v8 5/9] drivers: ignore pmdinfogen generation for Windows talshn 2020-06-22 7:55 ` [dpdk-dev] [PATCH v8 6/9] drivers: fix incorrect meson import folder " talshn 2020-06-22 7:55 ` [dpdk-dev] [PATCH v8 7/9] bus/pci: introduce Windows support with stubs talshn 2020-06-22 7:55 ` [dpdk-dev] [PATCH v8 8/9] bus/pci: support Windows with bifurcated drivers talshn 2020-06-23 23:28 ` Dmitry Kozlyuk 2020-06-24 8:02 ` Tal Shnaiderman 2020-06-22 7:55 ` [dpdk-dev] [PATCH v8 9/9] build: generate version.map file for MinGW on Windows talshn 2020-06-21 10:26 ` [dpdk-dev] [PATCH v7 2/9] pci: use OS generic memory mapping functions talshn 2020-06-21 10:26 ` [dpdk-dev] [PATCH v7 3/9] pci: build on Windows talshn 2020-06-21 10:26 ` [dpdk-dev] [PATCH v7 4/9] pci: fix format warning " talshn 2020-06-21 10:26 ` [dpdk-dev] [PATCH v7 5/9] drivers: ignore pmdinfogen generation for Windows talshn 2020-06-21 10:26 ` [dpdk-dev] [PATCH v7 6/9] drivers: fix incorrect meson import folder " talshn 2020-06-21 10:26 ` [dpdk-dev] [PATCH v7 7/9] bus/pci: introduce Windows support with stubs talshn 2020-06-21 11:23 ` Fady Bader 2020-06-21 10:26 ` [dpdk-dev] [PATCH v7 8/9] bus/pci: support Windows with bifurcated drivers talshn 2020-06-21 10:26 ` [dpdk-dev] [PATCH v7 9/9] build: generate version.map file for MinGW on Windows talshn 2020-06-18 21:15 ` [dpdk-dev] [PATCH v6 2/9] pci: use OS generic memory mapping functions talshn 2020-06-18 22:44 ` Dmitry Kozlyuk 2020-06-18 21:15 ` [dpdk-dev] [PATCH v6 3/9] pci: build on Windows talshn 2020-06-18 21:15 ` [dpdk-dev] [PATCH v6 4/9] pci: fix format warning " talshn 2020-06-18 21:15 ` [dpdk-dev] [PATCH v6 5/9] drivers: ignore pmdinfogen generation for Windows talshn 2020-06-18 21:15 ` [dpdk-dev] [PATCH v6 6/9] drivers: fix incorrect meson import folder " talshn 2020-06-18 21:15 ` [dpdk-dev] [PATCH v6 7/9] bus/pci: introduce Windows support with stubs talshn 2020-06-18 21:15 ` [dpdk-dev] [PATCH v6 8/9] bus/pci: support Windows with bifurcated drivers talshn 2020-06-18 22:40 ` Dmitry Kozlyuk 2020-06-18 21:15 ` [dpdk-dev] [PATCH v6 9/9] build: generate version.map file for MingW on Windows talshn 2020-06-18 23:13 ` Dmitry Kozlyuk [this message] 2020-06-21 6:36 ` Tal Shnaiderman 2020-06-20 18:54 ` Dmitry Kozlyuk 2020-06-21 5:49 ` Tal Shnaiderman 2020-06-09 10:31 ` [dpdk-dev] [PATCH v5 2/8] pci: use OS generic memory mapping functions talshn 2020-06-09 10:31 ` [dpdk-dev] [PATCH v5 3/8] pci: build on Windows talshn 2020-06-16 8:22 ` Thomas Monjalon 2020-06-09 10:31 ` [dpdk-dev] [PATCH v5 4/8] pci: fix format warning " talshn 2020-06-09 10:31 ` [dpdk-dev] [PATCH v5 5/8] drivers: ignore pmdinfogen generation for Windows talshn 2020-06-17 20:39 ` Dmitry Kozlyuk 2020-06-09 10:31 ` [dpdk-dev] [PATCH v5 6/8] drivers: fix incorrect meson import folder " talshn 2020-06-16 8:29 ` Thomas Monjalon 2020-06-16 9:17 ` Bruce Richardson 2020-06-09 10:31 ` [dpdk-dev] [PATCH v5 7/8] bus/pci: introduce Windows support with stubs talshn 2020-06-17 20:29 ` Dmitry Kozlyuk 2020-06-09 10:31 ` [dpdk-dev] [PATCH v5 8/8] bus/pci: support Windows with bifurcated drivers talshn 2020-06-17 20:28 ` Dmitry Kozlyuk
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200619021326.493469cb@sovereign \ --to=dmitry.kozliuk@gmail.com \ --cc=anatoly.burakov@intel.com \ --cc=bruce.richardson@intel.com \ --cc=david.marchand@redhat.com \ --cc=dev@dpdk.org \ --cc=fady@mellanox.com \ --cc=grive@u256.net \ --cc=harini.ramakrishnan@microsoft.com \ --cc=navasile@linux.microsoft.com \ --cc=ocardona@microsoft.com \ --cc=pallavi.kadam@intel.com \ --cc=ranjit.menon@intel.com \ --cc=talshn@mellanox.com \ --cc=thomas@monjalon.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git