On 19/10/20 18:40, Emmanuel Blot wrote:
> On 19 Oct 2020, at 17:50, Philippe Mathieu-Daudé wrote:
>
>> Cc'ing Markus/John/Paolo
>
> I never used `git bisect` up to now, so I might be wronb but it seems
> the issue would have been introduced with the following commit:
Hi,
I think this could be the fix. The problem would be that
awk '$2=="U"{print "-Wl,-u," $1}'
used to filter away lines with only one token, while the
Python script does not.
diff --git a/scripts/undefsym.py b/scripts/undefsym.py
index 69a895cd26..4b6a72d95f 100644
--- a/scripts/undefsym.py
+++ b/scripts/undefsym.py
@@ -15,12 +15,11 @@ def filter_lines_set(stdout, from_staticlib):
linesSet = set()
for line in stdout.splitlines():
tokens = line.split(b' ')
- if len(tokens) >= 1:
- if len(tokens) > 1:
- if from_staticlib and tokens[1] == b'U':
- continue
- if not from_staticlib and tokens[1] != b'U':
- continue
+ if len(tokens) >= 2:
+ if from_staticlib and tokens[1] == b'U':
+ continue
+ if not from_staticlib and tokens[1] != b'U':
+ continue
new_line = b'-Wl,-u,' + tokens[0]
if not new_line in linesSet:
linesSet.add(new_line)
If not, can you attach (or diff) the contents of block.syms and
qemu.syms before and after this commit?
Also please attach the output (on any commit) of "nm -P -g *.so".
Thanks,
Paolo
> 604f3e4e90c011a6b94fdc1d13700f3ec2375f2a is the first bad commit
> commit 604f3e4e90c011a6b94fdc1d13700f3ec2375f2a
> Author: Yonggang Luo <luoyongg...@gmail.com>
> Date: Thu Sep 3 01:00:50 2020 +0800
>
> meson: Convert undefsym.sh to undefsym.py
>
> Shell scripts are not easily invoked from the build process
> on MSYS, so convert undefsym.sh to a python script.
>
> Signed-off-by: Yonggang Luo <luoyongg...@gmail.com>
> Message-Id: <20200902170054.810-3-luoyongg...@gmail.com>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
>
> meson.build | 2 +-
> scripts/undefsym.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
> scripts/undefsym.sh | 20 --------------------
> 3 files changed, 50 insertions(+), 21 deletions(-)
> create mode 100644 scripts/undefsym.py
> delete mode 100755 scripts/undefsym.sh
