diff options
| author | Pedro Alves <palves@redhat.com> | 2013-04-16 18:12:14 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2013-04-16 18:12:14 +0000 |
| commit | e3b50a7f9484bed4bee60c29166ee554f33a5aa2 (patch) | |
| tree | 06bb94f8ddc505dd41b82647a05bd977cf23141c | |
| parent | dee368d345a422483a5b56baac6d7011c0e2f0db (diff) | |
| download | gdb-e3b50a7f9484bed4bee60c29166ee554f33a5aa2.zip gdb-e3b50a7f9484bed4bee60c29166ee554f33a5aa2.tar.gz gdb-e3b50a7f9484bed4bee60c29166ee554f33a5aa2.tar.bz2 | |
PR build/11881: LIBTHREAD_DB_SO can be undefined.
This patch:
http://sourceware.org/ml/gdb-patches/2009-04/msg00115.html
Changed behaviour by only defining LIBTHREAD_DB_SO if thread_db.h exists. The
definition of LIBTHREAD_DB_SO and LIBTHREAD_DB_SEARCH_PATH should be moved
outside of #ifdef HAVE_THREAD_DB_H.
This is based on a patch attached to the PR, however, it needed a
tweak, as it was it broke the HAVE_THREAD_DB_H path.
2013-04-16 Will Newton <will.newton@gmail.com>
Pedro Alves <palves@redhat.com>
PR build/11881
* common/gdb_thread_db.h (LIBTHREAD_DB_SO)
(LIBTHREAD_DB_SEARCH_PATH): Move outside of #ifdef
HAVE_THREAD_DB_H.
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/common/gdb_thread_db.h | 23 |
2 files changed, 20 insertions, 12 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5e7d14f..48d5ac0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2013-04-16 Will Newton <will.newton@gmail.com> + Pedro Alves <palves@redhat.com> + + PR build/11881 + + * common/gdb_thread_db.h (LIBTHREAD_DB_SO) + (LIBTHREAD_DB_SEARCH_PATH): Move outside of #ifdef + HAVE_THREAD_DB_H. + 2013-04-16 Pedro Alves <palves@redhat.com> Eli Zaretskii <eliz@gnu.org> diff --git a/gdb/common/gdb_thread_db.h b/gdb/common/gdb_thread_db.h index c95aa77..5c6f6cf 100644 --- a/gdb/common/gdb_thread_db.h +++ b/gdb/common/gdb_thread_db.h @@ -1,17 +1,5 @@ #ifdef HAVE_THREAD_DB_H #include <thread_db.h> - -#ifndef LIBTHREAD_DB_SO -#define LIBTHREAD_DB_SO "libthread_db.so.1" -#endif - -#ifndef LIBTHREAD_DB_SEARCH_PATH -/* $sdir appears before $pdir for some minimal security protection: - we trust the system libthread_db.so a bit more than some random - libthread_db associated with whatever libpthread the app is using. */ -#define LIBTHREAD_DB_SEARCH_PATH "$sdir:$pdir" -#endif - #else /* Copyright (C) 1999-2013 Free Software Foundation, Inc. @@ -453,3 +441,14 @@ extern td_err_e td_thr_dbresume (const td_thrhandle_t *__th); #endif /* thread_db.h */ #endif /* HAVE_THREAD_DB_H */ + +#ifndef LIBTHREAD_DB_SO +#define LIBTHREAD_DB_SO "libthread_db.so.1" +#endif + +#ifndef LIBTHREAD_DB_SEARCH_PATH +/* $sdir appears before $pdir for some minimal security protection: + we trust the system libthread_db.so a bit more than some random + libthread_db associated with whatever libpthread the app is using. */ +#define LIBTHREAD_DB_SEARCH_PATH "$sdir:$pdir" +#endif |