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
93 lines
1.8 KiB
Diff
93 lines
1.8 KiB
Diff
---
|
|
genprotimg/boot/stage3a.lds.S | 11 +++++------
|
|
genprotimg/boot/stage3b.lds.S | 9 ++++-----
|
|
2 files changed, 9 insertions(+), 11 deletions(-)
|
|
|
|
--- a/genprotimg/boot/stage3a.lds.S
|
|
+++ b/genprotimg/boot/stage3a.lds.S
|
|
@@ -23,8 +23,6 @@ ENTRY(_init)
|
|
|
|
SECTIONS
|
|
{
|
|
- . = 0x0;
|
|
-
|
|
. = HEAP_ADDRESS;
|
|
__heap_start = .;
|
|
.heap : {
|
|
@@ -46,7 +44,7 @@ SECTIONS
|
|
. = STAGE3A_INIT_ENTRY;
|
|
__text_init_start = .;
|
|
.text : {
|
|
- stage3a_init.o(.text.init)
|
|
+ *(.text.init)
|
|
__text_init_stop = ABSOLUTE(.);
|
|
/* Text size of text_init must be smaller than 'PARMAREA - IMAGE_ENTRY',
|
|
* otherwise the text data could be overwritten by the original zipl stage3
|
|
@@ -56,8 +54,8 @@ SECTIONS
|
|
. = 0x1000;
|
|
ASSERT(ABSOLUTE(.) == STAGE3A_ENTRY,
|
|
"Text section doesn't conform to the described memory layout");
|
|
- head.o(.text.start)
|
|
- *(.text)
|
|
+ *(.text.start)
|
|
+ *(.text .text.*)
|
|
}
|
|
|
|
.ex_table ALIGN(16) : {
|
|
@@ -74,7 +72,7 @@ SECTIONS
|
|
|
|
.rodata ALIGN(16) : {
|
|
*(.rodata)
|
|
- *(.rodata.*)
|
|
+ *(.rodata*)
|
|
}
|
|
|
|
.data ALIGN(16) : {
|
|
@@ -93,6 +91,7 @@ SECTIONS
|
|
/* Sections to be discarded */
|
|
/DISCARD/ : {
|
|
*(.eh_frame)
|
|
+ *(.interp)
|
|
*(.note.GNU-stack)
|
|
}
|
|
}
|
|
--- a/genprotimg/boot/stage3b.lds.S
|
|
+++ b/genprotimg/boot/stage3b.lds.S
|
|
@@ -21,8 +21,6 @@ ENTRY(_start)
|
|
|
|
SECTIONS
|
|
{
|
|
- . = 0x0;
|
|
-
|
|
. = HEAP_ADDRESS;
|
|
__heap_start = .;
|
|
.heap : {
|
|
@@ -34,8 +32,8 @@ SECTIONS
|
|
|
|
. = STAGE3B_ENTRY;
|
|
.text : {
|
|
- head.o(.text.start)
|
|
- *(.text)
|
|
+ *(.text.start)
|
|
+ *(.text .text.*)
|
|
}
|
|
|
|
.ex_table ALIGN(16) : {
|
|
@@ -52,7 +50,7 @@ SECTIONS
|
|
|
|
.rodata ALIGN(16) : {
|
|
*(.rodata)
|
|
- *(.rodata.*)
|
|
+ *(.rodata*)
|
|
}
|
|
|
|
.data ALIGN(16) : {
|
|
@@ -77,6 +75,7 @@ SECTIONS
|
|
/* Sections to be discarded */
|
|
/DISCARD/ : {
|
|
*(.eh_frame)
|
|
+ *(.interp)
|
|
*(.note.GNU-stack)
|
|
}
|
|
}
|