FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb/

Browse source 
* config.in: Regenerate.
	* configure: Regenerate.
	* configure.ac: Remove check for gnu/libc-version.h.
	* linux-thread-db.c <HAVE_GNU_LIBC_VERSION_H>: Remove include of
	gnu/libc-version.h.
	(enable_thread_event_reporting) <HAVE_GNU_LIBC_VERSION_H>: Remove
	variables libc_version, libc_major and libc_minor.  Replace sscanf by
	inferior_has_bug.  Extend the comment.
This commit is contained in:
Jan Kratochvil 2012-07-02 20:31:09 +00:00
parent fcb4437118
commit 8775fd2d8d
5 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gdb/ChangeLog
View file

@ -1,3 +1,14 @@
2012-07-02 Jan Kratochvil <jan.kratochvil@redhat.com>
* config.in: Regenerate.
* configure: Regenerate.
* configure.ac: Remove check for gnu/libc-version.h.
* linux-thread-db.c <HAVE_GNU_LIBC_VERSION_H>: Remove include of
gnu/libc-version.h.
(enable_thread_event_reporting) <HAVE_GNU_LIBC_VERSION_H>: Remove
variables libc_version, libc_major and libc_minor. Replace sscanf by
inferior_has_bug. Extend the comment.
2012-07-02 Jan Kratochvil <jan.kratochvil@redhat.com> 2012-07-02 Jan Kratochvil <jan.kratochvil@redhat.com>
* linux-thread-db.c (inferior_has_bug): New function. * linux-thread-db.c (inferior_has_bug): New function.

3
gdb/config.in
View file

@ -168,9 +168,6 @@
/* Define to 1 if you have the `getuid' function. */ /* Define to 1 if you have the `getuid' function. */
#undef HAVE_GETUID #undef HAVE_GETUID
/* Define to 1 if you have the <gnu/libc-version.h> header file. */
#undef HAVE_GNU_LIBC_VERSION_H
/* Define if <sys/procfs.h> has gregset_t. */ /* Define if <sys/procfs.h> has gregset_t. */
#undef HAVE_GREGSET_T #undef HAVE_GREGSET_T

2
gdb/configure vendored
View file

@ -8850,7 +8850,7 @@ fi
# FIXME: kettenis/20030102: In most cases we include these (ctype.h, time.h) # FIXME: kettenis/20030102: In most cases we include these (ctype.h, time.h)
# unconditionally, so what's the point in checking these? # unconditionally, so what's the point in checking these?
for ac_header in nlist.h machine/reg.h poll.h sys/poll.h proc_service.h \ for ac_header in nlist.h machine/reg.h poll.h sys/poll.h proc_service.h \
thread_db.h gnu/libc-version.h signal.h stddef.h \ thread_db.h signal.h stddef.h \
stdlib.h string.h memory.h strings.h sys/fault.h \ stdlib.h string.h memory.h strings.h sys/fault.h \
sys/file.h sys/filio.h sys/ioctl.h sys/param.h \ sys/file.h sys/filio.h sys/ioctl.h sys/param.h \
sys/resource.h sys/procfs.h sys/ptrace.h ptrace.h \ sys/resource.h sys/procfs.h sys/ptrace.h ptrace.h \

2
gdb/configure.ac
View file

@ -1022,7 +1022,7 @@ AC_HEADER_STDC
# FIXME: kettenis/20030102: In most cases we include these (ctype.h, time.h) # FIXME: kettenis/20030102: In most cases we include these (ctype.h, time.h)
# unconditionally, so what's the point in checking these? # unconditionally, so what's the point in checking these?
AC_CHECK_HEADERS([nlist.h machine/reg.h poll.h sys/poll.h proc_service.h \ AC_CHECK_HEADERS([nlist.h machine/reg.h poll.h sys/poll.h proc_service.h \
thread_db.h gnu/libc-version.h signal.h stddef.h \ thread_db.h signal.h stddef.h \
stdlib.h string.h memory.h strings.h sys/fault.h \ stdlib.h string.h memory.h strings.h sys/fault.h \
sys/file.h sys/filio.h sys/ioctl.h sys/param.h \ sys/file.h sys/filio.h sys/ioctl.h sys/param.h \
sys/resource.h sys/procfs.h sys/ptrace.h ptrace.h \ sys/resource.h sys/procfs.h sys/ptrace.h ptrace.h \

23
gdb/linux-thread-db.c
View file

@ -46,10 +46,6 @@
#include <signal.h> #include <signal.h>
#include <ctype.h> #include <ctype.h>
#ifdef HAVE_GNU_LIBC_VERSION_H
#include <gnu/libc-version.h>
#endif
/* GNU/Linux libthread_db support. /* GNU/Linux libthread_db support.
libthread_db is a library, provided along with libpthread.so, which libthread_db is a library, provided along with libpthread.so, which
@ -612,10 +608,6 @@ enable_thread_event_reporting (void)
{ {
td_thr_events_t events; td_thr_events_t events;
td_err_e err; td_err_e err;
#ifdef HAVE_GNU_LIBC_VERSION_H
const char *libc_version;
int libc_major, libc_minor;
#endif
struct thread_db_info *info; struct thread_db_info *info;
info = get_thread_db_info (GET_PID (inferior_ptid)); info = get_thread_db_info (GET_PID (inferior_ptid));
@ -632,14 +624,13 @@ enable_thread_event_reporting (void)
td_event_emptyset (&events); td_event_emptyset (&events);
td_event_addset (&events, TD_CREATE); td_event_addset (&events, TD_CREATE);
#ifdef HAVE_GNU_LIBC_VERSION_H /* There is a bug fixed between linuxthreads 2.1.3 and 2.2 by
/* The event reporting facility is broken for TD_DEATH events in commit 2e4581e4fba917f1779cd0a010a45698586c190a
glibc 2.1.3, so don't enable it if we have glibc but a lower * manager.c (pthread_exited): Correctly report event as TD_REAP
version. */ instead of TD_DEATH. Fix comments.
libc_version = gnu_get_libc_version (); where event reporting facility is broken for TD_DEATH events,
if (sscanf (libc_version, "%d.%d", &libc_major, &libc_minor) == 2 so don't enable it if we have glibc but a lower version. */
&& (libc_major > 2 || (libc_major == 2 && libc_minor > 1))) if (!inferior_has_bug ("__linuxthreads_version", 2, 2))
#endif
td_event_addset (&events, TD_DEATH); td_event_addset (&events, TD_DEATH);
err = info->td_ta_set_event_p (info->thread_agent, &events); err = info->td_ta_set_event_p (info->thread_agent, &events);