diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/linux-thread-db.c | 24 | ||||
| -rw-r--r-- | gdb/solib.c | 9 |
3 files changed, 36 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3b2693d..e5aac22 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2021-06-11 Kevin Buettner <kevinb@redhat.com> + + * solib.c (libpthread_name_p): Match "libc" in addition + to "libpthread". + * linux-thread-db.c (libpthread_objfile_p): New function. + (libpthread_name_p): Adjust preexisting callers to use + libpthread_objfile_p(). + 2021-06-11 Simon Marchi <simon.marchi@polymtl.ca> * dwarf2/loc.h (struct call_site_stuff): Remove. diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c index d1e8c22..5b4e5a8 100644 --- a/gdb/linux-thread-db.c +++ b/gdb/linux-thread-db.c @@ -799,6 +799,24 @@ check_thread_db (struct thread_db_info *info, bool log_progress) return test_passed; } +/* Predicate which tests whether objfile OBJ refers to the library + containing pthread related symbols. Historically, this library has + been named in such a way that looking for "libpthread" in the name + was sufficient to identify it. As of glibc-2.34, the C library + (libc) contains the thread library symbols. Therefore we check + that the name matches a possible thread library, but we also check + that it contains at least one of the symbols (pthread_create) that + we'd expect to find in the thread library. */ + +static bool +libpthread_objfile_p (objfile *obj) +{ + return (libpthread_name_p (objfile_name (obj)) + && lookup_minimal_symbol ("pthread_create", + NULL, + obj).minsym != NULL); +} + /* Attempt to initialize dlopen()ed libthread_db, described by INFO. Return true on success. Failure could happen if libthread_db does not have symbols we expect, @@ -1072,7 +1090,7 @@ try_thread_db_load_from_pdir (const char *subdir) return false; for (objfile *obj : current_program_space->objfiles ()) - if (libpthread_name_p (objfile_name (obj))) + if (libpthread_objfile_p (obj)) { if (try_thread_db_load_from_pdir_1 (obj, subdir)) return true; @@ -1181,7 +1199,7 @@ static bool has_libpthread (void) { for (objfile *obj : current_program_space->objfiles ()) - if (libpthread_name_p (objfile_name (obj))) + if (libpthread_objfile_p (obj)) return true; return false; @@ -1286,7 +1304,7 @@ thread_db_new_objfile (struct objfile *objfile) of the list of shared libraries to load, and in an app of several thousand shared libraries, this can otherwise be painful. */ && ((objfile->flags & OBJF_MAINLINE) != 0 - || libpthread_name_p (objfile_name (objfile)))) + || libpthread_objfile_p (objfile))) check_for_thread_db (); } diff --git a/gdb/solib.c b/gdb/solib.c index 2df5211..317f7eb 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -900,12 +900,17 @@ Do you need \"set solib-search-path\" or \"set sysroot\"?"), Uses a fairly simplistic heuristic approach where we check the file name against "/libpthread". This can lead to false - positives, but this should be good enough in practice. */ + positives, but this should be good enough in practice. + + As of glibc-2.34, functions formerly residing in libpthread have + been moved to libc, so "/libc." needs to be checked too. (Matching + the "." will avoid matching libraries such as libcrypt.) */ bool libpthread_name_p (const char *name) { - return (strstr (name, "/libpthread") != NULL); + return (strstr (name, "/libpthread") != NULL + || strstr (name, "/libc.") != NULL ); } /* Return non-zero if SO is the libpthread shared library. */ |