From 4bed503aa76616930def04986be3d2badecdd9c5 Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Wed, 18 Jan 2023 18:10:15 +0000 Subject: [PATCH] zipl/boot: disable build-id MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disable the build-id since it was never used. Adapt the linker scripts accordingly. Reviewed-by: Steffen Eiden Reviewed-by: Stefan Haberland Signed-off-by: Marc Hartmayer Signed-off-by: Jan Höppner --- zipl/boot/Makefile | 2 +- zipl/boot/stage2.lds.S | 2 -- zipl/boot/stage3.lds.S | 6 ------ 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/zipl/boot/Makefile b/zipl/boot/Makefile index 5ccbfb37..6177dfc1 100644 --- a/zipl/boot/Makefile +++ b/zipl/boot/Makefile @@ -74,7 +74,7 @@ stage3.exec: head.o stage3.o kdump3.o libc.o ebcdic.o ebcdic_conv.o sclp.o \ 2) SFLAGS="-Wl,-T,stage2.lds";; \ 3) SFLAGS="-Wl,-T,stage3.lds";; \ 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 $@ %.bin: %.exec $(OBJCOPY) -O binary \ diff --git a/zipl/boot/stage2.lds.S b/zipl/boot/stage2.lds.S index 2204dd56..057da853 100644 --- a/zipl/boot/stage2.lds.S +++ b/zipl/boot/stage2.lds.S @@ -88,8 +88,6 @@ SECTIONS } __stack_end = .; - .note.gnu.build-id : { *(.note.gnu.build-id) } - /* Sections to be discarded */ /DISCARD/ : { *(.eh_frame) diff --git a/zipl/boot/stage3.lds.S b/zipl/boot/stage3.lds.S index 1150fea4..92009307 100644 --- a/zipl/boot/stage3.lds.S +++ b/zipl/boot/stage3.lds.S @@ -69,12 +69,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)