From nobody Tue Dec 16 16:41:13 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB7FBC4167B for ; Thu, 30 Nov 2023 08:51:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344933AbjK3Ivh (ORCPT ); Thu, 30 Nov 2023 03:51:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231753AbjK3Iva (ORCPT ); Thu, 30 Nov 2023 03:51:30 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B99BB10DF; Thu, 30 Nov 2023 00:51:35 -0800 (PST) Date: Thu, 30 Nov 2023 08:51:33 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1701334294; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ei2mNn8OwqK1Sc4aKtY1O7cZCrtlOZi7TfAXs+UClv8=; b=yYhg46JpQKn421IDN2b2djun1MZvgVpZeLfYXSRBkCdW0YziafKjODizigoRng1MaJA6M4 iK0Ti5Bq3kTs/FAzwcGZ18IfeRyO8DzrpXC1rn06/+NnIagMd42GVhLjuIZigBkES9FRI0 Cye2e0A24SM0N/6fzr8vzz58F4mVtqMBg06xpPaLgPuObGxrs7u/AcbrK2VrvrT6c+deGo hPXmW3wxRSGqF/p2BEzUjH8vbwH0szXsVswnfA9sKY7Oh3ihoPQoM9Iqx7VaI+v0zE7NPn ZPAvEQahQKu7y9NkMX65ozb061tE9OeD+2YD9wgktPhsNWCKKC9625P4Kks5CQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1701334294; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ei2mNn8OwqK1Sc4aKtY1O7cZCrtlOZi7TfAXs+UClv8=; b=jCD5VsuRzWO7FoL/pcZqNbqea+1qgzT9MQOtaAyUEm7zhzIg+vcqLbx1iWBGB5TVCpQOHG oChEKIOxeEeAC4Ag== From: "tip-bot2 for Samuel Zeter" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/build] x86/tools: objdump_reformat.awk: Allow for spaces Cc: Samuel Zeter , Nathan Chancellor , Ingo Molnar , Kees Cook , Masami Hiramatsu , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231129-objdump-reformat-llvm-v3-2-0d855e79314d@kernel.org> References: <20231129-objdump-reformat-llvm-v3-2-0d855e79314d@kernel.org> MIME-Version: 1.0 Message-ID: <170133429362.398.4707883263902716130.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/build branch of tip: Commit-ID: f4570ebd836363dc7722b8eb8d099b311021af13 Gitweb: https://git.kernel.org/tip/f4570ebd836363dc7722b8eb8d099b311= 021af13 Author: Samuel Zeter AuthorDate: Wed, 29 Nov 2023 15:17:42 -07:00 Committer: Ingo Molnar CommitterDate: Thu, 30 Nov 2023 09:38:10 +01:00 x86/tools: objdump_reformat.awk: Allow for spaces GNU objdump and LLVM objdump have differing output formats. Specifically, GNU objump will format its output as: address:hex, whereas LLVM objdump displays its output as address:hex. objdump_reformat.awk incorrectly handles this discrepancy due to the unexpected space and as a result insn_decoder_test fails, as its input is garbled. The instruction line being tokenized now handles a space and colon, or tab delimiter. Signed-off-by: Samuel Zeter Signed-off-by: Nathan Chancellor Signed-off-by: Ingo Molnar Tested-by: Nathan Chancellor Tested-by: Kees Cook Reviewed-by: Kees Cook Acked-by: Masami Hiramatsu Link: https://lore.kernel.org/r/20231129-objdump-reformat-llvm-v3-2-0d855e7= 9314d@kernel.org Closes: https://github.com/ClangBuiltLinux/linux/issues/1364 --- arch/x86/tools/objdump_reformat.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/tools/objdump_reformat.awk b/arch/x86/tools/objdump_r= eformat.awk index 276e572..a4120d9 100644 --- a/arch/x86/tools/objdump_reformat.awk +++ b/arch/x86/tools/objdump_reformat.awk @@ -22,7 +22,7 @@ BEGIN { } =20 /^ *[0-9a-f]+:/ { - if (split($0, field, "\t") < 3) { + if (split($0, field, /: |\t/) < 3) { # This is a continuation of the same insn. prev_hex =3D prev_hex field[2] } else {