yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sim: testsuite: delete configure script

Browse Source 
Now that we've moved all ports to dejagnu & testsuite/sim/, the only
thing the testsuite/configure script has been doing is filling in the
sim_arch field in the testsuite/Makefile.  We can simply let the top
sim/configure script do that for us now.  This simplifies & speeds up
the build a bit by killing an entire configure script.
This commit is contained in:
Mike Frysinger 2021-01-05 03:38:51 -05:00
parent 29fd199ed8
commit bb3eddb5bd
7 changed files with 27 additions and 3133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sim/ChangeLog
View File

@ -1,3 +1,10 @@
2021-01-15 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete AC_CONFIG_SUBDIRS(testsuite) call.
Add AC_CONFIG_FILES([Makefile testsuite/Makefile]) call.
Drop argument to AC_OUTPUT.
* configure: Regenerate.
2021-01-12 Mike Frysinger <vapier@gentoo.org> 2021-01-12 Mike Frysinger <vapier@gentoo.org>
* README-HACKING (SIM_RUN_OBJS): Delete. * README-HACKING (SIM_RUN_OBJS): Delete.

16
sim/configure vendored
View File

@ -695,7 +695,6 @@ erc32
ppc ppc
ft32 ft32
v850 v850
testsuite
igen' igen'
# Initialize some variables set by options. # Initialize some variables set by options.
@ -3906,17 +3905,13 @@ subdirs="$subdirs aarch64"
esac esac
if test x"${sim_arch}" != x; then if test "$sim_igen" = yes; then
subdirs="$subdirs testsuite" subdirs="$subdirs igen"
if test "$sim_igen" = yes; then fi
subdirs="$subdirs igen"
fi
fi
fi fi
ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files Makefile testsuite/Makefile"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
@ -4625,6 +4620,7 @@ for ac_config_target in $ac_config_targets
do do
case $ac_config_target in case $ac_config_target in
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac esac
@ -5224,5 +5220,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi fi
exit 0

16
sim/configure.ac
View File

@ -42,15 +42,11 @@ m4_define([SIM_ARCH], [
AC_CONFIG_SUBDIRS($1) AC_CONFIG_SUBDIRS($1)
]) ])
if test "${enable_sim}" != no; then if test "${enable_sim}" != no; then
sinclude(configure.tgt) sinclude(configure.tgt)
if test x"${sim_arch}" != x; then if test "$sim_igen" = yes; then
AC_CONFIG_SUBDIRS(testsuite) AC_CONFIG_SUBDIRS(igen)
if test "$sim_igen" = yes; then fi
AC_CONFIG_SUBDIRS(igen)
fi
fi
fi fi
AC_OUTPUT(Makefile) AC_CONFIG_FILES([Makefile testsuite/Makefile])
AC_OUTPUT
exit 0

5
sim/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2021-01-15 Mike Frysinger <vapier@gentoo.org>
* configure, configure.ac: Delete.
* Makefile.in (Makefile, config.status): Switch to ../config.status.
2021-01-15 Mike Frysinger <vapier@gentoo.org> 2021-01-15 Mike Frysinger <vapier@gentoo.org>
* configure.ac (target): Delete d10v-*-elf case. * configure.ac (target): Delete d10v-*-elf case.

8
sim/testsuite/Makefile.in
View File

@ -171,11 +171,11 @@ distclean maintainer-clean realclean: clean
done ; \ done ; \
else true; fi else true; fi
Makefile : Makefile.in config.status Makefile : Makefile.in ../config.status
$(SHELL) config.status $(SHELL) ../config.status
config.status: $(srcdir)/configure config.status: $(srcdir)/../configure
$(SHELL) ./config.status --recheck $(SHELL) ../config.status --recheck
# FIXME: Requires --enable-maintainer-mode, which one could add, but # FIXME: Requires --enable-maintainer-mode, which one could add, but
# it's provided by automake. Maybe switch to automake someday. # it's provided by automake. Maybe switch to automake someday.
#$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in #$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in

3092
sim/testsuite/configure vendored
View File

File diff suppressed because it is too large Load Diff

16
sim/testsuite/configure.ac
View File

@ -1,16 +0,0 @@
dnl Process this file file with autoconf to produce a configure script.
dnl This file is a shell script fragment that supplies the information
dnl necessary to tailor a template configure script into the configure
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
AC_INIT(common/bits-tst.c)
CC=${CC-cc}
AC_SUBST(CC)
AC_CONFIG_AUX_DIR(../..)
AC_CANONICAL_SYSTEM
sinclude(../configure.tgt)
AC_OUTPUT(Makefile)