summaryrefslogtreecommitdiff
path: root/gdb/common
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2013-04-16 18:12:13 +0000
committerPedro Alves <palves@redhat.com>2013-04-16 18:12:13 +0000
commit06c8b68dd50e339199bba570fb37381ad0cb9c87 (patch)
tree8d0d186cfc44439d42106cf80c52a4b896797f89 /gdb/common
parentc80fa5a7c1b1277a6112f2984e2723c27cefd1df (diff)
downloadgdb-06c8b68dd50e339199bba570fb37381ad0cb9c87.tar.gz
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.
Diffstat (limited to 'gdb/common')
-rw-r--r--gdb/common/gdb_thread_db.h23
1 files changed, 11 insertions, 12 deletions
diff --git a/gdb/common/gdb_thread_db.h b/gdb/common/gdb_thread_db.h
index c95aa776fce..5c6f6cf28a0 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