From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by sourceware.org (Postfix) with ESMTPS id BCF283857359 for ; Thu, 2 Jun 2022 15:32:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BCF283857359 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2113.outbound.protection.outlook.com [104.47.17.113]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-39-lOF3yUoiPsyrdvDnmY3-pA-1; Thu, 02 Jun 2022 17:32:13 +0200 X-MC-Unique: lOF3yUoiPsyrdvDnmY3-pA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T2lKiHENhC9zb8yV3TCqHX0rbQZ5u0OVs7RbVtJ80oZx14Sbpq7qJF8VIhBka2raLPpfrwPEfjAwdbS82axqYVr5+bjxLopZFyhOtbxpl33hOsaoimlqgDJyg2dHjEMDLUTlOtDEuqVPzFEok9at2wD+TDfMBuuVmGh7u4D1Fy0FpJUkrn6MAWTXmTFd3IoNJNjw6JCVLRWu3sR6JcZAUlq4BYukz9JXd/HGWVB1O25JEanEVhsKd8iLQkfk+bTYNciGxpzfEPf2ppP83OxKSFIfJ30FL/en8ZkpNtj0ilqDYPbyykDT1qRRiAvWwfIZ6YIGkVt9Q8tBhZEb3g9MuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LGj5auJzXRgRbtw5CGB9flvVDqMTkA7m4FEgCaDp9Sc=; b=TrfWBXaj1uiB/3nXz+yNsGYnvtiyb/2eU5/DWFb8LGmirAkFZOQQgPPqMxBOWRfjKLFtTJmfrKxjIIRoPtt20PAMMI3DdkjIMSwQ3VAcJCJsklwhLXtVpMNcTwnRO1TRKHUWwXMjltB5kc9jJ6vj81POVf5VtO4eb0NuUVZueIG1AGrBQ2HBX2Ju2aq85ICuRvnLxWyUcxJ+KFY1BeB3yiW7X5O0B9fiTcJmPChoIB5EqiEICj17ngLrlm1jnsLLnCR8Yx+lA9zzr7rZntl0VGaNgq8MbZbhhCfD2ldmfuFruE0O2sn2R85bR2leVkxXmSd5kgILwQR77KHxKSVXqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by VI1PR04MB3214.eurprd04.prod.outlook.com (2603:10a6:802:6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13; Thu, 2 Jun 2022 15:32:12 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 15:32:12 +0000 Message-ID: <0fddf82b-750a-67b8-028e-ba0a71a35cf6@suse.com> Date: Thu, 2 Jun 2022 17:32:10 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Content-Language: en-US To: "gcc-patches@gcc.gnu.org" Cc: bonzini@gnu.org, neroden@gcc.gnu.org, aoliva@gcc.gnu.org, Ralf.Wildenhues@gmx.de From: Jan Beulich Subject: [PATCH] configure: arrange to use appropriate objcopy Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AM5PR04CA0019.eurprd04.prod.outlook.com (2603:10a6:206:1::32) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ca66f6a0-35cb-4fd1-9aab-08da44ad1031 X-MS-TrafficTypeDiagnostic: VI1PR04MB3214:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gzQpcbIro77V6iJu2ubHlF+x8iW281Ry7JhJkiPhbIRdgH5CZkMRqbLpJzsvkct7tyYss523/Hf0P9P0b8iPa71a4W4B3ZtW+Bzg0yqAJ3cC5HS8Wkn1PuEA9BWRV63E2hXlN9TBiCsqHtb5amqbZfbe3uXGtL7IGlUOHjRWGydhWgx6ibm2zBt1g+90GszmlKYT+qkAZvmMhVKO0zi5kCAIpIz4SYW/8JD5vMic4EfNJi1GZRh5AigmVD1US0yGMl4YBF3wPpP9z4584pZa2enqyKDkDDPvg9rTYMVryFb5/HShcrT/LVEPlZM/DxIfRxFf2A2rHIT58zE/c/FKTXa5TaNOEcB8qNQUOaEf7p12bN4ekCS3rgRpyCSCedWgu1QKnWKUoflWq6t/WoW3bGDGoSRwHzalb+ExdZNr6BKSJIOnJvxf5TicRKdYmJJ79RUNpYKnRg/9zTZ2bu30qSS+bvtXX4V6p6hkwDtwn4sxrUVCrRN81cS/G632XrS7r19A64qQx/liNOHoJAFE+m8wg4XUh6rCHyNCCNS9aO1diKN1gEfhEp6EaxKfA8vQc+Z9akSHyLe2l7REsAkBxb0CWr4Z10IRH3IAZpPX10fE30tv2eJLxWv35gFQjXT2MYLS15KItBn6LU0khQBvSvWjR10JChX7VyJ2sOH1ffCpGhiIlAtQoHN52h5FN6dm18CF7FAPfTGLCc+g4J5xedXMYZ6+vmJfNkQEW5pP0wJ80RcXM4BtPw5j4dyCNuIfq8oGVkiBJVQBTMIxsMYMvOLsxR71RktB9j/D/LcSLyvy3KD2eF8KU242FZS+GN9r X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR04MB6560.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(6512007)(2616005)(31696002)(316002)(26005)(6506007)(66476007)(6486002)(86362001)(66556008)(66946007)(508600001)(6916009)(186003)(83380400001)(5660300002)(2906002)(31686004)(8676002)(4326008)(8936002)(36756003)(38100700002)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YVQxeE53SkJpSm1DR1JJUG12MVdUVGRpRUdyaFV4eEsvRE0rUjh5UTZHM1hj?= =?utf-8?B?M1R2aGxETDlQM0tPcWZMZlNsbFlodUY4N25TOEd3endnZkx0WUlTVm1wV2Z3?= =?utf-8?B?bzRneUNXOEEzZ3dpWWFEcjJ6V29DUjdDaUQrWldweWxDeTlFeXlmVmk4NUd4?= =?utf-8?B?bHJ4SFpQYlNnSmxPUlBDeWQyNzdwanMxM0dQM3pMOW1yMHdMQ1BBeVNhRWtJ?= =?utf-8?B?VnhhZWJ5akYxd3lybzdQU0RLcHRCVkRVYlFSOWV5OHBIVTR0dWpPaktZTmxD?= =?utf-8?B?K28zNSt3YUZmYVdkSG9EU0x2R3laODI5MjQ1WGJzVFk4QlZ4VmZnUWwwWXU0?= =?utf-8?B?RjJ0MWptMmNTdnRPQUdsS2NOcFYrSkliYTB3c1BYMWxkNkdOcXd2Q29hZVBv?= =?utf-8?B?YWEyUGxMUWNwZ0grYk0yZklTS1laaFNSOXhhNmNhY2l0YXd3MUs4VkptYmFz?= =?utf-8?B?czV5eXB3eG9TNmd2RHFHTlV5QVUvK0djejNzOGwvUnlEckxJQ3JiSCtPTTBX?= =?utf-8?B?UnhFaUxEV3JUUDJDcjdLU0YvN2ljMkkweEs1cXFrbVUzUys3b09ZSUlnenZT?= =?utf-8?B?OEJaM2IzUnR1VVhWSENESWtYZE5vSkp5NkIxaTl4UHBwamVTOGd4WHVIdzMy?= =?utf-8?B?TzFveG84UmFOejc0Nm8vcHh0N014dFdocnBaTXRvMzlMaHNOelhYakZ3d2g2?= =?utf-8?B?YXpOdlRxdzE3ZkZ2NnFkdWVoUy9QT0xZMm9XclZkSzR2bmNWMU5JYUV3bGQw?= =?utf-8?B?Zkx3aXVLTmFhQ2FKN3orR3IwbzJLUStVcEVkU3F4V1p3L2dGa0d6K2lZOGR5?= =?utf-8?B?a0hJNEl1RWJ3ZnBMM3VUSXhiUUJCY2ppRHhJeVBOYVozTGt5RnhUbVppeFIx?= =?utf-8?B?UmdsUEJrUU9zdFNqUXQ2dDhMYmdYV1ZiV3Y3aWEyZStMbVdqTEdLR05vbUdZ?= =?utf-8?B?RUJIRFRhL1pTdjVQbldOb3l4akc2TW5HdCt4SDlYWVNxRHk1K1QwamxKcUdi?= =?utf-8?B?Vjl6YjUvM2JvMThpV3E2OG5ZUkkyOFJJM2pSRGVLRndpM3JNMkxxSnRWNEZw?= =?utf-8?B?WVdwQXphbERhS2VWSVduc1U0R0t0VDhiVmpmeVJRWEw5VUI4a2syYVlTL3Rq?= =?utf-8?B?WUp4aGgwSE9Bclo3ZUIyMTRMRU03L01KMDY5Q1hsMXhLTkM1SHVGK3QwbURq?= =?utf-8?B?VElnZEZiOENMY2pUN0pmNi94eEdDUnpjb1dTb0RpcWE4Z1hwN1JveDNObzNx?= =?utf-8?B?amYzL3MyY2ZyazZkWFdiTWpLZy9QLzNweW1PbGhKS2g3cDh5ejZKZFNJNmMv?= =?utf-8?B?eTBMNGFWNlFxVFVvT1ArcHFBR3R2Vlh6bXRqem5FeVZiSlp5UXRBVWJXWFB6?= =?utf-8?B?c3ZFL3hrcDdKL0ZHWC96RjZ0emw3R2RUQWhOa29VUjZWNXBGSUd6TDVVekY1?= =?utf-8?B?ZWJSbkl3bklXWXBnY09tZmcyR2JBWWJCNXlTVmhCaVN4Qm05eTFiZ1p4Ujk0?= =?utf-8?B?WFNMUlNtOTVxNlBKU2pDbml4di9oZmp5d0tjWG14b2o3cDBvRVovS2FSa09z?= =?utf-8?B?bkZFa2NuNllDYnA3elFIR015Z2xVTldXeERUSWxrRTBPQllXNndTbzFwakVa?= =?utf-8?B?dGNXcFhIVGZxZHpqNEwvS3B4TXUxSkE1NDJxRGFpL0NvK1UrUFpEVjZXN0tp?= =?utf-8?B?dEdRM2c3cUxTTW1rdEdvaHZ0V0RmeUUxTlVUT1dSQ2UrSGY2SnBpTE5iUDVQ?= =?utf-8?B?S3dROTk4VnhsSEh2UXJiZ1lHcFlVTmhubkt2TW51SWwyYlpVM05vdFNFL0d0?= =?utf-8?B?YWhCdFBsdkdsSktoR0Q2bURlOE9hN25Hd3FxTzJOYjVDQ21SQ2owTlB1cVNY?= =?utf-8?B?NVRsR21Zck9manN6V0xKMWFPSVhxZVliMHFtNWxUSTRCTy9aVjdsSXVuWDFk?= =?utf-8?B?NmN4VGpxOVhvTnNFMnU2ZzBCZ2F4S1BNRHJjdHdGN3E1SXFBTmxCbEhmalB6?= =?utf-8?B?QWpBbG9vMXVJUERBdjQwZ0Q0WnF5SEUxbEtQbHpjN2RZKyswMHErYVlaeWlX?= =?utf-8?B?ekl5c0RDTUhLK1U0WHp2ZDVJUExaSktUN3hzSmxHMEhHbk04RG5HYUt5Rkw4?= =?utf-8?B?Q2ZXVXVwT0kvTGMwbWJrYlAwVGJQMG5xTGFkQXl6d0JvQnpYSTQrLzY1MGlz?= =?utf-8?B?TUltQzIxZkFqemhyelhtb2pqOTZsb3laOEk2YlE1R3prMW1kaE5ieFp5SUp3?= =?utf-8?B?cm5uTVBsS2tHMkl1MFJZTlcraXhBS2U2b2F0bmhmaVZZbXJndDJjWC9hQXRB?= =?utf-8?B?cHhZZm1jQnN0NmRINUREejJJQkxBc2grVWZ2NHhhNHF6QnRoek81Zz09?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca66f6a0-35cb-4fd1-9aab-08da44ad1031 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 15:32:11.9782 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dP586EgxOx4wpp2RkSxlHHhROg77j1wTxsum77EVtKmq8aSt9FpA4CmELcz6odtuiD0ig2Ye71M8bjf5mucjAg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3214 X-Spam-Status: No, score=-3031.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2022 15:32:21 -0000 Using the system objcopy is wrong when other configure checks have probed a different set of binutils (I've noticed the problem on a system where the base objcopy can't deal with compressed debug sections). Arrange for the matching one to be picked up, first and foremost if an "in tree" one is available, by mirroring respective logic already present for nm. gcc/ * Makefile.in (ORIGINAL_OBJCOPY_FOR_TARGET): New. * configure.ac: Check for objcopy, producing ORIGINAL_OBJCOPY_FOR_TARGET. * configure: Update accordingly. * exec-tool.in (ORIGINAL_OBJCOPY_FOR_TARGET): New. Handle objcopy. --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -499,6 +499,7 @@ 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 ; \ --- a/gcc/configure +++ b/gcc/configure @@ -733,6 +733,8 @@ gcc_cv_readelf gcc_cv_objdump ORIGINAL_NM_FOR_TARGET gcc_cv_nm +ORIGINAL_OBJCOPY_FOR_TARGET +gcc_cv_objcopy ORIGINAL_LD_GOLD_FOR_TARGET ORIGINAL_LD_BFD_FOR_TARGET ORIGINAL_LD_FOR_TARGET @@ -23436,6 +23438,83 @@ 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 : @@ -33176,6 +33255,7 @@ 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" ;; @@ -33811,6 +33891,7 @@ $as_echo "$as_me: executing $ac_file com "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 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2815,6 +2815,36 @@ 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,, [ --- 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 or nm from the build tree. +# Invoke as, ld, nm, or objcopy from the build tree. ORIGINAL_AS_FOR_TARGET="@ORIGINAL_AS_FOR_TARGET@" ORIGINAL_LD_FOR_TARGET="@ORIGINAL_LD_FOR_TARGET@" @@ -25,6 +25,7 @@ ORIGINAL_LD_BFD_FOR_TARGET="@ORIGINAL_LD 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@ @@ -72,6 +73,11 @@ 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