56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Sun, 14 Jan 2018 19:27:18 +0000
|
|
Subject: Revert "objtool: Fix CONFIG_STACK_VALIDATION=y warning for
|
|
out-of-tree modules"
|
|
|
|
This reverts commit 9f0c18aec620bc9d82268b3cb937568dd07b43ff. This
|
|
check doesn't make sense for OOT modules as they should always use
|
|
a pre-built objtool.
|
|
---
|
|
Makefile | 33 ++++++++++++++++-----------------
|
|
1 file changed, 16 insertions(+), 17 deletions(-)
|
|
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -949,17 +949,6 @@ mod_sign_cmd = true
|
|
endif
|
|
export mod_sign_cmd
|
|
|
|
-ifdef CONFIG_STACK_VALIDATION
|
|
- 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
|
|
- SKIP_STACK_VALIDATION := 1
|
|
- export SKIP_STACK_VALIDATION
|
|
- endif
|
|
-endif
|
|
-
|
|
|
|
ifeq ($(KBUILD_EXTMOD),)
|
|
core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/
|
|
@@ -1110,6 +1099,22 @@ uapi-asm-generic:
|
|
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
|
|
src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm
|
|
|
|
+ifdef CONFIG_STACK_VALIDATION
|
|
+ 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
|
|
+ ifdef CONFIG_UNWINDER_ORC
|
|
+ $(error "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=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
|
|
+endif
|
|
+
|
|
PHONY += prepare-objtool
|
|
prepare-objtool: $(objtool_target)
|
|
ifeq ($(SKIP_STACK_VALIDATION),1)
|