From 4d696a5c686730d75623d7e41805e42ce5fcc60c Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 12 Mar 2020 14:12:36 -0400 Subject: [PATCH] gdb/selftest.m4: ensure $development is set Before commit 3d1e5a43cbe ("gdbsupport/configure.ac: source development.sh"), the GDB build in non-development mode (turn development to false in bfd/development.sh if you want to try) was broken because the gdbsupport configure script didn't source bfd/development.sh to set the development variable. Since the GDB_AC_SELFTEST macro relies on the `development` variable, I propose to modify it such that it errors out if $development does not have an expected value of "true" or "false". This could prevent a future similar problem from happening while refactoring the configure scripts. It would have caught the problem fixed by the patch mentioned earlier. gdb/ChangeLog: * selftest.m4 (GDB_AC_SELFTEST): Error out if $development is not "true" or "false". * configure: Re-generate. gdbserver/ChangeLog: * configure: Re-generate. gdbsupport/ChangeLog: * configure: Re-generate. --- gdb/ChangeLog | 6 ++++++ gdb/configure | 5 +++++ gdb/selftest.m4 | 4 ++++ gdbserver/ChangeLog | 4 ++++ gdbserver/configure | 5 +++++ gdbsupport/ChangeLog | 4 ++++ gdbsupport/configure | 5 +++++ 7 files changed, 33 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4ae6fd63102..490d9cbae5c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-03-12 Simon Marchi + + * selftest.m4 (GDB_AC_SELFTEST): Error out if $development is + not "true" or "false". + * configure: Re-generate. + 2020-03-12 Christian Biesinger * Makefile.in (HFILES_NO_SRCDIR): Add new arm-nbsd-tdep.h file. diff --git a/gdb/configure b/gdb/configure index 47ca77f400c..dd34688687e 100755 --- a/gdb/configure +++ b/gdb/configure @@ -19187,6 +19187,11 @@ $as_echo "#define GDB_DEFAULT_HOST_CHARSET \"UTF-8\"" >>confdefs.h # The default value of this option changes depending whether we're on # development mode (in which case it's "true") or not (in which case # it's "false"). + +if test "x$development" != xtrue && test "x$development" != xfalse; then : + as_fn_error $? "Invalid value for \$development, got \"$development\", expecting \"true\" or \"false\"." "$LINENO" 5 +fi + # Check whether --enable-unit-tests was given. if test "${enable_unit_tests+set}" = set; then : enableval=$enable_unit_tests; case "${enableval}" in diff --git a/gdb/selftest.m4 b/gdb/selftest.m4 index 4969de1cada..a88aa96171c 100644 --- a/gdb/selftest.m4 +++ b/gdb/selftest.m4 @@ -27,6 +27,10 @@ AC_DEFUN([GDB_AC_SELFTEST],[ # The default value of this option changes depending whether we're on # development mode (in which case it's "true") or not (in which case # it's "false"). + +AS_IF([test "x$development" != xtrue && test "x$development" != xfalse], + [AC_MSG_ERROR([Invalid value for \$development, got "$development", expecting "true" or "false".])]) + AC_ARG_ENABLE(unit-tests, AS_HELP_STRING([--enable-unit-tests], [Enable the inclusion of unit tests when compiling GDB]), diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index ef8addbfe87..94e1c040ea7 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2020-03-12 Simon Marchi + + * configure: Re-generate. + 2020-03-11 Simon Marchi * configure: Re-generate. diff --git a/gdbserver/configure b/gdbserver/configure index 13ac7188454..b0a25688c75 100755 --- a/gdbserver/configure +++ b/gdbserver/configure @@ -6083,6 +6083,11 @@ fi # The default value of this option changes depending whether we're on # development mode (in which case it's "true") or not (in which case # it's "false"). + +if test "x$development" != xtrue && test "x$development" != xfalse; then : + as_fn_error $? "Invalid value for \$development, got \"$development\", expecting \"true\" or \"false\"." "$LINENO" 5 +fi + # Check whether --enable-unit-tests was given. if test "${enable_unit_tests+set}" = set; then : enableval=$enable_unit_tests; case "${enableval}" in diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index f9fe58a7f59..5e4f27758dc 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,3 +1,7 @@ +2020-03-12 Simon Marchi + + * configure: Re-generate. + 2020-03-11 Simon Marchi * configure: Re-generate. diff --git a/gdbsupport/configure b/gdbsupport/configure index 1b141387e5a..66dc9062045 100755 --- a/gdbsupport/configure +++ b/gdbsupport/configure @@ -10606,6 +10606,11 @@ $as_echo "$bfd_cv_have_sys_procfs_type_elf_fpregset_t" >&6; } # The default value of this option changes depending whether we're on # development mode (in which case it's "true") or not (in which case # it's "false"). + +if test "x$development" != xtrue && test "x$development" != xfalse; then : + as_fn_error $? "Invalid value for \$development, got \"$development\", expecting \"true\" or \"false\"." "$LINENO" 5 +fi + # Check whether --enable-unit-tests was given. if test "${enable_unit_tests+set}" = set; then : enableval=$enable_unit_tests; case "${enableval}" in -- 2.30.2