summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-03-31 07:47:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-31 07:47:21 -0700
commitf78b5be2a5d08709177963df17b8df42e690a652 (patch)
tree877d337da5fcf3cadfcd4a1d317e8bc69f870558 /Makefile
parent6536c5f2c8cf79db0d37e79afcdb227dc854509c (diff)
parent7dd47617114921fdd8c095509e5e7b4373cc44a1 (diff)
downloadlinux-stable-f78b5be2a5d08709177963df17b8df42e690a652.tar.gz
linux-stable-f78b5be2a5d08709177963df17b8df42e690a652.tar.bz2
linux-stable-f78b5be2a5d08709177963df17b8df42e690a652.zip
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Thomas Gleixner: "A small set of core updates: - Make the watchdog respect the selected CPU mask again. That was broken by the rework of the watchdog thread management and caused inconsistent state and NMI watchdog being unstoppable. - Ensure that the objtool build can find the libelf location. - Remove dead kcore stub code" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: watchdog: Respect watchdog cpumask on CPU hotplug objtool: Query pkg-config for libelf location proc/kcore: Remove unused kclist_add_remap()
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 929f51ef3075..52f067eadc48 100644
--- a/Makefile
+++ b/Makefile
@@ -953,9 +953,11 @@ mod_sign_cmd = true
endif
export mod_sign_cmd
+HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf)
+
ifdef CONFIG_STACK_VALIDATION
has_libelf := $(call try-run,\
- echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0)
+ echo "int main() {}" | $(HOSTCC) -xc -o /dev/null $(HOST_LIBELF_LIBS) -,1,0)
ifeq ($(has_libelf),1)
objtool_target := tools/objtool FORCE
else