Commit cee47579 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'objtool-urgent-2026-01-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull objtool fixes from Ingo Molnar:
 "Fix two objtool build failures that trigger in uncommon build
  environments"

* tag 'objtool-urgent-2026-01-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: fix build failure due to missing libopcodes check
  objtool: fix compilation failure with the x32 toolchain
parents 8562711a 436326bc

tools/objtool/Makefile

+14 −10
Original line number Diff line number Diff line
@@ -72,23 +72,27 @@ HOST_OVERRIDES := CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" 


#

# To support disassembly, objtool needs libopcodes which is provided

# with libbdf (binutils-dev or binutils-devel package).

# with libbfd (binutils-dev or binutils-devel package).

#

FEATURE_USER = .objtool

FEATURE_TESTS = libbfd disassembler-init-styled

FEATURE_DISPLAY =

include $(srctree)/tools/build/Makefile.feature

# We check using HOSTCC directly rather than the shared feature framework

# because objtool is a host tool that links against host libraries.

#

HAVE_LIBOPCODES := $(shell echo 'int main(void) { return 0; }' | \

			$(HOSTCC) -xc - -o /dev/null -lopcodes 2>/dev/null && echo y)



ifeq ($(feature-disassembler-init-styled), 1)

	OBJTOOL_CFLAGS += -DDISASM_INIT_STYLED

endif

# Styled disassembler support requires binutils >= 2.39

HAVE_DISASM_STYLED := $(shell echo '$(pound)include <dis-asm.h>' | \

			$(HOSTCC) -E -xc - 2>/dev/null | grep -q disassembler_style && echo y)



BUILD_DISAS := n



ifeq ($(feature-libbfd),1)

ifeq ($(HAVE_LIBOPCODES),y)

	BUILD_DISAS := y

	OBJTOOL_CFLAGS += -DDISAS -DPACKAGE="objtool"

	OBJTOOL_CFLAGS += -DDISAS -DPACKAGE='"objtool"'

	OBJTOOL_LDFLAGS += -lopcodes

ifeq ($(HAVE_DISASM_STYLED),y)

	OBJTOOL_CFLAGS += -DDISASM_INIT_STYLED

endif

endif



export BUILD_DISAS

tools/objtool/include/objtool/warn.h

+2 −2
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@ static inline void unindent(int *unused) { indent--; } 
	if (unlikely(insn->sym && insn->sym->pfunc &&			\

		     insn->sym->pfunc->debug_checksum)) {		\

		char *insn_off = offstr(insn->sec, insn->offset);	\

		__dbg("checksum: %s %s %016lx",				\

		      func->name, insn_off, checksum);			\

		__dbg("checksum: %s %s %016llx",			\

		      func->name, insn_off, (unsigned long long)checksum);\

		free(insn_off);						\

	}								\

})