From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2044.outbound.protection.outlook.com [40.107.105.44]) by sourceware.org (Postfix) with ESMTPS id 788383857835 for ; Tue, 29 Nov 2022 10:37:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 788383857835 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=OUNIAYunqtmLc0+RGWRMmZNPHMEDuDF2TN6b44DJ74HjhzK7GvJLJ9mxKRqj/tLu2940cEvnnAgOWv4YYnKpyWHWyMfAfq68o5loE84By35a44DY5pkZcptoLC+l5PUh2ECvUDU6SlgiowiAKQRKVswPumFsELJGfRRRYdr1g/tWRS5tKn+k+O2pL2zOINkXGKJM8y4yB8evfgfxtX5XzgIPaMAdFIt1xU6IHYwExa1FaLt3bXIwI4J4jFncqYOPzSbVFM6UWtv2e6y3muBiVG/0XTgCvlr/u+reL7eh9hQdjB5GUXlS1ww/TUGoHX3nd81quhME/rDDKt+mlje2yw== 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=TSxNy/uqwDH3tYTCb8B3ZAtC0sCP4r7F9/QDQlFI+WI=; b=PV+RbvVdBTfR7luHMPbM/+ZTzB6bMRDXpAcPkSx+OLFu3Rcq3QmLjGG09UiT59r2OpuSNsLVfqwvYpsqyUHuoZZxMQ8i3SWgxZTYyRf4oopRDherXJbiehKHMvtOxN2GNwqF/poPL0HeRG93kRs7LYK8Z5QuxNKt7YgwHOJRTpOIv4QNRnlrgIYlXs+vBeq/NdZKOuCOZcRiFG/4f5bxZC9wwEcoMmtSXHo0A5FNh8MG0ySfj4lan5tL1f6bZHu45Ui/QNnkq26V97FNY9tYwSKJDHh79sqGNLtrNw3ou02b0tHlI0pJLRWlziRWBPHfCvF6/IuLvzFihCEmxcIXNg== 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=TSxNy/uqwDH3tYTCb8B3ZAtC0sCP4r7F9/QDQlFI+WI=; b=vqjTbcb7YhXoItOQ+tI2fFA8FV9QSPq2bQj7JhlOPG3XAPNPBwGasmsLeKEw8ZqQp1xRGzE9XJ/CITNL9kg9oOyLmAoB5F3hoIFjzuHeO5BzuotnTGiBSf/hNrJq0C9JnkiAmP5M4zOfWgAtM+2XOE6Wdt6OGEO1J4ulglQkgyH5EvM4FaLkjYBvoMD79B064dJjtbQppdcrvbAI3CFiNuXeosGp/oAk9guFywVmkUrqovBZFRitOAFjx9rN+o9LlRNMavycylB1sLdy+ybf1XSkNJOtWiAi1v6o/G+mDyLWxkfhDnhAo9j4036zEb4fFEBBcoohg3Se7xuw/EZCnw== 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 DBBPR04MB7947.eurprd04.prod.outlook.com (2603:10a6:10:1f1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.19; Tue, 29 Nov 2022 10:37:00 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8%4]) with mapi id 15.20.5857.023; Tue, 29 Nov 2022 10:37:00 +0000 Message-ID: <2ae84a68-29f3-d94d-1a12-c3d0c81f81a3@suse.com> Date: Tue, 29 Nov 2022 11:36:59 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: [PATCH 2/5] gas: squash (some) .linefile from listings Content-Language: en-US To: Binutils References: <9afdf9c8-323b-78c1-d75b-8964e00cdec5@suse.com> From: Jan Beulich In-Reply-To: <9afdf9c8-323b-78c1-d75b-8964e00cdec5@suse.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR3P281CA0146.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:95::18) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|DBBPR04MB7947:EE_ X-MS-Office365-Filtering-Correlation-Id: 932caf91-e989-421e-46cf-08dad1f5a5dd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gT+kOjXvZ4U1jh9qQIqq3It4j5ux4YZR4NbAwemINAZExRw1RESRhTfGZl8ZuI9UTgpXUpJU/S7g5VOK6OyxL0a9bdSW9k5K6buA5tOxvSWO3xbFNtt1JjeM/mu6FMW47Xiys8Fx4oqcNo7wm5kjeEkBAUJQhNyV+IS4VwnzS4KbRnjNy8/Eq/DZaUqOF+ITAYg9XzYKwIhZ+bY+3z1Pj9/CnYE72ybunnuvgkDsSnOtoIGqNQunyn97gjkoRIE6SOU0+WS0EV2BJXLkh2axE33cm32gH8bQ8HEjp1ViTP2vXCZbe+8jEgL1Z5bZyyLa06y24rZTVxfKC+pIOCsZ0mQ+TO+ZtYwwFcJNF/Bb2UM6PS3usW5IRA+rzI3g4w3pElvvHVy00+l47t2oS2eCvOnIaeacpOFOp7j5M4p8NSt2/JQjh1IQiMuqeuOm+3fkNELj993Fh9xaCdCb3OG4oshbfms3nZb2Cuwtuf2Jg1OkFzmRcvMSjSsJkf9nJKjkb0dJMrLCuCYj+jn9PkMIbVdPtnTZhQikOPemwTOHSDJ6ti5+X7RVEa26QGOL/4jnkXc1Wx2ZN6bNVoWCduVX/xzeLP71el2KdxgkBPAQJ0qkF41BWXbwuxX1RYqRq/XEuVHjF6PQE6dh+lh1RFJ3Y3LJk6ji15wV8HBZ8YLKY5Ij24bJUpTe7iZ4965qOejdyEk2jxBVeS3gtRkUS3TzKPbUQZZ1PzcNyG+YwETLhR0= 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:(13230022)(366004)(376002)(346002)(396003)(136003)(39860400002)(451199015)(316002)(6916009)(478600001)(86362001)(38100700002)(6486002)(5660300002)(31696002)(41300700001)(36756003)(8936002)(66476007)(186003)(8676002)(66556008)(66946007)(2616005)(83380400001)(31686004)(6506007)(26005)(2906002)(6512007)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dkZVQUZCNlJ2aWJpNTVnZFg1Znd2YVpSekxuRHlzQWp2SGpuTnZLWE5VaWZY?= =?utf-8?B?NHUzTnV1eTFuR21jTmlETDJaS3NsNmZMZSs1czJsUVdKZnR3NFdCdVgva1d4?= =?utf-8?B?bUZkb3JlWmJUbGY4UkY5OThWSStGODdaMEY5ZHlBZHpBYXM3RlhpZTZpKzJn?= =?utf-8?B?amxTQW81Yk5hbFJJZ0NBV1JRR0dUY2RoM1poYVZ6Zk5VUDlub2g3by91NzBW?= =?utf-8?B?VDRudC8rdVpGR1RDNUEyK1NTd1RqTEtQMDNqNzEraDJJdEJ3cGg3Q1cyQjBx?= =?utf-8?B?SUdFeTFVc01kd0hLT3NPRFBPdGFFd01oSTc1ZVZ4YkxHRVp4Z0FZTytSWWFp?= =?utf-8?B?WmpyNDVRaU44QVJ1bnRpMFc5dWNwdHBiTHk0S1B2Q1JOZGx5VFQxK25EaFdY?= =?utf-8?B?aGpGZ1RQWDZMODJlRDdlaGZ3OEIycEpoRlo5elFEZ0hSUE9vNHNmUXdnTHpi?= =?utf-8?B?dXNiWS95TmhKK0ViL3BYelAwdzI1MURtbHJwVUcxTVgzMWpwVVVKSHUrZ09k?= =?utf-8?B?eG16UkUyTE1iQlhmbVNTNzkvUWdLVXVGcTFwWWtWSzdVUW1UMVJrN1NLajRj?= =?utf-8?B?clErOEJPY3VTaDkvQnNDY1oyS3IxV0haVytOSzkvdVJxTzQ3ekxWTEM2WDZM?= =?utf-8?B?RHZiVXJ0OFg0RWhKNWo4d2pKc3VqWDVEU0t0bllMM0I4bWU4NjFUZzFFM3BO?= =?utf-8?B?TU1TbkNWS3kramJ0OStYcm9jMWJuVHhOSE1uTThIK09JTjhpWDZHWCthMmNk?= =?utf-8?B?LzBVZlM1UHhuSzJRT0k5VEhhR2JFc0gwTFdBU2VWdmoxSE1TdEs3MCtEaEto?= =?utf-8?B?dXhsRHNzSDMxcjdCOGtkM2NKU24yVVczWk5NRHJSSm95cGp4NlYwTGFRY0U1?= =?utf-8?B?M2crWXI0bWQzamQ4MXVsei9mZDZ5Z0VVYTBtL0ttbGEvMjV6WVFEMzBKTHdy?= =?utf-8?B?SW01bGhLVURrQXVISjg5OC93WGVoa3RrMlJOVDB3QUxBUHlYSkRIUnNKdTE1?= =?utf-8?B?NWEzVDRDRUJkaFhqakNheW0vTzJoaU5lTnJoR2NzYXhncHdTUUs5Tm0yRHhP?= =?utf-8?B?a3hmNllYWEp5bFlMdklkZW9tQXBEMWZDWXNNc1Z0NER3em9hRkxITkpKbE1v?= =?utf-8?B?aFNmR1lLai8vdkVFOWc0MVJZVXAxSFVwN3k3TGdPU2w5Wm83cG5KU3VrVWFr?= =?utf-8?B?MUVzK1VkRkRSL3ZzdWNPNFdKM1JyL1N5Q28reHlZMU1xSDBrNm5QZTRTSTJy?= =?utf-8?B?Mll1ODdHTHVtUHJrZFg0cGdOV1d4K1JMNG1yYVBYbTNlTTVrRUZ2UVdaa1Ew?= =?utf-8?B?L3dQcml2VFUvU1lkZE1VVVErNXFXU05qQUhaMlprcjdaVEUrQ0xDanJIc09Z?= =?utf-8?B?aHo3TnVweE55Nkg0enpZbGFYNCt1WDRtcTZaemsvRnZzaWcwVFNEYkZQSjRV?= =?utf-8?B?UGVRbzVhWnJOZFhqYWt5WmtUUGxtNXByMHJlOWNpNXpXaUZ1OWsvTkFHVjZX?= =?utf-8?B?Y0o4RUR1QVdOYkpxbkpWQmVXd2lZRUR3WlY1RUlVMWIwQ2duZStDTzgzNlJI?= =?utf-8?B?ODJYYXZsZDM2Sk1Vclg4RGtiK3YxMjU3NXRzN29IQkFMNEl2ZFVBZUVEanZT?= =?utf-8?B?SmtTV1hEWmhFVGI0RS85aTlxRlJLVzh6TGlyaDZJc0RPd3JXOCtEcmRRazcy?= =?utf-8?B?QkVDeG82bFR1VlpLTDJ1cG9sU1lKQmNndzhqandLS1FkTzI2TXFtREx0a2FN?= =?utf-8?B?WlQ0bzVtbi9WbC9yVGZ6TUZ1LzEwWlN2RHZQbVhOblZ3WE0wSDRIaHA5ejJ3?= =?utf-8?B?Q0NnamJTeE9jWWtqZTRhS2ZQWm1qLy9oNUc2QlZkN1EzbjRaN0QrNzRMUDZU?= =?utf-8?B?aVNPL09sN1NkNUJualg1SW9IUHdMblNVTER6bk9pTUNIM2doTVBWd2dMT3Bq?= =?utf-8?B?cUlCZ1hleXhqRXNHUlFZeWFhOVl2aFZPdVZjZGNpRHloTWJMWnZpaXJXKzJR?= =?utf-8?B?ZmFITGF5OVAxZGFRTFVJNlpLb1VXNG15NEJaR2RjQk9YMkVlK25IWlc2YlE2?= =?utf-8?B?amEzdE5OSDFQRGJjMHhBd3VQMWNrbEFZOTBOTUk3WHpKSzFwUWk2a2g5SWtG?= =?utf-8?Q?tSRs4sLLmnESZsSCbIlXDF5hH?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 932caf91-e989-421e-46cf-08dad1f5a5dd X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2022 10:37:00.7531 (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: RNxoLk4wo/5ml8KvFiZhDuCKh9g2CvkbnvIrvEYCjO1hiDqY/g/m4wFVBj/vwa2wKNQSjaOsjGqPN1FgJehGfQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7947 X-Spam-Status: No, score=-3029.1 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 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: Not so long ago we started to insert these artificially when expanding certain macro-like constructs; zap them as cluttering what actually results from user input. --- We may want to also zap ones resulting from "# ", albeit these anyway appear in listings only when assembling from stdin. Such zapping also would need to happen elsewhere and/or in a different manner. Slightly RFC: Am I at risk of zapping a label named "linefile" this way? (At least we can assume that this directive is the only think on a line, _if_ it is a directive, for being internal only.) If so, lifting buffer_and_nest()'s respective logic into a helper function may be the way to go. --- a/gas/read.c +++ b/gas/read.c @@ -867,7 +867,10 @@ read_a_source_file (const char *name) /* Find the end of the current expanded macro line. */ s = find_end_of_line (input_line_pointer, flag_m68k_mri); - if (s != last_eol) + if (s != last_eol + && !startswith (input_line_pointer, + !flag_m68k_mri ? " .linefile " + : " linefile ")) { char *copy; size_t len;