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 2D9963856241 for ; Fri, 6 May 2022 06:54:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2D9963856241 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2168.outbound.protection.outlook.com [104.47.17.168]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-39-NonFqaelNCWpkv7xsevo5w-1; Fri, 06 May 2022 08:54:51 +0200 X-MC-Unique: NonFqaelNCWpkv7xsevo5w-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SIiE/edzg2l1EL2uCQizN0FD8QOJd1/d/dXsqmpagXO8AsgOf8+ZVRCAkNKxEh6UNrF7QofRrgZ4L8Iwu1uFv9nyb2J0nBx8JktDQxqUVEdASTG3CgBBYb9yvq+dXnzdVAaYqFjzrxaG7Zg7cW9I70VEe82houBHw4hcMP5kBcfMTJlU0pscYk/EVQoiRPCs099UsSG+k59Y3d51CrqK7pOx7ojoWpZttzsnt9iNvs6yWpJPqlXImHan3kP1cuc2yZSNiUEs0R0/J46c/VZZbRrkluul3cdNcAy/QmGLrtE0oERPB39pIDiP400aiFTNPwoz+MSc4SfsUp1S/V7bdw== 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=BA4FJHxKq+n66ldr/nNemqeAVlEw5rM+z3Detan8QU4=; b=WqJD7z4WkHnFcVebR4GFmCU0NDmN9rZ3wp4koqRFNdbs3n9MiML1gE4e5mMhhaoFQ2L8wI1+AGBHwJkZpKt6lkyThFoDbFSIVkEI0q3dftKVS0iXsS5b2mj7UiMKKAQOjkP0fzm/ewmKupgFvmSJDHwiJwBBjS4eUn++SjOQP/xhidzfzKZ+rweD3vPLM9Z9X68k31JZqKcGdYfr40rLugg+PSZc7S4EqSJ/3R4xo+Vmfo9Mix3cRx/x3ytD1dH1Zq7WDV3mkRICvcDEcNpzmqZe42vKUqQvNBO2f33iunZHB98v3xGozrNfUd6pfAyvzU/iNyy2kd+ZM+cQwpGSSA== 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 DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) by DB7PR04MB4426.eurprd04.prod.outlook.com (2603:10a6:5:34::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.27; Fri, 6 May 2022 06:54:50 +0000 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::84b:e9d3:8906:8b9c]) by DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::84b:e9d3:8906:8b9c%6]) with mapi id 15.20.5227.018; Fri, 6 May 2022 06:54:50 +0000 Message-ID: Date: Fri, 6 May 2022 08:54:49 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Subject: [PATCH 3/5] COFF/PE: don't leave zero timestamp after objcopy / strip Content-Language: en-US To: Binutils Cc: Dave Korn References: <4242b48a-f2c3-4af2-db1e-35dbbbdc1b2e@suse.com> From: Jan Beulich In-Reply-To: <4242b48a-f2c3-4af2-db1e-35dbbbdc1b2e@suse.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AS9PR06CA0023.eurprd06.prod.outlook.com (2603:10a6:20b:462::28) To DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8e97ccf4-ad82-4fdc-92ac-08da2f2d50d6 X-MS-TrafficTypeDiagnostic: DB7PR04MB4426: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: 6mB131KJUMX96EwoI7Y2z7WMeRAQNJnvEFbGmmPo3NZUZqbIFoi7aYfd0lCtmL9eztxXCMlJ5S+uiqx1ogpPjy/DGMGBRTHs95NnJ5AtwFMyelhQRrClKoIFFW+hwLXfL+QFBovt555ChONDyJq54Qwxn0bMmUniEQbE0nkebtf4PPrNaPAJkE3rQuYqEOXfbylkkOj6w+mXTTOZtWuIC9q4xQp8+ySYHIJhMGywRA5YDzLP9tWqWo/gzc11QN+MrTHbThbVPE6E4djpyNNjdPtyNhwnnmYK4Z2U+T1SWuv2fYixSblsG3oJCycns/pUABj5M7QsU2bBztFamz43jXabhuGw81hoK0UO6OsX9Xz8kEtNbml22I5dCcnNSAxLW7WnGwoGCrUegu1EYCle+uzpK+v6UYlOsZECFdQn9mTfXAt2Mgpr5aB2CU1j2s/nb6o0AiYcMSy2QXXabBXQjbUFPVKwYi7nLqEakgij853r0iuwZr5bBPZ8da9a+V4aLe7R6SsjkVFalCr5MOiSZ+eyz/9zrDuCZRFbWs7N2dG95voFBRvD6SHUcC2+d5uhMWgq5hLItOS6wtZhTXXkIknDwLT7eIbPkLLrg5djfI7D+kTtlrxZneRDlecAAlq2JsA+4M1WqObc5A8q+JhnEgmWFIkDR2VHR/IrLlUuU4f5IrjaS1ip1urcGOjoBk56rJsF3q+WvaHhhJE3hORStAb0akTi9mgHd59PKLHI/MB0tycEb2t5uS971NCxkff0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU2PR04MB8616.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(6506007)(2616005)(6916009)(4744005)(31686004)(8936002)(6512007)(26005)(5660300002)(508600001)(2906002)(6486002)(36756003)(86362001)(66946007)(66556008)(186003)(31696002)(8676002)(66476007)(316002)(38100700002)(4326008)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?V0NSUGI3TzZoRmVPalhub1RHa1hEcGNQTEVBMjlGb2l2MS9EYk1rdzFmZE0z?= =?utf-8?B?dHZKREl0N2x0ckgvUTI5ZXBjUTZOb3FBaU9MK2NiRFh2SWZuS1lYZW9YSDk0?= =?utf-8?B?NEhJdkZkalY1eVFQbnlxRlVSc3VNc1NwTWsrZVNqS1EzclQvaFlXVG9BWUpB?= =?utf-8?B?V1AwZjQ1S1pLNmY1eHpZaUthR1pibTFlUHlsSmhUUkF1dlNtSkdaanJSaTlL?= =?utf-8?B?OHZqamRnTWs4NFZreVl5S0xqUHVEMlFPbnZ6bVg4TU5LS3A4SVlEdWxGN25v?= =?utf-8?B?VXlSN1R1dkxxV3Jka0FFWGs2RGcrUDlNcHZTMTV0QVpnNmRPZ0ZyRHBSMmN5?= =?utf-8?B?UW1EcC9Tc3RacUk5enRubkNUUWthRHFpR1d2WFFmSmZjUHpoNWcxczN0ZGJu?= =?utf-8?B?Z295ZGVDUDhpc1ZEV2hoRmxyK1c2WVFqQ01XUnl4V1Q3SXM3UXQyWmV4K1BY?= =?utf-8?B?K3d5L1VxbWpzSnRxT1NyWUdWVDE5LzVBTTZxZzM5MlpYMjZoM212OUEyaFN6?= =?utf-8?B?NWo4YWo5cTFTamxoR0MzSUF2RUphYmtwRnpBRkRYeHZhaUh1YWxXb2kvWG81?= =?utf-8?B?QUJsN3hFTzdKTG92aC9IbzhTaHJ3K3djMG5yeGsvMmxBQXVGTTN2SlZNUnkr?= =?utf-8?B?WGhZTVNkenNWZ253Z0JNbXpmWVozWENWaHN5OXh6V2RuWS9WOWJ5Ni9CR0dG?= =?utf-8?B?Tk54L0pJK1VhZ21LRklLMi9hTzd3Rm5CdU9qd1FEVHgvcGxzT3hoYVpaQkhR?= =?utf-8?B?SWhZY1JyVGp4NTB5cFNGOHJWVWQ4MXFyeDkxZlhzaGk1eXVDMzJMc3FkUTJl?= =?utf-8?B?YStMQkMrVXpsY0FUWjJsRnVOM2t5amVSaDJlUEg4S0FrT1JtZ1djV1Zsb00z?= =?utf-8?B?ZU0yZi9kem5BbmtiUEQ5MDRhOUdFTWpKdHByM3RmRlBSVkFQL2srMGNITjFq?= =?utf-8?B?TGx0a2JpQ28rQ1BSdEczK0o5YU95MUxBcmc3eDk4YmZxeFEreEdtVlh3RHBt?= =?utf-8?B?NTI2NUU4Z2JFUHFSTkdveUJPY1ZpS01pUGxtRkpTcUdxMXpYU2t3VTIxbEZK?= =?utf-8?B?ZXhHVXZkTitRSWFIa3BvTlJBTDJiaTcxWVU1aE9QVXZSRmwzUzhpaWxZK3FD?= =?utf-8?B?TVpzRkVJZDVweWlKT1ZYeW1DNlRRL0VhaURYQ2pQa004ZDZhSkJYZXNQbWRy?= =?utf-8?B?VHQwWGVSckJwbzJ3eGRGMmtDK0hvUTBHRDY1VXFKbzFEL0NwNjIwS0txeHpn?= =?utf-8?B?VWxERm5NSnROZ2dsbVAweFBBQXhiaG03UUFuVFdsTTZDYnUyK0Z5UmtOK1ln?= =?utf-8?B?THdhL3hIRHF4bElLTGpNTHdFb25WSU1yZjExeEI1NVdWYUNLVlpHa0VTZUVj?= =?utf-8?B?VkI4U2MvbWRwU0lPZGl1Q0pjTVNlZkVxc2Nxc3dwbndGZ2ZlOVRqQ1lLaWNP?= =?utf-8?B?QnBFcmx0VGhtWEt1b3FOVmJQM3FPcE9XMHRQS2swZm9aVWp5cEVMa3VRNlNp?= =?utf-8?B?RDhGUU9WOUc1M25sTUgyaFlZc05VaDFYMmVBK0JpTjJlRTFFa0k5UUptQTcr?= =?utf-8?B?bFpvR0JKUjYvTnRZNWxwOVRGZkVtRVlQc05ybEpFNUF5eTIzeVM2Q2VSdmcz?= =?utf-8?B?cjNleXFpR2xObllFTVNMUkRCa1hoY3Z0VDhmS2g5cWltS2hOMXVZMi8zZDEy?= =?utf-8?B?ZXVEak5aem4xTjNSQ3lhSGV4ZkhSSUJFTzlEMFlVeVhWL1RudGNmYTBON1hG?= =?utf-8?B?OG1mb3M3RnhDSE1JVUF4Y3J0cG11Y2JkOHIyaDRwVTluaDhvSktqL0pPY1p1?= =?utf-8?B?NWxsSFlPclV3dXZmOTVjYjZaUzZZWCtvVFZWZzlWRVFpRVo0MVJuY0x3cGcv?= =?utf-8?B?RFdUKytOZjdDT3RPdWhSeHlkazNjWGVzWnBCQjE2KzVRbG5MbEgrak9uWFZD?= =?utf-8?B?T1RlNFVWb2dxZlVCOGk0WUx3eG1iT3ptWUxxZUtjdFVFZU04d1VwdDcvRFZB?= =?utf-8?B?alo5b0Z2emMrNnJnN1dRdXZCUzJEOGMzMXR3SHpBQW5FWDFxaExNT0dzRFRq?= =?utf-8?B?UjFDZDhPY01uM3R4c0NyTlZZZHdpRzZaQXA0bjdIbmZHN1g0bXlMYzBQZ1pQ?= =?utf-8?B?T2JnSHFMakJUdXp4SHJkaExoWUZyanJSN3NNbE5sU1hZMUVzZzQ5YmRsazhM?= =?utf-8?B?aWpMWHBnem0zMG5UMmgwM0hqNGdmN3ZZWUl3RWtxdDNGSFdRbjNGNkRMQXdk?= =?utf-8?B?MEVCc25RbEZzMWhXbTZZVkpZV3dkcjRkcW1oZEoyWXBIeXRJdGRYd2ZWSmVZ?= =?utf-8?B?dlF6enBaWllOR2kvRkk4NWMrRHhFWDlyTFR1TnpYSnhzakltMmJSQT09?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e97ccf4-ad82-4fdc-92ac-08da2f2d50d6 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8616.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2022 06:54:50.3557 (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: WkG7bkE3AeefwFJtr1UhGfcfO5lFi45Fpn4UfZRCLpaMjXmasfejdeAWgnebj5Mh39vofDc/t0RGykrvcAY6cw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4426 X-Spam-Status: No, score=-3031.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 May 2022 06:54:54 -0000 Fill the timestamp field suitably for _bfd_XXi_only_swap_filehdr_out(). Instead of re-arranging the present if(), fold this logic with that of copying the optional header. --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -2747,7 +2747,14 @@ copy_object (bfd *ibfd, bfd *obfd, const /* Copy PE parameters before changing them. */ if (bfd_get_flavour (ibfd) == bfd_target_coff_flavour && bfd_pei_p (ibfd)) - pe->pe_opthdr = pe_data (ibfd)->pe_opthdr; + { + pe->pe_opthdr = pe_data (ibfd)->pe_opthdr; + + if (preserve_dates) + pe->timestamp = pe_data (ibfd)->coff.timestamp; + else + pe->timestamp = -1; + } if (pe_file_alignment != (bfd_vma) -1) pe->pe_opthdr.FileAlignment = pe_file_alignment; @@ -2793,11 +2800,6 @@ copy_object (bfd *ibfd, bfd *obfd, const file_alignment, section_alignment); } - - if (preserve_dates - && bfd_get_flavour (ibfd) == bfd_target_coff_flavour - && bfd_pei_p (ibfd)) - pe->timestamp = pe_data (ibfd)->coff.timestamp; } free (isympp);