From: H.J. Lu Date: Wed, 10 Sep 2025 12:15:55 +0000 (-0700) Subject: Revert "binutils: Require GNU tail for 'objdump -Wi' test" X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45f3ea0bbb5e19175009aa513612ae2e8e414f43;p=thirdparty%2Fbinutils-gdb.git Revert "binutils: Require GNU tail for 'objdump -Wi' test" This reverts commit 897d8d7bba581e4c1614af5712b730b006f03407. --- diff --git a/binutils/Makefile.am b/binutils/Makefile.am index f1df54ffcaf..1528302ea61 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -208,7 +208,6 @@ check-DEJAGNU: site.exp r=`pwd`; export r; \ LC_ALL=C; export LC_ALL; \ EXPECT=$(EXPECT); export EXPECT; \ - TAIL=$(TAIL); export TAIL; \ runtest=$(RUNTEST); \ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ $$runtest --tool $(DEJATOOL) --srcdir $${srcdir}/testsuite \ diff --git a/binutils/Makefile.in b/binutils/Makefile.in index bad324fb118..549b5a361c8 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -138,7 +138,7 @@ EXTRA_PROGRAMS = srconv$(EXEEXT) sysdump$(EXEEXT) coffdump$(EXEEXT) \ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ - $(top_srcdir)/../bfd/warning.m4 $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../bfd/warning.m4 \ $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/gettext-sister.m4 \ @@ -573,7 +573,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TAIL = @TAIL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -1837,7 +1836,6 @@ check-DEJAGNU: site.exp r=`pwd`; export r; \ LC_ALL=C; export LC_ALL; \ EXPECT=$(EXPECT); export EXPECT; \ - TAIL=$(TAIL); export TAIL; \ runtest=$(RUNTEST); \ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ $$runtest --tool $(DEJATOOL) --srcdir $${srcdir}/testsuite \ diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4 index 5909ff0d361..eb1433a68bd 100644 --- a/binutils/aclocal.m4 +++ b/binutils/aclocal.m4 @@ -1187,7 +1187,6 @@ AC_SUBST([am__untar]) m4_include([../bfd/acinclude.m4]) m4_include([../bfd/warning.m4]) -m4_include([../config/acx.m4]) m4_include([../config/depstand.m4]) m4_include([../config/enable.m4]) m4_include([../config/gettext-sister.m4]) diff --git a/binutils/configure b/binutils/configure index e7fce6858b5..6f54be99066 100755 --- a/binutils/configure +++ b/binutils/configure @@ -656,7 +656,6 @@ zlibdir DEMANGLER_NAME EXEEXT_FOR_BUILD CC_FOR_BUILD -TAIL HDEFINES GENINSRC_NEVER_FALSE GENINSRC_NEVER_TRUE @@ -864,7 +863,6 @@ DEBUGINFOD_CFLAGS DEBUGINFOD_LIBS YACC YFLAGS -TAIL ZSTD_CFLAGS ZSTD_LIBS MSGPACK_CFLAGS @@ -1569,8 +1567,6 @@ Some influential environment variables: YFLAGS The list of arguments that will be passed by default to $YACC. This script will default YFLAGS to the empty string to avoid a default value of `-d' given by some make applications. - TAIL Location of GNU tail. Defaults to the first GNU version of - `tail', `gtail' on PATH. ZSTD_CFLAGS C compiler flags for ZSTD, overriding pkg-config ZSTD_LIBS linker flags for ZSTD, overriding pkg-config MSGPACK_CFLAGS @@ -11085,7 +11081,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11088 "configure" +#line 11084 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11191,7 +11187,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11194 "configure" +#line 11190 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14824,48 +14820,6 @@ fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU tail" >&5 -$as_echo_n "checking for GNU tail... " >&6; } -if ${ac_cv_path_TAIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$TAIL"; then - ac_path_TAIL_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - 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_prog in tail gtail; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_TAIL="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_TAIL" || continue -# Check for GNU $ac_path_TAIL -case `"$ac_path_TAIL" --version 2>&1` in -*GNU*) - ac_cv_path_TAIL=$ac_path_TAIL && ac_path_TAIL_found=:;; -esac - - $ac_path_TAIL_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_TAIL"; then - : - fi -else - ac_cv_path_TAIL=$TAIL -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_TAIL" >&5 -$as_echo "$ac_cv_path_TAIL" >&6; } - TAIL=$ac_cv_path_TAIL - - # Put a plausible default for CC_FOR_BUILD in Makefile. if test -z "$CC_FOR_BUILD"; then if test "x$cross_compiling" = "xno"; then diff --git a/binutils/configure.ac b/binutils/configure.ac index ba1ab4e6d7f..93e8a4b0934 100644 --- a/binutils/configure.ac +++ b/binutils/configure.ac @@ -180,8 +180,6 @@ AC_SUBST(AR) AC_PROG_RANLIB AC_PROG_INSTALL -ACX_PROG_GNU_TAIL - BFD_CC_FOR_BUILD DEMANGLER_NAME=c++filt diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp index 95c09fe2b9c..f3142b10442 100644 --- a/binutils/testsuite/binutils-all/objdump.exp +++ b/binutils/testsuite/binutils-all/objdump.exp @@ -595,14 +595,7 @@ if { ![is_elf_format] } then { send_log "\n" } - if {![info exists env(TAIL)]} { - # If no GNU tail is available, skip this test. - verbose "Need GNU tail for 'objdump -Wi' test" - untested "objdump -Wi" - return - } - - set got [remote_exec host "$env(TAIL) -n +4 tmpdir/objdump.out" "" "/dev/null" "tmpdir/objdump.tail"] + set got [remote_exec host "tail -n +4 tmpdir/objdump.out" "" "/dev/null" "tmpdir/objdump.tail"] set output [remote_upload host tmpdir/objdump.tail] if ![file size $output] then { diff --git a/config/acx.m4 b/config/acx.m4 index 3c4960cedf6..db54ccf1c7c 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -684,16 +684,3 @@ export SHELLOPTS ]) fi ]) - -# ACX_PROG_GNU_TAIL -# -------------------- -# Check for GNU tail. -AC_DEFUN([ACX_PROG_GNU_TAIL], - [AC_ARG_VAR([TAIL], [Location of GNU tail. Defaults to the first - GNU version of `tail', `gtail' on PATH.]) - AC_CACHE_CHECK([for GNU tail], [ac_cv_path_TAIL], - [AC_PATH_PROGS_FEATURE_CHECK([TAIL], [tail gtail], - [_AC_PATH_PROG_FLAVOR_GNU([$ac_path_TAIL], - [ac_cv_path_TAIL=$ac_path_TAIL && ac_path_TAIL_found=:])])]) - TAIL=$ac_cv_path_TAIL -])