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
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
---
|
|
genprotimg/boot/Makefile | 2 +-
|
|
genprotimg/boot/stage3a.lds.S | 6 ------
|
|
genprotimg/boot/stage3b.lds.S | 6 ------
|
|
3 files changed, 1 insertion(+), 13 deletions(-)
|
|
|
|
--- a/genprotimg/boot/Makefile
|
|
+++ b/genprotimg/boot/Makefile
|
|
@@ -79,7 +79,7 @@ stage3b_reloc.elf:
|
|
stage3b) SFLAGS="-Wl,-T,stage3b.lds";; \
|
|
stage3b_reloc) SFLAGS="-Wl,-estage3b_reloc_start,-Ttext,0";; \
|
|
esac; \
|
|
- $(LINK) $$SFLAGS $(NO_PIE_LDFLAGS) $(NO_WARN_RWX_SEGMENTS_LDFLAGS) -m64 -static -nostdlib $(filter %.o, $^) -o $@
|
|
+ $(LINK) $$SFLAGS $(NO_PIE_LDFLAGS) $(NO_WARN_RWX_SEGMENTS_LDFLAGS) -Wl,--build-id=none -m64 -static -nostdlib $(filter %.o, $^) -o $@
|
|
@chmod a-x $@
|
|
|
|
%.bin: %.elf
|
|
--- a/genprotimg/boot/stage3a.lds.S
|
|
+++ b/genprotimg/boot/stage3a.lds.S
|
|
@@ -90,12 +90,6 @@ SECTIONS
|
|
ASSERT(ABSOLUTE(.) < 0x13000, "Data section doesn't conform to the described memory layout");
|
|
}
|
|
|
|
- /* List this explicitly as otherwise .note.gnu.build-id will be
|
|
- * put at 0x0 */
|
|
- .notes : {
|
|
- *(.note.*)
|
|
- }
|
|
-
|
|
/* Sections to be discarded */
|
|
/DISCARD/ : {
|
|
*(.eh_frame)
|
|
--- a/genprotimg/boot/stage3b.lds.S
|
|
+++ b/genprotimg/boot/stage3b.lds.S
|
|
@@ -74,12 +74,6 @@ SECTIONS
|
|
}
|
|
__stack_end = .;
|
|
|
|
- /* List this explicitly as otherwise .note.gnu.build-id will be
|
|
- * put at 0x0 */
|
|
- .notes : {
|
|
- *(.note.*)
|
|
- }
|
|
-
|
|
/* Sections to be discarded */
|
|
/DISCARD/ : {
|
|
*(.eh_frame)
|