[GIT PULL] objtool fix

Ingo Molnar
2017-10-14T15:53:43Z

Linus,

Please pull the latest core-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus

# HEAD: 3dd40cb320fee7c23b574ab821ce140ccd1281c9 objtool: Upgrade libelf-devel warning to error for CONFIG_ORC_UNWINDER

A single objtool fix: avoid silently broken ORC debuginfo builds and error out
instead.

Thanks,

Ingo

------------------>
Josh Poimboeuf (1):
objtool: Upgrade libelf-devel warning to error for CONFIG_ORC_UNWINDER

Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cf007a31d575..bc5c79e8e3cf 100644
--- a/Makefile
+++ b/Makefile
@@ -933,7 +933,11 @@ ifdef CONFIG_STACK_VALIDATION
ifeq ($(has_libelf),1)
objtool_target := tools/objtool FORCE
else
- $(warning "Cannot use CONFIG_STACK_VALIDATION, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
+ ifdef CONFIG_ORC_UNWINDER
+ $(error "Cannot generate ORC metadata for CONFIG_ORC_UNWINDER=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
+ else
+ $(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
+ endif
SKIP_STACK_VALIDATION := 1
export SKIP_STACK_VALIDATION
endif