diff options
author | Mike Frysinger <vapier@gentoo.org> | 2021-06-19 22:13:00 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2021-06-19 22:43:56 -0400 |
commit | a979f2a07a7df495199f6477b43a34b781e0443f (patch) | |
tree | 8c8c307ccde1b5f33e1976ab0142ab5afc2e1385 /sim/moxie | |
parent | 54c47dfb68a5e2cfde5fec7224b0f92b12edc42c (diff) | |
download | gdb-a979f2a07a7df495199f6477b43a34b781e0443f.zip gdb-a979f2a07a7df495199f6477b43a34b781e0443f.tar.gz gdb-a979f2a07a7df495199f6477b43a34b781e0443f.tar.bz2 |
sim: unify dtc tool checks
Only one arch uses this currently, but others could too. By moving
it up to the common checks, it'll also let us simplify the moxie code
significantly.
Diffstat (limited to 'sim/moxie')
-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 |
4 files changed, 6 insertions, 98 deletions
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 |