51 lines
1.5 KiB
Diff
51 lines
1.5 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 | 22 +++++++++++-----------
|
|
1 file changed, 11 insertions(+), 11 deletions(-)
|
|
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -954,17 +954,6 @@ 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 $(HOST_LIBELF_LIBS) -,1,0)
|
|
- ifeq ($(has_libelf),1)
|
|
- objtool_target := tools/objtool FORCE
|
|
- else
|
|
- SKIP_STACK_VALIDATION := 1
|
|
- export SKIP_STACK_VALIDATION
|
|
- endif
|
|
-endif
|
|
-
|
|
PHONY += prepare0
|
|
|
|
ifeq ($(KBUILD_EXTMOD),)
|
|
@@ -1115,6 +1104,17 @@ 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 $(HOST_LIBELF_LIBS) -,1,0)
|
|
+ ifeq ($(has_libelf),1)
|
|
+ objtool_target := tools/objtool FORCE
|
|
+ else
|
|
+ SKIP_STACK_VALIDATION := 1
|
|
+ export SKIP_STACK_VALIDATION
|
|
+ endif
|
|
+endif
|
|
+
|
|
PHONY += prepare-objtool
|
|
prepare-objtool: $(objtool_target)
|
|
ifeq ($(SKIP_STACK_VALIDATION),1)
|