diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-23 20:25:01 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-23 20:25:01 +0200 |
commit | 6527efba38a06410f19670adba8a1951f8fe3d3c (patch) | |
tree | 760861ec87730eed4eaf4f6c20a2509edbf8af87 /Makefile | |
parent | Merge tag 'usb-4.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
parent | objtool: Fix Makefile to properly see if libelf is supported (diff) | |
download | linux-6527efba38a06410f19670adba8a1951f8fe3d3c.tar.xz linux-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-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |