From: Jan Beulich Date: Tue, 7 Jun 2022 08:24:53 +0000 (+0200) Subject: Revert "configure: arrange to use appropriate objcopy" X-Git-Tag: basepoints/gcc-14~6204 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cef3f69c2f4cbc05aa3ec00f2fdbacfa8ca1d303;p=thirdparty%2Fgcc.git Revert "configure: arrange to use appropriate objcopy" This reverts commit 6124f4248888484f419671f4f7bd40d253d3de06. It lacks pieces to work with system binutils. --- diff --git a/gcc/Makefile.in b/gcc/Makefile.in index eea996c6c9b..b6dcc45a58a 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -499,7 +499,6 @@ RANLIB_FOR_TARGET := $(shell \ ORIGINAL_LD_FOR_TARGET = @ORIGINAL_LD_FOR_TARGET@ ORIGINAL_NM_FOR_TARGET = @ORIGINAL_NM_FOR_TARGET@ NM_FOR_TARGET = ./nm -ORIGINAL_OBJCOPY_FOR_TARGET = @ORIGINAL_OBJCOPY_FOR_TARGET@ STRIP_FOR_TARGET := $(shell \ if [ -f $(objdir)/../binutils/strip-new ] ; then \ echo $(objdir)/../binutils/strip-new ; \ diff --git a/gcc/configure b/gcc/configure index a52574d02b5..f43dc989d02 100755 --- a/gcc/configure +++ b/gcc/configure @@ -731,8 +731,6 @@ gcc_cv_dsymutil gcc_cv_otool gcc_cv_readelf gcc_cv_objdump -ORIGINAL_OBJCOPY_FOR_TARGET -gcc_cv_objcopy ORIGINAL_NM_FOR_TARGET gcc_cv_nm ORIGINAL_LD_GOLD_FOR_TARGET @@ -23438,83 +23436,6 @@ case "$ORIGINAL_NM_FOR_TARGET" in ;; esac -# Figure out what objcopy we will be using. -if ${gcc_cv_objcopy+:} false; then : - -else - -if test -f $gcc_cv_binutils_srcdir/configure.ac \ - && test -f ../binutils/Makefile \ - && test x$build = x$host; then - gcc_cv_objcopy=../binutils/objcopy$build_exeext -elif test -x objcopy$build_exeext; then - gcc_cv_objcopy=./objcopy$build_exeext -elif ( set dummy $OBJCOPY_FOR_TARGET; test -x $2 ); then - gcc_cv_objcopy="$OBJCOPY_FOR_TARGET" -else - # Extract the first word of "$OBJCOPY_FOR_TARGET", so it can be a program name with args. -set dummy $OBJCOPY_FOR_TARGET; 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_path_gcc_cv_objcopy+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $gcc_cv_objcopy in - [\\/]* | ?:[\\/]*) - ac_cv_path_gcc_cv_objcopy="$gcc_cv_objcopy" # Let the user override the test with a path. - ;; - *) - 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_path_gcc_cv_objcopy="$as_dir/$ac_word$ac_exec_ext" - $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 - - ;; -esac -fi -gcc_cv_objcopy=$ac_cv_path_gcc_cv_objcopy -if test -n "$gcc_cv_objcopy"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_objcopy" >&5 -$as_echo "$gcc_cv_objcopy" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what objcopy to use" >&5 -$as_echo_n "checking what objcopy to use... " >&6; } -if test "$gcc_cv_objcopy" = ../binutils/objcopy$build_exeext; then - # Single tree build which includes binutils. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: newly built objcopy" >&5 -$as_echo "newly built objcopy" >&6; } - in_tree_objcopy=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_objcopy" >&5 -$as_echo "$gcc_cv_objcopy" >&6; } - in_tree_objcopy=no -fi - -ORIGINAL_OBJCOPY_FOR_TARGET=$gcc_cv_objcopy - -case "$ORIGINAL_OBJCOPY_FOR_TARGET" in - ./objcopy | ./objcopy$build_exeext) ;; - *) ac_config_files="$ac_config_files objcopy:exec-tool.in" - ;; -esac # Figure out what objdump we will be using. if ${gcc_cv_objdump+:} false; then : @@ -33293,7 +33214,6 @@ do "as") CONFIG_FILES="$CONFIG_FILES as:exec-tool.in" ;; "collect-ld") CONFIG_FILES="$CONFIG_FILES collect-ld:exec-tool.in" ;; "nm") CONFIG_FILES="$CONFIG_FILES nm:exec-tool.in" ;; - "objcopy") CONFIG_FILES="$CONFIG_FILES objcopy:exec-tool.in" ;; "dsymutil") CONFIG_FILES="$CONFIG_FILES dsymutil:exec-tool.in" ;; "clearcap.map") CONFIG_LINKS="$CONFIG_LINKS clearcap.map:${srcdir}/config/$clearcap_map" ;; "$all_outputs") CONFIG_FILES="$CONFIG_FILES $all_outputs" ;; @@ -33929,7 +33849,6 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} "as":F) chmod +x as ;; "collect-ld":F) chmod +x collect-ld ;; "nm":F) chmod +x nm ;; - "objcopy":F) chmod +x objcopy ;; "dsymutil":F) chmod +x dsymutil ;; "default":C) case ${CONFIG_HEADERS} in diff --git a/gcc/configure.ac b/gcc/configure.ac index 5fe826aa4eb..80bdd8ceef9 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2815,36 +2815,6 @@ case "$ORIGINAL_NM_FOR_TARGET" in *) AC_CONFIG_FILES(nm:exec-tool.in, [chmod +x nm]) ;; esac -# Figure out what objcopy we will be using. -AS_VAR_SET_IF(gcc_cv_objcopy,, [ -if test -f $gcc_cv_binutils_srcdir/configure.ac \ - && test -f ../binutils/Makefile \ - && test x$build = x$host; then - gcc_cv_objcopy=../binutils/objcopy$build_exeext -elif test -x objcopy$build_exeext; then - gcc_cv_objcopy=./objcopy$build_exeext -elif ( set dummy $OBJCOPY_FOR_TARGET; test -x $[2] ); then - gcc_cv_objcopy="$OBJCOPY_FOR_TARGET" -else - AC_PATH_PROG(gcc_cv_objcopy, $OBJCOPY_FOR_TARGET) -fi]) - -AC_MSG_CHECKING(what objcopy to use) -if test "$gcc_cv_objcopy" = ../binutils/objcopy$build_exeext; then - # Single tree build which includes binutils. - AC_MSG_RESULT(newly built objcopy) - in_tree_objcopy=yes -else - AC_MSG_RESULT($gcc_cv_objcopy) - in_tree_objcopy=no -fi - -ORIGINAL_OBJCOPY_FOR_TARGET=$gcc_cv_objcopy -AC_SUBST(ORIGINAL_OBJCOPY_FOR_TARGET) -case "$ORIGINAL_OBJCOPY_FOR_TARGET" in - ./objcopy | ./objcopy$build_exeext) ;; - *) AC_CONFIG_FILES(objcopy:exec-tool.in, [chmod +x objcopy]) ;; -esac # Figure out what objdump we will be using. AS_VAR_SET_IF(gcc_cv_objdump,, [ diff --git a/gcc/exec-tool.in b/gcc/exec-tool.in index 3a0fefa70c9..cf7222745fb 100644 --- a/gcc/exec-tool.in +++ b/gcc/exec-tool.in @@ -17,7 +17,7 @@ # along with GCC; see the file COPYING3. If not see # . -# Invoke as, ld, nm, or objcopy from the build tree. +# Invoke as, ld or nm from the build tree. ORIGINAL_AS_FOR_TARGET="@ORIGINAL_AS_FOR_TARGET@" ORIGINAL_LD_FOR_TARGET="@ORIGINAL_LD_FOR_TARGET@" @@ -25,7 +25,6 @@ ORIGINAL_LD_BFD_FOR_TARGET="@ORIGINAL_LD_BFD_FOR_TARGET@" ORIGINAL_LD_GOLD_FOR_TARGET="@ORIGINAL_LD_GOLD_FOR_TARGET@" ORIGINAL_PLUGIN_LD_FOR_TARGET="@ORIGINAL_PLUGIN_LD_FOR_TARGET@" ORIGINAL_NM_FOR_TARGET="@ORIGINAL_NM_FOR_TARGET@" -ORIGINAL_OBJCOPY_FOR_TARGET="@ORIGINAL_OBJCOPY_FOR_TARGET@" ORIGINAL_DSYMUTIL_FOR_TARGET="@ORIGINAL_DSYMUTIL_FOR_TARGET@" exeext=@host_exeext@ fast_install=@enable_fast_install@ @@ -73,11 +72,6 @@ case "$invoked" in prog=nm-new$exeext dir=binutils ;; - objcopy) - original=$ORIGINAL_OBJCOPY_FOR_TARGET - prog=objcopy$exeext - dir=binutils - ;; dsymutil) original=$ORIGINAL_DSYMUTIL_FOR_TARGET # We do not build this in tree - but still want to be able to execute