121bd3e056
- Apllied the following patches (bsc#1208527, bsc#1206173) * s390-tools-sles15sp5-01-zipl-boot-discard-.eh_frame-and-.interp-input-sectio.patch * s390-tools-sles15sp5-02-zipl-boot-declare-that-no-executable-stack-is-requir.patch * s390-tools-sles15sp5-03-zipl-boot-use-no-warn-rwx-segments-linker-flag.patch * s390-tools-sles15sp5-04-zipl-boot-disable-build-id.patch * s390-tools-sles15sp5-05-zipl-boot-simplify-objcopy-commands.patch * s390-tools-sles15sp5-06-zipl-move-STAGE2_MAX_SIZE-and-STAGE1B_LOAD_ADDR-to-l.patch * s390-tools-sles15sp5-07-zipl-boot-use-linker-scripts-for-all-bootloaders.patch * s390-tools-sles15sp5-08-genprotimg-boot-declare-that-no-executable-stack-is-.patch * s390-tools-sles15sp5-09-genprotimg-boot-use-no-warn-rwx-segments-linker-flag.patch * s390-tools-sles15sp5-10-genprotimg-boot-disable-build-id.patch * s390-tools-sles15sp5-11-genprotimg-boot-Makefile-simplify-objcopy-command.patch * s390-tools-sles15sp5-12-genprotimg-boot-improve-linker-scripts.patch * s390-tools-sles15sp5-13-genprotimg-boot-stage3b-add-size-check-to-the-linker.patch * s390-tools-sles15sp5-14-genprotimg-boot-stage3b_reloc.bin-add-linker-script.patch * s390-tools-sles15sp5-15-zipl-Embed-loader-data-directly-into-boot-object.patch OBS-URL: https://build.opensuse.org/request/show/1067101 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=157
60 lines
1.5 KiB
Diff
60 lines
1.5 KiB
Diff
---
|
|
genprotimg/boot/head.S | 5 +++++
|
|
genprotimg/boot/stage3a.lds.S | 1 +
|
|
genprotimg/boot/stage3a_init.S | 5 +++++
|
|
genprotimg/boot/stage3b.lds.S | 1 +
|
|
genprotimg/boot/stage3b_reloc.S | 5 +++++
|
|
5 files changed, 17 insertions(+)
|
|
|
|
--- a/genprotimg/boot/head.S
|
|
+++ b/genprotimg/boot/head.S
|
|
@@ -29,3 +29,8 @@ _start:
|
|
brasl %r14, initialize
|
|
.Lstack: .long STACK_ADDRESS + STACK_SIZE - STACK_FRAME_OVERHEAD
|
|
.previous
|
|
+
|
|
+/* The code doesn't require an executable stack */
|
|
+#if defined(__linux__) && defined(__ELF__)
|
|
+.section .note.GNU-stack,"",%progbits
|
|
+#endif
|
|
--- a/genprotimg/boot/stage3a.lds.S
|
|
+++ b/genprotimg/boot/stage3a.lds.S
|
|
@@ -99,5 +99,6 @@ SECTIONS
|
|
/* Sections to be discarded */
|
|
/DISCARD/ : {
|
|
*(.eh_frame)
|
|
+ *(.note.GNU-stack)
|
|
}
|
|
}
|
|
--- a/genprotimg/boot/stage3a_init.S
|
|
+++ b/genprotimg/boot/stage3a_init.S
|
|
@@ -26,3 +26,8 @@ _init:
|
|
br %r1
|
|
.Lstage3a_entry: .long STAGE3A_ENTRY
|
|
.previous
|
|
+
|
|
+/* The code doesn't require an executable stack */
|
|
+#if defined(__linux__) && defined(__ELF__)
|
|
+.section .note.GNU-stack,"",%progbits
|
|
+#endif
|
|
--- a/genprotimg/boot/stage3b.lds.S
|
|
+++ b/genprotimg/boot/stage3b.lds.S
|
|
@@ -83,5 +83,6 @@ SECTIONS
|
|
/* Sections to be discarded */
|
|
/DISCARD/ : {
|
|
*(.eh_frame)
|
|
+ *(.note.GNU-stack)
|
|
}
|
|
}
|
|
--- a/genprotimg/boot/stage3b_reloc.S
|
|
+++ b/genprotimg/boot/stage3b_reloc.S
|
|
@@ -53,3 +53,8 @@ stage3b_start:
|
|
.incbin "stage3b.bin"
|
|
stage3b_end:
|
|
.previous
|
|
+
|
|
+/* The code doesn't require an executable stack */
|
|
+#if defined(__linux__) && defined(__ELF__)
|
|
+.section .note.GNU-stack,"",%progbits
|
|
+#endif
|