From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758765AbcCEI0k (ORCPT ); Sat, 5 Mar 2016 03:26:40 -0500 Received: from torg.zytor.com ([198.137.202.12]:59098 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751304AbcCEI0c (ORCPT ); Sat, 5 Mar 2016 03:26:32 -0500 Date: Sat, 5 Mar 2016 00:24:41 -0800 From: tip-bot for Josh Poimboeuf Message-ID: Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, torvalds@linux-foundation.org, sudipm.mukherjee@gmail.com, hpa@zytor.com, peterz@infradead.org, jpoimboe@redhat.com, sfr@canb.auug.org.au, akpm@linux-foundation.org Reply-To: torvalds@linux-foundation.org, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, sfr@canb.auug.org.au, jpoimboe@redhat.com, peterz@infradead.org, hpa@zytor.com, sudipm.mukherjee@gmail.com In-Reply-To: <8c27fe00face60f42e888ddb3142c97e45223165.1457026550.git.jpoimboe@redhat.com> References: <8c27fe00face60f42e888ddb3142c97e45223165.1457026550.git.jpoimboe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:core/objtool] objtool: Detect and warn if libelf is missing and don't break the build Git-Commit-ID: 3b27a0c85d7068130ed8e3977a2e977ade986841 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3b27a0c85d7068130ed8e3977a2e977ade986841 Gitweb: http://git.kernel.org/tip/3b27a0c85d7068130ed8e3977a2e977ade986841 Author: Josh Poimboeuf AuthorDate: Thu, 3 Mar 2016 11:39:30 -0600 Committer: Ingo Molnar CommitDate: Sat, 5 Mar 2016 09:20:44 +0100 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 Cc: Andrew Morton Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephen Rothwell Cc: Sudip Mukherjee Cc: Thomas Gleixner 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 --- Makefile | 13 ++++++++++++- scripts/Makefile.build | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2c27a01..60b7295 100644 --- a/Makefile +++ b/Makefile @@ -995,8 +995,19 @@ prepare0: archprepare FORCE # All the preparing.. prepare: prepare0 prepare-objtool +ifdef CONFIG_STACK_VALIDATION + has_libelf := $(shell echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf - &> /dev/null && echo 1 || echo 0) + ifeq ($(has_libelf),1) + objtool_target := tools/objtool FORCE + else + $(warning "Cannot use CONFIG_STACK_VALIDATION, please install libelf-dev or elfutils-libelf-devel") + SKIP_STACK_VALIDATION := 1 + export SKIP_STACK_VALIDATION + endif +endif + PHONY += prepare-objtool -prepare-objtool: $(if $(CONFIG_STACK_VALIDATION), tools/objtool FORCE) +prepare-objtool: $(objtool_target) # Generate some files # --------------------------------------------------------------------------- diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 130a452..e1bc190 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -242,6 +242,7 @@ cmd_record_mcount = \ endif ifdef CONFIG_STACK_VALIDATION +ifneq ($(SKIP_STACK_VALIDATION),1) __objtool_obj := $(objtree)/tools/objtool/objtool @@ -260,6 +261,7 @@ objtool_obj = $(if $(patsubst y%,, \ $(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \ $(__objtool_obj)) +endif # SKIP_STACK_VALIDATION endif # CONFIG_STACK_VALIDATION define rule_cc_o_c