Received-SPF: pass (google.com: domain of linux-kernel+bounces-125891-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Sat, 30 Mar 2024 21:23:06 -0000
From: "tip-bot2 for Mikulas Patocka" <tip-bot2@linutronix.de>
Sender: tip-bot2@linutronix.de
Reply-to: linux-kernel@vger.kernel.org
To: linux-tip-commits@vger.kernel.org
Subject: [tip: objtool/urgent] objtool: Fix compile failure when using the x32
 compiler
Cc: Mikulas Patocka <mpatocka@redhat.com>, Ingo Molnar <mingo@kernel.org>,
 Josh Poimboeuf <jpoimboe@redhat.com>, linux-kernel@vger.kernel.org,
 x86@kernel.org
Precedence: bulk
MIME-Version: 1.0
Message-ID: <171183378642.10875.5605747277159898590.tip-bot2@tip-bot2>
Robot-ID: <tip-bot2@linutronix.de>
Robot-Unsubscribe:
 Contact <mailto:tglx@linutronix.de> to get blacklisted from these emails
Precedence: bulk
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

The following commit has been merged into the objtool/urgent branch of tip:

Commit-ID:     6205125bd326ed0153e5f9da3c4689fe60ae885a
Gitweb:        https://git.kernel.org/tip/6205125bd326ed0153e5f9da3c4689fe60a=
e885a
Author:        Mikulas Patocka <mpatocka@redhat.com>
AuthorDate:    Sat, 30 Mar 2024 20:23:08 +01:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Sat, 30 Mar 2024 22:12:37 +01:00

objtool: Fix compile failure when using the x32 compiler

When compiling the v6.9-rc1 kernel with the x32 compiler, the following
errors are reported. The reason is that we take an "unsigned long"
variable and print it using "PRIx64" format string.

	In file included from check.c:16:
	check.c: In function =E2=80=98add_dead_ends=E2=80=99:
	/usr/src/git/linux-2.6/tools/objtool/include/objtool/warn.h:46:17: error: fo=
rmat =E2=80=98%llx=E2=80=99 expects argument of type =E2=80=98long long unsig=
ned int=E2=80=99, but argument 5 has type =E2=80=98long unsigned int=E2=80=99=
 [-Werror=3Dformat=3D]
	   46 |                 "%s: warning: objtool: " format "\n",   \
	      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
	check.c:613:33: note: in expansion of macro =E2=80=98WARN=E2=80=99
	  613 |                                 WARN("can't find unreachable insn at=
 %s+0x%" PRIx64,
	      |                                 ^~~~
	...

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: linux-kernel@vger.kernel.org
---
 tools/objtool/check.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 0b10ad0..0a33d91 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -585,7 +585,7 @@ static int add_dead_ends(struct objtool_file *file)
 	struct section *rsec;
 	struct reloc *reloc;
 	struct instruction *insn;
-	unsigned long offset;
+	uint64_t offset;
=20
 	/*
 	 * Check for manually annotated dead ends.