fix up some 4.9 LDFLAGS patches

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 a828c354a9a3afc823cfbb1f6933b16ec5dbb0f6..398b6eb2fb3e9cc62703647624b9e0de1a4a9410 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
  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 67f25305527121a4e27a112e17e3606d53d441f5..f41cd82cf6ff4a81742ea51bca6dd827dede160f 100644 (file)
--- 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 <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  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 <gregkh@linuxfoundation.org>
  
 --- 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