From patchwork Mon Nov 6 14:03:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 162019 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2677354vqu; Mon, 6 Nov 2023 06:04:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IEHPbug3uJgA9eMyh8OF4BWyyaU6ZINfWB9FMC3+yDnuf6RTf0kEpDTQGO0t0PZn4myirNE X-Received: by 2002:a05:6870:730e:b0:1ea:125f:cffa with SMTP id q14-20020a056870730e00b001ea125fcffamr28067835oal.34.1699279448515; Mon, 06 Nov 2023 06:04:08 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1699279448; cv=pass; d=google.com; s=arc-20160816; b=k0A8PLBpcAw1ruOhUFvuCkKBL8xEttQHWVCCCO1Ts4Mne1Fl5SceAHqRFl/qSNPNOd 0aCDdia6qeKoMveDY1QoXdO5TtcDTjA+PCTDVISLEMd7XLwNUViK2MTGfhlCwMLdvmwM orL8ezaB9gxEWYCJgwmPFZrS4UO4MhwFxv8Jybf7teRX+5yOHhWAbYQpgkSwZso8TJ9w gATtMkCHvZuIAiIfBiDkDzcU1jQJ76GfTo8nAxpknJr9XA3LrVPM9Lf/+qmO8YLvca+i HNA5O4J8Dx+1aAzbuA2ktNoDXAtHuC3oRIRtlzhqIqxjRjY/rsjDN0jklREYJRq7/ZOe H7DQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version :content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:date:message-id:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=JfCOPS9nwQlfrt83lPg6FeUjP+gSE6FehJ6/PQUBlYY=; fh=8WW8/k0o0G2vlJiZAQKLzwZ5FShsw2CjyMds4OH6804=; b=vNi+nCyXoRWhF76GPVTwKx4xwa6ub1FqTmoL+VZPTg71g+LymckTqFEYYIW/2rMMfS 8hN1xkQaZ2780AxkJIC9zpjHpZfU4CdKUPHV+WGi/87ijVWo00lEUpnY5vKrfCriwJv/ /+Pq2zptqDDZKhe9KTCRcfHDGt532+VFK6DgCrWMoIPpaTnnj0mgetmcauXkMj+1zqb1 EUJ/4CWTZte8ydvxhBE6HAPDRs05+RQykDSlC2gfcdt9W34lQ6g/P0MbzS0fXz8FhcJQ 4j25KUO2TQfyVwmRUPzT/b7Xcc6bYDiWgF/yqXSQZwP4XH0+cvy/Z9GxkPheaHyVGAb4 cwqw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=yahiGaRy; arc=pass (i=2); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id t25-20020a0561020a1900b00457b2ad8bc5si864830vsa.573.2023.11.06.06.04.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 06:04:08 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=yahiGaRy; arc=pass (i=2); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5C04B3856DC6 for ; Mon, 6 Nov 2023 14:04:01 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2073.outbound.protection.outlook.com [40.107.15.73]) by sourceware.org (Postfix) with ESMTPS id 3E4DE3857359 for ; Mon, 6 Nov 2023 14:03:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3E4DE3857359 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3E4DE3857359 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.15.73 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1699279435; cv=pass; b=iRiZf9q7WaBQkQObwiIPsw41KSIOjcvNLxMU8W5Cnmp305PiqqTCpXrZqL4srh8puv93q8GyQauG75rycFMSuEuqit8hulhyeYChTa6d6r/bOBRp23Ei0jCgDX+/UcAfcyjLGaB+BmBmtgllik23o2ci+dd//Gr3Mtq1EbNdB7w= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1699279435; c=relaxed/simple; bh=1rGbp2NBrc4+uBtmAw2UhxU+pPlvDsBc+HKiHLBIaT8=; h=DKIM-Signature:Message-ID:Date:Subject:From:To:MIME-Version; b=ju0OHQOT3/xdiwhbIE/XFwzTesxSTiwqSriG4H1pLzqVEHqKwHMBOctx2NXo3k0pbAq6MsZjrn5va4LXbdA8DX3YomMuZEuFn5VYssCiGPGfdwuE+vwrErZntHf7077Mn8iMSzWI2Ui/FViX1Rgf9sxvT/Rsuhy/RK8bAONVvVY= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DxIl6guWtlDH/1nhKyBUHVAP+sycECG7widHWgHaQe5ZJ64fAOoFsQixWiyljRh6UKLls2ZuzWm4B2CzpIX4KPwiIz20A1gjM1Zr9m9pn8nw2L7SLlyq225z02XZufOhE/1z8vjn6GHO00h9R8GZHIzsTeOMnsLCsHkHiQTaojKqYe5aiRJI0ozBpZBOzlsdjVpLmjElRjKUBjm5Bgv+vXQQM7tw44LpwtRFxR1/j/1W+6yfRLDU1T0zNnQCA5JVsmDx/fJbLfbEmB2JQuWG2cDMY1IOD4/6hKaOdXqRIV+hVwvQjKaeUlwaizRMGcorELkvTfgl6+W2G1ekepG92w== 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=JfCOPS9nwQlfrt83lPg6FeUjP+gSE6FehJ6/PQUBlYY=; b=PCKCQMKN2vvfTilxNxVzzEZa6h/lbdoQq/9IX7SwdoVgM/XV6+TTGnuC7I8EeKvVtQHbm/qtYMreVeCvOXBidP8nGrkki8xxxj0XtKKuYSt27hst5cEjgQThUFM8rPHbyaRkJ9EstrNkG/5YwCdcN5zTkEQ5U58i3Qlefg567dZHjRUpbi62NefyQcYnqJgZXNSobc2XZLke4ddlk3V4uQOVlpkOC/ZhgC7dA173bW0tp0wAIXd72T5ATKUkXBI51jLMsWFY1g3P4koAp2nBpWNxn4efrSKfgmLMFsag7WCn91kYMNtqwc/NOuRpCqsTZXoDt6SMYLAeGI6jyA9WYA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JfCOPS9nwQlfrt83lPg6FeUjP+gSE6FehJ6/PQUBlYY=; b=yahiGaRy9KaCpjMUA6I07Ns9Hyn2K9qpKIH1lhZ5TTObRJx1Py5yiG+Z9IGQnW/tuG/JkZq83H3yvW1XigbTa7hXEQg4aMQDqgVq+OMlBE/xFN50YixNzVDtWDC6Oe+7jO1AeFSyDpOim7boF9FK/fV+dmWA/8GlH3tFY7itPf2dyysGbllckROBSN9LLo6eut2rAW9eTJINn9lWGrE5kPTTDiojeqZ3ocwxaSh48hQl3jZ3ey1KVySiW5STarDTMYg5a3t/VrgnDOqT32GZi1a/U43ViZnI8jUwA7morKSF7tje1X9grXvORiConlYoV8KbjhnIPTKAR9/rF+WvXg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by AM0PR04MB6788.eurprd04.prod.outlook.com (2603:10a6:208:18e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.13; Mon, 6 Nov 2023 14:03:42 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::eb8e:fa24:44c1:5d44]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::eb8e:fa24:44c1:5d44%3]) with mapi id 15.20.6977.016; Mon, 6 Nov 2023 14:03:41 +0000 Message-ID: <1fbad9f6-107f-4a36-91ac-839b69887c5d@suse.com> Date: Mon, 6 Nov 2023 15:03:40 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: [PATCH 1/2] x86: conditionally hide object-format-specific functions Content-Language: en-US From: Jan Beulich To: Binutils Cc: "H.J. Lu" References: <11646ba2-6dea-70c4-a6f6-9b533d44c180@suse.com> In-Reply-To: <11646ba2-6dea-70c4-a6f6-9b533d44c180@suse.com> X-ClientProxiedBy: FRYP281CA0005.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::15) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AM0PR04MB6788:EE_ X-MS-Office365-Filtering-Correlation-Id: cc773e54-2b9e-4ec2-b456-08dbded12eb8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Cne+nsy/aQoAyzuSBUWUBJm9sZUZW7NpZHWBzENoGUkIJFTh9j39hbi5vnzS1mURk51XonBqDBA/uP64jasxUsmVA7ND5FJA302n+0AVpCeux0Ha65Ef14c8tI3mEQjYuElonjpEtKILpAZFB19xFKaDTCx67TLT3lw2f7xAFl28PXhDRv5cjbQD61yAbXRTmaSgQge948Exn/IwGKbeXXqgPOdWmKIhVqg1uF91OEaAansBkizRzxG496MRl0XV+RJGtRw156PK0D0BSCcpHK2G3kenimLw1ncJVBrZQOcoPsjZGzgBhFa4fw2R6BBCTv0q7cGzYVTAYlX7EOc62HUZwlUF1tAU86Lfjsf/6Cj/HjOXLao25VkxgdFPuU/e5WmUSBQu1pO5tesozRDSztw+OAnhPrbtetRchGhxCYw1Twc41fmc2hmBmLrwdJO+VqpjsA52FWlYD/KGQXRL+ZcrETq1wcAQyNvs96sQkYZILrZ3Yk22b0ifHabowsH9KOQBbYztvgVLpeslcEqcW8ugrX4Gaz7H5eZQ0EBOL5zAonkxXbhFKq9mfnLcntOUFnirj7Gyf+gZhtB+QqeEWNoF+dsx5a1Z2TcqUftURyR3lXxjzZeqNHGu3SI39XQmWACE4QpXGNO+csj4PtL5pw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU2PR04MB8790.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(346002)(376002)(136003)(366004)(396003)(39860400002)(230922051799003)(451199024)(64100799003)(186009)(1800799009)(26005)(2616005)(6506007)(83380400001)(6512007)(8936002)(4326008)(5660300002)(8676002)(41300700001)(6486002)(2906002)(478600001)(6916009)(316002)(66946007)(66476007)(66556008)(86362001)(36756003)(38100700002)(31696002)(31686004)(66899024)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?HDk8ZFVzYK1UjdTMrNpymCkQjx+d?= =?utf-8?q?Cd7F8EMyHaDQdhxSxAMLZVJN5y8Vypa9jqBjA+tATOAiFrhEOglKL34VLtAIoqY1v?= =?utf-8?q?NJU8Pe1+Ce1soRFxKunJ8gA4hq5BBOB52R91AeMe/4FsvcQf12tnx8vS7GFXcK9FV?= =?utf-8?q?7hyeafBzhWETsZ/uE167tZ26HCNqcYd0/rVqgDBcsT0Wek4moFltE2qPAaR5dSF/U?= =?utf-8?q?sdVHgCIeGpl4RUCWQp53IBeRuoVx0E2NORc6IBzIDat2sf8PaqTmxSSS6RshH+zuJ?= =?utf-8?q?jvtFfwG4WGnDPsiXzCo+MLpmsnWvRMZiB/rnYc/mWUovT2JxVkKwth9ACuv1xG8FP?= =?utf-8?q?D7upmCPUnxu1Kr33XTwMz1wynaelAYct1euKUaRh6h1M6+0m75/Uacv4bdhOQk5o+?= =?utf-8?q?hdgVN3xztxz7cHG4xRVaq72x3mOtEZnPEtwf6aauAXVt3NXoEyot7q9m1LVZOQTf+?= =?utf-8?q?hazc7CzFPOsAH0C+KBUakCb/MWbfCCoClAIdiwrvk9ZIOKndyAgKAHmH/mEdvSGNl?= =?utf-8?q?Wff2r1wcNiaqJyAbxe914ZWQ2ef7GsqF1hKzN5QbwAQrD9gCGPe/6t0jYe8NAN5jN?= =?utf-8?q?jzOQEEQ9aNHl5WKRnuSh45UIn59SEhvSSjaCiYpGwrAC+/C4bP7aVpoNqnDzo92Wf?= =?utf-8?q?XyTKEpf7YvP/YbYzE3VUDa/nyh+EwOLhjJKAMqfOs3FVW7NDiiRV4RiLjFrgiMRHA?= =?utf-8?q?4FPH4rCFp4VhRcQ5aEVMLC5lSPRLmhxw3qYQ3PN9YKFIDrq+gpnM62vCUHtp/qULK?= =?utf-8?q?u0EEthewBfue5PcX/mzgsho5NlEdl0Wz8OiaSidaAEgnLTf6zFe25sk7oYVyp+pTY?= =?utf-8?q?xRxorYpXbPL9ObbAZHokpcuNCNloZIk1U5nBRJBV+QJg7lYM+C0iqi96/n10/ydSO?= =?utf-8?q?f0/BPDA07Ftq7MnPs6GtrjTzRV/RVIdWAw9V73xvyGKCtjDPGZ8+3a0Y+OonBaMZ4?= =?utf-8?q?8jWL8vb1ZvpFGpwlPjOMHUPSU8v3nTI2YSaTCiTs73JjLyQmoyhBtSBzLWDW/pOV4?= =?utf-8?q?jS0sP4MhTgNbfCK/CEfrqRvHK56xESCcUTVd0cQyAtYtLrw9tI0yD2/YdWTCS4DE9?= =?utf-8?q?+cE0+SB+AyaY8RSUX356N8MKzwz6Z6KYx48cxQOQbcmdIXSFs6OEC3hCxIB65xzLJ?= =?utf-8?q?e22RZBYEOcA1hrRz0B6B4b/0cXg7gR9yjiSaW7ah3D23nIZkf6ITlD4czko696yOr?= =?utf-8?q?JP0fLBHYIgV+AnbAvi4rDJ96GYfK2+U76G7jbdpMFlZx5rmC7B1MW4bL/0VUMhQfB?= =?utf-8?q?wSIQs+R2NaXFyy1nnKgjj6LWGVocv6vlnq1ZF8qRP8NvYMLmCESjGTvmmJ4Sl0bW0?= =?utf-8?q?mnKTdanfvQ5CEZ0n52Osr/M8lOUkcrP91l/5ziTyWrBDtLE21NtQIgDZXD8AilxQy?= =?utf-8?q?h/pe0trwGGAT9ELt5RF3pwN5Mc8EnYeF6+9vlsuRBsSAQ1ZdDXkoSvzu1w2/6awWI?= =?utf-8?q?y1MNadAA30Hy4iZiRgZtgEzhwugYvC1XfaNUKVDGheFBnRI0wieQ4A57huaUqsXoZ?= =?utf-8?q?h+we2tsPx1yH?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc773e54-2b9e-4ec2-b456-08dbded12eb8 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2023 14:03:41.7770 (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: 3fyoraMFn39WOJcxR2Yba/2MD/bN7URXZGX3kg+5hLTlX9b9UqZLA3THzcbqMULx5T5eRl3y8Ckb2B6lgTLN4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6788 X-Spam-Status: No, score=-3025.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781823646940619129 X-GMAIL-MSGID: 1781823646940619129 ELF-only functions don't need to be built when dealing with a non-ELF target. md_section_align() also doesn't need to be a function when dealing with non-AOUT targets. Similarly tc_fix_adjustable() can be a simple macro when building non-ELF targets. Furthermore x86_elf_abi is already used in ELF-only code sections, with one exception. By adjusting that, the otherwise bogusly named variable can also be confined to just ELF builds. --- Do we actually need to retain all those uses of OBJ_MAYBE_*? Only cris actually permits obj-multi to be used. Not having them would not only improve readability, but would also eliminate anomalies like elf_symbol_resolved_in_segment_p() not actually checking IS_ELF (or OUTPUT_FLAVOR). --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -587,9 +587,7 @@ static int use_rela_relocations = 0; /* __tls_get_addr/___tls_get_addr symbol for TLS. */ static const char *tls_get_addr; -#if ((defined (OBJ_MAYBE_COFF) && defined (OBJ_MAYBE_AOUT)) \ - || defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) \ - || defined (TE_PE) || defined (TE_PEP) || defined (OBJ_MACH_O)) +#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) /* The ELF ABI to use. */ enum x86_elf_abi @@ -3520,15 +3518,15 @@ reloc (unsigned int size, return NO_RELOC; } +#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) /* Here we decide which fixups can be adjusted to make them relative to the beginning of the section instead of the symbol. Basically we need to make sure that the dynamic relocations are done correctly, so in some cases we force the original symbol to be used. */ int -tc_i386_fix_adjustable (fixS *fixP ATTRIBUTE_UNUSED) +tc_i386_fix_adjustable (fixS *fixP) { -#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) if (!IS_ELF) return 1; @@ -3579,9 +3577,9 @@ tc_i386_fix_adjustable (fixS *fixP ATTRI || fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT || fixP->fx_r_type == BFD_RELOC_VTABLE_ENTRY) return 0; -#endif return 1; } +#endif static INLINE bool want_disp32 (const insn_template *t) @@ -15273,10 +15271,12 @@ i386_target_format (void) if (startswith (default_arch, "x86_64")) { update_code_flag (CODE_64BIT, 1); +#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) if (default_arch[6] == '\0') x86_elf_abi = X86_64_ABI; else x86_elf_abi = X86_64_X32_ABI; +#endif } else if (!strcmp (default_arch, "i386")) update_code_flag (CODE_32BIT, 1); @@ -15408,12 +15408,12 @@ md_undefined_symbol (char *name) return 0; } +#if defined (OBJ_AOUT) || defined (OBJ_MAYBE_AOUT) /* Round up a section size to the appropriate boundary. */ valueT -md_section_align (segT segment ATTRIBUTE_UNUSED, valueT size) +md_section_align (segT segment, valueT size) { -#if (defined (OBJ_AOUT) || defined (OBJ_MAYBE_AOUT)) if (OUTPUT_FLAVOR == bfd_target_aout_flavour) { /* For a.out, force the section size to be aligned. If we don't do @@ -15426,10 +15426,10 @@ md_section_align (segT segment ATTRIBUTE align = bfd_section_alignment (segment); size = ((size + (1 << align) - 1) & (-((valueT) 1 << align))); } -#endif return size; } +#endif /* On the i386, PC-relative offsets are relative to the start of the next instruction. That is, the address of the offset, plus its @@ -15873,6 +15873,20 @@ x86_dwarf2_addr_size (void) return bfd_arch_bits_per_address (stdoutput) / 8; } +#ifdef TE_PE +void +tc_pe_dwarf2_emit_offset (symbolS *symbol, unsigned int size) +{ + expressionS exp; + + exp.X_op = O_secrel; + exp.X_add_symbol = symbol; + exp.X_add_number = 0; + emit_expr (&exp, size); +} +#endif + +#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) int i386_elf_section_type (const char *str, size_t len) { @@ -15893,20 +15907,6 @@ i386_solaris_fix_up_eh_frame (segT sec) } #endif -#ifdef TE_PE -void -tc_pe_dwarf2_emit_offset (symbolS *symbol, unsigned int size) -{ - expressionS exp; - - exp.X_op = O_secrel; - exp.X_add_symbol = symbol; - exp.X_add_number = 0; - emit_expr (&exp, size); -} -#endif - -#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) /* For ELF on x86-64, add support for SHF_X86_64_LARGE. */ bfd_vma --- a/gas/config/tc-i386.h +++ b/gas/config/tc-i386.h @@ -141,8 +141,12 @@ int i386_validate_fix (struct fix *); if (!i386_validate_fix(FIX)) goto SKIP; \ } while (0) +#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) #define tc_fix_adjustable(X) tc_i386_fix_adjustable(X) extern int tc_i386_fix_adjustable (struct fix *); +#else +#define tc_fix_adjustable(X) ((void)(X), 1) +#endif /* Values passed to md_apply_fix don't include the symbol value. */ #define MD_APPLY_SYM_VALUE(FIX) 0 @@ -219,6 +223,10 @@ if ((n) \ extern void i386_cons_align (int); #define md_cons_align(nbytes) i386_cons_align (nbytes) +#if !defined (OBJ_AOUT) && !defined (OBJ_MAYBE_AOUT) +#define md_section_align(seg, value) ((void)(seg), (value)) +#endif + void i386_print_statistics (FILE *); #define tc_print_statistics i386_print_statistics From patchwork Mon Nov 6 14:04:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 162020 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2677584vqu; Mon, 6 Nov 2023 06:04:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IEnY4b4++/6l89JPkouJRL52I3PON95+58DUd6u7k3AUgF3e5Mi1QIwSBz1CpQTEYG/FoP4 X-Received: by 2002:a67:e09e:0:b0:45e:5785:e2c1 with SMTP id f30-20020a67e09e000000b0045e5785e2c1mr3678855vsl.12.1699279465856; Mon, 06 Nov 2023 06:04:25 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1699279465; cv=pass; d=google.com; s=arc-20160816; b=g1Fuwg+vEMByVxOqgikTAl5+Bt0lhdwtVCC6ncjmaRkK4Tduz+qZvPvWRPK+4RnfLp wCTYK0dGGVlzxSgqfHIgsmPbgZLMS3Oka2t50W/k8HjQFCDxOJ0OWxF5cwt5GSy+Fk/3 hYYDAjfsw/3Uk5uh4Kq8plzkTcAvlOWvMgKqv8WpHZbyEcq0n8lOoKbFlhpW6zdoNfjC fDd6YNRGlJu4dffoO25qbPAxqJnx9bBi0tYGQF0mDzkBXCnaKmEw1tcS9X9483PSNx3K STL3kV2yMVXGt9xRpMy5+xWhgRQ68R7nucdkty2SzEL0LDLOB8F6dxTtSuEYZVyWTY4Y dDqA== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version :content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:date:message-id:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=ypxQtozYtx6RDkEqrRrasEFnwo4hUQ9VWUrvAiDP8/E=; fh=8WW8/k0o0G2vlJiZAQKLzwZ5FShsw2CjyMds4OH6804=; b=McBPkSXsCTZLrdZgVMCwCvSRfHqyVMeEVlnBGFki9y6KnwTKPv0VqIVoemTCwysRtZ jGHEzb37SxOt8wiJC+J3+gUIGP7kCgLVP5sGaO/vpJUSmsZR88JYfpqQTL0J1niZpouI sUT6qqcFcoi+YijHfIYyQ2YPTesZNURukBJomAmcB5abyP26uHdVkJGnsUkJnxDpMML+ DMGCOqYWm52JQ7nFIZktEsA1oReUHxBUjnOW8pOerV2qybK0j72FrN4tLacOm/Y7C19K QihABWl8v2vqO1yPCjiOIwHFDq6Pefu1E8ZkGseP9XOV0PkD9PZ/9CVY29cGGf2s5+LM nGMw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=f5pvL9Dx; arc=pass (i=2); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id p1-20020a056102200100b0045258ccd2casi831272vsr.740.2023.11.06.06.04.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 06:04:25 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=f5pvL9Dx; arc=pass (i=2); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2E51E385B53E for ; Mon, 6 Nov 2023 14:04:15 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2078.outbound.protection.outlook.com [40.107.15.78]) by sourceware.org (Postfix) with ESMTPS id 2F7D23858419 for ; Mon, 6 Nov 2023 14:04:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2F7D23858419 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2F7D23858419 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.15.78 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1699279451; cv=pass; b=kx8DzZL64VzOWJYz2KihfZLgcfOW0isNq5DJKUs32B/1BExCFvlbHUx926VczH9baWiJC2K8zLVY4FCdxhTLsN1h3LWbyuhcYjyXotiNRr2+ZqxaYvO5kcIn2QxySBWm2kiJitZms+7EjMas2R2R63zqJwXloCNE9xyCChsdFgo= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1699279451; c=relaxed/simple; bh=IS8nk9KwSjkyq+hbAqgUPQsIXWxknywRRsVcEsftIVE=; h=DKIM-Signature:Message-ID:Date:Subject:From:To:MIME-Version; b=egp+6peoVJx4Ro2XxYuZPZb8K9eloBCmfMad/rEI+uAJYLMYO0XSw6sWcErEIsnhVdQF8etCKid3CFFeGozYxWknQhuqfd4dhmBu5nGjpVbnLQxR0oWFX9Zl6BtU2eNk9oshPw7uJ9BRV7Xu4zCpqLU0ugXJIyprHszeifFLzL8= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e5t0MCnQPYRXnI7CapLGdJ/dlBcHvqgqn+2QseFQOTTckHroW8lQ+Y8AHqf52kCm/4Zi0nOtAi9mCpClpjJE7zySaE2EhrhfGHhzlpOHJwNXv0n+2rpj7/YN59RQzUsTVgeaCUqKDzd71w+EseznVhOeMeqWiQc3V2GsHkkGusPfhmAr/xtB6BpkRcSR75I74VXJ8y7ULrjl9JCI1doERuQxZTcElMKPhf7FstB6JKItCE1pcZFkLe6vvKxpBnQaiRsE/MrK8G47OEJ4ZZ23E5RhaSPotzqyF4jra1jyDXaEcOnC+Fv4pWh1s/K7O0gnAF9NQ58dJ9b+ReUm6Hobkg== 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=ypxQtozYtx6RDkEqrRrasEFnwo4hUQ9VWUrvAiDP8/E=; b=Ju9r0iV+rQTzlyBFymL0REbME13+oCgDouBfj1okQtHdXqgToOmSjNCUemrmQ1rZe2SobIHBd9ryIrx5zFZPzKJcwmeMDiVucSmxmIdV3ZQRzYaut1JWlgTekY7JRs4h5DhGTai6jDwC0ZjDnzTrs3CL9pQ3JDS32CbmonxyhjBbCaWitdBCTAmnWvPgJNwNj7fjewLOPbr5wTZuoBSu1/Ey1tNaLPrKYuZDgHencEnLRzkdKuaaqq45iFt6tp3CESArlIqOjS96Ds8RR87Iou1Il2Tj5cKsRitbmhWrqtcAW0Z1TBX0qcfeHu3TEPADwSVCqzl8OmuW01KLapMhWQ== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ypxQtozYtx6RDkEqrRrasEFnwo4hUQ9VWUrvAiDP8/E=; b=f5pvL9DxAHZyse6a9p6+gYq45p0DScyLqznY3mFfajab+f+ozNLvthBL6i67q+csy0GnW1yhl+Ve6SaRNU+Yjm/83pCbEUUk1ATO5YxBI1sg2i+VFX7ga4eFge6aDMBU5p+hQRM8Jve0iHsJWzsGzQ7z3GV3cQ6DLrfqnF4S7qQLnosU28oZE9MKiPkppqP+FvEf/PT544jZGFeeiTj+qKZLvqzLaCL6zCmVdjLw0F3Q78zUsJcx/KSclDUya5LSrXZhRxPrT10S/Yzb5QNc8BEs2hwHVS72ORo1f+PbPqF8fPqB1t/tdppkVn0UcUEAKZcOslXUnH7AXygsaCdWQA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by AM0PR04MB6788.eurprd04.prod.outlook.com (2603:10a6:208:18e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.13; Mon, 6 Nov 2023 14:04:07 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::eb8e:fa24:44c1:5d44]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::eb8e:fa24:44c1:5d44%3]) with mapi id 15.20.6977.016; Mon, 6 Nov 2023 14:04:07 +0000 Message-ID: <9b115243-9fb0-df6d-cea1-5af6bdf1e660@suse.com> Date: Mon, 6 Nov 2023 15:04:05 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: [PATCH 2/2] x86: use IS_ELF Content-Language: en-US From: Jan Beulich To: Binutils Cc: "H.J. Lu" References: <11646ba2-6dea-70c4-a6f6-9b533d44c180@suse.com> In-Reply-To: <11646ba2-6dea-70c4-a6f6-9b533d44c180@suse.com> X-ClientProxiedBy: FR4P281CA0353.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f4::16) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AM0PR04MB6788:EE_ X-MS-Office365-Filtering-Correlation-Id: a5baa58c-825d-4f9b-9596-08dbded13dca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2bnrxuqyOg7qWNo/1r/72rE4PqxJWBCXmfV1XG14zMyg7hb2dkfUM1Oxh5bqh3PHwHOPZLSjSLbTajFMJr8N4B7oBIvnWpK39xTXo10o2SNsQa9Fd9YnqEtBmjxr0bRWFjkrpW8Kf8XJYw2U0MZsNpHdxPzht128oKikUno+LE1C+c9JF2A2ScbExY7Z8wxIHwvwSPkHXh5vrwI8DfkO2oassuWTaDLdlWxpdaKX9DWyKHKohre4u+lKG/t+oQ41P8UgY1kg6/YwIaz/Fsgkx2tf/+WNyc2J4awL2pZEyylq6RzIs9Ui+S46gA2Zz409xxlRDSMiUv6juQthyVeAKn2VfZDYznZyYYjBOCX2rflbkyBGS1uwtzJwJsIdq7DE92sbcQlvNsFEDbpjlpeebMzJ7GdqVyYi9Ze9J68YvV1WAj11CKMaKhc561/fEdidHX2yeVp1eLGb4pgSnw9wzJfyxefpKHzNZ1SsOPKcKqOzMUVivQDIPMzF3C8qrOgU0wEbefMmXXMynng97CG52WYFF0rXIcaJrnAODwjilkpwmzxJhzIFYA8+Jt+Ka/Imkm0FvaA1DA+ot3+TK7U+VJNYtm2AvO05HtLT5TX0JuFeo9Vj0m9YGSXRsn7A7ppWwVtZZVcAueDlLwrjGPbWcUWNt+L61mzsnCQ7ZGwovhbUiqK0aGYeDoEU65I3kk6U X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU2PR04MB8790.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(346002)(376002)(136003)(366004)(396003)(39860400002)(230173577357003)(230273577357003)(230922051799003)(451199024)(64100799003)(186009)(1800799009)(26005)(2616005)(6506007)(6512007)(8936002)(4326008)(5660300002)(8676002)(41300700001)(6486002)(2906002)(478600001)(6916009)(316002)(66946007)(66476007)(66556008)(86362001)(36756003)(38100700002)(31696002)(31686004)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?0pUj9whfsBzWT0pC2Q+L1s/VWS5k?= =?utf-8?q?XuKdBDyKU+n3iJUcrcNvA3/Bb47JbJ8ZRjcylAnSQaVvGlxqp4RV/RZWQCRvfw2dR?= =?utf-8?q?yrfPwavp/VrwWPawBkgjTcYl1SaILLm6LpGanPKMWe3mSCXAcMQ1tyiu1t2czyTQJ?= =?utf-8?q?mfc2fMAyofGtDduUxJQpOF2CjU3TtQRHZ6ndbgI+PLdtToQXLk7RrG7AApr2cJUx4?= =?utf-8?q?Vde2XAbqY6Ksd65KlM9D2llDZEfljdz7+uwaAbhwTaipuM7suiOXV8udCJvMnjGnW?= =?utf-8?q?ir7MwRN+vhG44FaKv70/71H7pCKsyYpkVGYUpk7uUm2SvhzCC8wFXMwR6R+ZnNRoI?= =?utf-8?q?1YjARIBgLJkta3LgP8GOK5/eTHNBGjJAbi03Ic+aTiW58lmuXJK6RMGkp03qWJ+KS?= =?utf-8?q?8hp6yTn/MADE0+2G+SoJtDXPkJfMN2JGnP9AzoQZ4hdNKEg6o9I3G/RLslUda73PN?= =?utf-8?q?4qo8JLHJq97xt1sQL3ZksBR7uUHjBriy7M3OiQAwi0hk+6DuzF0mAia4zY09R0z33?= =?utf-8?q?MqUQSfZUqbgdUYE8FejO8GdeA2ADcrWWtoe2oDucN34rmnV8ptw1Ro5yXr4uwb4Ht?= =?utf-8?q?WgNDgYkHrLqhmaNTwriyoE8LgwiijG1OM0AF/h2sIoG7RwVh24zPLc/e9vX5cG2gn?= =?utf-8?q?C1vroaGX4ml2EZ4O4SNp/V8MjxEqvqhT7yh7Nn4gxfhe/gq3sHQgddmFmqoAD1Q/k?= =?utf-8?q?cVJHbA/OF72QGOP6LkQRVM0c6hgUaLZ22U5zi2O6p9wY8cU9398uAda6zU7DVGef6?= =?utf-8?q?xIwpB6EGeU66E587hE6eiPj+qYuACDjZpr01HygvKnr/vM6IWiyVkd9g1eDs8hWGU?= =?utf-8?q?t5suEHFCfwdtYKr1Y6MdnOziCsaRnEELFL7JysgmxnXAzU6lCW82m5JfxihwnWIqU?= =?utf-8?q?/jp0QGLJJk8o9f/B1QjfjG+MKu0cWfJTQDeTtMeUhBRGH9xple3CrRBcC9W7uCgQQ?= =?utf-8?q?kX4FzXwZ9BOxtZqcO6zJYcL8wIbMU5LFJu9I4EttaLyu0wtMOfUgRqy+rTU4rFqgP?= =?utf-8?q?auMpfpvH/oJNy0l19Ha8oHR4+7kMFrzDANEcXOA2ga6OZ1lkRGoBfFUuCRbSEbFYV?= =?utf-8?q?UQ1h2V1g9vTfnv26AS5h1/NkD8EiPOGb0ptxw0zNShsSB6chJu9XhhBX0dKgRu7tX?= =?utf-8?q?Nx3E8y1m5IQs6plLLFiDvecgRi5Bw5P5eRpk45BQ5KocCRCNWGb3P9a4coYYAPdY4?= =?utf-8?q?ggPFA5Z+tcYS0zsdE5gFFcOXdtk0ru7CKeQf1fIhaaRkIcXlx5wbaJvZ6R7FXvSrQ?= =?utf-8?q?EN4rVDK44J8/5Cab+XSxCnRdrl8QJOebXEPwbe5sp15Obo6aigVRauBujaPgi3bCM?= =?utf-8?q?36rAf8VjzU/hn8UTGJNdPyh/NuNtNqJUWVR8u78z8eka+a/2r9kP0L9PMA5IHEzKT?= =?utf-8?q?sjfP4qZQfIAZahBQHUv4fRUY90YTQJumGWQoMxpuWr5x0RrrUTHcmXwokLw88Alsb?= =?utf-8?q?1UG2QD3B1ssjS1zzKlEi+3hKcyOTMoz0wyA5j7CaYDSUu+4SdGF0sHD80Lp46/EjG?= =?utf-8?q?BP1T/fW6/OBD?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5baa58c-825d-4f9b-9596-08dbded13dca X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2023 14:04:07.0397 (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: qHzZqBlSBt1PS193UmheVZ24Lya4Yvh4WXSCNR8Ym76vD0AJV3KAk1pIgh5cijtqWIT9IdpKKUYrBzsmpWii3Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6788 X-Spam-Status: No, score=-3026.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781823665004097667 X-GMAIL-MSGID: 1781823665004097667 ... instead of (inefficiently) open-coding it. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -3056,8 +3056,7 @@ i386_arch (void) { if (cpu_arch_isa == PROCESSOR_IAMCU) { - if (OUTPUT_FLAVOR != bfd_target_elf_flavour - || flag_code == CODE_64BIT) + if (!IS_ELF || flag_code == CODE_64BIT) as_fatal (_("Intel MCU is 32bit ELF only")); return bfd_arch_iamcu; } @@ -3080,7 +3079,7 @@ i386_mach (void) { if (cpu_arch_isa == PROCESSOR_IAMCU) { - if (OUTPUT_FLAVOR != bfd_target_elf_flavour) + if (!IS_ELF) as_fatal (_("Intel MCU is 32bit ELF only")); return bfd_mach_i386_iamcu; } --- a/gas/config/tc-i386.h +++ b/gas/config/tc-i386.h @@ -154,11 +154,9 @@ extern int tc_i386_fix_adjustable (struc /* ELF wants external syms kept, as does PE COFF. */ #if defined (TE_PE) && defined (STRICT_PE_FORMAT) #define EXTERN_FORCE_RELOC \ - (OUTPUT_FLAVOR == bfd_target_elf_flavour \ - || OUTPUT_FLAVOR == bfd_target_coff_flavour) + (IS_ELF || OUTPUT_FLAVOR == bfd_target_coff_flavour) #else -#define EXTERN_FORCE_RELOC \ - (OUTPUT_FLAVOR == bfd_target_elf_flavour) +#define EXTERN_FORCE_RELOC IS_ELF #endif /* This expression evaluates to true if the relocation is for a local