gdbserver_tests: Improve compatibility of library directory name

Some linux os make softlink from customized directory like lib64xxx
into standard system lib64 directory.

https://bugs.kde.org/show_bug.cgi?id=467839

Contributed-by: JojoR <rjiejie@gmail.com>

diff --git a/NEWS b/NEWS
index b8d5e333d720b23e4c278640ac51408f5cafbcb8..13efee7d4a5035e0ed6800b623d1b0a998df1fe4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -147,6 +147,7 @@ are not entered into bugzilla tend to get forgotten about or ignored.
 465435  m_libcfile.c:66 (vgPlain_safe_fd): Assertion 'newfd >= VG_(fd_hard_limit)' failed.
 466104  aligned_alloc problems, part 1
 467482  Build failure on aarch64 Alpine
+467839  Gdbserver: Improve compatibility of library directory name
 n-i-bz  FreeBSD rfork syscall fail with EINVAL or ENOSYS rather than VG_(unimplemented)
 
 To see details of a given bug, visit

diff --git a/gdbserver_tests/filter_gdb.in b/gdbserver_tests/filter_gdb.in
index 28f807d09e9a11634cd9a1e61c47817f11b57034..16186dfe2c9bfe060aea0e0ab7ede8860f28d477 100755 (executable)
--- a/gdbserver_tests/filter_gdb.in
+++ b/gdbserver_tests/filter_gdb.in
@@ -147,10 +147,10 @@ s/in _select ()/in syscall .../
 #             (on 32 bits, we have an int_80, on 64 bits, directly select)
 s/in \(.__\)\{0,1\}select () from \/.*$/in syscall .../
 
-/^   from \/lib\/libc.so.*$/d
-/^   from \/lib64\/libc.so.*$/d
-/^   from \/lib64\/.*\/libc.so.*$/d
-/^   from \/lib64\/.*\/libc-.*.so/d
+/^   from \/lib.*\/libc.so.*$/d
+/^   from \/lib64.*\/libc.so.*$/d
+/^   from \/lib64.*\/.*\/libc.so.*$/d
+/^   from \/lib64.*\/.*\/libc-.*.so/d
 s/ from \/lib\/libc\.so.*//
 
 #       and yet another (gdb 7.0 way) to get a system call