[2/2,master/8.1] Fix GDBserver build failure when $development is false
Commit Message
When we set bfd/development.sh:$development to false, GDBserver failed to
build,
selftest.o: In function `selftests::run_tests(char const*)':
binutils-gdb/gdb/gdbserver/../common/selftest.c:97:undefined reference to `selftests::reset()'
collect2: error: ld returned 1 exit status
selftest.o shouldn't be compiled and linked when $development is false.
With this patch, in release mode, GDBserver doesn't nothing with option
--selftest,
$ ./gdbserver --selftest=foo
$ ./gdbserver --selftest
$
gdb/gdbserver:
2018-01-05 Yao Qi <yao.qi@linaro.org>
* Makefile.in (OBS): Remove selftest.o.
* configure.ac: Set srv_selftest_objs if $development is true.
(GDBSERVER_DEPFILES): Append $srv_selftest_objs.
* configure: Re-generated.
* server.c (captured_main): Wrap variable selftest_filter with
GDB_SELF_TEST.
---
gdb/gdbserver/Makefile.in | 1 -
gdb/gdbserver/configure | 3 ++-
gdb/gdbserver/configure.ac | 3 ++-
gdb/gdbserver/server.c | 6 ++++++
4 files changed, 10 insertions(+), 3 deletions(-)
@@ -261,7 +261,6 @@ OBS = \
regcache.o \
remote-utils.o \
rsp-low.o \
- selftest.o \
server.o \
signals.o \
signals-state-save-restore.o \
@@ -5815,6 +5815,7 @@ fi
if $development; then
+ srv_selftest_objs="selftest.o"
$as_echo "#define GDB_SELF_TEST 1" >>confdefs.h
@@ -8287,7 +8288,7 @@ $as_echo "#define USE_XML 1" >>confdefs.h
done
fi
-GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles $srv_host_obs"
+GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles $srv_host_obs $srv_selftest_objs"
GDBSERVER_LIBS="$srv_libs"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the target supports __sync_*_compare_and_swap" >&5
@@ -57,6 +57,7 @@ fi
GDB_AC_LIBMCHECK(${libmcheck_default})
if $development; then
+ srv_selftest_objs="selftest.o"
AC_DEFINE(GDB_SELF_TEST, 1,
[Define if self-testing features should be enabled])
fi
@@ -410,7 +411,7 @@ if test "$srv_xmlfiles" != ""; then
done
fi
-GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles $srv_host_obs"
+GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles $srv_host_obs $srv_selftest_objs"
GDBSERVER_LIBS="$srv_libs"
dnl Check whether the target supports __sync_*_compare_and_swap.
@@ -3560,7 +3560,9 @@ captured_main (int argc, char *argv[])
volatile int attach = 0;
int was_running;
bool selftest = false;
+#if GDB_SELF_TEST
const char *selftest_filter = NULL;
+#endif
while (*next_arg != NULL && **next_arg == '-')
{
@@ -3684,7 +3686,9 @@ captured_main (int argc, char *argv[])
else if (startswith (*next_arg, "--selftest="))
{
selftest = true;
+#if GDB_SELF_TEST
selftest_filter = *next_arg + strlen ("--selftest=");
+#endif
}
else
{
@@ -3762,7 +3766,9 @@ captured_main (int argc, char *argv[])
if (selftest)
{
+#if GDB_SELF_TEST
selftests::run_tests (selftest_filter);
+#endif
throw_quit ("Quit");
}