From patchwork Fri Feb 20 15:12:54 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 130347 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 6A3384B9DB56 for ; Fri, 20 Feb 2026 15:13:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6A3384B9DB56 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=HIHkDyJR X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id D7F1C4BA2E15 for ; Fri, 20 Feb 2026 15:12:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D7F1C4BA2E15 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-Filter: OpenARC Filter v1.0.0 sourceware.org D7F1C4BA2E15 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771600377; cv=none; b=kfIPfjZCAv84bBQuD6sBecklRxtR2MjahV68g82S4q7SVEouPSoiNIsywo0wl3dMY+DQG88OtPNVSlH84X6hmIjzpOp1BBlbGJXwTWRzm6dnm1zgCkyPlvCvek9tv0dp/eZvftOpNXYSJCJdTc8gcmlwOKwACPPlsyBVIb1Ch0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771600377; c=relaxed/simple; bh=PDI3qF2NGGgCxnJ+96AAsQuIbxg8IYDY3Z5KsL8T8qI=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=DV8R8v4R9M174i/g/4BjmhjRK40JasymK3Ru28VJiIEjKVYX3FKhf91rHY7etGac0e3XWZUT/NDiEoa0/1uoZK5BSWaf9KVbu1wo1kBgCmBjbX/kZBq4H5WClXnCKXE0DiMKghpmuTNji34LL0bnJSRxBDDDFsL8RjK6zrZkDK4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D7F1C4BA2E15 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-43767807da6so1627681f8f.2 for ; Fri, 20 Feb 2026 07:12:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1771600375; x=1772205175; darn=sourceware.org; h=content-transfer-encoding:autocrypt:subject:from:to :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=ERu8v0X4sWv2dADldt+cDGKXtWEo484HYyjn4yOxdFc=; b=HIHkDyJRNJfS9zq12o4+PQpSvk97F5DhM1uNtp115h0tyTToknsnEATlwKuOZ9EQWb KkyNYtZ+PDnuhyXpy6t1tK2N7v4MDfYuXhpIsm9BEUAtQduDpVDZNvwZ3mAwK7+PoXbo IiQlaaCgR91I0g0xI5Q/PKL3OWalT40GW2LvmxCMR23Nxe2hQmi0e5/DWA2lJwLbRprO QIMbB4/6NzibfrtSfx3QgP0adNuCMVxMbHhb1kpwfMsFYmOHhKnJCZUoQO1Y9SELCB1s TrnrIA6ZKck1BG83qw6lSG5yPQWntrYnF5gvsF8Fw+aH1P8VOEJEIZbYnqO1ik/i6Q+q 6prg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771600375; x=1772205175; h=content-transfer-encoding:autocrypt:subject:from:to :content-language:user-agent:mime-version:date:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ERu8v0X4sWv2dADldt+cDGKXtWEo484HYyjn4yOxdFc=; b=In8+27cff4unsjMzYs2t8UG+j243AfiPBXQS07xXQpWnEsxDrKBEEqXIHTR2soRJ2a 0YsMZ/l+oZUwkfq1JWij6+ExR7PI6zjftCHwbgzSmJp4IGz7IB6efkLDPNZwT65zr0UV x81KecojcSLu1lYq8yG1rV6j0ftF77S8s79s4rh2BHZf8GArhDCvdl7U//8Fh7QMcR9i EBIy4jGXHa0JypQgBIIk4ZCUFUe7CkK5uCHAObcMNZRMdo4tz8YbzHlXRYylSgxODkm2 t8g7F1sStUW10QLEIIY1Ke+hAg8rwQ1Xx9449GsNn1KYV0g+G9dFGH32jiWo/CJNERf/ 9CYg== X-Gm-Message-State: AOJu0YxvFiBKsY2szEohe7qKm+s+IGiIll2UKdn+pwz2mn8H2UAUe1O0 chdm+bXSlweQ2Xg4WvIXuiMtO7FOpjgXFMlkhNEPn631tvjWMpGFWbYN2S+6jwuiQ+sB9WFTdAa 74Rg= X-Gm-Gg: AZuq6aIJi56AU8ZRbOuHG7NdkjiS/7oFB8P8BG8nZbd7/z7YBG2OG42jraxYY0AGWyD zX26d5+KUJTau5OyVZa+vhghrQ5wBodRYu15TfeOkItyvCfHbErvSTm6qPTTV0VQdaungJK62a3 LLU+onGH7EwWMUinbFrAHP5ykh2FyVxXumrafqxayWlNNbaC9CU0GVTpoWnaGIl12jNvxfMEhE5 Q2n0WzA/Tp9FuEJgl7rC9HuncKl9RL9Qfj1RL7T2tggXln1boczo6vjHvnzVEOhJkGE8vrnTBVY t5mgtpqE/EFh19d0fldmjcwHvsIcmwZEuLItj8vwc4Rrnz/nADF9+RU2LTz1OcrTi7cqETni1jQ ZWz6kfb8EBiXlwTxJoH8kecvypW9rV0X24cDqTs+tn4sGVlQdx7L6tw2a3Z24yJGVgQuOSXyDsQ m7p3rSp3il8ULZ97UlzpL5JfNsUzGiGadQhHXcleP8A1XHGDHeyuU0x/9cgpZi1WTQja9BSqOIu Zr7hGg/vTCMJ/U= X-Received: by 2002:a05:6000:248a:b0:436:3475:473e with SMTP id ffacd0b85a97d-4396f187ebemr403505f8f.51.1771600375236; Fri, 20 Feb 2026 07:12:55 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43796a74918sm56136615f8f.17.2026.02.20.07.12.54 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 20 Feb 2026 07:12:54 -0800 (PST) Message-ID: Date: Fri, 20 Feb 2026 16:12:54 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Binutils From: Jan Beulich Subject: [PATCH] gas: use get_single_number() in get_linefile_number() Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL X-Spam-Status: No, score=-3017.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE, SPF_NONE, TXREP, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org We don't really want to handle expressions there, we want plain numbers. --- a/gas/read.c +++ b/gas/read.c @@ -2047,11 +2047,11 @@ s_file (int ignore ATTRIBUTE_UNUSED) static bool get_linefile_number (int *flag) { - expressionS exp; + offsetT val; SKIP_WHITESPACE (); - if (*input_line_pointer < '0' || *input_line_pointer > '9') + if (is_end_of_stmt (*input_line_pointer)) return false; /* Don't mistakenly interpret octal numbers as line numbers. */ @@ -2062,16 +2062,17 @@ get_linefile_number (int *flag) return true; } - expression_and_evaluate (&exp); - if (exp.X_op != O_constant) + val = get_single_number (); + /* Zero was handled above; getting back zero indicates an error. */ + if (val == 0) return false; #if defined (BFD64) || LONG_MAX > INT_MAX - if (exp.X_add_number < INT_MIN || exp.X_add_number > INT_MAX) + if (val < INT_MIN || val > INT_MAX) return false; #endif - *flag = exp.X_add_number; + *flag = val; return true; } --- a/gas/testsuite/gas/all/linefile.l +++ b/gas/testsuite/gas/all/linefile.l @@ -1,6 +1,7 @@ # This should match the output of gas linefile.s. .*linefile\.s: Assembler messages: .*linefile\.s:2: Warning: line 2 +.*linefile\.s:4: Error: .* .*linefile\.s:5: Warning: line 5 .*linefile\.s:8: Warning: line 8 #pass