From d8b6db7f5f5bb08703de80b9c192416b53c7f404 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 11 Aug 2022 13:54:19 +0200 Subject: [PATCH] fix up some 4.9 LDFLAGS patches --- ...ink-with-z-noexecstack-no-warn-rwx-segments.patch | 4 ++-- ...oot-with-z-noexecstack-no-warn-rwx-segments.patch | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/queue-4.9/makefile-link-with-z-noexecstack-no-warn-rwx-segments.patch b/queue-4.9/makefile-link-with-z-noexecstack-no-warn-rwx-segments.patch index a828c354a9a..398b6eb2fb3 100644 --- a/queue-4.9/makefile-link-with-z-noexecstack-no-warn-rwx-segments.patch +++ b/queue-4.9/makefile-link-with-z-noexecstack-no-warn-rwx-segments.patch @@ -49,9 +49,9 @@ Signed-off-by: Greg Kroah-Hartman LDFLAGS_vmlinux += $(call ld-option, --gc-sections,) endif -+KBUILD_LDFLAGS += -z noexecstack ++LDFLAGS += -z noexecstack +ifeq ($(CONFIG_LD_IS_BFD),y) -+KBUILD_LDFLAGS += $(call ld-option,--no-warn-rwx-segments) ++LDFLAGS += $(call ld-option,--no-warn-rwx-segments) +endif + ifeq ($(CONFIG_STRIP_ASM_SYMS),y) diff --git a/queue-4.9/x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch b/queue-4.9/x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch index 67f25305527..f41cd82cf6f 100644 --- a/queue-4.9/x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch +++ b/queue-4.9/x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch @@ -41,9 +41,9 @@ Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- arch/x86/boot/Makefile | 2 +- - arch/x86/boot/compressed/Makefile | 4 ++++ + arch/x86/boot/compressed/Makefile | 6 ++++++ arch/x86/entry/vdso/Makefile | 2 +- - 3 files changed, 6 insertions(+), 2 deletions(-) + 3 files changed, 8 insertions(+), 2 deletions(-) --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -58,14 +58,16 @@ Signed-off-by: Greg Kroah-Hartman --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile -@@ -54,6 +54,10 @@ else +@@ -54,6 +54,12 @@ else LDFLAGS += $(shell $(LD) --help 2>&1 | grep -q "\-z noreloc-overflow" \ && echo "-z noreloc-overflow -pie --no-dynamic-linker") endif -+LDFLAGS_vmlinux += -z noexecstack ++ ++LDFLAGS += -z noexecstack +ifeq ($(CONFIG_LD_IS_BFD),y) -+LDFLAGS_vmlinux += $(call ld-option,--no-warn-rwx-segments) ++LDFLAGS += $(call ld-option,--no-warn-rwx-segments) +endif ++ LDFLAGS_vmlinux := -T hostprogs-y := mkpiggy -- 2.47.3