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 132A43856DE1 for ; Fri, 6 May 2022 06:06:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 132A43856DE1 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2058.outbound.protection.outlook.com [104.47.1.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-5-s3bITOywPpiEw2HvIsVnGw-1; Fri, 06 May 2022 08:06:34 +0200 X-MC-Unique: s3bITOywPpiEw2HvIsVnGw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YiGWA/tCMih8iULPfZseu5jJ+kzOzkZuNuEXXX73PQiPDkrkk2TxdhUhmkqiABydKbvHnofVokw/4vur4pqjQX0E0eVF6yT6ZIzWIlah3b5L+ICV9z/9dV7FocI19xNKSnA7c7MPXGcfYBDS4c8P1vkzO23/WJ4vpQNFc1tmYUjemnsjN/OfUW1N0Rq9jxHXItRZeCqXej/AAhtCTC5OueaUDXIZlLKmaQpXlzF1P6OpIiTRrrh11sWeYIk+1/aTCQiuSGAsbme6lYGKwvNebuApeOTUDSzTGt/qELrYHqJqpy0hKYNyOiYgHTiQc+66XlprS07Cuk9DEQvctRtikA== 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=234FO7bQbXN9B/G8wrN57zlpMDQf33gm5SDC7vaUVVI=; b=GlXsiLMOc2OrwBHxL9AqN+RrWttYvwIwikjK+cnqwvQGYzE6lkguXnUJAQvH0bG7SBT+2tVsr3+RUvZHSUFs0ahHUhk+kkE7RWh6DSJ4GXROomCt0c9RKkSQ9AzXnbW2s5TBpd+86hgXjoxKpLa7ucjo6X9hc8t6CRPTHqr0Njk0Psndp/7ikIhqgvgLGQhHktDR6mS6NP89BcamYVLp8GjoEre/z/ZhNKeSbXsk1dtPBAgVN7wpUqn4uLFveWuCSFem+W+U6nydyovQ2fTXBzvqGBrLT5ofofvxpCfBm3O+eQ0/c/3h1kTwtF9F37O4vSjAolWxCMKcnOvLGf3N0g== 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:33 +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:33 +0000 Message-ID: <58fbd8a8-b6b4-ee39-bbc1-dc351e122c13@suse.com> Date: Fri, 6 May 2022 08:06:32 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Subject: [PATCH 3/6] gas: don't ignore .linefile inside false conditionals 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: AM6PR05CA0023.eurprd05.prod.outlook.com (2603:10a6:20b:2e::36) 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: 8a532671-9f11-43f2-8ade-08da2f269212 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: ml/ZmJ78RXvmkjhedgozeSMNBYM8+rGGm/23Mw5tw3xTyEKa1F95sxpKCqQbJ8DsOZREmaSsOJhiU79IH0yiAM21sMFPWP1Kuhr8KUzwtiVcN/knVLqFUdwUkmMDAZnK1BqRtPIBbp9nP5puORLBo7GYm+dmqXH4cC4mwtLc6WiFzXa5ADifPUimf+kBMb6it0JFfYQu+K6BNWO/BcpdWm1cctLEyXRZOYiAt+UEFb5HeNK1JhI73OpAM0OjaXsU/R6yGBf+8Im0DEWv8YTVnfykk/EupNc0SqgQ+qGZzqBx/B7yoBFpHZz4qJ04kJpD/7EjNBMK3ntJYfb0rBFGdyMe1FFwJqZowjZkk+Sh0ssMNJ51xUyFvLkoBZ6ucQKcv5tprghbJHvcNvQWewVPOrwc7BXhudYocTKiUQ7LbKBRBjknpVMD9gSNxL5wBcvVZGkHEStneHfASVQPDhAvTasYDLYeZ6/xqFbLQ8eps2lrz5b9Y1TWK9o+GnMua2LVLZ0s3OfAWBUmzngOnQxaXls6tWdq5hPkEj0VHRKei45FhmWoeYUvDLZz9lrcr7s9ejXi042tjzcQIimT5jV1UyWni6SbKeBK6rIfaL64/fCvHgBKekSz6lOZigd117ONXckKDXh6QQ2o8Li2mGI2uPUb+eSEaC2ip1T1FWtgSFh/FcV/PrPvXdxhnYfwWyUsXE2tCjX7xGFCYKlNJ0yPGIsQWPxh3lR+GSaymovLztgUsXn2BnIZdhIQLu8fz9kA+Ri05SH1RYtVQxcIr5NH/Q== 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)(83380400001)(6506007)(8936002)(142923001)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MFNnYVp6NTdkUzVldEwxR2x3b015NU1tT1RwQ2JDNWgyT3BOVEtjbXJEUVRv?= =?utf-8?B?SE5NaEphLzR6SXlvYXp6ejErZTJCbHV3SExRQ21OVWJSc2lQam5UTFh5bHpL?= =?utf-8?B?ZlA1cFpVbTNqbTZMa0dvUDA0SEp0YWhybUY1OTJacTFuZ09waWs5ZWtaa1Fn?= =?utf-8?B?MWhqTjdTajdOR3hURFlVcGtqc05XNWhoQ0U5THc3bGdrZzlXZ3JLMUZzZGhk?= =?utf-8?B?dE1wU2U2SHVnNlYzMFcxVXUyV0pDY25ha05pNlM5RnBxcUV2am1KUmFpTHhr?= =?utf-8?B?KzFvOENKVVA2cDhjQzQ1TWUzM0FvUE5PQnRaTFpGZjVZWHJwTVdCNjlCVFNI?= =?utf-8?B?a1lyeUVtb1l3YWRWZWVmNnhyRGFvNzVmUmtpUkhMRFBPNy96SXAraUZWYWt6?= =?utf-8?B?Rk15NlNFVU42NWthK3FwVnhQRXVOL0dBeUtwMDY2ZHFkTjNqMTlFZWJrWFZu?= =?utf-8?B?cTVERTJOd3c1OG1FWFo4WUM4VlVaY2M1UmhoVW1aT0dkbTdlR1BKUWRmZEU0?= =?utf-8?B?aWFFVjl4NitkczJBTGp0MVhxOEI4OVBobXVWeDlGSk1VTmh2N3NEUEpJWktT?= =?utf-8?B?UEhuK0tvOHhxeHo4TElsY1czOTAzZ1U5RWY0WTBQM1A2VHpmNUthYVFVbU9N?= =?utf-8?B?Q01RbEZVOFozWk9TR3ozeFpLNERZcXRxZWRqTFFLdUVmQ2NBOUNxMzNicldR?= =?utf-8?B?b3FnWFlCcDQ0LzVHazF3eXRxZENhVnVxZXN0RzhGWlMxeXRMM3NqR2V5eGdp?= =?utf-8?B?cU5lNWhhR2ZWQ1l3M3o1U0N6WDRxUisvS1NiSTVFR1A4Z3pPKzFPYjJyWGlv?= =?utf-8?B?MzhjTi83MVZjSUEvRmdRVW45QnNvMHoxUWt6eGk2SFAyS3dKSEdBQlM2RDVp?= =?utf-8?B?V3hFMTRrYnpDajVEVUFEYzc0QVkvaEpOLzNFN3E4NHJNdk9jSFdiVGw1bUpH?= =?utf-8?B?Unc3WGExWjg4WE55Uml0ZkJlZUJYZTZ4UEhHeEdLcjdReWZaS08wdnZKNTh5?= =?utf-8?B?dC90ZTJpUDlxdXBzZ3hVY3dpMjVuanlWZmRTOHVUNU1Mbzg1c1NTcFdqUkd2?= =?utf-8?B?VVFlRjhERjNpb2J0cDRqTVhNUzdjODdsOEltYzRIcGozV2YrVzJxRHJDSUdU?= =?utf-8?B?bVR1ZWk3TjZsS0tucmlKcWRURzJCRVlyYW1rUk5UVVpGYi9vSkVRM2hSVWh6?= =?utf-8?B?ZkF0a1U3SDFJaUR5MUdPWFhEYTVYanJaclRmNnhxcFQyNEVUZUsvTlE2TFBO?= =?utf-8?B?NjMxSTlEMmtFNE12T2VWZlhuUUpzYmswSnVKMFA0MlN5ZTZJUkg4aE82VkhY?= =?utf-8?B?UUFFcUd6VVp3dE56dU93WnoyY1FHdnEwdXRoNTJuU2l3R09TSnJPN0VKWTdJ?= =?utf-8?B?VEpVREFuYktUd0dTMmtmRDBDQ1pZckZRUDhTZkJ6dnlSTjV2Nm03SEs4aG5Z?= =?utf-8?B?RFFoM1hxRXd6TTgxd2s3MVdBUVBhYnAzR3AxbFd6ZWVCRTRxczFxSDAzZlJa?= =?utf-8?B?ZDVyV3p6MDdmZ1V4TVBwYzhRREJkOGFkbTFSNkU4VDNOYUpxS0VKU0R1NDd4?= =?utf-8?B?WWVSRXRGalZuUDg3N0Z4UGZ4M2toYWZDQnAxb0ZOMnhQeGp2bTBKSVpWTjZ5?= =?utf-8?B?cm1LMDNBR3A1UjdSVjQyTlFRYlA0T0NXLzBTaFBTZkkvUTVBQTFsUmpFQnFs?= =?utf-8?B?cDNwM05lS25hYW9CdUdRTVhUczJDZFFhSDlpVi9XRVdhb1dEdVF1YmZJaHMz?= =?utf-8?B?MVFEV04rN0k2cTNiUFJmODVRVnZRL1JvR2ZyUjU5bXVRV0M5c1NsR0tGYmlY?= =?utf-8?B?alcwY2cxZU0xY0pGWEF1VnkyZkhpMUNyb1YzcFdGNjZSMm92VmhSM0phWHFG?= =?utf-8?B?VGU5YXM5WU9RcXhjdWZPU2xGeVVFeFNDTHRDNFJkMkw4RS93aGpWUGpJaFFQ?= =?utf-8?B?UjhRcERpdG9Kc2d1ZEFPMksxNkdINVFHUkRCY213d0MvbDNyblU5YmpHT3Ux?= =?utf-8?B?cU43bEZkK3RYV3IwVkNCb3NIN3RhTVd2QjZFdGc2VDlvbmpZN0dwRzlBVnlw?= =?utf-8?B?MSs1ZFJTZU9mR3JSbW1jRnRKeTQ1WDhMMmFUZGRzMitEQXdIb0h2UUw3TW9L?= =?utf-8?B?dktYa2hJWHJ4c01vWlRObXVpY1U1Sk1JZDlTN2w5UXZsR01kN2oxRTFXWkhi?= =?utf-8?B?ZnZ1NWVjelBESkJSV3ZBTUZoZnNkRDR0cFdCR3hQWEdrdU9UL3dyS0g5c3hG?= =?utf-8?B?M2FWaHV6VXpQekdwVHZ0SW94Sll1eGh5ei9OWk1nbGVZYS9LM2ZidXBPaHd2?= =?utf-8?B?Ri9BNVBRZmJ5enJ4U200UmlXM1pobUtkS1hUK2hMQ1FSd1J5d0FiUT09?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a532671-9f11-43f2-8ade-08da2f269212 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:33.3548 (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: DGQdG9fou9VtlDajRZWL1Jr6QT29jyVFYNYnHmlabq3ESjfF13QObosU9SiEYc4ps4P9tuW9cvuvVMKs51Pr1Q== 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:37 -0000 When assembling code previously pre-processed by a C compiler, long enough comments may have been collapsed into "# " constructs. If we skip these, line numbers (and possibly even file names) will be off / wrong in both diagnostics and debug info. --- a/gas/cond.c +++ b/gas/cond.c @@ -525,6 +525,10 @@ ignore_input (void) || !strncasecmp (s, "endc", 4)) return 0; break; + case 'l': case 'L': + if (!strncasecmp (s, "linefile", 8)) + return 0; + break; } return (current_cframe != NULL) && (current_cframe->ignoring); --- /dev/null +++ b/gas/testsuite/gas/all/cond-2.l @@ -0,0 +1,12 @@ +# This should match the output of gas -al cond-2.s. +.*: Assembler messages: +.*:1005: Warning: line 5 +.*cond-2.s.* + + +[ ]*[1-9][0-9]*[ ]+\.if[ ]+0[ ]* +[ ]*[1-9][0-9]*[ ]+# 1003 "cond-2\.s" +[ ]*[1-9][0-9]*[ ]+\.endif[ ]* +[ ]*[1-9][0-9]*[ ]* +[ ]*[1-9][0-9]*[ ]+\.warning[ ].* +#pass --- /dev/null +++ b/gas/testsuite/gas/all/cond-2.s @@ -0,0 +1,5 @@ + .if 0 +# 1003 "cond-2.s" + .endif + + .warning "line 5" --- a/gas/testsuite/gas/all/gas.exp +++ b/gas/testsuite/gas/all/gas.exp @@ -466,6 +466,11 @@ if [is_elf_format] { run_dump_test quoted-sym-names +# Targets where # is not a line comment character don't transform +# "# " into .linefile (PR gas/29120). +setup_xfail "tic30-*-*" +run_list_test cond-2 "-al" + run_list_test macro "-alm" run_list_test pr20312