From 45950eb60008c70fb79306012e76a024a8790ca3 Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Mon, 4 Mar 2019 12:44:20 -0500 Subject: [PATCH] Use '$enable_unittest' instead of '$development' on gdbserver/configure.srv (for 'aarch64*-*-linux*' case) On commit 8ecfd7bd4acd69213c06fac6de9af38299123547 ("Add parameter to allow enabling/disabling selftests via configure") it seems that I forgot to use the proper '$enable_unittest' variable when checking to see whether to add selftest-related objects to 'srv_regobj'. This causes a build failure on Aarch64 when 'development=false' (which is the case for the 8.3 branch) and 'enable_unittest=true'. This patch fixes the problem by using '$enable_unittest' instead of '$development' when performing the check. As a reminder, it's important to notice that '$enable_unittest's default value (i.e., when the option '--enable-unit-tests' is not passed to configure) is the same as '$development', so this patch doesn't affect the current build. I'd like to install this patch both on master and on the 8.3 branch. OK? gdb/gdbserver/ChangeLog: 2019-03-04 Sergio Durigan Junior * configure.srv: Use '$enable_unittest' instead of '$development' when checking whether to fill 'srv_regobj' on 'aarch64*-*-linux*' case. --- gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/configure.srv | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index b6086598fa7..1cdbb63b631 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2019-03-04 Sergio Durigan Junior + + * configure.srv: Use '$enable_unittest' instead of '$development' + when checking whether to fill 'srv_regobj' on 'aarch64*-*-linux*' + case. + 2019-02-27 Tom Tromey * gdbreplay.c (logchar): Handle \r\n. diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index d19d22b3a32..bec72e2b193 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -43,7 +43,7 @@ srv_linux_obj="linux-low.o linux-osdata.o linux-procfs.o linux-ptrace.o linux-wa case "${target}" in aarch64*-*-linux*) srv_regobj="arm-with-neon.o" - if $development; then + if $enable_unittests; then srv_regobj="${srv_regobj} aarch64.o" srv_regobj="${srv_regobj} linux-aarch64-tdesc-selftest.o" fi -- 2.30.2