summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-23 11:25:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-23 11:25:01 -0700
commit6527efba38a06410f19670adba8a1951f8fe3d3c (patch)
tree760861ec87730eed4eaf4f6c20a2509edbf8af87 /Makefile
parent68dc08b5802f606b5b50dde558533b643b6d9526 (diff)
parentc2bb9e32e2315971a8535fee77335c04a739d71d (diff)
downloadlinux-stable-6527efba38a06410f19670adba8a1951f8fe3d3c.tar.gz
linux-stable-6527efba38a06410f19670adba8a1951f8fe3d3c.tar.bz2
linux-stable-6527efba38a06410f19670adba8a1951f8fe3d3c.zip
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool fixes from Ingo Molnar: "A handful of objtool fixes: two improvements to how warnings are printed plus a false positive warning fix, and build environment fix" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: objtool: Fix Makefile to properly see if libelf is supported objtool: Detect falling through to the next function objtool: Add workaround for GCC switch jump table bug
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 873411873c03..012b7dd3ed24 100644
--- a/Makefile
+++ b/Makefile
@@ -1008,7 +1008,8 @@ prepare0: archprepare FORCE
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)
+ has_libelf := $(call try-run,\
+ echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0)
ifeq ($(has_libelf),1)
objtool_target := tools/objtool FORCE
else