Skip to content

Commit 3b27a0c

Browse files
jpoimboeIngo Molnar
authored andcommitted
objtool: Detect and warn if libelf is missing and don't break the build
With CONFIG_STACK_VALIDATION enabled, if the host system doesn't have a development version of libelf installed, the build fails with errors like: elf.h:22:18: fatal error: gelf.h: No such file or directory compilation terminated. Instead of failing to build, instead just print a warning and disable stack validation. Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-next@vger.kernel.org Cc: linux@roeck-us.net Cc: live-patching@vger.kernel.org Link: http://lkml.kernel.org/r/8c27fe00face60f42e888ddb3142c97e45223165.1457026550.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent e17cf3a commit 3b27a0c

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

Makefile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,8 +995,19 @@ prepare0: archprepare FORCE
995995
# All the preparing..
996996
prepare: prepare0 prepare-objtool
997997

998+
ifdef CONFIG_STACK_VALIDATION
999+
has_libelf := $(shell echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf - &> /dev/null && echo 1 || echo 0)
1000+
ifeq ($(has_libelf),1)
1001+
objtool_target := tools/objtool FORCE
1002+
else
1003+
$(warning "Cannot use CONFIG_STACK_VALIDATION, please install libelf-dev or elfutils-libelf-devel")
1004+
SKIP_STACK_VALIDATION := 1
1005+
export SKIP_STACK_VALIDATION
1006+
endif
1007+
endif
1008+
9981009
PHONY += prepare-objtool
999-
prepare-objtool: $(if $(CONFIG_STACK_VALIDATION), tools/objtool FORCE)
1010+
prepare-objtool: $(objtool_target)
10001011

10011012
# Generate some files
10021013
# ---------------------------------------------------------------------------

scripts/Makefile.build

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ cmd_record_mcount = \
242242
endif
243243

244244
ifdef CONFIG_STACK_VALIDATION
245+
ifneq ($(SKIP_STACK_VALIDATION),1)
245246

246247
__objtool_obj := $(objtree)/tools/objtool/objtool
247248

@@ -260,6 +261,7 @@ objtool_obj = $(if $(patsubst y%,, \
260261
$(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \
261262
$(__objtool_obj))
262263

264+
endif # SKIP_STACK_VALIDATION
263265
endif # CONFIG_STACK_VALIDATION
264266

265267
define rule_cc_o_c

0 commit comments

Comments
 (0)