gdb/testsuite: restore configure script

Commit f99d1d37496f ("Remove gdb/testsuite/configure") removed
gdb/testsuite/configure, as anything gdb/testsuite/configure did could
be done by gdb/configure.

There is however one use case that popped up when this changed
propagated to downstream consumers, to run the testsuite on an already
built GDB.  In the workflow of ROCm-GDB at AMD, a GDB package is built
in a CI job.  This GDB package is then tested on different machines /
hardware configurations as part of other CI jobs.  To achieve this,
those CI jobs only configure the testsuite directory and run "make
check" with an appropriate board file.

In light of this use case, the way I see it is that gdb/testsuite could
be considered its own project.  It could be stored in a completely
different repo if we want to, it just happens to be stored inside gdb/.

Since the only downside of having gdb/testsuite/configure is that it
takes a few more seconds to run, but on the other hand it's quite useful
for some people, I propose re-adding it.

In a sense, this is revert of f99d1d37496f, but it's not a direct
git-revert, as some things have changed since.

gdb/ChangeLog:

	* configure.ac: Remove things that were moved from
	testsuite/configure.ac.
	* configure: Re-generate.

gdb/testsuite/ChangeLog:

	* configure.ac: Restore.
	* configure: Re-generate.
	* aclocal.m4: Re-generate.
	* Makefile.in (distclean): Add config.status.
	(Makefile): Adjust paths.
	(lib/pdtrace): Adjust paths.
	(config.status): Add.

Change-Id: Ic38c79485e1835712d9c99649c9dfb59667254f1

gdb/configure

@@ -619,14 +619,10 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_header_list=
 enable_option_checking=no
+ac_header_list=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-NM_TRANSFORM_NAME
-GAS_TRANSFORM_NAME
-READELF_TRANSFORM_NAME
-STRIP_TRANSFORM_NAME
 GCORE_TRANSFORM_NAME
 GDB_TRANSFORM_NAME
 XSLTPROC
@@ -637,7 +633,6 @@ LIBXXHASH
 HAVE_LIBXXHASH
 CTF_DEPS
 LIBCTF
-enable_libctf
 LTLIBBABELTRACE
 LIBBABELTRACE
 HAVE_LIBBABELTRACE
@@ -668,7 +663,6 @@ GDBTKLIBS
 X_LIBS
 X_LDFLAGS
 X_CFLAGS
-subdirs
 TK_XINCLUDES
 TK_DEPS
 TK_LIBRARY
@@ -776,7 +770,7 @@ PKG_CONFIG_PATH
 PKG_CONFIG
 HAVE_NATIVE_GCORE_TARGET
 TARGET_OBS
-RPATH_ENVVAR
+subdirs
 GDB_DATADIR
 DEBUGDIR
 MAKEINFO_EXTRA_FLAGS
@@ -882,7 +876,6 @@ with_gdb_datadir
 with_relocated_sources
 with_auto_load_dir
 with_auto_load_safe_path
-enable_shared
 enable_targets
 enable_64_bit_bfd
 enable_gdbmi
@@ -963,7 +956,8 @@ DEBUGINFOD_LIBS
 YACC
 YFLAGS
 XMKMF'
-ac_subdirs_all='gdbtk'
+ac_subdirs_all='testsuite
+gdbtk'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -1589,7 +1583,6 @@ Optional Features:
                           sometimes confusing) to the casual installer
   --enable-plugins        Enable support for plugins
   --disable-largefile     omit support for large files
-  --enable-shared         build shared libraries [default=yes]
   --enable-targets=TARGETS
                           alternative target configurations
   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
@@ -6623,34 +6616,9 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_auto_load_safe_path" >&5
 $as_echo "$with_auto_load_safe_path" >&6; }
 
-# Enable shared libraries.
-# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared;
-else
-  enable_shared=yes
-fi
 
 
-# If we have shared libraries, try to set RPATH_ENVVAR reasonably,
+subdirs="$subdirs testsuite"
-# such that we can find the shared libraries in the build tree.
-if test $enable_shared = no; then
-  # The variable `RPATH_ENVVAR' itself is not likely to be used on any
-  # platform.
-  RPATH_ENVVAR=RPATH_ENVVAR
-else
-  # The variable `LD_LIBRARY_PATH' is used on most platforms.
-  RPATH_ENVVAR=LD_LIBRARY_PATH
-  # The following exceptions are taken from Libtool 1.4.3.
-  case $host_os in
-    aix*)
-      if test $host_cpu != ia64; then
-        RPATH_ENVVAR=LIBPATH
-      fi ;;
-    darwin* | rhapsody*)
-      RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
-  esac
-fi
 
 
 # Check whether to support alternative target configurations
@@ -18325,9 +18293,7 @@ $as_echo "${private_dir}" >&6; }
 	  CONFIG_OBS="${CONFIG_OBS} gdbres.o"
 	fi
 
-
+        subdirs="$subdirs gdbtk"
-
-subdirs="$subdirs gdbtk"
 
     fi
 fi
@@ -19209,7 +19175,6 @@ fi
 
 
 
-
 # If nativefile (NAT_FILE) is not set in configure.nat, we link to an
 # empty version.
 
@@ -19841,44 +19806,6 @@ ac_config_files="$ac_config_files gcore"
 
 ac_config_files="$ac_config_files Makefile gdb-gdb.gdb gdb-gdb.py doc/Makefile data-directory/Makefile"
 
-# Transform the name of some programs for the testsuite/lib/pdtrace
-# test tool.
-
-  gdb_ac_transform=`echo "$program_transform_name" | sed -e 's/\\$\\$/\\$/g'`
-  STRIP_TRANSFORM_NAME=`echo strip | sed -e "$gdb_ac_transform"`
-  if test "x$STRIP_TRANSFORM_NAME" = x; then
-     STRIP_TRANSFORM_NAME=strip
-  fi
-
-
-
-  gdb_ac_transform=`echo "$program_transform_name" | sed -e 's/\\$\\$/\\$/g'`
-  READELF_TRANSFORM_NAME=`echo readelf | sed -e "$gdb_ac_transform"`
-  if test "x$READELF_TRANSFORM_NAME" = x; then
-     READELF_TRANSFORM_NAME=readelf
-  fi
-
-
-
-  gdb_ac_transform=`echo "$program_transform_name" | sed -e 's/\\$\\$/\\$/g'`
-  GAS_TRANSFORM_NAME=`echo as | sed -e "$gdb_ac_transform"`
-  if test "x$GAS_TRANSFORM_NAME" = x; then
-     GAS_TRANSFORM_NAME=as
-  fi
-
-
-
-  gdb_ac_transform=`echo "$program_transform_name" | sed -e 's/\\$\\$/\\$/g'`
-  NM_TRANSFORM_NAME=`echo nm | sed -e "$gdb_ac_transform"`
-  if test "x$NM_TRANSFORM_NAME" = x; then
-     NM_TRANSFORM_NAME=nm
-  fi
-
-
-ac_config_files="$ac_config_files testsuite/lib/pdtrace"
-
-ac_config_files="$ac_config_files testsuite/Makefile"
-
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -20608,8 +20535,6 @@ do
     "gdb-gdb.py") CONFIG_FILES="$CONFIG_FILES gdb-gdb.py" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "data-directory/Makefile") CONFIG_FILES="$CONFIG_FILES data-directory/Makefile" ;;
-    "testsuite/lib/pdtrace") CONFIG_FILES="$CONFIG_FILES testsuite/lib/pdtrace" ;;
-    "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -21240,7 +21165,6 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     "depdir":C) $SHELL $ac_aux_dir/mkinstalldirs $DEPDIR ;;
     "nm.h":L) echo > stamp-nmh ;;
     "gcore":F) chmod +x gcore ;;
-    "testsuite/lib/pdtrace":F) chmod +x testsuite/lib/pdtrace ;;
 
   esac
 done # for ac_tag

gdb/configure.ac

@@ -153,31 +153,7 @@ AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escape_dir,
 	      [Directories safe to hold auto-loaded files.])
 AC_MSG_RESULT([$with_auto_load_safe_path])
 
-# Enable shared libraries.
+AC_CONFIG_SUBDIRS(testsuite)
-AC_ARG_ENABLE(shared,
-AS_HELP_STRING([--enable-shared], [build shared libraries [default=yes]]),,
-  enable_shared=yes)
-
-# If we have shared libraries, try to set RPATH_ENVVAR reasonably,
-# such that we can find the shared libraries in the build tree.
-if test $enable_shared = no; then
-  # The variable `RPATH_ENVVAR' itself is not likely to be used on any
-  # platform.
-  RPATH_ENVVAR=RPATH_ENVVAR
-else
-  # The variable `LD_LIBRARY_PATH' is used on most platforms.
-  RPATH_ENVVAR=LD_LIBRARY_PATH
-  # The following exceptions are taken from Libtool 1.4.3.
-  case $host_os in
-    aix*)
-      if test $host_cpu != ia64; then
-        RPATH_ENVVAR=LIBPATH
-      fi ;;
-    darwin* | rhapsody*)
-      RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
-  esac
-fi
-AC_SUBST(RPATH_ENVVAR)
 
 # Check whether to support alternative target configurations
 AC_ARG_ENABLE(targets,
@@ -2195,7 +2171,6 @@ else
   LIBCTF=
   CTF_DEPS=
 fi
-AC_SUBST(enable_libctf)
 AC_SUBST(LIBCTF)
 AC_SUBST(CTF_DEPS)
 
@@ -2261,13 +2236,5 @@ GDB_AC_TRANSFORM([gdb], [GDB_TRANSFORM_NAME])
 GDB_AC_TRANSFORM([gcore], [GCORE_TRANSFORM_NAME])
 AC_CONFIG_FILES([gcore], [chmod +x gcore])
 AC_CONFIG_FILES([Makefile gdb-gdb.gdb gdb-gdb.py doc/Makefile data-directory/Makefile])
-# Transform the name of some programs for the testsuite/lib/pdtrace
-# test tool.
-GDB_AC_TRANSFORM(strip, STRIP_TRANSFORM_NAME)
-GDB_AC_TRANSFORM(readelf, READELF_TRANSFORM_NAME)
-GDB_AC_TRANSFORM(as, GAS_TRANSFORM_NAME)
-GDB_AC_TRANSFORM(nm, NM_TRANSFORM_NAME)
-AC_CONFIG_FILES([testsuite/lib/pdtrace], [chmod +x testsuite/lib/pdtrace])
-AC_CONFIG_FILES([testsuite/Makefile])
 
 AC_OUTPUT

gdb/testsuite/Makefile.in

@@ -348,14 +348,17 @@ clean mostlyclean:
 
 distclean maintainer-clean realclean: clean
 	-rm -f *~ core
-	-rm -f Makefile *-init.exp
+	-rm -f Makefile config.status *-init.exp
 	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
 
-Makefile : Makefile.in ../config.status $(host_makefile_frag)
+Makefile : Makefile.in config.status $(host_makefile_frag)
-	cd .. && $(SHELL) ./config.status testsuite/Makefile
+	$(SHELL) config.status Makefile
 
-lib/pdtrace: pdtrace.in ../config.status
+lib/pdtrace: pdtrace.in config.status
-	cd .. && $(SHELL) ./config.status testsuite/lib/pdtrace
+	$(SHELL) config.status lib/pdtrace
+
+config.status: configure
+	$(SHELL) config.status --recheck
 
 TAGS: force
 	find $(srcdir) -name '*.exp' -print | \

gdb/testsuite/aclocal.m4

@@ -0,0 +1,37 @@
+m4_include(../../config/acx.m4)
+m4_include(../../config/override.m4)
+m4_include(../../config/enable.m4)
+m4_include(../transform.m4)
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 7
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])

gdb/testsuite/configure.ac

@@ -0,0 +1,99 @@
+#                                                       -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+# Copyright 2002-2021 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+AC_INIT
+AC_CONFIG_SRCDIR([gdb.base])
+
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
+ACX_NONCANONICAL_TARGET
+
+# Enable gdbtk.
+AC_ARG_ENABLE(gdbtk,
+[  --enable-gtk            enable gdbtk graphical user interface (GUI)],,
+  [if test -d $srcdir/../gdbtk && test -d $srcdir/gdb.gdbtk; then
+    enable_gdbtk=yes
+  else
+    enable_gdbtk=no
+  fi])
+# We unconditionally disable gdbtk tests on selected platforms.
+case $host_os in
+  go32* | windows*)
+    enable_gdbtk=no ;;
+esac
+
+# Add gdbtk tests when appropriate.
+if test $enable_gdbtk = yes; then
+   AC_CONFIG_SUBDIRS(gdb.gdbtk)
+fi
+
+GCC_ENABLE([libctf], [yes], [], [Handle .ctf type-info sections])
+AC_SUBST(enable_libctf)
+
+# Enable shared libraries.
+AC_ARG_ENABLE(shared,
+[  --enable-shared         build shared libraries [deault=yes]],,
+  enable_shared=yes)
+
+# If we have shared libraries, try to set RPATH_ENVVAR reasonably,
+# such that we can find the shared libraries in the build tree.
+if test $enable_shared = no; then
+  # The variable `RPATH_ENVVAR' itself is not likely to be used on any
+  # platform.
+  RPATH_ENVVAR=RPATH_ENVVAR
+else
+  # The variable `LD_LIBRARY_PATH' is used on most platforms.
+  RPATH_ENVVAR=LD_LIBRARY_PATH
+  # The following exceptions are taken from Libtool 1.4.3.
+  case $host_os in
+    aix*)
+      if test $host_cpu != ia64; then
+        RPATH_ENVVAR=LIBPATH
+      fi ;;
+    darwin* | rhapsody*)
+      RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
+  esac
+fi
+AC_SUBST(RPATH_ENVVAR)
+
+AC_CHECK_HEADERS(pthread.h)
+
+AC_EXEEXT
+
+if test "${build}" = "${host}" -a "${host}" = "${target}"; then
+   case "${host}" in
+     *gnu*)
+       EXTRA_RULES=read1
+       ;;
+   esac
+fi
+AC_SUBST(EXTRA_RULES)
+
+# Transform the name of some programs and generate the lib/pdtrace
+# test tool.
+AC_ARG_PROGRAM
+GDB_AC_TRANSFORM(strip, STRIP_TRANSFORM_NAME)
+GDB_AC_TRANSFORM(readelf, READELF_TRANSFORM_NAME)
+GDB_AC_TRANSFORM(as, GAS_TRANSFORM_NAME)
+GDB_AC_TRANSFORM(nm, NM_TRANSFORM_NAME)
+AC_CONFIG_FILES([lib/pdtrace], [chmod +x lib/pdtrace])
+AC_CONFIG_FILES([Makefile])
+
+AC_OUTPUT