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.111.102]) by sourceware.org (Postfix) with ESMTPS id 746433858434 for ; Wed, 5 Jan 2022 11:14:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 746433858434 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2112.outbound.protection.outlook.com [104.47.17.112]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-30-VAOTZKoMOwSPrBAxx9rDsg-1; Wed, 05 Jan 2022 12:14:44 +0100 X-MC-Unique: VAOTZKoMOwSPrBAxx9rDsg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JeHAei4yyeRX772dNxDAenINDlafrOC6ZkJ6ZzSreX7RQrVOgEcFkVly94RAYm4A2THJLoW0m+Le53Cy9FSCOTjKQwayUQxNFr5i1R8M9Sch44P0+Je+YiPrJF5l8YokZ/vr3QgwVYN0ixVGJd2h7X8fCXW2x/ozbEvBo+ZHyk38vAhK3f8eY+/UowlZOfk0LKi3DAZqAr//GeEUpHMcFZEaosSQ+6Jdy5lI6PvJeJ9OwMOextSNm+G9DYAXmSXMfBtJS2/kWpAmte3ueF2JjBGQqedjeSSsrjLed5zfY5hyIER4zI5sMJma1vp2cYr5nUsOv+WsvEyUsQZg/Qx7cw== 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=uwDdWalCQkFpbKZDrzRMGCB8oHxhIP4R2xHp7mXaez8=; b=cemMpONjv2rKWgUfaOcqMH1BgG6zZuEe4mpP3eAmiLrqPOcGG0ihKNlBEgQQJUbUk+zudt+/d+df7Ng1fbdQfmgUEVjlONa9i0EUH0yMat4fcibqQ7ki2DrooyS8m9Uo0bx2Oi9SjKB+U3TGMcFgeGyqxnAlDzHZYGv+witSGOWCWV1CdSP+8LtXJO3txgC0+I9VLgzQX8AH3RbYTUWrTNgWlc/BBqZBFFoPD84oBn/+uGNOcmVWNsxAe3fXQwWsFukd+6gxfCYCOQ4QFWv6hJPnt4pIWsCvaHQ9s58ry3G9zvb4aZHTxO5bYG/eG1gsi3kjKalmxWGzKEK7tcRUtg== 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 VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB4383.eurprd04.prod.outlook.com (2603:10a6:803:6b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Wed, 5 Jan 2022 11:14:42 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe%6]) with mapi id 15.20.4844.016; Wed, 5 Jan 2022 11:14:42 +0000 Message-ID: Date: Wed, 5 Jan 2022 12:14:40 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Content-Language: en-US To: Binutils From: Jan Beulich Subject: [PATCH] x86-64: restrict PC32 -> PLT32 conversion Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR2P281CA0025.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::12) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 634cacfc-45b7-441b-20dc-08d9d03c9229 X-MS-TrafficTypeDiagnostic: VI1PR04MB4383:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UPUxmUZJAsrUxKR/HvUeZVByU9uzFFq0nasA9ezez9oHTlhEUqDyFRfLLgwv1p1gKCzpLlus/15v7wyJzqAkkuIUsHGEzKBqTI+aP4n1lZtP5JOBF/jQvZncipNCbSa7IQ5jkQf4UloNynkj5hj3/L4a1kWgtd9myjzjestAsDCnTM6YEkb0VQJUQIGi4huCm/sPqaJyi1Kpr8xIY5hQqfx5oe2MXK9U1iYT4hf2db0GXWCebySW/n8jOc7ZvNLXzo9pTMlglq4yMpMe3YbcY3uRseErdHHw7ECxePxQdLBp7Nv25LxmKCeQgcVlXZzhM8KzoTAVSrfRx/qvzKaTGg8C9rCcm1jU7Ae/E4X/sL2TnIZI8VaUgojoUoofraleYXRCFmzBRix03cZItCtGTQ1KaJLc2yRqD26kOEwNY9OE/FWUAIv+r+0u0mGN3kd7Ac9PGYH4Z70FO7ji1crESmYSPEvnsLZR6Kiu+OICwkZ29nGxcweIh5p+qp4oJvZgYyNj80zVJ/wrGGmLil+G4kQgwLyzmnUM+SRi+C4sg2dAPgrL1syX7NUtGNLRbsbInoshP6pfXkh8Z0YPIGLM49uxjMC7zPszKgAZk/9srDCaU3oiQLoTiKQDUSposzWjDpYGlw7OE54unzFms/Vx6DU67KSnUBRbRHlEZS3MHJnz7SHcJ9pUvR6jMdIZE3/SsBD+U4iCrTHoZm0Qk0Hi7RU/jo9d9BSqUe1QpJuWJnc= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5600.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(316002)(38100700002)(26005)(6916009)(508600001)(6512007)(2616005)(66556008)(66946007)(66476007)(83380400001)(186003)(86362001)(5660300002)(8936002)(4326008)(8676002)(31696002)(2906002)(36756003)(31686004)(6506007)(6486002)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YzRNamt6djFIamdnNWJacHdtNk9JMlY5RFF4UDFQY2JLQVdYSnFUNjlIajQ5?= =?utf-8?B?cHZTZExHNmkrN2s1L1VWVlI1eXV2eEo1bUQ3eitZczgvdDlqT3k4TjBZZW1t?= =?utf-8?B?K0ZUY3FYZlFkbGQ0K1R6dnNXTFpnQ2lqOUh2WXpiLzNoR3BOUjh5SVcyMWtz?= =?utf-8?B?cUxNWDhUNDhWN2NqWmNmK3RJM0lHUlE0UXlnSWVUVzJhS2VUTmVRQzYxaTNY?= =?utf-8?B?T2o3QzNDcmNCV2s2UXJEcmZWOTRYcWd4eVdrWTZOQ0FZd3FOcEVjVS9vM1RJ?= =?utf-8?B?ZUxCOFJXRmEvS1RxbTJtczZJMHc3U0oybU1zNndFRjhsYjAzaFdWdjRWTnJY?= =?utf-8?B?d1A3Z1JnUXY5RWJQeCs2M240ckpoSVQySlU4c09GQWlWYXBJT3VCb0N3bVNl?= =?utf-8?B?Y0dLY1JLNElRTjFOSWhKRlorY0pmQmdnT3c1L1piaDJEOFBQUlhKRkZWd1NT?= =?utf-8?B?WWRMbFMzK20xNEdmbWh5Q0xHS2I5a3Z1K0NFZnV6RXVBZEpkN0xHNGJrZzBS?= =?utf-8?B?U3g1RzN0YzZxWE1QaVhEWTRlT0hmWWdqMWtxUWwySHowSmtGdkRlSll3YWFW?= =?utf-8?B?ZmY1UHJwRHo5Tk1URWtSK2FHblliWWM1aWhtbk12cjZrWnFtMFBGdUtuMXRG?= =?utf-8?B?emc3QldHbU9uckR1UFJndjZYNnVYSlR5dFFSSk9YaThXaVZLUGhHYUNucE51?= =?utf-8?B?NFJXR2daTTliYURIUHNsMjA0Rm5zMmQrTWNZalN6SUN5YkZFMGd3VTdqUVJo?= =?utf-8?B?b3gxV2NneUdERTdyNUZwZC8wcVFlY3BpM0tNQy83aUp2QmhjN3BQSkYwRmtX?= =?utf-8?B?dnNiWHB5NUpsbFo2U0crc3ZwMFFhSmlLOU41MjcwS0k2alc4dlhIVTR5R0ZC?= =?utf-8?B?cUYvZnlleFl3QXJOa1NwZksveC84ZUFwVFU2VjdTSGFZbVB3OTN6anlKRUhW?= =?utf-8?B?RFIrakx1RVAwcjFTQUdUV2tzM0dReTdrNXVJdHRmM1JDZVRDbFp4ZEtkM0lG?= =?utf-8?B?MS9IaG96amhuRDFtL0xBeXczSFdGSkcwYU5HajIwRlk3ZFU1cHZYWmNJWFhz?= =?utf-8?B?NFM2NWZQVHVGTW5aVjYydzFHUjFTaDIvNnRTaU9UcG4yMURzYzVNMkl6Vm5C?= =?utf-8?B?Rzd4QjRtcVUyUFliWk8wa014eGJubW1ibjlxT250S2FYK2ppTmFFemRRaGEv?= =?utf-8?B?V0Npb3h3c1hlNTdkVm44VE1hTkdnUW5hUis1WlRkcHg2ckJ4VHl4RHlLdjU1?= =?utf-8?B?RUNZd0ZSVHB4M1dvNzBTOFNSbnZ2dEM0eENVQ3ZrZDFEaDZyekY4ZzJGdmlk?= =?utf-8?B?TXBBWUdYVFBqajFwR1o3U215enlaZnNXUForK2puRnI0NnFHNFJkQ3BaWEp4?= =?utf-8?B?Qy9EVjdmZThMMWpUUGg1bkdFMDVHTXJhMW5xR05aYkFLL2F2SXM0dXRoZGVP?= =?utf-8?B?MDVYSlNTR0htQ3RXMTBKTm5XUDhvUGMydW91UUlGYXRIcGowZVpObHVjOHhx?= =?utf-8?B?d1h4ZVRrcjVKemtSSzFrdmFRdlJ5VUxrWC82WlhKUDV2UnJ0SkMwQkJJL0lq?= =?utf-8?B?RkJ2TStmQ0M5dWQrWUZwdGtUdXU5L21zNklSNklONlpuS2F6UExjZWxGZk1o?= =?utf-8?B?Tm1yMnZWN0tndzYzY3FQVFdFcjhFQ1hyQTIvODl4WGNFWHJjd1R1SHR6SDNq?= =?utf-8?B?YWtURWhNeGhFZXlsTDZrRlFJZ0RQaHhyaFRHZk8vQ1JXQ1YvNnlRVit5Vlky?= =?utf-8?B?VTFPTUg3ZlEvZEJ3b2lkR0RST09nenpWOERmUTMwNXhQdjB4TGM2S2Z5VmJW?= =?utf-8?B?N3JJRnJPcFRwUE9pV3loQ2JoakhTY1UwTURkOVhIZkFwMk9QVVBqNEpzeXhh?= =?utf-8?B?eE5aTGpJd3I2ZWZtbldJamtuWXNGQ0ZPeHNHclQwV1BzNnFINHdqUjlhV25T?= =?utf-8?B?KzRhTGNuWTA2elEwbVUzbDNLdGNkR2lnUlg2T1EwMnZxSUJNZzhFcC9ETU5I?= =?utf-8?B?QVJ2MlVXZ1BHUEVXYmVhV0M0TndOckdRZUZlWXNHb3p0cW56aXBtZk1CSDUw?= =?utf-8?B?OXU2b1FXR0I0UEliK3RlbGJhNlBDWCtoNmx4QUxMN3JPMUFsRUV5a1c2TFhn?= =?utf-8?B?bDcwbEhyT1JPMGluNlFMdi9KYytJUE1WWFhhTnMzOVlwcHZWMit0eWIzMS9l?= =?utf-8?Q?0oYgWP7XfyJWoiBOZzoeMys=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 634cacfc-45b7-441b-20dc-08d9d03c9229 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 11:14:42.0538 (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: ZWqzUJFrLPpKoRGSXszhG0aRZdGAkOGHKbMi6NZOUUIYxNQWgAPldn49leISnNFWvP0ohuxTS54BuQUEMEUTJw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4383 X-Spam-Status: No, score=-3033.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP 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: Wed, 05 Jan 2022 11:14:47 -0000 Neither non-64-bit code nor uses with a non-zero offset from a symbol should be converted to PLT32, as an eventual PLT entry would not express what was requested. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -8857,6 +8857,8 @@ output_branch (void) off = 0; } + frag_now->tc_frag_data.code64 = flag_code == CODE_64BIT; + /* 1 possible extra opcode + 4 byte displacement go in var part. Pass reloc in fr_var. */ frag_var (rs_machine_dependent, 5, i.reloc[0], subtype, sym, off, p); @@ -8985,8 +8987,8 @@ output_jump (void) } #if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) - if (size == 4 - && jump_reloc == NO_RELOC + if (flag_code == CODE_64BIT && size == 4 + && jump_reloc == NO_RELOC && i.op[0].disps->X_add_number == 0 && need_plt32_p (i.op[0].disps->X_add_symbol)) jump_reloc = BFD_RELOC_X86_64_PLT32; #endif @@ -12289,7 +12291,8 @@ md_estimate_size_before_relax (fragS *fr else if (size == 2) reloc_type = BFD_RELOC_16_PCREL; #if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) - else if (need_plt32_p (fragP->fr_symbol)) + else if (fragP->tc_frag_data.code64 && fragP->fr_offset == 0 + && need_plt32_p (fragP->fr_symbol)) reloc_type = BFD_RELOC_X86_64_PLT32; #endif else --- a/gas/config/tc-i386.h +++ b/gas/config/tc-i386.h @@ -283,6 +283,7 @@ struct i386_tc_frag_data unsigned int mf_type : 3; unsigned int classified : 1; unsigned int branch_type : 3; + unsigned int code64 : 1; /* Only set by output_branch for now. */ }; /* We need to emit the right NOP pattern in .align frags. This is