Commit cd92ac25 authored by Hans de Goede's avatar Hans de Goede Committed by Vasily Gorbik
Browse files

s390/purgatory: Make sure we fail the build if purgatory has missing symbols 



Since we link purgatory with -r aka we enable "incremental linking"
no checks for unresolved symbols are done while linking the purgatory.

This commit adds an extra check for unresolved symbols by calling ld
without -r before running objcopy to generate purgatory.ro.

This will help us catch missing symbols in the purgatory sooner.

Note this commit also removes --no-undefined from LDFLAGS_purgatory
as that has no effect.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/lkml/20191212205304.191610-1-hdegoede@redhat.com


Tested-by: default avatarPhilipp Rudo <prudo@linux.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 6feeee8e

arch/s390/purgatory/.gitignore

+1 −0
Original line number Diff line number Diff line 
purgatory

purgatory.chk

purgatory.lds

purgatory.ro

arch/s390/purgatory/Makefile

+10 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ OBJECT_FILES_NON_STANDARD := y 


purgatory-y := head.o purgatory.o string.o sha256.o mem.o



targets += $(purgatory-y) purgatory.lds purgatory purgatory.ro

targets += $(purgatory-y) purgatory.lds purgatory purgatory.chk purgatory.ro

PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))



$(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE
@@ -26,15 +26,22 @@ KBUILD_CFLAGS += $(CLANG_FLAGS) 
KBUILD_CFLAGS += $(call cc-option,-fno-PIE)

KBUILD_AFLAGS := $(filter-out -DCC_USING_EXPOLINE,$(KBUILD_AFLAGS))



LDFLAGS_purgatory := -r --no-undefined -nostdlib -z nodefaultlib -T

# Since we link purgatory with -r unresolved symbols are not checked, so we

# also link a purgatory.chk binary without -r to check for unresolved symbols.

PURGATORY_LDFLAGS := -nostdlib -z nodefaultlib

LDFLAGS_purgatory := -r $(PURGATORY_LDFLAGS) -T

LDFLAGS_purgatory.chk := -e purgatory_start $(PURGATORY_LDFLAGS)

$(obj)/purgatory: $(obj)/purgatory.lds $(PURGATORY_OBJS) FORCE

		$(call if_changed,ld)



$(obj)/purgatory.chk: $(obj)/purgatory FORCE

		$(call if_changed,ld)



OBJCOPYFLAGS_purgatory.ro := -O elf64-s390

OBJCOPYFLAGS_purgatory.ro += --remove-section='*debug*'

OBJCOPYFLAGS_purgatory.ro += --remove-section='.comment'

OBJCOPYFLAGS_purgatory.ro += --remove-section='.note.*'

$(obj)/purgatory.ro: $(obj)/purgatory FORCE

$(obj)/purgatory.ro: $(obj)/purgatory $(obj)/purgatory.chk FORCE

		$(call if_changed,objcopy)



$(obj)/kexec-purgatory.o: $(obj)/kexec-purgatory.S $(obj)/purgatory.ro FORCE

CRA Git | Maintained and supported by SUSTech CRA and CCSE