diff options
| -rw-r--r-- | sim/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/Makefile.in | 1 | ||||
| -rw-r--r-- | sim/arch-subdir.mk.in | 1 | ||||
| -rwxr-xr-x | sim/configure | 98 | ||||
| -rw-r--r-- | sim/m4/sim_ac_toolchain.m4 | 2 | ||||
| -rw-r--r-- | sim/moxie/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/moxie/Makefile.in | 2 | ||||
| -rwxr-xr-x | sim/moxie/configure | 94 | ||||
| -rw-r--r-- | sim/moxie/configure.ac | 2 |
9 files changed, 112 insertions, 100 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog index 67304f5..c22f9b3 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,5 +1,11 @@ 2021-06-19 Mike Frysinger <vapier@gentoo.org> + * arch-subdir.mk.in (DTC): Define. + * m4/sim_ac_toolchain.m4: Call AC_CHECK_TOOL. + * configure, Makefile.in: Regenerate. + +2021-06-19 Mike Frysinger <vapier@gentoo.org> + * arch-subdir.mk.in: Move intl vars from common/Make-common.in. * m4/sim_ac_common.m4: Move ZW_GNU_GETTEXT_SISTER_DIR call ... * m4/sim_ac_platform.m4: ... here. diff --git a/sim/Makefile.in b/sim/Makefile.in index c912db9..9ba3471 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -645,6 +645,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ +DTC = @DTC@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in index 8128a27..5f59f88 100644 --- a/sim/arch-subdir.mk.in +++ b/sim/arch-subdir.mk.in @@ -39,6 +39,7 @@ LDFLAGS = @LDFLAGS@ AR = @AR@ AR_FLAGS = rc RANLIB = @RANLIB@ +DTC = @DTC@ DEPMODE = @CCDEPMODE@ DEPDIR = @DEPDIR@ diff --git a/sim/configure b/sim/configure index 1b56b62..9f84c4f 100755 --- a/sim/configure +++ b/sim/configure @@ -719,6 +719,7 @@ CFLAGS_FOR_BUILD RANLIB_FOR_BUILD CC_FOR_BUILD AR_FOR_BUILD +DTC INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM @@ -4409,6 +4410,99 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dtc", so it can be a program name with args. +set dummy ${ac_tool_prefix}dtc; 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_DTC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DTC"; then + ac_cv_prog_DTC="$DTC" # 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_DTC="${ac_tool_prefix}dtc" + $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 +DTC=$ac_cv_prog_DTC +if test -n "$DTC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DTC" >&5 +$as_echo "$DTC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DTC"; then + ac_ct_DTC=$DTC + # Extract the first word of "dtc", so it can be a program name with args. +set dummy dtc; 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_ac_ct_DTC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DTC"; then + ac_cv_prog_ac_ct_DTC="$ac_ct_DTC" # 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_ac_ct_DTC="dtc" + $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 +ac_ct_DTC=$ac_cv_prog_ac_ct_DTC +if test -n "$ac_ct_DTC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DTC" >&5 +$as_echo "$ac_ct_DTC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DTC" = x; then + DTC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DTC=$ac_ct_DTC + fi +else + DTC="$ac_cv_prog_DTC" +fi + + if test "x$cross_compiling" = "xno"; then : "${AR_FOR_BUILD:=\$(AR)}" : "${CC_FOR_BUILD:=\$(CC)}" @@ -11938,7 +12032,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11941 "configure" +#line 12035 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12044,7 +12138,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12047 "configure" +#line 12141 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/m4/sim_ac_toolchain.m4 b/sim/m4/sim_ac_toolchain.m4 index 2f1a428..47b9928 100644 --- a/sim/m4/sim_ac_toolchain.m4 +++ b/sim/m4/sim_ac_toolchain.m4 @@ -24,6 +24,8 @@ AC_C_BIGENDIAN AC_ARG_PROGRAM AC_PROG_INSTALL +AC_CHECK_TOOL(DTC, dtc) + dnl Setup toolchain settings for build-time tools.. if test "x$cross_compiling" = "xno"; then : "${AR_FOR_BUILD:=\$(AR)}" diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog index e30f9e1..10d0086 100644 --- a/sim/moxie/ChangeLog +++ b/sim/moxie/ChangeLog @@ -1,5 +1,11 @@ 2021-06-19 Mike Frysinger <vapier@gentoo.org> + * Makefile.in (DTC): Delete. + * configure.ac: Delete AC_CHECK_TOOL call. + * configure: Regenerate. + +2021-06-19 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in index bd58074..eed4d1c 100644 --- a/sim/moxie/Makefile.in +++ b/sim/moxie/Makefile.in @@ -17,8 +17,6 @@ ## COMMON_PRE_CONFIG_FRAG -DTC = @DTC@ - dtbdir = @datadir@/gdb/dtb SIM_OBJS = \ diff --git a/sim/moxie/configure b/sim/moxie/configure index 277b4e2..653a48f 100755 --- a/sim/moxie/configure +++ b/sim/moxie/configure @@ -590,7 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -DTC MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -1750,99 +1749,6 @@ fi -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dtc", so it can be a program name with args. -set dummy ${ac_tool_prefix}dtc; 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_DTC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DTC"; then - ac_cv_prog_DTC="$DTC" # 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_DTC="${ac_tool_prefix}dtc" - $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 -DTC=$ac_cv_prog_DTC -if test -n "$DTC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DTC" >&5 -$as_echo "$DTC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DTC"; then - ac_ct_DTC=$DTC - # Extract the first word of "dtc", so it can be a program name with args. -set dummy dtc; 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_ac_ct_DTC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DTC"; then - ac_cv_prog_ac_ct_DTC="$ac_ct_DTC" # 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_ac_ct_DTC="dtc" - $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 -ac_ct_DTC=$ac_cv_prog_ac_ct_DTC -if test -n "$ac_ct_DTC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DTC" >&5 -$as_echo "$ac_ct_DTC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DTC" = x; then - DTC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DTC=$ac_ct_DTC - fi -else - DTC="$ac_cv_prog_DTC" -fi - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" diff --git a/sim/moxie/configure.ac b/sim/moxie/configure.ac index c7475b7..08bf6ff 100644 --- a/sim/moxie/configure.ac +++ b/sim/moxie/configure.ac @@ -4,6 +4,4 @@ AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) SIM_AC_COMMON -AC_CHECK_TOOL(DTC, dtc) - SIM_AC_OUTPUT |