From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 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=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 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=xC/GPnJnJyW+ua1kgLMziDR4R2lNLJHN/EyYjlfl/rI=; b=sgfbi1DeZ08qmjRPf+aMDFCtSsFeaPjrHKoi/cH8YsfEBoWsE4eJAIhDquuub45BBabjYOeeso3KIpwFG4S03cRf9vmASRE2QJLSRnCaMs4e7KMolkz+fSP6phIOabaTIvipGBgT4eXSmeuIB5q/kgHfRmc74aamjHpFk9elLDFiJ+ie5MMnjyIcmZH2RfXFaa75waPTTNL09aKgXSoOohtdTcUJcE0phP+VnlvA5Ol7Y0KW688Dhx9HSz/OInAs6ulR/0okfO0BVQpaEsruOjqRo2jYhoXVPFrVuWZrxxO+AQeMWA3jVi99B7xTL97oj/l3hAPMi2wGzCmmfCmcTw== 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: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> 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: 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?B?V2t6TDk4dXNiMGtiZjZyMjlJTVFEWFRDeEduWFdrV08wRjZkS29YY01idHJu?= =?utf-8?B?aC9kdzhrSVg4VDRsY3V1QjB1dUVMenhKdldOVmN3SXhtdVNzY0kwcGVkY2FH?= =?utf-8?B?dTh2Y205TDJ3U2NsYWErMUJXZlR0cEJSOTdUR3lhaUFwNHRjU3NvSXZJOHpE?= =?utf-8?B?eEJuekRWVDNsWUFmUGdWNTcxcDV0OENBc2FaZzBXQzh3eFF4clFQRzBvWFU0?= =?utf-8?B?cnQvVXhzQ1JlMjZFeHJmMm44UjFWUHlFRktpVzVoT2tyRCthNXM2OVhlVDlZ?= =?utf-8?B?SmtTbG1malJ5cGl3Q3J3eVB0NnJkeFdTVkJWWXo4enlwNkZ0UHlhVjhkVkRH?= =?utf-8?B?QUg3MHpMWmZNWHVRajZBVndxb1FYYm9WNUUvQ1BYd3dYbkxnS3E3NGp2dlZl?= =?utf-8?B?Sy9rRElXL3JLUm1hMFhuUlRZL0xIWFJWbTRGVmFGNzFuNU1Wa1NnYm9qR2po?= =?utf-8?B?K0hRZXdsazZQQmhOckwvWXFZYTNqTGw0QUpmWkplemJrVFhUcWNaOTFhNVB2?= =?utf-8?B?Y0lqd28zaEF4SFRsSU5UUThZbHVsZ1dYQmcwaXZaMFV5ZURDZFhEL2lYUFhh?= =?utf-8?B?MGJmNkdGN1RVMHBOenZZYkJZVW43UE55YS9pdEZ2T2IrVTdwRU9iblNLUjlO?= =?utf-8?B?eTdwc3prUW9JK3BxY1NUNUJ0Q2NvUGIvWCt6V2VKNG9IVTBDdkV6T1VlcGxK?= =?utf-8?B?cUhRY0gzUGtEL0pueFQ4UStWN0tIaUN5eHJMbjg5NDM2aVg1c3lHWHJEN2R2?= =?utf-8?B?WHQvTUJoS2lNQXpBY2hlbnQ5TmZDMC9kR21sdk1LeTN2N2dvczh3Z0FoNEx3?= =?utf-8?B?ZXFyMko5c1I2S2NZWXJEdlh5WG1ZNFF0NUtpOFZKbit4bGJqeHpOdkt6QUJG?= =?utf-8?B?aGQwZVBiUGJBRlE2K09MUlhUSlZNdGRnWmEzQTdHRE5NN3FoRk9qd1lTaWFG?= =?utf-8?B?QWdmWTg0NUY4KzJwcnJ0MW5ET3k4c1F2b3ozZTRwWkVsVG5rQmxWanNEY2NM?= =?utf-8?B?aVhKa24rK3l5WGtLTWZDY2xiT0xJdFlXc244Tkw4WGhPYXRtUmlWTHBudW4x?= =?utf-8?B?UjRLMENLaDJ4Z0l3WjBrRkZneDFoSTJYc2Z2b2xWaERVWWh4QktsejN3QzR0?= =?utf-8?B?SzRKM3RsbGFnWVZoRmJSb09hVFgvNThlc0FKSUtFb0lLdnNSd2Uwa1I2SVpD?= =?utf-8?B?YVY4TThJL1dKTTBpczNNQ1dqNFpIdEZxRnlJT1cweVlvS2Z1WlMydUtCN2Iy?= =?utf-8?B?QVU1bFM3UGFVYmVKMWJQNVA2WHJHUFlKeXVKenJGL2RpNWpJb3VlVWtTZmxU?= =?utf-8?B?TnRKcHBrS2U0MUtqVDdjZy82YnhBbGZHOWdzclZ2S3dUOXhZMi9Uak51NGJq?= =?utf-8?B?TElFa1l6SjY1dzBWMHVWN09sVFVOSzNKZ0JZWU5ZMGZzVTdVRDdGV3RVN0h3?= =?utf-8?B?S2kyd2VkSE5PZDI4Z0c1UU14citZUnR0ZFZ3dm9oaE1wQ2tnWnp3VCtYZWhq?= =?utf-8?B?OHRuanF4L3lEbnhsSHR2WlJ2Y2V0bUhQSmRhNXdLbFNZUWNmZlVCK3NZaFpQ?= =?utf-8?B?dmxYd3A4VTZvaWlHVXhBUlJQL2xCY3dSYUtudGVWOVNPS3I1cmdmc2ZtUGpU?= =?utf-8?B?dzFHVm1meUJCZWpPci9jVXdUV2xDM1cwYnV6UnkwQUJFWUdFdXpuSUNLUEJ4?= =?utf-8?B?VGUzRTNzVmxMNzd5a1RwY0dzdElnZzdMZ3AzTUxTZEtHOHBwMU9waW1vN3k1?= =?utf-8?B?aWo0T3l3Mjdmb3k2M2M1K3J0UHRVTXYyUmtwaWhSTnZETG9WeVNrU09LTXJr?= =?utf-8?B?Q2hpTGVQM1dNMzdFem9sYWN6b1c3WWVFZVczUWhmZGVFQ0FjQ3o0bEszU0R0?= =?utf-8?B?ZFZDRHl1d1duNWxMT1VZUktzemxWQmhOWlR5bkNYWHVhZXVjY2NiOTlRLy9X?= =?utf-8?B?U0dPMXEwVUtsSlZtTUcxb2dPd3BvcjE3cy9nMk9BMGVOSFVPbHFoZGh1NHpT?= =?utf-8?B?eHhSWFU0NmY5djNTV1A0QnBtQW51NG9qS1ljN1FGR1NkWjRmWVhYWnJPMFN0?= =?utf-8?B?aENlemE5WjU3ZGJsdGNwWEpNOUdXRnJaRks2SG1UbFAvNThJcGNXN25HVkF1?= =?utf-8?Q?iP5Bsh9RlFVAfebZfbp3Dld9W?= 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 List-Id: 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); }