This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 5/6] Fix remaining GDBserver issues with !HAVE_THREAD_DB_H.
- From: Pedro Alves <palves at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Tue, 16 Apr 2013 19:31:18 +0100
- Subject: [PATCH 5/6] Fix remaining GDBserver issues with !HAVE_THREAD_DB_H.
- References: <20130416183043 dot 540 dot 32214 dot stgit at brno dot lan>
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.
---
gdb/gdbserver/Makefile.in | 8 ++------
gdb/gdbserver/linux-low.h | 6 ++----
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 6c3d7bd..a2281cb 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -123,7 +123,8 @@ CFLAGS = @CFLAGS@
INTERNAL_CFLAGS_BASE = ${CFLAGS} ${GLOBAL_CFLAGS} \
${PROFILE_CFLAGS} ${INCLUDE_CFLAGS}
INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS)
-INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER
+INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) \
+ @USE_THREAD_DB@ -DGDBSERVER
# LDFLAGS is specifically reserved for setting from the command line
# when running make.
@@ -559,11 +560,6 @@ vsnprintf.o: $(srcdir)/../../libiberty/vsnprintf.c
$(POSTCOMPILE)
i386_low_h = $(srcdir)/i386-low.h
-
-linux-low.o: linux-low.c
- $(COMPILE) $< @USE_THREAD_DB@
- $(POSTCOMPILE)
-
win32_low_h = $(srcdir)/win32-low.h
aarch64.c : $(srcdir)/../regformats/aarch64.dat $(regdat_sh)
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;