diff options
author | Pedro Alves <palves@redhat.com> | 2013-04-16 18:20:40 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2013-04-16 18:20:40 +0000 |
commit | 04f5fe89ae8c13d903cded6cc28924dff058ece0 (patch) | |
tree | b68db5ff71638c1ce93b6f433412ee9cb5bd513f /gdb/gdbserver/linux-low.h | |
parent | 488a42b8c4330b6de178cadc089b1d551dd7f974 (diff) | |
download | gdb-04f5fe89ae8c13d903cded6cc28924dff058ece0.zip gdb-04f5fe89ae8c13d903cded6cc28924dff058ece0.tar.gz gdb-04f5fe89ae8c13d903cded6cc28924dff058ece0.tar.bz2 |
Fix remaining GDBserver issues with !HAVE_THREAD_DB_H.
The previous patches are still not sufficient to build gdbserver with
our copy of thread_db.h.
../../../src/gdb/gdbserver/thread-db.c: In function ‘find_one_thread’:
../../../src/gdb/gdbserver/thread-db.c:316:6: error: ‘struct lwp_info’ has no member named ‘th’
../../../src/gdb/gdbserver/thread-db.c: In function ‘attach_thread’:
../../../src/gdb/gdbserver/thread-db.c:341:6: error: ‘struct lwp_info’ has no member named ‘th’
../../../src/gdb/gdbserver/thread-db.c: In function ‘thread_db_get_tls_address’:
../../../src/gdb/gdbserver/thread-db.c:514:47: error: ‘struct lwp_info’ has no member named ‘th’
make: *** [thread-db.o] Error 1
First, linux-low.h is including <thread_db.h> directly instead of our
gdb_thread_db.h, although thread-db.c includes the latter. Then the
'th' field of struct lwp_info is only defined if HAVE_THREAD_DB_H is
defined, which is not true if we're using our replacement copy of
thread_db.h. We have a USE_THREAD_DB symbol defined if we're building
thread-db.c that's ideal for this, however, it's currently only
defined when compiling linux-low.c (through a Makefile rule). The
patch makes it defined when compiling any file.
gdb/gdbserver/
2013-04-16 Pedro Alves <palves@redhat.com>
* Makefile.in (INTERNAL_CFLAGS): Add @USE_THREAD_DB@.
(linux-low.o): Delete rule.
* linux-low.h: Always include "gdb_thread_db.h" instead of
conditionally including thread_db.h.
(struct lwp_info) <th>: Guard with #ifdef USE_THREAD_DB instead of
HAVE_THREAD_DB_H.
Diffstat (limited to 'gdb/gdbserver/linux-low.h')
-rw-r--r-- | gdb/gdbserver/linux-low.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gdb/gdbserver/linux-low.h b/gdb/gdbserver/linux-low.h index 27dd3b5..834dd91 100644 --- a/gdb/gdbserver/linux-low.h +++ b/gdb/gdbserver/linux-low.h @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_THREAD_DB_H -#include <thread_db.h> -#endif +#include "gdb_thread_db.h" #include <signal.h> #include "gdbthread.h" @@ -270,7 +268,7 @@ struct lwp_info int need_step_over; int thread_known; -#ifdef HAVE_THREAD_DB_H +#ifdef USE_THREAD_DB /* The thread handle, used for e.g. TLS access. Only valid if THREAD_KNOWN is set. */ td_thrhandle_t th; |