From e3b50a7f9484bed4bee60c29166ee554f33a5aa2 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 16 Apr 2013 18:12:14 +0000 Subject: [PATCH] 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 Pedro Alves PR build/11881 * common/gdb_thread_db.h (LIBTHREAD_DB_SO) (LIBTHREAD_DB_SEARCH_PATH): Move outside of #ifdef HAVE_THREAD_DB_H. --- gdb/ChangeLog | 9 +++++++++ gdb/common/gdb_thread_db.h | 23 +++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5e7d14f91d3..48d5ac065cb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2013-04-16 Will Newton + Pedro Alves + + 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 Eli Zaretskii 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 - -#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 -- 2.30.2