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 8E7243856DED for ; Fri, 6 May 2022 06:06:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8E7243856DED Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2051.outbound.protection.outlook.com [104.47.1.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-20-6f6EvkThPTGmSzCv8Fu8yw-1; Fri, 06 May 2022 08:06:10 +0200 X-MC-Unique: 6f6EvkThPTGmSzCv8Fu8yw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V3otcX4+rlH4S+ZeIOjXI8i8HjUTd7kOWz5vBU0ODQZ2/KuWL/ACK1Jf1rG+Lr7JAha2x7f5CQmEZ2c9qBYlpBdXLiIcsvajHYbSmtm9OVu904Em2Lx5J3yU15XJb6ufVHJK1aLpBbJYdfgCtCADUfwepOKHBpnsOFy4TQje3JlY52hU8FLJ2rkCpn3m/xISOSF8DxKvaFs+xQD4gXpZe5N+hAlALxuR2IdbMzU/tjcN1d64eo45qAvCYZHADvT+Lk34d+2ofRTGqo4ar5Iq8PUctOLw587AyWtvl12KMRlFjLTTc49g9OglB5B2ZeWUxZ/cfcQg5yRpqJovRtQFMA== 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=u4AuZxtw7XaQeyQ7xv1b3FTOijQfoJwa4DsfvyWNkc4=; b=Pw+sZr8URCGLPrU94bWI7h2G2xmadGDyDyZc81aHF484sqHeEnEL7YOs7o6qTUqfESdr9VbFCo9sfOBuxm8yMV6VNhnd25I7nU1WyMWF+NEIHkVPqCiNQKDXEiaymCC8WQUrnTer859WUFQ+e8AnFAA1XwSsRB7j7UNX0loRW8jqrCE6oDCd3osgKJJnjGBpMNEMv3dEs6devXl3b2GCGC2cgknV6RQa2C4b6fgC3RaoR6Y/nhyC25Fwqi5yCO4BK/92/btdsmjEA8MEB12zyeWEiYC+uoy0ZkwQ6rM5wtlWv7dpEm6zJBR3Fbqs45R+Hl1J66QDvuhb3zn9du9LNw== 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 DB9PR04MB8378.eurprd04.prod.outlook.com (2603:10a6:10:25f::7) 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:06:09 +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:06:09 +0000 Message-ID: <9320fd72-5afa-3e64-5008-379812e7c036@suse.com> Date: Fri, 6 May 2022 08:06:08 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Subject: [PATCH 2/6] gas: simplify ignore_input() 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: AM6PR05CA0033.eurprd05.prod.outlook.com (2603:10a6:20b:2e::46) 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: 9612e5c3-81f5-4dcb-7635-08da2f2683f2 X-MS-TrafficTypeDiagnostic: DB9PR04MB8378: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: tSPNxfE9fezveDZpxo1ZzX1IAkvsSUUo+BsQAJOQ2KUQEVhebsfG6TsondSGLohcyU3whDvyyrhKl2GzYT31BRTKuDv3i8VkOVCLa/Eeh08un0zEwK6O6qhsnxKoGdxRUx3fyj42OqL/0GAseqd2q3JcMrCZ7mrr1dmbVD0aGN4XjFcMF+eDUMyTNNytWfoynHPFF5RIJbhIHlwMTbFUxtZsNSi3vydexHIJDOlNw+bRUNlQFNeuLateghMIomMjJRQJ9Y9VaVNIq5lm/vUUqNqFVOa4Osa4D3dGVIYHNXqHJ7Efjw2nYJ6GWokOysR+IfhFQHcEP/y+86NuEEVIdavW5vVHBwaf4xbRTJVwIXyG6FhE3p6vScrMVcpmjEgDmMIvt+wZ4OnxqssMxtbPTCL2hzzrkySjv5tvT4vmtkiHkmAiaCBLT9wfMcLCTUA/Pr5x3m2reR6DHPgbolalaP21K/XwdJ06Yil2SuglyuatMsSctXNCO0CBXkamPkfQ85kNyV5i+Ues8tOoXPoM2kAZ3+o24qfNLTUAYCFlffyDebWZ+6VspDL3wRtm5vp+xo6L49NMpjhyTMzB3db1m5q7tYoQ0Itf1RUvgtZNiw/ha1xqDHTaAX6CIJmUfTXKk0TADEH1OQRml8O7UhtRrQ9gIodDuc8l+wUATZBuWvsddSjz6BIXfhf1zpzIDNHFVBvO32OfiQcb0fxSbjPXeGiEgyrX4izDfL1RzjsGxZE= 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)(26005)(2616005)(31696002)(6486002)(508600001)(186003)(36756003)(86362001)(31686004)(6512007)(38100700002)(6916009)(66476007)(5660300002)(66946007)(66556008)(8676002)(316002)(2906002)(6506007)(8936002)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?c2syUFJkMDF2c1JvaHpBSUhEOGx1VHdBSkdVTm83TVdYcEc0SS9BY3JCQzRQ?= =?utf-8?B?bXVkTWRqUGMyKzAxL0tOaXlYSDJ1UG5nRjhFWlRoeWk2Z1NCaXFMUmZQL3FC?= =?utf-8?B?QVpMOEpYSW9BWEdSb3lUUVN3S3BQa2JyWUFIWkxyMjJBb2VjYlR3OWpBMzVn?= =?utf-8?B?d25MZzNPMFI0V1oybFBPUHgxYTROcTQ1c2tBd0ppdTJOWVRHaUpaQlZYQkRl?= =?utf-8?B?YmQ4eS9CcHpodTk1OVVPLzBzbnpodTVHdk9lQlJKN3NDY0ZLTHRMU3V6dUNZ?= =?utf-8?B?M2t6M2lqWTNwd1p2bGFRaUg5WnhZT0pHZ0haL3E2ZHJtTSt1R3ZlOWEwUHg3?= =?utf-8?B?dnovVkd6N29sMDRKQWxUSW1OcTltNEQvZWRPZ0R2NnZFWHg3OS9jeDA5MU5T?= =?utf-8?B?L0s2WDg0aVFEZ3VXUUFOTlVoTngxZjkrdFhsZ2NmemkyRkswVFlWV3RCNXYx?= =?utf-8?B?WE5uaXJjYmcrTnJZMzNaMmRCVnRzeWIzbVhiMlByNThBWm5NR3M0bWFBbEl4?= =?utf-8?B?enFFTlhSMXg3aTJZU3grZDZYMDZFa25KR0J0SzlHcU5DclZrdkZPcUN1eW5l?= =?utf-8?B?SEtUeE83MnViSldWRm5kZWM2UFFTbytJQyt2ZEhtNkFHZEdycXJocEVkbC8z?= =?utf-8?B?bVVVbTNFUkh2UlA4aUVrcC9mTWJ0TUQrMjBNd2wxUzRBQkt1L0xQeTIzd0pv?= =?utf-8?B?MkYvZERGZ05OcEYxSTRmci8vREhPOE5Ecm5jVFNLOVBDM0JieDJMc3F2bE4x?= =?utf-8?B?bGNSNUlyZHllUzAzNGRXRGFYSWFHVXNjR2NRSTBUUUN3K0ZidGVMWmM0QmpP?= =?utf-8?B?UlVTWitJVWQyMk8vdkgvRTdWaWxEbW1ZVVYxZmhkNnppYlBPWXk3REQ0VDlw?= =?utf-8?B?b2hNV3R1RGUwVGpYWVpkMEJvbk9EV3I5ZTY0d3dncVA1QzZWVnJ1bFlhNjk5?= =?utf-8?B?K2xtOE5melVFSEpYWm1Hb2dlcVpkSkc5d28xR054Z3NJeGRCQTh0M1l1eVNv?= =?utf-8?B?YzZvS0JRUFVWWmV0eTc0c2p5bERjQUpSa0lGTDU2RG93a21UZ2R4Z0NNVlZX?= =?utf-8?B?OVhzWG1JTUZ6T1lNejh0bUFXNVBJemZYZ1NMNTdubytsMU9mcXduNWFLTmlO?= =?utf-8?B?c2UrUlFJcTNhRnRRTlB1TEFzYVJabEQ2SW50aDg1VXRXQnB2emZraWNnWkpj?= =?utf-8?B?c3d4OFU0K2VIc1hDSEl5c2I0MlNvcFVVWmV0SVN4WnNoZnp1eStEd0NsQWRu?= =?utf-8?B?MzMvczJqd0ZodDZZdHo0QkJONVlzY0ZYN1h2Vm5ZdWoxRndIWG04NWhpcXFq?= =?utf-8?B?ZTdiZG53SDlscWE1Z1oyQzBvVXZJZldZSHBuTTVIanBCZnpvWVo5a0hmOUNQ?= =?utf-8?B?clNTTVp0RlF0VTFZOGs5ME8reERlYzhGd3JReDlZVGZrYmJOVlZJdmNyT3Y1?= =?utf-8?B?QWsvRzlWTnFMd1BTTFZSeE1YZEZzclVEZjNwTTN2RU10SkNxOWhLcVd0SnBl?= =?utf-8?B?MTc3NGhDZGgzY3VlWjBhbDBYYU5VcnlsV1haMHF3OFV5TlVuZGFIOVFHajhs?= =?utf-8?B?RUhLVnBwQmY5VUVpK01YbXpwY0hHOUxNU2Y1WGdLaEFPTmJ3OUN4QmVFMWZu?= =?utf-8?B?NE1JWkVHMDdmZnZUYjlJS2ZSZk1TQ0VMcEFKeTVuL0psSk8vazI5OVUxSUlm?= =?utf-8?B?aWN1ZnE1dDRYZ2JzcUs4UTNySm1FandIVDE4K0gzQmwvM2R5WFNadW9Zbmo1?= =?utf-8?B?REZHUHl6akxFK0JhRVViWEcvSXpPbys1cHJvcXhSKzNlMzJKNFdiNlorK3V2?= =?utf-8?B?cmk2ZjVEZkREL29TUC8wUWtuV2NOY0hnUms4KzdXSEpYL3VXbG5mbml4UFhH?= =?utf-8?B?NFN6ZFRJZ1lITkVCUFYzT0tTSC84MzF0eDd1RUovdUdqbmhtOFYxR1VaNHJC?= =?utf-8?B?bnZqMkVNQUFpNG5ibkppVnRuR0xvSklNY2lxL1FTcTQ1RzdnRXQ1Wjc1V3pH?= =?utf-8?B?YmR6cHROSGN0UlQrSnFWbXVSbTVsVE5xLzFsMllyb0JuZExYWmRJUGVpRHhP?= =?utf-8?B?T2xjN1NzUmdkUmY0UGhuUUNQZUJzcUQ4L2k2bDR0RGlHRTNoRHhNek8vemhw?= =?utf-8?B?MkRXZ2NxTjJKYnh4YXgyV3MySWkyMTNGQ0FyU0JpSmg4L2JVSmpYWkh2NElj?= =?utf-8?B?cGlwd09YSlJEOHF3eWtEc1BRZUJpUXhBSi83VUpaVU9BOEJoVVNibk9SSTNH?= =?utf-8?B?Um9qbGZVQmZUTzdnT2hFbEVtVlhydzBWejRFNEF5K25HNGtLNk1Bb3Jldk9L?= =?utf-8?B?UmxNbjBlNmNORGFmbUswWlVHRmFnc096dWI2MXV4S09vZGFNZmRSQT09?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9612e5c3-81f5-4dcb-7635-08da2f2683f2 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:06:09.6419 (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: Whey5N/fAPWcWrWSsMBZQP9akgftnSSHryVfpuDbyY0Zxc/58FmuWCSNMpSOceyXYl9g2DVEk1NcuI6o+SjEfA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8378 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:06:13 -0000 First of all convert to switch(), in preparation of adding another directive here which may not be ignored. While doing so drop dead code: A string the first two characters of which do not match "if" also wont match "ifdef" or "ifndef". --- I was tempted to drop the leading 'e' from the strings compared against, but I then decided against because doing so might not be liked by everyone. --- a/gas/cond.c +++ b/gas/cond.c @@ -513,17 +513,19 @@ ignore_input (void) } /* We cannot ignore certain pseudo ops. */ - if (((s[0] == 'i' - || s[0] == 'I') - && (!strncasecmp (s, "if", 2) - || !strncasecmp (s, "ifdef", 5) - || !strncasecmp (s, "ifndef", 6))) - || ((s[0] == 'e' - || s[0] == 'E') - && (!strncasecmp (s, "else", 4) - || !strncasecmp (s, "endif", 5) - || !strncasecmp (s, "endc", 4)))) - return 0; + switch (s[0]) + { + case 'i': case 'I': + if (s[1] == 'f' || s[1] == 'F') + return 0; + break; + case 'e': case 'E': + if (!strncasecmp (s, "else", 4) + || !strncasecmp (s, "endif", 5) + || !strncasecmp (s, "endc", 4)) + return 0; + break; + } return (current_cframe != NULL) && (current_cframe->ignoring); }