From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2059.outbound.protection.outlook.com [40.107.104.59]) by sourceware.org (Postfix) with ESMTPS id 0967C3850848 for ; Wed, 8 Mar 2023 16:08:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0967C3850848 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-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ItgnS8HcrSo4tnAhk/Sc2VIJdv+c3s6aezca+0HEpVHBPsD5PYvekOSO2dM/WHgO8GZq7mqB24c+7CN3HChHifiy1s+YF6i1MoL3MWOIoJ9MS6LV9GscbQnOJs2ZW4bV29W79J9XDYZgNG1I7MDIYMyJ0estwsGT6cXJgC5hTz6BuCscXJT5vMWgr6XX+LDklI5x5I5oidNmJkG5Cv/asZNhhRB98HVZV6VHppjj3rXBTw0aX7NSQoyA33xM9RG3Q1R7dAeIkhHngFFUZmEvAS4D8tiJ3qzluc6nRkMXeYgmQwk5767vGbYVh1pOrfvYxTw8f6snc8PPmQpxeIyucw== 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=U6/bY+DIGpFtESBJaeYHb6OxiolM6eI1RxxpxUNYxRA=; b=F59Zm7NDZFNKE2ocPr+vFPIWac31HmUW0Rsum+Y+lq3ffymwoz0drNsdUH9y+2W68s6a8Z6raIEDpDh79FgkT/kDs3U71NIjuNugFwrUOUGzZj3wkdTmpKd7k4eTSj05rLp9Ja6/HjGpAO/w2oQKK/zMFUdx+Ol7MkIq0K3SYFLhkwNBX1c1hvCTsHbRuBqADs2sQgM4iuyHg8VPasocmUMtotjAWLsUKShM1rYeZGD4F5woovI8tJ7ceSBdMWlvURNOwr3dB1eZxV3p4g1ABsDXhGqBDJl3z+ay4g2yyYSpk9hP1iCZXnlFs+vhQbZuABtt5OFydJInrqP/ihQIIw== 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=U6/bY+DIGpFtESBJaeYHb6OxiolM6eI1RxxpxUNYxRA=; b=hmMsTQOEvi0mvLY20uZ4Wlq0LR8w9ZonM8/aUfKDl3V0tCiK4YTl8ghkIvxqT+E7X5LOIBb9wQNU1HmHrwEdDBl1CWoyc0I2sQzbY/eVBG8MERRMemv7w9SY8dwZV2WhYWlkvBdbVIBSxalnXwa5lxHKKXaIeVAlaJjEoSTmSW6Nxn7noKI3tD1AKdAUv77NecDmmaoRSjDisKfVHruHtfOvAMZvTGLNZhmLK7wDjbW7tCEuLR0MgMKkQEDbNbY/YaQsF5LZMeQz7SXiZj75jD85In7iwB4CgdQOWt0N1i+AE2xNhtmUoh6E4W87Oqx+gXPBZzQvRUc3psS0VHxOdA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by DU2PR04MB8630.eurprd04.prod.outlook.com (2603:10a6:10:2dd::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.29; Wed, 8 Mar 2023 16:08:18 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b%5]) with mapi id 15.20.6156.028; Wed, 8 Mar 2023 16:08:18 +0000 Message-ID: Date: Wed, 8 Mar 2023 17:08:17 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: [PATCH 2/4] gas: isolate macro_strip_at to macro.c Content-Language: en-US To: Binutils References: From: Jan Beulich In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR2P281CA0056.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:93::7) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|DU2PR04MB8630:EE_ X-MS-Office365-Filtering-Correlation-Id: 21584270-9274-485e-5d8f-08db1fef54f2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QBqGE6jK1FsAnH+21KTgA8cXNOGeibnio0+EU8VZwXLKs8g2PGraGBZImIG5ecHSXmxLuSKMm+doAxYFVGvjVMdfd4M8IjLPiOAx9wjpNXaPIwjb1LnPKSvbkkX0hplA8pzWqgNEsuD+vf/OsRIWEKuO+ry+cS6TFNi2LEfjlD1rA+G8/jE9Qnr7g5JCOtIwCKIP2yyoDLWC7FHz3SWUCCF+vp6Vbb4q8daR3d5bOFcBRUafHutgdHLCXeHBMbEroIxRYEhn9g/ROyqIFLumn2RvpXxqu8hyhJo2W05yFKceBR697Pb8r2UpqsfB0CSwjzp7sYUbLzE6C327k68b0Mxw5rdhs7Nt4/Xz6VeJ/rE1SD46q0E3xXOmf0YkXVMI3A+tCBBHzBN6l/SHcBhViW5JUvy4odU+5+4s3dWcpz26igRgeAJNKZgbcGSzbBUGHGPrZHHOJhzXYFA7dlkRZlogtrjHqVJc1LtSLxFicaG+4jiUEN5tGXIktO1MPDKrA1eGVw7iT35ieBMUfIrxs02QrzILJa9xWAmtMD4ahWlu0ywraq1L9njJUrAY7Jl4jrBTgafZQQmAwNE0b93MsY0EYWNwv3LaxS8KmhDaukqwgu62cBDJ/0J1fvjVRhqOjz1Rt1393q2ldXImGSiM4AZUT25PbNzkyPxy1qM5gsUj6J91CzkUc3SJrwwwq/q4cEzsqI/K9Ig6Cps8S8dqRl+/5LlKOnGXtYB6VJFORnA= 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:(13230025)(39860400002)(366004)(376002)(136003)(346002)(396003)(451199018)(2906002)(38100700002)(26005)(186003)(6512007)(6506007)(2616005)(31686004)(31696002)(478600001)(66556008)(66946007)(6486002)(8936002)(5660300002)(66476007)(41300700001)(8676002)(36756003)(6916009)(316002)(86362001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?V01KWnJhQnRubEVMRU5rWFFXbkxGY2xnNzVMR2pOYUhSa0NtVEpMbW1vTVdG?= =?utf-8?B?NXlSMU1Jbk11alI3T1pBRksxYXBKVi9JS24rTXVXK0F1NlpHdkFDSXN5RTRH?= =?utf-8?B?elJ2S2NYMThnc1QrclM0NkhKSkFqWEFHNHZ1VlJ0b1hQS2dVOEoxRDNZbTM2?= =?utf-8?B?UVBhbitXU3Zja0huYTllK3ZiVUhRYlowck1hL2ovL2lvamxKdkhCbzV6V2h1?= =?utf-8?B?Z1dKMlQ1OFgySGJWMXg2WUxkb05xYmxJRmtEb1R1cXl6WFFienEyNXJvbURG?= =?utf-8?B?VUtyUGRYeDIydmNyRGZnWk9vcGttVmRkU0dFQVNYaFNUYnk4Mkt3RlltWmJR?= =?utf-8?B?dEN4eVQweUJqbEJTc3VXVG55Nnp5SkV2a0hFM2pad0RlV0RuNmJ2S0tJSm5U?= =?utf-8?B?Qi8wbVh0S2JIc0Q5UXVIb2tXZnUzcXBQcGd3cFpKY3NVdFMwYVJOOEcxbEJi?= =?utf-8?B?eHdBMnRBeGVrNFI3NzhXMkZVaWNFWmJNYVBPZlNCMWYvZDdxTEppaDM4bkxa?= =?utf-8?B?aGRyaDMzZnZqQzVPOU1NVE5oa0s5UE5BelhZREJzWk9nc204NUMvYTRFbnpP?= =?utf-8?B?N3JUWlZoTFdENjhocW45L0dhN2s0N3dQK2V0UC9VL0Qrd1hXRHlyU3cyK2w1?= =?utf-8?B?V05oOEN0dkZMYS9sZ3QyZEwxTEpyTS92dC9lek5sRisvNzk4OGFxQld3VlJj?= =?utf-8?B?WFgrYkxrR3FJVUUwUzhzSnhMOG5waFVYUUxWdS9abWpad0pLMmdPTjAvMEtz?= =?utf-8?B?S0FPVlNWRVl2UVpGMnZYaG5tN3Q3N2prQjNYcTM0SHJsNCtkc2l3WDByTG1l?= =?utf-8?B?cThraitOVHNoSEJrSWZybzRtVGxDeW9EL3NQRkxiMHFjVThmSXg4REFiRGxm?= =?utf-8?B?cG5iVHErNHQ5ZlYwVjdUZGcyR0pDaWVnbDBrcWdib0JhN2R3a1YwS25KV3JN?= =?utf-8?B?Y0x4RGV6QmNFTllkZHE0ckF2QWxPVGhMOGVzcGZ6SkdBalh5WDdrcmdKVHdO?= =?utf-8?B?dlhBS1BmUjJ6bTYyUTFjV0QrdlZlQU9RYlpmWGVjRlVuQitaRFc1ckduNHZ1?= =?utf-8?B?Vm1qU09BT2NHSHB5OUc3cGFGYTVYa1hjVGdpSFFsV2JEaXcrVEpVNjFCc0pv?= =?utf-8?B?WXdqcHdxdlVFZ3ZtL0VPeEpQcnlaYTI3MFlGdjdGR3JKRTN3SUVTOVBCeXBj?= =?utf-8?B?ak1kOERzYXcwdTdod1Rjb1VkaFIrWjhzWW5GeC9VVlJZaS8zUStEendlOU40?= =?utf-8?B?WmRVUVIzNTFBYWp1QjhNMzlXcTc3bTN0aUo4bnlpcmJMYUxxbk0xWGZxZ0Iv?= =?utf-8?B?dTIrQUxEb2xIV05BbU40M0p5d2NnaEtSK09JcTFMY2J2dXRsMTN0anJpNDQy?= =?utf-8?B?Y3FCSnNMUXQrdzJZUHg0OWVGcUZ6b1MvOEordGd0V2x1S1d1dTVIa1ZSRGtq?= =?utf-8?B?anB5Mm1tSzJvaTNMOTB2MnAxeFFmTGlJTjBFSzk1dDZ4K2N6Q3Y4N0tCQkFL?= =?utf-8?B?azB2VXNISGVnN21Uek8wbElUK1pzWFVXSUNud0JPUTI4amZmdFNUM09tV0ZD?= =?utf-8?B?T2FFeEtRR3A0czNadDA3d043ckJCUnFFcFJGeFpCTWQ3Kzd0WW14R2xESDhY?= =?utf-8?B?b29mYjEvWUtqMEhYTGs3MVFqVUJsZGVWd0ZJVTE2aWNpTUd3eXlZQXdML0dW?= =?utf-8?B?bCtLUXExU1VpVGNsMUVUT2F0VDBIZVhaTWRKN1BOaDJLYnRVeVQyV0dFeTNk?= =?utf-8?B?MEhONm9oTDRwWTQwOENIdnVEalN1N3dJRnVra1NLZVVmNGRKVVdRR00rbHd0?= =?utf-8?B?SVZBN3NJcVUrRUJ4WDBZelQ0LzgrZ3RMZDNHOXVhVVdLM0FBUUNuZVYyN3Vm?= =?utf-8?B?YzRBcUdBa0o0dmJyS0VSblUvMXpxVU9rb3l1NU1vVjZvbExBazNUbUFvcnd1?= =?utf-8?B?YVdmdUVLN0ZPc05LNFZIaVg0S3kxbm9TWXkvbHBNVjBzaFdKMEFPemh1VW5G?= =?utf-8?B?RE04MENZRDlneVl0ekJJYXdIYUNQRDE4MkVBcE5hVTJzV2hKanZjbDJBSzJR?= =?utf-8?B?RHNyQytSMWdnTlRTR1JOZ2pmS210cVBqWkVudVNYTElSeHgwaUQzN2x2MWg3?= =?utf-8?Q?EuEDJOItfQOIsp/UdneCizrrL?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21584270-9274-485e-5d8f-08db1fef54f2 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2023 16:08:18.7121 (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: L3i5o6mxZEqIIts2cIeq9ZRvBgCWGbuB9haFLiLfVgT9FwkGiGks99ZlwN77rd7yuYQpoPSkXfY2NyS+l2ZH6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8630 X-Spam-Status: No, score=-3028.2 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_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This removes a leftover from i960 support; with that nothing is left which would set macro_strip_at to non-zero, so the variable is converted to a #define (retaining the logic in case a new user would appear) and macro_init()'s respective parameter is dropped. --- a/gas/as.c +++ b/gas/as.c @@ -1307,11 +1307,7 @@ gas_init (void) input_scrub_begin (); expr_begin (); - int macro_strip_at = 0; -#ifdef TC_I960 - macro_strip_at = flag_mri; -#endif - macro_init (flag_macro_alternate, flag_mri, macro_strip_at); + macro_init (flag_macro_alternate, flag_mri); dwarf2_init (); --- a/gas/macro.c +++ b/gas/macro.c @@ -60,7 +60,7 @@ static int macro_mri; /* Whether we should strip '@' characters. */ -static int macro_strip_at; +#define macro_strip_at false /* Number of macro expansions that have been done. */ @@ -78,14 +78,13 @@ macro_del_f (void *ent) /* Initialize macro processing. */ void -macro_init (int alternate, int mri, int strip_at) +macro_init (int alternate, int mri) { macro_hash = htab_create_alloc (16, hash_string_tuple, eq_string_tuple, macro_del_f, notes_calloc, NULL); macro_defined = 0; macro_alternate = alternate; macro_mri = mri; - macro_strip_at = strip_at; } void --- a/gas/macro.h +++ b/gas/macro.h @@ -83,7 +83,7 @@ extern htab_t macro_hash; extern int buffer_and_nest (const char *, const char *, sb *, size_t (*) (sb *)); -extern void macro_init (int, int, int); +extern void macro_init (int, int); extern void macro_end (void); extern void macro_set_alternate (int); extern void macro_mri_mode (int);