Use '$enable_unittest' instead of '$development' on gdbserver/configure.srv (for 'aarch64*-*-linux*' case)

Message ID 20190304174924.27024-1-sergiodj@redhat.com
State New
Headers show
Series
  • Use '$enable_unittest' instead of '$development' on gdbserver/configure.srv (for 'aarch64*-*-linux*' case)
Related show

Commit Message

Sergio Durigan Junior March 4, 2019, 5:49 p.m.
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  <sergiodj@redhat.com>

	* 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(-)

-- 
2.17.2

Comments

Simon Marchi March 4, 2019, 6:06 p.m. | #1
On 2019-03-04 12:49, Sergio Durigan Junior wrote:
> 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?


Thanks, this LGTM.

Simon
Sergio Durigan Junior March 4, 2019, 9:48 p.m. | #2
On Monday, March 04 2019, Simon Marchi wrote:

> On 2019-03-04 12:49, Sergio Durigan Junior wrote:

>> 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?

>

> Thanks, this LGTM.


Thanks, pushed.

45950eb60008c70fb79306012e76a024a8790ca3

-- 
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF  31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
http://sergiodj.net/

Patch

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index b6086598fa..1cdbb63b63 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@ 
+2019-03-04  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	* configure.srv: Use '$enable_unittest' instead of '$development'
+	when checking whether to fill 'srv_regobj' on 'aarch64*-*-linux*'
+	case.
+
 2019-02-27  Tom Tromey  <tromey@adacore.com>
 
 	* gdbreplay.c (logchar): Handle \r\n.
diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
index d19d22b3a3..bec72e2b19 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