From patchwork Tue Nov 29 10:36:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 27161 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp254087wrr; Tue, 29 Nov 2022 02:36:35 -0800 (PST) X-Google-Smtp-Source: AA0mqf5cY9fIdcC32PDDT7XZhXrqQzKGU3VE5B7tW8sqwn0CidW3MS/B5XIngAIP73KpwZHQzgPG X-Received: by 2002:a17:906:a147:b0:7b2:7b45:2cd2 with SMTP id bu7-20020a170906a14700b007b27b452cd2mr47293227ejb.615.1669718195283; Tue, 29 Nov 2022 02:36:35 -0800 (PST) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id hp40-20020a1709073e2800b0078b96068bc0si11925611ejc.79.2022.11.29.02.36.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Nov 2022 02:36:35 -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=@sourceware.org header.s=default header.b=GK8mZDku; arc=fail (signature failed); 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=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F02A33858413 for ; Tue, 29 Nov 2022 10:36:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F02A33858413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669718194; bh=xC/GPnJnJyW+ua1kgLMziDR4R2lNLJHN/EyYjlfl/rI=; h=Date:Subject:To:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=GK8mZDkuj0k8Uo0RpApFiqUGkOs6cN8T0OL7v78XT7pYfuRZmn+VsH9JWzq4WiGXK pugobo7gxvj0pSDA9rOy+H6ZkXPoOaXDoYQo9Gf2kGaUMctesqhff8Pb+iBcB/CJdg 9ScAWDBbO+fJoYwS0Hu52/BL82qaMvH0IDr2bJ7I= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2074.outbound.protection.outlook.com [40.107.105.74]) by sourceware.org (Postfix) with ESMTPS id AA7FB3858C53 for ; Tue, 29 Nov 2022 10:36:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AA7FB3858C53 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XJZAS+rhQdvNFl6z6deiMhKgMwUgl/bpQ0UWX5jNSJ2c3TZpYOfDE8/gR5nnye5zN+HMpydHsW7ODKXDW3iZOGezRczXW9fSZ6HD2l3a56/jxOBVTotSgNQp9PLrfKXpMufq9fPVE4NEik/M3pApMhc9gKNAIDudUMx+Rs4O3nkNpEFo4T6pIJtKEpQX00+bEtmUC516VpHNFGs/UY7L8y+Ok7b17yq1yElRoTdqbcdrEL57M8kTA3AgmyTIRVBD+4kGNJn9LB709u/RHWyVyH60GJmqGB3W4v4F8U1a2e7FtFgDb1Tre5zN7IZpBU6QTT9OTiiiItFhW5vkOSXXsw== 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=xC/GPnJnJyW+ua1kgLMziDR4R2lNLJHN/EyYjlfl/rI=; b=eihongtDpLVFLfecsaqRIUQgXInZu8qAmXbXiHYTe21lFPjdWe8gEICSSJJZx/BvoJdyCJliDmpTq5E1xojoJjb8CDU6vcWlDu8TP8K6vSVUIzjVglzvOki+hXBOpVNG1gLsSEdqw4B4oNAWsChCJUOmgbbL2/0uN2/R5DqTbt0zJ5KzhnPbZKw6DcVayfNQIEBnq3aTcyipyfBP+A4lNCTZERhxznnum8J0nxRrtuTP2i2t+NCNZ8z4ZOvwLwT0dd8pvexhHF6/API2IWPhQoqsiijZmuftyD2ft4cU0RPtc3lHehIRBgZCXgXf/JaqU9F7iiC+Ja+5o24QTDFC3A== 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 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:36:23 +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:36:23 +0000 Message-ID: <01b77f18-8af3-4128-3645-2f1e05690197@suse.com> Date: Tue, 29 Nov 2022 11:36:21 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: [PATCH 1/5] gas: avoid inserting extra newline in buffer_and_nest() Content-Language: en-US To: Binutils References: <9afdf9c8-323b-78c1-d75b-8964e00cdec5@suse.com> In-Reply-To: <9afdf9c8-323b-78c1-d75b-8964e00cdec5@suse.com> X-ClientProxiedBy: FR3P281CA0137.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:95::11) 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: 86accf7c-eaa3-4146-f66f-08dad1f58fc3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6AMadLIG1q2quVYw5bRx8Zbx0QvgS9arNdTBYXgvWGxoFysFSR82ND1m9x1D8+4cndJuGGhlHoBkVTOCK7hYp5tb3OcLNATEaPSNtQjTe7ZI8fvdXzwMwMRX9PqfRimHx7OtOGxacNau9Wp6WDZeDmceRD9pRZNcSm4uHJ7ibYGZA8qVQdRYFiY8GkVUD0Loxw4Ae4BOJbHl7y198OkI/dlFS/4lurLkvuYkJEte5MY12MMlRJWtR2Uah0X/a/cJOfEHe+cIDpzdvALFHM2gETAGX1VHB5DVOopKRWpleJnD3IVEgcupI5haphhqLacJtLnEqaIWgdrTpsgWrCIBA9hqBRrq8X579U+mNb6nPMS4AkeJcAv2fMMM7S6LMR3cwSke3CNvpoEkXyiH3ocwmWBPjgCrBZyWMVjk52UxP68e4F0KT+V+2ixgRKDnsAH5D/OMLPHHt1ficd2fQywaYDHPaz5g/1nNCRAHTdxiq1Qv9/xUdSxgZuTlt9XR69Oip07rMbjv+yzTJKRi2aGzYnjM7akGMckLQ+EjGFHfU4up1e2hBgrSsrNeZgd4fSkQi2niOsLCotz8AENugFYF+aABptSNnsdR0l635oqFvrR2xaOQxEzNAPJnyGVcB7VXXEmvjdcqYVv1tkV0I4vuRx77yD5ASpKsVPSqwOYicHDRD4zmVux+8v1uG9PYZlYWcEI/wSksJLzkXoHDq+vyHmE6RIKCBA4cvq1zGWd6AII= 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?q?WkzL98usb0kbf6r29IMQDXTCxGnX?= =?utf-8?q?WkWO0F6dKoXcMbtrnh/dw8kIX8T4lcuuB0uuELzxJvWNVcwIxmuSscI0pedcaGu8v?= =?utf-8?q?cm9L2wSclaa+1BWfTtpBR97TGyaiAp4tcSsoIvI8zDxBnzDVT3lYAfPgV571p5t8C?= =?utf-8?q?AsaZg0WC8wxQxrQPG0oXU4rt/UxsCRe26Exrf2n8R1VPyEFKiW5hOkrD+a5s69XeT?= =?utf-8?q?9YJkSlmfjRypiwCrwyPt6rdxWSVBVYz8zyp6FtPyaV8dVDGAH70zLZfMXuQj6AVwq?= =?utf-8?q?oQXboV5E/CPXwwXnLgKq74jvvVeK/kDIW/rKRma0XnRTY/LHXRVm4FVaF71n5MVkS?= =?utf-8?q?gbojGjh+HQewlk6PBhNrL/YqYa3jLl4AJfZJezbkTXTqcZ91a5PvcIjwo3hAxHTlI?= =?utf-8?q?NTQ8YlulgWXBg0ivZ0UyeDCdXD/iXPXa0bf6GF7TU0pNzvYbBYUn7PNya/itFvOb+?= =?utf-8?q?U7pEObnSKR9Ny7pszkQoI+pqcST5BtCcoPb/X+zWeJ4oHU0CvEzOUeplJqHQcH3Pk?= =?utf-8?q?D/JnxT8Q+V7KHiCyxrLn89436iX5syGXrD7dvXt/MBhKiMAzAchent9NfC0/dGmlv?= =?utf-8?q?MKy3v7gos8wgAh4Lweqr2J9sR6KcYYrDvXyXmY4Qt5Ki8VJn+xlbjxzNvKzABFhd0?= =?utf-8?q?ePbPbAFQ6+OLRXTJVMtdgZa3A7GDNM7qhFOjwYSiaFAgfY845F8+2prrt1nDOy8sQ?= =?utf-8?q?voz3e4pZElTnkBlVjsDccLiXJkn++yyXkKMfCclbOLItYWsn8NL8XhOatmRiVLpnu?= =?utf-8?q?n1R4K0CKh2xgIwZ0kFFgx1hI2XsfvolVhDUYhxBKlz3wC4tK4J3tllagYVhFbRoOa?= =?utf-8?q?TX/58esAJIKEoIKvsRwe0kR6IZCaV8M8I/WJM0is3MCWj4ZHtFqFyIOW0yYoKfuZS?= =?utf-8?q?2uKB7b2AU5lS7PaUbeJ1bP5P6XrGPYJyuJzrF/di5jIoueUkSflTNtJppkKe41KjT?= =?utf-8?q?7cg/6bxAlfG9gsrVvKwT9xY2/TjNu4bjLIEkYzJ65w0V0uV7OlTUNK3JgBYYNY0fs?= =?utf-8?q?U7UD7FWtU7HwKi2wedHNOd28gG5QMxr+YRttdVwvohhMpCkgZzwT+Xehj8tnjqx/y?= =?utf-8?q?DnxlHtvZRvcetmHPJda5wKlSYQcffUB+sYhZPvlXwp8U6oiiGUxARRP/lBcwRaKnt?= =?utf-8?q?eV9SOKr5rgfsfmPjTw1GVmfyBBejOr/cUwTWlC3W0buzRy0ABEYGEuznICKPBxTe3?= =?utf-8?q?E3sVlL77ykTpcGstIgg7Lgp3MLSdKG8pp1Opimo7y5ij4Oyw27foy63c5+rtPtUMv?= =?utf-8?q?2RkpihRNvDLoVySkSOKMrkChiLeP3WM37EzolaczoW7YeEeW3QhfdeECAcCz4lK3S?= =?utf-8?q?DtdVCDyuwWn5lLOUYRKszlVBhNZTynCXXuaeucccb99Q//WSGO1q0UKlJVmMG1ogO?= =?utf-8?q?wpor17s/g2OA0eNHUOlqhdhu4zSxxRXU46f9v3SWP4BpmAnu4ojKYc7QFGSdZ4fYX?= =?utf-8?q?XZrO0SthCeza9Z57dbltcpXJM9GWFrZFK6HmTlP/58IpcW7nGVAuiP5Bsh9RlFVAf?= =?utf-8?q?ebZfbp3Dld9W?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86accf7c-eaa3-4146-f66f-08dad1f58fc3 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:36:23.7242 (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: 7R0CuYeMzbWqHj7JpPZUhXiL/qHsg82JqV+lckFB4GW3DAMMct2b4Gq5/5jaEL65B7UmLZFA2TE3JU4MRG8hKg== 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 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-Patchwork-Original-From: Jan Beulich via Binutils From: Jan Beulich Reply-To: Jan Beulich Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750826426258803654?= X-GMAIL-MSGID: =?utf-8?q?1750826426258803654?= In "-alm" listings I've noticed an odd blank line following the inserted .linefile one. This results from the explicit NL inserted being redundant with the one left in place from the original input line by all respective callers. Note that we need to compensate for the removed line by bumping the directive argument (which in turn is decremented again in s_linefile() before calling new_logical_line_flags(), and I have to confess that when putting together the original change I was a little puzzled by the imbalance of increments/decrements, but then I forgot to actually go look for the cause). While there also switch to sb_add_string() instead of effectively open- coding it to some degree. --- a/gas/macro.c +++ b/gas/macro.c @@ -142,10 +142,10 @@ buffer_and_nest (const char *from, const as_where (&line); if (!flag_m68k_mri) - linefile = xasprintf ("\t.linefile %u .\n", line); + linefile = xasprintf ("\t.linefile %u .", line + 1); else - linefile = xasprintf ("\tlinefile %u .\n", line); - sb_add_buffer (ptr, linefile, strlen (linefile)); + linefile = xasprintf ("\tlinefile %u .", line + 1); + sb_add_string (ptr, linefile); xfree (linefile); }