From efd82ac7cb6af0b85efd6f105bae8923b913583d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 22 Apr 2021 19:51:54 -0600 Subject: Require GNU make GDB has required GNU make for quite some time, and this patch applies this approach to the sim as well. Requiring GNU make means that automatic dependency tracking can be simple and reliable, and it also makes other refactorings simpler. sim/ChangeLog 2021-04-22 Tom Tromey * m4/sim_ac_common.m4 (SIM_AC_COMMON): Don't check for make. sim/aarch64/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/arm/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/avr/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/bfin/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/common/ChangeLog 2021-04-22 Tom Tromey * Make-common.in: Require GNU make. sim/cr16/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/cris/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/d10v/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/erc32/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/example-synacor/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/frv/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/ft32/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/h8300/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/iq2000/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/lm32/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/m32c/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/m32r/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/m68hc11/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/mcore/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/microblaze/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/mips/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/mn10300/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/moxie/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/msp430/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/or1k/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/pru/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/riscv/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/rl78/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/rx/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/sh/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. sim/v850/ChangeLog 2021-04-22 Tom Tromey * configure: Rebuild. --- sim/or1k/ChangeLog | 4 ++++ sim/or1k/configure | 69 ++---------------------------------------------------- 2 files changed, 6 insertions(+), 67 deletions(-) (limited to 'sim/or1k') diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog index 8e1a543..c2fe690 100644 --- a/sim/or1k/ChangeLog +++ b/sim/or1k/ChangeLog @@ -1,3 +1,7 @@ +2021-04-22 Tom Tromey + + * configure: Rebuild. + 2021-04-21 Mike Frysinger * aclocal.m4: Regenerate. diff --git a/sim/or1k/configure b/sim/or1k/configure index e8d5266..56c80b51e 100755 --- a/sim/or1k/configure +++ b/sim/or1k/configure @@ -681,9 +681,6 @@ INCINTL LIBINTL_DEP LIBINTL USE_NLS -GMAKE_FALSE -GMAKE_TRUE -MAKE CCDEPMODE DEPDIR am__leading_dot @@ -7229,64 +7226,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type fi -# Check for the 'make' the user wants to use. -for ac_prog in make -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MAKE+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$MAKE"; then - ac_cv_prog_MAKE="$MAKE" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_MAKE="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -MAKE=$ac_cv_prog_MAKE -if test -n "$MAKE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5 -$as_echo "$MAKE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$MAKE" && break -done - -MAKE_IS_GNU= -case "`$MAKE --version 2>&1 | sed 1q`" in - *GNU*) - MAKE_IS_GNU=yes - ;; -esac - if test "$MAKE_IS_GNU" = yes; then - GMAKE_TRUE= - GMAKE_FALSE='#' -else - GMAKE_TRUE='#' - GMAKE_FALSE= -fi - - ALL_LINGUAS= # If we haven't got the data from the intl directory, # assume NLS is disabled. @@ -11263,7 +11202,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11266 "configure" +#line 11205 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11369,7 +11308,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11372 "configure" +#line 11311 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12393,10 +12332,6 @@ LTLIBOBJS=$ac_ltlibobjs -if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then - as_fn_error $? "conditional \"GMAKE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then as_fn_error $? "conditional \"PLUGINS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 -- cgit v1.1